From 1818e22be92ea4ceabe905c4ed7fe66317799943 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Mar 2019 09:56:01 +0100 Subject: [PATCH] Add some font awesome icons on buttons --- htdocs/takepos/customers.php | 2 +- htdocs/takepos/floors.php | 6 ++++++ htdocs/takepos/freezone.php | 9 ++++++++- htdocs/takepos/invoice.php | 14 +++++++++++--- htdocs/takepos/receipt.php | 6 ++++++ htdocs/takepos/takepos.php | 14 ++++++++++---- 6 files changed, 42 insertions(+), 9 deletions(-) diff --git a/htdocs/takepos/customers.php b/htdocs/takepos/customers.php index 05fdf5537c9..6bb96e478d3 100644 --- a/htdocs/takepos/customers.php +++ b/htdocs/takepos/customers.php @@ -26,7 +26,7 @@ /** * \file htdocs/takepos/customers.php - * \ingroup societe + * \ingroup takepos * \brief Page to show list of third parties. TODO Merge with societe/list.php */ diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php index 0206fe1a8e0..9401d61b9a0 100644 --- a/htdocs/takepos/floors.php +++ b/htdocs/takepos/floors.php @@ -15,6 +15,12 @@ * along with this program. If not, see . */ +/** + * \file htdocs/takepos/floors.php + * \ingroup takepos + * \brief Page to edit floors and tables. + */ + //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php index f9a270b247c..64c21a30304 100644 --- a/htdocs/takepos/freezone.php +++ b/htdocs/takepos/freezone.php @@ -15,6 +15,12 @@ * along with this program. If not, see . */ +/** + * \file htdocs/takepos/floors.php + * \ingroup takepos + * \brief Popup to enter a free line + */ + //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); @@ -33,7 +39,8 @@ $place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0); // $plac $posnb = (GETPOST('posnb', 'int') > 0 ? GETPOST('posnb', 'int') : 0); // $posnb is id of POS $idline = GETPOST('idline', 'int'); -$action = GETPOST('action'); +$action = GETPOST('action', 'alpha'); + /* * View diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index ed3f133b2d4..856616ee7b0 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -16,6 +16,12 @@ * along with this program. If not, see . */ +/** + * \file htdocs/takepos/invoice.php + * \ingroup takepos + * \brief Page to generate section with list of lines + */ + // if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1'); // Not disabled cause need to load personalized language // if (! defined('NOREQUIREDB')) define('NOREQUIREDB', '1'); // Not disabled cause need to load personalized language // if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1'); @@ -48,8 +54,8 @@ $amountofpayment = price2num(GETPOST('amount', 'alpha')); $invoiceid = GETPOST('invoiceid', 'int'); $paycode = $pay; -if ($pay == 'cash') $paycode = 'LIQ'; // For backward compatibility -if ($pay == 'card') $paycode = 'CB'; // For backward compatibility +if ($pay == 'cash') $paycode = 'LIQ'; // For backward compatibility +if ($pay == 'card') $paycode = 'CB'; // For backward compatibility if ($pay == 'cheque') $paycode = 'CHQ'; // For backward compatibility // Retrieve paiementid @@ -477,9 +483,11 @@ if ($placeid > 0) else { print ''.$langs->trans("Empty").''; - } } +else { // No invoice generated yet + print ''.$langs->trans("Empty").''; +} print ''; diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php index 7e560a0d40f..262231f72b5 100644 --- a/htdocs/takepos/receipt.php +++ b/htdocs/takepos/receipt.php @@ -19,6 +19,12 @@ * along with this program. If not, see . */ +/** + * \file htdocs/takepos/floors.php + * \ingroup takepos + * \brief Page to show a receipt. + */ + require '../main.inc.php'; // Load $user and permissions include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php index 9fa2154eaf1..959bc0baac5 100644 --- a/htdocs/takepos/takepos.php +++ b/htdocs/takepos/takepos.php @@ -16,6 +16,12 @@ * along with this program. If not, see . */ +/** + * \file htdocs/takepos/floors.php + * \ingroup takepos + * \brief Main TakePOS screen + */ + //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); @@ -493,17 +499,17 @@ if (count($maincategories)==0) { // User menu and external TakePOS modules $menus = array(); $r=0; -$menus[$r++]=array('title'=>$langs->trans("SearchProduct"), +$menus[$r++]=array('title'=>''.$langs->trans("SearchProduct"), 'action'=>'Search();'); $menus[$r++]=array('title'=>$langs->trans("FreeZone"), 'action'=>'FreeZone();'); -$menus[$r++]=array('title'=>$langs->trans("Customer"), +$menus[$r++]=array('title'=>''.$langs->trans("Customer"), 'action'=>'Customer();'); -$menus[$r++]=array('title'=>$langs->trans("BackOffice"), +$menus[$r++]=array('title'=>''.$langs->trans("BackOffice"), 'action'=>'window.open(\''.(DOL_URL_ROOT ? DOL_URL_ROOT : '/').'\', \'_backoffice\');'); $menus[$r++]=array('title'=>$langs->trans("DoPayment"), 'action'=>'CloseBill();'); -$menus[$r++]=array('title'=>$langs->trans("Logout"), +$menus[$r++]=array('title'=>''.$langs->trans("Logout"), 'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';'); // BAR RESTAURANT specific menu