From 0fbde14b33e57db9f5a6fb6a226c7224159a77f9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 25 Feb 2020 12:58:15 +0100 Subject: [PATCH] Clean syntax of code --- htdocs/takepos/admin/other.php | 87 ++++++++++++++++------------------ 1 file changed, 40 insertions(+), 47 deletions(-) diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php index ddaaf7dac51..383a710a47a 100644 --- a/htdocs/takepos/admin/other.php +++ b/htdocs/takepos/admin/other.php @@ -21,17 +21,15 @@ * \ingroup takepos * \brief Setup page for TakePos module */ - require '../../main.inc.php'; // Load $user and permissions -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; -require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php"; +require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; +require_once DOL_DOCUMENT_ROOT . "/core/lib/takepos.lib.php"; // If socid provided by ajax company selector -if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id'])) -{ +if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id'])) { $_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); $_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); $_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); @@ -44,8 +42,8 @@ $langs->loadLangs(array("admin", "cashdesk")); global $db; -$sql = "SELECT code, libelle FROM ".MAIN_DB_PREFIX."c_paiement"; -$sql .= " WHERE entity IN (".getEntity('c_paiement').")"; +$sql = "SELECT code, libelle FROM " . MAIN_DB_PREFIX . "c_paiement"; +$sql .= " WHERE entity IN (" . getEntity('c_paiement') . ")"; $sql .= " AND active = 1"; $sql .= " ORDER BY libelle"; $resql = $db->query($sql); @@ -56,11 +54,12 @@ if ($resql) { } } + /* * Actions */ -if (GETPOST('action', 'alpha') == 'set') -{ + +if (GETPOST('action', 'alpha') == 'set') { $db->begin(); if (GETPOST('socid', 'int') < 0) $_POST["socid"] = ''; @@ -80,52 +79,46 @@ if (GETPOST('action', 'alpha') == 'set') $res = dolibarr_set_const($db, "TAKEPOS_DIRECT_PAYMENT", GETPOST('TAKEPOS_DIRECT_PAYMENT', 'int'), 'int', 0, '', $conf->entity); $res = dolibarr_set_const($db, "TAKEPOS_CUSTOM_RECEIPT", GETPOST('TAKEPOS_CUSTOM_RECEIPT', 'int'), 'int', 0, '', $conf->entity); //$res = dolibarr_set_const($db, "TAKEPOS_HEAD_BAR", GETPOST('TAKEPOS_HEAD_BAR', 'int'), 'int', 0, '', $conf->entity); - $res = dolibarr_set_const($db, "TAKEPOS_EMAIL_TEMPLATE_INVOICE", GETPOST('TAKEPOS_EMAIL_TEMPLATE_INVOICE', 'alpha'), 'chaine', 0, '', $conf->entity); + $res = dolibarr_set_const($db, "TAKEPOS_EMAIL_TEMPLATE_INVOICE", GETPOST('TAKEPOS_EMAIL_TEMPLATE_INVOICE', 'alpha'), 'chaine', 0, '', $conf->entity); if (!empty($conf->global->TAKEPOS_ENABLE_SUMUP)) { $res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity); $res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity); } - if ($conf->global->TAKEPOS_ORDER_NOTES == 1) - { + if ($conf->global->TAKEPOS_ORDER_NOTES == 1) { $extrafields = new ExtraFields($db); $extrafields->addExtraField('order_notes', 'Order notes', 'varchar', 0, 255, 'facturedet', 0, 0, '', '', 0, '', 0, 1); } - dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha')); + dol_syslog("admin/cashdesk: level " . GETPOST('level', 'alpha')); if (!$res > 0) $error++; - if (!$error) - { - $db->commit(); - setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else - { - $db->rollback(); - setEventMessages($langs->trans("Error"), null, 'errors'); - } + if (!$error) { + $db->commit(); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); + } else { + $db->rollback(); + setEventMessages($langs->trans("Error"), null, 'errors'); + } } + /* * View */ -$form = new Form($db); -$formproduct = new FormProduct($db); - llxHeader('', $langs->trans("CashDeskSetup")); -$linkback = ''.$langs->trans("BackToModuleList").''; -print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup'); +$linkback = '' . $langs->trans("BackToModuleList") . ''; +print load_fiche_titre($langs->trans("CashDeskSetup") . ' (TakePOS)', $linkback, 'title_setup'); $head = takepos_prepare_head(); dol_fiche_head($head, 'other', 'TakePOS', -1); print '
'; // Mode -print '
'; -print ''; +print ''; +print ''; print ''; @@ -133,16 +126,17 @@ print '
'; // Marketplace print "\n"; -print "\n"; -print ''; -print ''; +print '' . "\n"; +print ''; +print ''; print ''; -print "\n"; $url = 'https://www.dolistore.com/45-pos'; -print ''; -print ''; -print ''; + +print '' . "\n"; +print ''; +print ''; +print ''; print ''; print "
'.$langs->trans("WebSiteDesc").''.$langs->trans("URL").'
' . $langs->trans("WebSiteDesc") . '' . $langs->trans("URL") . '
'.$langs->trans("DolistorePosCategory").''.$url.'
' . $langs->trans("DolistorePosCategory") . '' . $url . '
\n"; @@ -152,22 +146,21 @@ print '
'; print '
'; - - print '
'; // Support print "\n"; -print "\n"; +print '' . "\n"; print ''; -print ''; +print ''; print ''; -print "\n"; $url = 'http://www.takepos.com'; -print ''; + +print '' . "\n"; +print ''; print ''; -print ''; +print ''; print ''; print "
TakePOS Support'.$langs->trans("URL").'' . $langs->trans("URL") . '
TakePOS original developers'.$url.'' . $url . '
\n";