Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX Takepos barcode rule with float qty (#31916)

Browse Source 
* FIX Takepos barcode rule with float qty

* Replace floatval by cast in float and GETPOSTINT by GETPOSTFLOAT for qty

* Keep last test condition on barcode value
This commit is contained in:
lvessiller-opendsi 2024-11-19 13:21:31 +01:00 committed by GitHub
parent 93ec6f9ef7
commit d2f5ee65ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/takepos/ajax/ajax.php
View File

@ -249,7 +249,7 @@ if ($action == 'getProducts' && $user->hasRight('takepos', 'run')) {
'label' => $obj->label,
'tosell' => $obj->tosell,
'tobuy' => $obj->tobuy,
'barcode' => $obj->barcode,
'barcode' => $term, // there is only one product matches the barcode rule and so the term is considered as the barcode of this product
'price' => empty($objProd->multiprices[$pricelevel]) ? $obj->price : $objProd->multiprices[$pricelevel],
'price_ttc' => empty($objProd->multiprices_ttc[$pricelevel]) ? $obj->price_ttc : $objProd->multiprices_ttc[$pricelevel],
'object' => 'product',

2
htdocs/takepos/index.php
View File

@ -817,7 +817,7 @@ function Search2(keyCodeForEnter, moreorless) {
console.log("There is only 1 answer with barcode matching the search, so we change the thirdparty "+data[0]['rowid']);
ChangeThirdparty(data[0]['rowid']);
}
else if ($('#search').val() == data[0]['barcode'] && 'product' == data[0]['object']) {
else if ('product' == data[0]['object'] && $('#search').val() == data[0]['barcode']) {
console.log("There is only 1 answer and we found search on a barcode, so we add the product in basket, qty="+data[0]['qty']);
ClickProduct(0, data[0]['qty']);
}

2
htdocs/takepos/invoice.php
View File

@ -648,7 +648,7 @@ if (empty($reshook)) {
$datapriceofproduct = $prod->getSellPrice($mysoc, $customer, 0);
$qty = GETPOSTISSET('qty') ? GETPOSTINT('qty') : 1;
$qty = GETPOSTISSET('qty') ? GETPOSTFLOAT('qty') : 1;
$price = $datapriceofproduct['pu_ht'];
$price_ttc = $datapriceofproduct['pu_ttc'];
//$price_min = $datapriceofproduct['price_min'];