github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-04 20:06:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add functionality to move a product when it is opened

Browse Source
This commit is contained in:
Rosemary Orchard 2022-04-18 09:06:31 +01:00
parent d4bd6b2fb3
commit 051ecc657e
6 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
localization/strings.pot
View File

@ -2326,3 +2326,10 @@ msgstr ""
msgid "Stock entries at this location will be consumed first" msgid "Stock entries at this location will be consumed first"
msgstr "" msgstr ""
msgid "Move on open"
msgstr ""
msgid "When checked, opening the product will move one unit to the default consume location"
msgstr ""

2
migrations/0189.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE products
ADD move_on_open TINYINT NOT NULL DEFAULT 0 CHECK(move_on_open IN (0, 1));

34
public/viewjs/consume.js
View File

@ -373,9 +373,11 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
$(".input-group-productamountpicker").trigger("change"); $(".input-group-productamountpicker").trigger("change");
var defaultLocationId = productDetails.location.id; var defaultLocationId = productDetails.location.id;
if (productDetails.product.default_consume_location_id != null && !productDetails.product.default_consume_location_id.isEmpty()) var defaultConsumeLocationId = productDetails.product.default_consume_location_id;
if (defaultConsumeLocationId != null && !defaultConsumeLocationId.isEmpty())
{ {
defaultLocationId = productDetails.product.default_consume_location_id; defaultLocationId = defaultConsumeLocationId;
} }
$("#location_id").find("option").remove().end().append("<option></option>"); $("#location_id").find("option").remove().end().append("<option></option>");
@ -386,26 +388,22 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
var stockAmountAtDefaultLocation = 0; var stockAmountAtDefaultLocation = 0;
stockLocations.forEach(stockLocation => stockLocations.forEach(stockLocation =>
{ {
if (stockLocation.location_id == defaultLocationId) var stockLocationName = stockLocation.location_name;
{ if (stockLocation.location_id == defaultLocationId) {
$("#location_id").append($("<option>", { stockLocationName += +" (" + __t("Default location") + ")";
value: stockLocation.location_id,
text: stockLocation.location_name + " (" + __t("Default location") + ")"
}));
$("#location_id").val(defaultLocationId);
$("#location_id").trigger('change');
setDefault = 1; setDefault = 1;
stockAmountAtDefaultLocation += Number.parseFloat(stockLocation.amount); stockAmountAtDefaultLocation += Number.parseFloat(stockLocation.amount);
} }
else $("#location_id").append($("<option>", {
{ value: stockLocation.location_id,
$("#location_id").append($("<option>", { text: stockLocationName
value: stockLocation.location_id, }));
text: stockLocation.location_name $("#location_id").val(defaultLocationId);
})); $("#location_id").trigger('change');
} setDefault = 1;
stockAmountAtDefaultLocation += Number.parseFloat(stockLocation.amount);
if (setDefault == 0) if (!setDefault)
{ {
$("#location_id").val(defaultLocationId); $("#location_id").val(defaultLocationId);
$("#location_id").trigger('change'); $("#location_id").trigger('change');

12
public/viewjs/productform.js
View File

@ -240,6 +240,18 @@ $('#location_id').change(function(event)
{ {
Grocy.FrontendHelpers.ValidateForm('product-form'); Grocy.FrontendHelpers.ValidateForm('product-form');
}); });
$('#default_consume_location_id').change(function(event) {
var defaultLocation = $("#location_id :selected").val();
var consumeLocationLocation = document.getElementById('default_consume_location_id');
console.log('defaultLocation', defaultLocation);
console.log('consumeLocationLocation', consumeLocationLocation);
var moveOnOpen = document.getElementById('move_on_open');
if (consumeLocationLocation && defaultLocation !== consumeLocationLocation) {
moveOnOpen.setAttribute('disabled', "");
} else {
moveOnOpen.removeAttribute('disabled');
}
});
$('#product-form input').keydown(function(event) $('#product-form input').keydown(function(event)
{ {

13
services/StockService.php
View File

@ -1007,11 +1007,11 @@ class StockService extends BaseService
]); ]);
$logRow->save(); $logRow->save();
$stockEntry->update([ $update = [
'open' => 1, 'open' => 1,
'opened_date' => date('Y-m-d'), 'opened_date' => date('Y-m-d'),
'best_before_date' => $newBestBeforeDate 'best_before_date' => $newBestBeforeDate
]); ];
$amount -= $stockEntry->amount; $amount -= $stockEntry->amount;
} }
@ -1048,15 +1048,20 @@ class StockService extends BaseService
]); ]);
$logRow->save(); $logRow->save();
$stockEntry->update([ $update = [
'amount' => $amount, 'amount' => $amount,
'open' => 1, 'open' => 1,
'opened_date' => date('Y-m-d'), 'opened_date' => date('Y-m-d'),
'best_before_date' => $newBestBeforeDate 'best_before_date' => $newBestBeforeDate
]); ];
$amount = 0; $amount = 0;
} }
if ($product->move_on_open) {
$update['location_id'] = $product->default_consume_location_id ?? $stockEntry->location_id;
}
$stockEntry->update($update);
} }
return $transactionId; return $transactionId;

13
views/productform.blade.php
View File

@ -146,6 +146,19 @@
$location->id == $product->default_consume_location_id) selected="selected" @endif value="{{ $location->id }}">{{ $location->name }}</option> $location->id == $product->default_consume_location_id) selected="selected" @endif value="{{ $location->id }}">{{ $location->name }}</option>
@endforeach @endforeach
</select> </select>
@if(GROCY_FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING)
<div class="custom-control custom-checkbox">
<input @if($mode=='edit'
&&
$product->move_on_open == 1) checked @endif class="form-check-input custom-control-input" type="checkbox" id="move_on_open" name="move_on_open" value="1">
<label class="form-check-label custom-control-label"
for="move_on_open">{{ $__t('Move on open') }}&nbsp;<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $__t("When checked, opening the product will move one unit to the default consume location") }}"></i>
</label>
</div>
@endif
</div> </div>
@else @else
<input type="hidden" <input type="hidden"