From cb5577826d075c2928a611f111884da1fc249dc6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Jul 2020 03:50:14 +0200 Subject: [PATCH] Look and feel v13 --- htdocs/bom/tpl/objectline_create.tpl.php | 1 - htdocs/core/tpl/objectline_create.tpl.php | 2 +- htdocs/langs/en_US/main.lang | 2 +- htdocs/takepos/css/pos.css.php | 4 ++++ htdocs/takepos/index.php | 1 + htdocs/takepos/invoice.php | 29 ++++++++++++++--------- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php index e8fbbac28d2..8501f1ca30f 100644 --- a/htdocs/bom/tpl/objectline_create.tpl.php +++ b/htdocs/bom/tpl/objectline_create.tpl.php @@ -58,7 +58,6 @@ if ($nolinesbefore) { } print ''; print '
'.$langs->trans('AddNewLine').''; - // echo $langs->trans("FreeZone"); print ''; print ''.$langs->trans('Qty').''; if ($conf->global->PRODUCT_USE_UNITS) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index df61dff70f5..97ef9818efc 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -85,7 +85,7 @@ if ($nolinesbefore) { -
trans('AddNewLine'); ?>trans("FreeZone"); ?> +
trans('AddNewLine'); ?> element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 94a357f353a..692c441282a 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -725,7 +725,7 @@ Page=Page Notes=Notes AddNewLine=Add new line AddFile=Add file -FreeZone=Not a predefined product/service +FreeZone=Free-text product FreeLineOfType=Free-text item, type: CloneMainAttributes=Clone object with its main attributes ReGeneratePDF=Re-generate PDF diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php index 80271e8bdb3..f4c9cf3a88a 100644 --- a/htdocs/takepos/css/pos.css.php +++ b/htdocs/takepos/css/pos.css.php @@ -272,6 +272,10 @@ table.postablelines tr td { background-color: var(--colorbacklineimpair1); } +.postablelines td.linecolht { + line-height: 1.3em !important; +} + div.paymentbordline { width:calc(50% - 16px); diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index 3c3314aa2e1..ab5acc1ac50 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -467,6 +467,7 @@ function New() { } if (r == true) { + // Reload section with invoice lines $("#poslines").load("invoice.php?action=delete&place=" + place, function () { //$('#poslines').scrollTop($('#poslines')[0].scrollHeight); }); diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 26b0e71a5fd..c6b7bb2c734 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -425,6 +425,7 @@ if ($action == "delete") { $sql .= " WHERE ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'"; $resql3 = $db->query($sql); + $invoice->update_price(1); if ($resql1 && $resql2 && $resql3) { $db->commit(); @@ -845,7 +846,10 @@ print '
'; print ''; print ''; print ''; -} +print ''; if ($_SESSION["basiclayout"] != 1) { print ''; print ''; - print ''; + print ''; + } + print ''; } elseif ($mobilepage == "invoice") print ''; print "\n";
'; -print ''; +// In phone version only show when it is invoice page +if ($mobilepage == "invoice" || $mobilepage == "") { + print ''.$sectionwithinvoicelink; +} if ($conf->global->TAKEPOS_BAR_RESTAURANT) { $sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place); @@ -858,25 +862,28 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) } // In phone version only show when is invoice page if ($mobilepage == "invoice" || $mobilepage == "") { - print $langs->trans('Place')." ".$label." - "; - print $langs->trans('Floor')." ".$floor." - "; + print ''.$langs->trans('Place')." ".$label."
"; + print ''.$langs->trans('Floor')." ".$floor.""; } elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) print $mysoc->name; elseif ($mobilepage == "cats") print $langs->trans('Category'); elseif ($mobilepage == "products") print $langs->trans('Label'); +} else { + print $langs->trans("Products"); } -// In phone version only show when is invoice page -if ($mobilepage == "invoice" || $mobilepage == "") { - print $langs->trans('TotalTTC'); - print ' : '.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).''; - print '
'.$sectionwithinvoicelink; - print '		'.$langs->trans('ReductionShort').''.$langs->trans('Qty').''.$langs->trans('TotalTTCShort').''; + print ''.$langs->trans('TotalTTCShort').'
'; + // In phone version only show when it is invoice page + if ($mobilepage == "invoice" || $mobilepage == "") { + print ''.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).''; + print '		'.$langs->trans('Qty').'