diff --git a/controllers/StockApiController.php b/controllers/StockApiController.php index 68c8fe76..3eb360a5 100644 --- a/controllers/StockApiController.php +++ b/controllers/StockApiController.php @@ -174,7 +174,7 @@ class StockApiController extends BaseApiController $shoppingLocationId = $requestBody['shopping_location_id']; } - $bookingId = $this->getStockService()->EditStockEntry($args['entryId'], $requestBody['amount'], $bestBeforeDate, $locationId, $shoppingLocationId, $price, $requestBody['open'], $requestBody['purchased_date']); + $bookingId = $this->getStockService()->EditStockEntry($args['entryId'], $requestBody['amount'], $bestBeforeDate, $locationId, $shoppingLocationId, $price, $requestBody['open'], $requestBody['purchased_date'], $requestBody['qu_factor_purchase_to_stock']); return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId)); } catch (\Exception $ex) diff --git a/public/viewjs/stockentries.js b/public/viewjs/stockentries.js index 8f173a05..20c9a8ec 100644 --- a/public/viewjs/stockentries.js +++ b/public/viewjs/stockentries.js @@ -177,6 +177,7 @@ function RefreshStockEntryRow(stockRowId) ); $('#stock-' + stockRowId + '-price').text(result.price); + $('#stock-' + stockRowId + '-qu-factor-purchase-to-stock').text(result.qu_factor_purchase_to_stock); $('#stock-' + stockRowId + '-purchased-date').text(result.purchased_date); $('#stock-' + stockRowId + '-purchased-date-timeago').attr('datetime', result.purchased_date + ' 23:59:59'); diff --git a/public/viewjs/stockentryform.js b/public/viewjs/stockentryform.js index 19817541..d0b41f81 100644 --- a/public/viewjs/stockentryform.js +++ b/public/viewjs/stockentryform.js @@ -26,6 +26,9 @@ jsonData.location_id = 1; } jsonData.price = price; + jsonData.qu_factor_purchase_to_stock = jsonForm.qu_factor_purchase_to_stock; + console.log(jsonForm); + console.log(jsonData); jsonData.open = $("#open").is(":checked"); diff --git a/services/StockService.php b/services/StockService.php index ddfd1331..81f2db62 100644 --- a/services/StockService.php +++ b/services/StockService.php @@ -597,7 +597,7 @@ class StockService extends BaseService return $this->getDatabase()->lastInsertId(); } - public function EditStockEntry(int $stockRowId, float $amount, $bestBeforeDate, $locationId, $shoppingLocationId, $price, $open, $purchasedDate) + public function EditStockEntry(int $stockRowId, float $amount, $bestBeforeDate, $locationId, $shoppingLocationId, $price, $open, $purchasedDate, $quFactorPurchaseToStock) { $stockRow = $this->getDatabase()->stock()->where('id = :1', $stockRowId)->fetch(); @@ -645,6 +645,7 @@ class StockService extends BaseService 'shopping_location_id' => $shoppingLocationId, 'opened_date' => $openedDate, 'open' => $open, + 'qu_factor_purchase_to_stock' => $quFactorPurchaseToStock, 'purchased_date' => $purchasedDate )); @@ -1146,6 +1147,7 @@ class StockService extends BaseService 'best_before_date' => $logRow->best_before_date, 'purchased_date' => $logRow->purchased_date, 'price' => $logRow->price, + 'qu_factor_purchase_to_stock' => $logRow->qu_factor_purchase_to_stock, 'location_id' => $logRow->location_id, 'open' => $open, 'opened_date' => $openedDate diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php index f31142d9..09724f21 100644 --- a/views/stockentries.blade.php +++ b/views/stockentries.blade.php @@ -41,6 +41,7 @@ {{ $__t('Store') }} {{ $__t('Price') }} @endif + {{ $__t('Factor purchase to stock') }} {{ $__t('Purchased date') }} @include('components.userfields_thead', array( @@ -158,6 +159,9 @@ {{ $stockEntry->price }} @endif + + {{ $stockEntry->qu_factor_purchase_to_stock }} + {{ $stockEntry->purchased_date }} diff --git a/views/stockentryform.blade.php b/views/stockentryform.blade.php index b9a6d2ee..39a55c1e 100644 --- a/views/stockentryform.blade.php +++ b/views/stockentryform.blade.php @@ -60,6 +60,16 @@ 'additionalHtmlContextHelp' => '
' . $__t('Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated') . '
' )) + @include('components.numberpicker', array( + 'id' => 'qu_factor_purchase_to_stock', + 'label' => 'Factor purchase to stock quantity unit', + 'value' => $stockEntry->qu_factor_purchase_to_stock, + 'min' => 1, + 'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'), + 'additionalCssClasses' => 'input-group-qu', + 'additionalHtmlElements' => '

' + )) + @if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) @include('components.numberpicker', array( 'id' => 'price',