lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14586 from ptibogxiv/patch-353

Browse Source 
NEW change thirdparty with barcode scan in takepos
This commit is contained in:
Laurent Destailleur 2020-08-31 16:15:59 +02:00 committed by GitHub
commit d11d02a23a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2004 Andreu Bisquerra <jove@bisquerra.com> /* Copyright (C) 2001-2004 Andreu Bisquerra <jove@bisquerra.com>
/* Copyright (C) 2020 Thibault FOUCART <support@ptibogxiv.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -68,6 +69,24 @@ if ($action == 'getProducts') {
echo 'Failed to load category with id='.$category; echo 'Failed to load category with id='.$category;
} }
} elseif ($action == 'search' && $term != '') { } elseif ($action == 'search' && $term != '') {
// Change thirdparty with barcode
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
$thirdparty = new Societe($db);
$result = $thirdparty->fetch('', '', '', $term);
if ( $result && $thirdparty->id > 0) {
$rows = array();
$rows[] = array(
'rowid' => $thirdparty->id,
'name' => $thirdparty->name,
'barcode' => $thirdparty->barcode,
'object' => 'thirdparty'
);
echo json_encode($rows);
exit;
}
// Define $filteroncategids, the filter on category ID if there is a Root category defined. // Define $filteroncategids, the filter on category ID if there is a Root category defined.
$filteroncategids = ''; $filteroncategids = '';
if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) { // A root category is defined, we must filter on products inside this category tree if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) { // A root category is defined, we must filter on products inside this category tree
@ -101,7 +120,8 @@ if ($action == 'getProducts') {
'tosell' => $obj->tosell, 'tosell' => $obj->tosell,
'tobuy' => $obj->tobuy, 'tobuy' => $obj->tobuy,
'barcode' => $obj->barcode, 'barcode' => $obj->barcode,
'price' => $obj->price 'price' => $obj->price,
'object' => 'product'
//'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency) //'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency)
); );
} }

16
htdocs/takepos/index.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2018 Andreu Bisquerra <jove@bisquerra.com> /* Copyright (C) 2018 Andreu Bisquerra <jove@bisquerra.com>
* Copyright (C) 2019 Josep Lluís Amador <joseplluis@lliuretic.cat> * Copyright (C) 2019 Josep Lluís Amador <joseplluis@lliuretic.cat>
* Copyright (C) 2020 Thibault FOUCART <support@ptibogxiv.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -406,6 +407,15 @@ function ClickProduct(position) {
ClearSearch(); ClearSearch();
} }
function ChangeThirdparty(idcustomer) {
console.log("ChangeThirdparty");
// Call page list.php to change customer
$("#poslines").load("../societe/list.php?action=change&contextpage=poslist&idcustomer="+idcustomer+"&place="+place+"", function() {
});
ClearSearch();
}
function deleteline() { function deleteline() {
console.log("Delete line"); console.log("Delete line");
$("#poslines").load("invoice.php?action=deleteline&place="+place+"&idline="+selectedline, function() { $("#poslines").load("invoice.php?action=deleteline&place="+place+"&idline="+selectedline, function() {
@ -531,7 +541,11 @@ function Search2(keyCodeForEnter) {
// If there is only 1 answer // If there is only 1 answer
if ($('#search').val().length > 0 && data.length == 1) { if ($('#search').val().length > 0 && data.length == 1) {
console.log($('#search').val()+' - '+data[0]['barcode']); console.log($('#search').val()+' - '+data[0]['barcode']);
if ($('#search').val() == data[0]['barcode']) { if ($('#search').val() == data[0]['barcode'] && 'thirdparty' == data[0]['object']) {
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']) {
console.log("There is only 1 answer with barcode matching the search, so we add the product in basket"); console.log("There is only 1 answer with barcode matching the search, so we add the product in basket");
ClickProduct(0); ClickProduct(0);
} }