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

remove product barcode tags

Browse Source
This commit is contained in:
Kurt Riddlesperger 2020-04-28 01:11:05 -05:00
parent 6676e3c508
commit 2bb792af99
2 changed files with 0 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
public/viewjs/productform.js
View File

@ -166,33 +166,6 @@
} }
}); });
$('#barcode-taginput').tagsManager({
'hiddenTagListName': 'barcode',
'tagsContainer': '#barcode-taginput-container',
'tagClass': 'badge badge-secondary',
'delimiters': [13, 44]
});
if (Grocy.EditMode === 'edit')
{
Grocy.Api.Get('objects/products/' + Grocy.EditObjectId,
function (product)
{
if (product.barcode !== null && product.barcode.length > 0)
{
product.barcode.split(',').forEach(function(item)
{
$('#barcode-taginput').tagsManager('pushTag', item);
});
}
},
function(xhr)
{
console.error(xhr);
}
);
}
var prefillName = GetUriParam('prefillname'); var prefillName = GetUriParam('prefillname');
if (prefillName !== undefined) if (prefillName !== undefined)
{ {
@ -200,18 +173,6 @@ if (prefillName !== undefined)
$('#name').focus(); $('#name').focus();
} }
var prefillBarcode = GetUriParam('prefillbarcode');
if (prefillBarcode !== undefined)
{
$('#barcode-taginput').tagsManager('pushTag', prefillBarcode);
$('#name').focus();
}
$("#barcode-taginput").on("blur", function(e)
{
$("#barcode-taginput").tagsManager("pushTag", $("#barcode-taginput").val());
});
$('.input-group-qu').on('change', function(e) $('.input-group-qu').on('change', function(e)
{ {
var quIdPurchase = $("#qu_id_purchase").val(); var quIdPurchase = $("#qu_id_purchase").val();
@ -435,29 +396,6 @@ $(document).on('click', '.qu-conversion-delete-button', function(e)
console.error(xhr); console.error(xhr);
} }
); );
var newBarcode = '';
productBarcode.split(',').forEach(function(item)
{
if(barcode != item)
{
newBarcode += ',' + item;
}
});
var jsonDataProduct = {};
jsonDataProduct.barcode = newBarcode;
Grocy.Api.Put('objects/products/' + productId, jsonDataProduct,
function(result)
{
},
function(xhr)
{
Grocy.FrontendHelpers.EndUiBusy("product-form");
Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
}
);
} }
} }
}); });
@ -562,13 +500,3 @@ $('#qu_id_purchase').blur(function(e)
Grocy.FrontendHelpers.ValidateForm('product-form'); Grocy.FrontendHelpers.ValidateForm('product-form');
} }
}); });
$(document).on("Grocy.BarcodeScanned", function(e, barcode, target)
{
if (target != "#barcode-taginput")
{
return;
}
$("#barcode-taginput").tagsManager("pushTag", barcode);
});

9
views/productform.blade.php
View File

@ -56,7 +56,6 @@
@endphp @endphp
@include('components.productpicker', array( @include('components.productpicker', array(
'products' => $products, 'products' => $products,
'nextInputSelector' => '#barcode-taginput',
'prefillById' => $prefillById, 'prefillById' => $prefillById,
'disallowAllProductWorkflows' => true, 'disallowAllProductWorkflows' => true,
'isRequired' => false, 'isRequired' => false,
@ -70,14 +69,6 @@
<textarea class="form-control wysiwyg-editor" id="description" name="description">@if($mode == 'edit'){{ $product->description }}@endif</textarea> <textarea class="form-control wysiwyg-editor" id="description" name="description">@if($mode == 'edit'){{ $product->description }}@endif</textarea>
</div> </div>
<div class="form-group tm-group">
<label for="barcode-taginput">{{ $__t('Barcode(s)') }}&nbsp;&nbsp;<i class="fas fa-barcode"></i></label>
<div class="input-group">
<input type="text" class="form-control tm-input barcodescanner-input" id="barcode-taginput" data-target="#barcode-taginput">
</div>
<div id="barcode-taginput-container"></div>
</div>
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
<div class="form-group"> <div class="form-group">
<label for="location_id">{{ $__t('Default location') }}</label> <label for="location_id">{{ $__t('Default location') }}</label>