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

New: When adding a product in POS, the line added is automatically

Browse Source 
selected so we can change immediatly qty or price
This commit is contained in:
Laurent Destailleur 2019-03-29 12:19:23 +01:00
parent 822552defb
commit 6027e018e9
2 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
htdocs/takepos/invoice.php
View File

@ -168,7 +168,7 @@ if ($action == "addline")
$price_base_type = $prod->multiprices_base_type[$customer->price_level]; $price_base_type = $prod->multiprices_base_type[$customer->price_level];
} }
$invoice->addline($prod->description, $price, 1, $tva_tx, $prod->localtax1_tx, $prod->localtax2_tx, $idproduct, $prod->remise_percent, '', 0, 0, 0, '', $price_base_type, $price_ttc, $prod->type, -1, 0, '', 0, 0, null, 0, '', 0, 100, '', null, 0); $idoflineadded = $invoice->addline($prod->description, $price, 1, $tva_tx, $prod->localtax1_tx, $prod->localtax2_tx, $idproduct, $prod->remise_percent, '', 0, 0, 0, '', $price_base_type, $price_ttc, $prod->type, -1, 0, '', 0, 0, null, 0, '', 0, 100, '', null, 0);
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
@ -204,17 +204,21 @@ if ($action == "deleteline") {
} }
} }
if ($action == "updateqty") { if ($action == "updateqty")
{
foreach($invoice->lines as $line) foreach($invoice->lines as $line)
{ {
if ($line->id == $idline) { $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit); if ($line->id == $idline)
{
$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
} }
} }
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
if ($action == "updateprice") { if ($action == "updateprice")
{
foreach($invoice->lines as $line) foreach($invoice->lines as $line)
{ {
if ($line->id == $idline) { $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit); if ($line->id == $idline) { $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
@ -224,7 +228,8 @@ if ($action == "updateprice") {
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
if ($action == "updatereduction") { if ($action == "updatereduction")
{
foreach($invoice->lines as $line) foreach($invoice->lines as $line)
{ {
if ($line->id == $idline) { $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit); if ($line->id == $idline) { $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
@ -234,7 +239,8 @@ if ($action == "updatereduction") {
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
if ($action == "order" and $placeid != 0) { if ($action == "order" and $placeid != 0)
{
include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$headerorder = '<html><br><b>' . $langs->trans('Place') . ' ' . $place . '<br><table width="65%"><thead><tr><th class="left">' . $langs->trans("Label") . '</th><th class="right">' . $langs->trans("Qty") . '</th></tr></thead><tbody>'; $headerorder = '<html><br><b>' . $langs->trans('Place') . ' ' . $place . '<br><table width="65%"><thead><tr><th class="left">' . $langs->trans("Label") . '</th><th class="right">' . $langs->trans("Qty") . '</th></tr></thead><tbody>';
@ -315,13 +321,23 @@ var selectedline=0;
var selectedtext=""; var selectedtext="";
var placeid=<?php echo ($placeid > 0 ? $placeid : 0);?>; var placeid=<?php echo ($placeid > 0 ? $placeid : 0);?>;
$(document).ready(function() { $(document).ready(function() {
$('table tbody tr').click(function(){ var idoflineadded = <?php echo ($idoflineadded?$idoflineadded:0); ?>;
$('table tbody tr').removeClass("selected");
$('.posinvoiceline').click(function(){
console.log("Click done on "+this.id);
$('.posinvoiceline').removeClass("selected");
$(this).addClass("selected"); $(this).addClass("selected");
if (selectedline==this.id) return; // If is already selected if (selectedline==this.id) return; // If is already selected
else selectedline=this.id; else selectedline=this.id;
selectedtext=$('#'+selectedline).find("td:first").html(); selectedtext=$('#'+selectedline).find("td:first").html();
}); });
/* Autoselect the line */
if (idoflineadded > 0)
{
console.log("Auto select "+idoflineadded);
$('.posinvoiceline#'+idoflineadded).click();
}
<?php <?php
if ($action == "order" and $order_receipt_printer1 != "") { if ($action == "order" and $order_receipt_printer1 != "") {
@ -353,18 +369,6 @@ if ($action == "search" || $action == "valid") {
<?php <?php
} }
?>
$('table tbody tr').click(function(){
console.log("We click on a line");
$('table tbody tr').removeClass("selected");
$(this).addClass("selected");
if (selectedline==this.id) return; // If is already selected
else selectedline=this.id;
selectedtext=$('#'+selectedline).find("td:first").html();
});
<?php
if ($action == "temp" and $ticket_printer1 != "") { if ($action == "temp" and $ticket_printer1 != "") {
?> ?>
@ -439,7 +443,7 @@ print '<br>'.$sectionwithinvoicelink;
print '</td>'; print '</td>';
print '<td class="linecolqty right">' . $langs->trans('ReductionShort') . '</td>'; print '<td class="linecolqty right">' . $langs->trans('ReductionShort') . '</td>';
print '<td class="linecolqty right">' . $langs->trans('Qty') . '</td>'; print '<td class="linecolqty right">' . $langs->trans('Qty') . '</td>';
print '<td class="linecolht right">' . $langs->trans('TotalHTShort') . '</td>'; print '<td class="linecolht right nowraponall">' . $langs->trans('TotalHTShort') . '</td>';
print "</tr>\n"; print "</tr>\n";
if ($placeid > 0) if ($placeid > 0)

14
htdocs/takepos/takepos.php
View File

@ -153,18 +153,10 @@ function ClearSearch() {
// Set the focus on search field but only on desktop. On tablet or smartphone, we don't to avoid to have the keyboard open automatically // Set the focus on search field but only on desktop. On tablet or smartphone, we don't to avoid to have the keyboard open automatically
function setFocusOnSearchField() { function setFocusOnSearchField() {
console.log("Call setFocusOnSearchField in page takepos.php"); console.log("Call setFocusOnSearchField in page takepos.php");
<?php <?php if ($conf->browser->layout == 'classic') { ?>
//global $conf;
//if ($conf->browser->layout == 'classic') {
?>
if (app.hasKeyboard)
{
console.log("has keyboard from localStorage, so we can force focus on search field"); console.log("has keyboard from localStorage, so we can force focus on search field");
$("#search").focus(); $("#search").focus();
} <?php } ?>
<?php
//}
//?>
} }
function PrintCategories(first) { function PrintCategories(first) {
@ -653,7 +645,7 @@ $menus[$r++]=array('title'=>'<span class="fa fa-sign-out-alt paddingrightonly"><
print '<!-- Show the search input text -->'."\n"; print '<!-- Show the search input text -->'."\n";
print '<div class="margintoponly">'; print '<div class="margintoponly">';
print '<input type="text" id="search" name="search" onkeyup="Search2();" style="width:80%;font-size: 150%;" placeholder="'.$langs->trans("Search").'" autofocus> '; print '<input type="text" id="search" name="search" onkeyup="Search2();" style="width:80%;font-size: 150%;" placeholder="'.$langs->trans("Search").'" autofocus> ';
print '<a class="marginleftonly" onclick="ClearSearch();">'.img_picto('', 'searchclear').'</a>'; print '<a class="marginleftonly hideonsmartphone" onclick="ClearSearch();">'.img_picto('', 'searchclear').'</a>';
print '</div>'; print '</div>';
?> ?>
</div> </div>