kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 20:26:42 +00:00
Code Issues Projects Releases Wiki Activity

Add hint when barcode lookup is disabled

Browse Source
This commit is contained in:
Bernd Bestel
2017-04-21 12:03:56 +02:00
parent d628f9b3ca
commit 5db288fc3c
5 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
grocy.js
View File

@@ -95,3 +95,8 @@ Grocy.GetUriParam = function(key)
} }
} }
}; };
Grocy.Wait = function(ms)
{
return new Promise(resolve => setTimeout(resolve, ms));
}

2
views/inventory.js
View File

@@ -33,6 +33,7 @@
} }
toastr.success('Stock amount of ' + productDetails.product.name + ' is now ' + jsonForm.new_amount.toString() + ' ' + productDetails.quantity_unit_stock.name); toastr.success('Stock amount of ' + productDetails.product.name + ' is now ' + jsonForm.new_amount.toString() + ' ' + productDetails.quantity_unit_stock.name);
Grocy.Wait(1000);
if (addBarcode !== undefined) if (addBarcode !== undefined)
{ {
@@ -241,6 +242,7 @@ $(function()
{ {
$('#addbarcodetoselection').text(addBarcode); $('#addbarcodetoselection').text(addBarcode);
$('#flow-info-addbarcodetoselection').removeClass('hide'); $('#flow-info-addbarcodetoselection').removeClass('hide');
$('#barcode-lookup-disabled-hint').removeClass('hide');
} }
}); });

2
views/inventory.php
View File

@@ -4,7 +4,7 @@
<form id="inventory-form"> <form id="inventory-form">
<div class="form-group"> <div class="form-group">
<label for="product_id">Product&nbsp;&nbsp;<i class="fa fa-barcode"></i></label> <label for="product_id">Product&nbsp;&nbsp;<i class="fa fa-barcode"></i><span id="barcode-lookup-disabled-hint" class="small text-muted hide">&nbsp;&nbsp;Barcode lookup is disabled</span></label>
<select class="form-control combobox" id="product_id" name="product_id" required> <select class="form-control combobox" id="product_id" name="product_id" required>
<option value=""></option> <option value=""></option>
<?php foreach ($products as $product) : ?> <?php foreach ($products as $product) : ?>

2
views/purchase.js
View File

@@ -35,6 +35,7 @@
} }
toastr.success('Added ' + amount + ' ' + productDetails.quantity_unit_stock.name + ' of ' + productDetails.product.name + ' to stock'); toastr.success('Added ' + amount + ' ' + productDetails.quantity_unit_stock.name + ' of ' + productDetails.product.name + ' to stock');
Grocy.Wait(1000);
if (addBarcode !== undefined) if (addBarcode !== undefined)
{ {
@@ -239,6 +240,7 @@ $(function()
{ {
$('#addbarcodetoselection').text(addBarcode); $('#addbarcodetoselection').text(addBarcode);
$('#flow-info-addbarcodetoselection').removeClass('hide'); $('#flow-info-addbarcodetoselection').removeClass('hide');
$('#barcode-lookup-disabled-hint').removeClass('hide');
} }
}); });

2
views/purchase.php
View File

@@ -4,7 +4,7 @@
<form id="purchase-form"> <form id="purchase-form">
<div class="form-group"> <div class="form-group">
<label for="product_id">Product&nbsp;&nbsp;<i class="fa fa-barcode"></i></label> <label for="product_id">Product&nbsp;&nbsp;<i class="fa fa-barcode"></i><span id="barcode-lookup-disabled-hint" class="small text-muted hide">&nbsp;&nbsp;Barcode lookup is disabled</span></label>
<select class="form-control combobox" id="product_id" name="product_id" required> <select class="form-control combobox" id="product_id" name="product_id" required>
<option value=""></option> <option value=""></option>
<?php foreach ($products as $product) : ?> <?php foreach ($products as $product) : ?>