Fixed shopping_location_id was missing for consume / transfer stock transactions and when undoing them (fixes #2896)

.devtools/data_generation_scripts/9999_reset_admin_password.php

@@ -15,5 +15,5 @@ if ($adminUserRow == null)
 }
 
 $adminUserRow->update([
-	'password' => password_hash('admin', PASSWORD_DEFAULT)
+	'password' => password_hash('admin', PASSWORD_ARGON2ID)
 ]);

.editorconfig

@@ -1,8 +0,0 @@
-root = true
-
-[*]
-indent_style = tab
-indent_size = 4
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true

changelog/28_1.15.0_2018-07-22.md

@@ -2,7 +2,7 @@
   - => https://github.com/grocy/grocy-desktop
   - Run Grocy without a webserver just like a normal (Windows) desktop application
   - New "embedded mode" for Grocy to help running in "desktop application mode" [see README](https://github.com/grocy/grocy#embedded-mode)
-- New datepicker shorthands and improvements
+- New date time picker shorthands and improvements
   - `YYYYMMe` or `YYYYMM+` gets expanded to the end of the given month in the given year in proper notation
   - Changed: `MMDD` will be expanded to the given day next year if > today
   - [see README](https://github.com/grocy/grocy#input-shorthands-for-date-fields)

changelog/51_2.4.4_2019-07-07.md

@@ -1,6 +1,6 @@
 - Fixed that price data (last price & chart) was not taken from inventory correction bookings, only purchases
 - Fixed weekly chores were scheduled on the same day after execution
 - Fixed that undone chores were also included in "Last tracked"
-- Fixed the date-time-picker width was too narrow sometimes
+- Fixed the date time picker width was too narrow sometimes
 - Improved that execution dates of "Track date only" chores will never display the time part
 - Improved date display for products that never expire (again, there was a display problem after consuming an item on the stock overview page)

changelog/52_2.5.0_2019-09-22.md

@@ -73,7 +73,7 @@
 
 ### General & other improvements/fixes
 - Added a new `config.php` setting `CALENDAR_SHOW_WEEK_OF_YEAR` to configure if calendars should show week numbers (defaults to `true`)
-- Fixed that date/time pickers not considered the `config.php` setting `CALENDAR_FIRST_DAY_OF_WEEK`
+- Fixed that date time pickers not considered the `config.php` setting `CALENDAR_FIRST_DAY_OF_WEEK`
 - Improved the handling which entry page to use with disabled feature flags (thanks @nielstholenaar)
 - Boolean settings provided via environment variables (so the strings `true` and `false`) are now parsed correctly (thanks @mduret)
 - All uploaded pictures (currently for products and recipes) are now automatically downscaled to the appropriate size when serving them to improve page load times (this requires the `php-gd` extension, if not installed, images will not be downscaled)

changelog/56_2.6.1_2020-03-06.md

@@ -43,7 +43,7 @@ If you run Grocy in a subdirectory, you need to set a new `config.php` setting (
 - Added a button to enable the device flash light on the camera barcode scanner popup (thanks @radim-ek)
 - Optimized the top navbar height and overall spacing to waste less space
 - Replaced the scan-mode-switch-button by a native button because it's less disturbing
-- Fixed that the "contextual time ago" of date/time pickers was not displayed
+- Fixed that the "contextual time ago" of date time pickers was not displayed
 - New translations: (thanks all the translators)
   - Czech (demo available at https://cs.demo.grocy.info)
   - Portuguese (Portugal) (demo available at https://pt-pt.demo.grocy.info)

changelog/82_UNRELEASED_xxxx-xx-xx.md

@@ -0,0 +1,59 @@
+> ⚠️ xxxBREAKING CHANGESxxx
+
+> ❗ xxxImportant upgrade informationXXX
+
+> 💡 xxxMinor upgrade informationXXX
+
+### New Feature: xxxx
+
+- xxx
+
+### Stock
+
+- Fixed that changing the location on the purchase page re-initialized the due date based on product defaults (if any)
+- Fixed that when undoing a product consume or transfer transaction, the store of the corresponding stock entry wasn't restored
+  - This will only apply to new consume / transfer transactions, not when undoing transactions made before using this release
+
+### Shopping list
+
+- xxx
+
+### Recipes
+
+- xxx
+
+### Meal plan
+
+- xxx
+
+### Chores
+
+- xxx
+
+### Calendar
+
+- xxx
+
+### Tasks
+
+- xxx
+
+### Batteries
+
+- xxx
+
+### Equipment
+
+- xxx
+
+### Userfields
+
+- xxx
+
+### General
+
+- xxx
+
+### API
+
+- xxx

middleware/DefaultAuthMiddleware.php

@@ -40,10 +40,10 @@ class DefaultAuthMiddleware extends AuthMiddleware
 				$sessionKey = SessionService::getInstance()->CreateSession($user->id, $stayLoggedInPermanently);
 				self::SetSessionCookie($sessionKey);
 
-				if (password_needs_rehash($user->password, PASSWORD_DEFAULT))
+				if (password_needs_rehash($user->password, PASSWORD_ARGON2ID))
 				{
 					$user->update([
-						'password' => password_hash($inputPassword, PASSWORD_DEFAULT)
+						'password' => password_hash($inputPassword, PASSWORD_ARGON2ID)
 					]);
 				}
 

migrations/0027.php

@@ -9,7 +9,7 @@ if (defined('GROCY_HTTP_USER'))
 	// Migrate old user defined in config file to database
 	$newUserRow = $db->users()->createRow([
 		'username' => GROCY_HTTP_USER,
-		'password' => password_hash(GROCY_HTTP_PASSWORD, PASSWORD_DEFAULT)
+		'password' => password_hash(GROCY_HTTP_PASSWORD, PASSWORD_ARGON2ID)
 	]);
 	$newUserRow->save();
 }
@@ -18,7 +18,7 @@ else
 	// Create default user "admin" with password "admin"
 	$newUserRow = $db->users()->createRow([
 		'username' => 'admin',
-		'password' => password_hash('admin', PASSWORD_DEFAULT)
+		'password' => password_hash('admin', PASSWORD_ARGON2ID)
 	]);
 	$newUserRow->save();
 }

public/viewjs/purchase.js

@@ -441,36 +441,65 @@ if (Grocy.Components.ProductPicker !== undefined)
 
 function PrefillBestBeforeDate(product, location)
 {
+	if (!Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)
+	{
+		return;
+	}
+
 	if (location == null)
 	{
 		location = {}
 	}
 
-	if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)
+	var shortcutValue = $("#datetimepicker-shortcut").attr("data-datetimepicker-shortcut-value");
+	var dueDateCurrent = Grocy.Components.DateTimePicker.GetValue();
+	var dueDateDefault = null;
+	var dueDateFreezer = null;
+
+	if (product.default_best_before_days != 0)
 	{
-		var dueDays;
+		dueDateDefault = moment().add(product.default_best_before_days, 'days').format('YYYY-MM-DD');
-		if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING && BoolVal(location.is_freezer))
+
+		if (product.default_best_before_days == -1)
 		{
-			dueDays = product.default_best_before_days_after_freezing;
+			dueDateDefault = shortcutValue;
 		}
-		else
-		{
-			dueDays = product.default_best_before_days;
 	}
 
-		if (dueDays != 0)
+	if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING && BoolVal(location.is_freezer) && product.default_best_before_days_after_freezing != 0)
 	{
-			if (dueDays == -1)
+		dueDateFreezer = moment().add(product.default_best_before_days_after_freezing, 'days').format('YYYY-MM-DD');
+
+		if (product.default_best_before_days_after_freezing == -1)
 		{
-				if (!$("#datetimepicker-shortcut").is(":checked"))
+			dueDateFreezer = shortcutValue;
+		}
+	}
+
+	// Set the default due date when currently no one is set
+	if (dueDateDefault && !dueDateCurrent)
+	{
+		if (!$("#datetimepicker-shortcut").is(":checked") && dueDateDefault == shortcutValue)
 		{
 			$("#datetimepicker-shortcut").click();
 		}
+		else
+		{
+			Grocy.Components.DateTimePicker.SetValue(dueDateDefault);
+		}
+	}
+
+	// Set the default due date after freezing when currently no one is set or when it was previously set to the default due date
+	// (so essentially don't overwrite a by the user different entered due date)
+	if (dueDateFreezer && (!dueDateCurrent || dueDateCurrent == dueDateDefault))
+	{
+		if (!$("#datetimepicker-shortcut").is(":checked") && dueDateFreezer == shortcutValue)
+		{
+			$("#datetimepicker-shortcut").click();
 		}
 		else
 		{
-				Grocy.Components.DateTimePicker.SetValue(moment().add(dueDays, 'days').format('YYYY-MM-DD'));
+			Grocy.Components.DateTimePicker.SetValue(dueDateFreezer);
-			}
 		}
 	}
 }

services/StockService.php

@@ -463,7 +463,8 @@ class StockService extends BaseService
 						'transaction_id' => $transactionId,
 						'user_id' => GROCY_USER_ID,
 						'location_id' => $stockEntry->location_id,
-						'note' => $stockEntry->note
+						'note' => $stockEntry->note,
+						'shopping_location_id' => $stockEntry->shopping_location_id
 					]);
 					$logRow->save();
 
@@ -498,7 +499,8 @@ class StockService extends BaseService
 						'transaction_id' => $transactionId,
 						'user_id' => GROCY_USER_ID,
 						'location_id' => $stockEntry->location_id,
-						'note' => $stockEntry->note
+						'note' => $stockEntry->note,
+						'shopping_location_id' => $stockEntry->shopping_location_id
 					]);
 					$logRow->save();
 
@@ -1532,7 +1534,8 @@ class StockService extends BaseService
 				'opened_date' => $logRow->opened_date,
 				'open' => $logRow->opened_date !== null,
 				'location_id' => $logRow->location_id,
-				'note' => $logRow->note
+				'note' => $logRow->note,
+				'shopping_location_id' => $logRow->shopping_location_id
 			]);
 			$stockRow->save();
 
@@ -1583,7 +1586,8 @@ class StockService extends BaseService
 					'stock_id' => $logRow->stock_id,
 					'price' => $logRow->price,
 					'opened_date' => $logRow->opened_date,
-					'note' => $logRow->note
+					'note' => $logRow->note,
+					'shopping_location_id' => $logRow->shopping_location_id
 				]);
 				$stockRow->save();
 			}

services/UsersService.php

@@ -12,7 +12,7 @@ class UsersService extends BaseService
 			'username' => $username,
 			'first_name' => $firstName,
 			'last_name' => $lastName,
-			'password' => password_hash($password, PASSWORD_DEFAULT),
+			'password' => password_hash($password, PASSWORD_ARGON2ID),
 			'picture_file_name' => $pictureFileName
 		]);
 		$newUserRow = $newUserRow->save();
@@ -61,7 +61,7 @@ class UsersService extends BaseService
 				'username' => $username,
 				'first_name' => $firstName,
 				'last_name' => $lastName,
-				'password' => password_hash($password, PASSWORD_DEFAULT),
+				'password' => password_hash($password, PASSWORD_ARGON2ID),
 				'picture_file_name' => $pictureFileName
 			]);
 		}