From f1b80fc19a1f01cc9457bef9eff2768af787bc68 Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Tue, 20 Aug 2019 23:44:30 +0200 Subject: [PATCH] Add 'Direct Cash Payment' button in TakePOS --- htdocs/langs/en_US/cashdesk.lang | 2 ++ htdocs/takepos/admin/setup.php | 8 ++++++++ htdocs/takepos/takepos.php | 10 ++++++++++ 3 files changed, 20 insertions(+) diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 012b6b4c804..628de17efcc 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -70,3 +70,5 @@ TerminalSelect=Select terminal you want to use: POSTicket=POS Ticket BasicPhoneLayout=Use basic layout for phones SetupOfTerminalNotComplete=Setup of terminal %s is not complete +DirectPayment=Direct payment +DirectPaymentButton=Direct cash payment button diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index 3fb9d869cd0..6d33b8a19c2 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -79,6 +79,7 @@ if (GETPOST('action', 'alpha') == 'set') $res = dolibarr_set_const($db, "TAKEPOS_FOOTER", GETPOST('TAKEPOS_FOOTER', 'alpha'), 'chaine', 0, '', $conf->entity); $res = dolibarr_set_const($db, "TAKEPOS_NUMPAD", GETPOST('TAKEPOS_NUMPAD', 'alpha'), 'chaine', 0, '', $conf->entity); $res = dolibarr_set_const($db, "TAKEPOS_NUM_TERMINALS", GETPOST('TAKEPOS_NUM_TERMINALS', 'alpha'), 'chaine', 0, '', $conf->entity); + $res = dolibarr_set_const($db, "TAKEPOS_DIRECT_PAYMENT", GETPOST('TAKEPOS_DIRECT_PAYMENT', 'int'), 'int', 0, '', $conf->entity); if ($conf->global->TAKEPOS_ORDER_NOTES==1) { @@ -223,6 +224,13 @@ $array=array(0=>$langs->trans("Numberspad"), 1=>$langs->trans("BillsCoinsPad")); print $form->selectarray('TAKEPOS_NUMPAD', $array, (empty($conf->global->TAKEPOS_NUMPAD)?'0':$conf->global->TAKEPOS_NUMPAD), 0); print "\n"; +// Direct Payment +print ''; +print $langs->trans('DirectPaymentButton'); +print ''; +print $form->selectyesno("TAKEPOS_DIRECT_PAYMENT", $conf->global->TAKEPOS_DIRECT_PAYMENT, 1); +print "\n"; + $substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2); $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation"); $htmltext = ''.$langs->trans("AvailableVariables").':
'; diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php index 7260bc81a58..4dc481a98cf 100644 --- a/htdocs/takepos/takepos.php +++ b/htdocs/takepos/takepos.php @@ -575,6 +575,12 @@ function TerminalsDialog() }); } +function DirectPayment(){ + console.log("DirectPayment"); + $("#poslines").load("invoice.php?place"+place+"&action=valid&pay=trans("cash");?>", function() { + }); +} + $( document ).ready(function() { PrintCategories(0); LoadProducts(0); @@ -666,6 +672,10 @@ $menus[$r++]=array('title'=>''
'.$langs->trans("FreeZone").'
', 'action'=>'FreeZone();'); $menus[$r++]=array('title'=>'
'.$langs->trans("Payment").'
', 'action'=>'CloseBill();'); +if ($conf->global->TAKEPOS_DIRECT_PAYMENT){ + $menus[$r++]=array('title'=>'
'.$langs->trans("DirectPayment").'
', 'action'=>'DirectPayment();'); +} + // BAR RESTAURANT specific menu if ($conf->global->TAKEPOS_BAR_RESTAURANT) {