alxarafe / alixar

public/htdocs/website/index.php

Spacing +25 added lines, -25 removed lines

@@ -425,7 +425,7 @@ 
 if ($sortorder) {
     $backtopage .= '&sortorder=' . urlencode($sortorder);
 }
-include DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';  // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file.
+include DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file.
 
 $backtopage = $savbacktopage;
 //var_dump($backtopage);
@@ -1188,7 +1188,7 @@ 
         $content = '';
         if (GETPOSTISSET('content')) {
             //$content = GETPOST('content', 'restricthtmlallowunvalid');    // @TODO Use a restricthtmlallowunvalidwithphp
-            $content = GETPOST('content', 'none');  // @TODO Use a restricthtmlallowunvalidwithphp
+            $content = GETPOST('content', 'none'); // @TODO Use a restricthtmlallowunvalidwithphp
 
             $objectpage->content = make_substitutions($content, $substitutionarray);
         } else {
@@ -1561,7 +1561,7 @@ 
                     $error++;
                     setEventMessages($langs->trans('ErrorFaviconMustBeASquaredImage'), array(), 'errors');
                 }
-                if (! $error && ($filesize[0] != 16 && $filesize[0] != 32 && $filesize[0] != 64)) {
+                if (!$error && ($filesize[0] != 16 && $filesize[0] != 32 && $filesize[0] != 64)) {
                     $error++;
                     setEventMessages($langs->trans('ErrorFaviconSize'), array(), 'errors');
                 }
@@ -1573,7 +1573,7 @@ 
                 if (!GETPOSTISSET('updateandstay')) {   // If we click on "Save And Stay", we don not make the redirect
                     $action = 'preview';
                     if ($backtopage) {
-                        $backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage);    // Clean backtopage url
+                        $backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage); // Clean backtopage url
                         header("Location: " . $backtopage);
                         exit;
                     }
@@ -1606,7 +1606,7 @@ 
             $phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
             // Security analysis
-            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);   // Contains the setEventMessages
+            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
             if (!$errorphpcheck) {
                 $htmlheadercontent = '';
@@ -1644,7 +1644,7 @@ 
             $phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
             // Security analysis
-            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);   // Contains the setEventMessages
+            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
             if (!$errorphpcheck) {
                 $csscontent = '';
@@ -1687,7 +1687,7 @@ 
             $phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
             // Security analysis
-            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);   // Contains the setEventMessages
+            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
             if (!$errorphpcheck) {
                 $jscontent = '';
@@ -1725,7 +1725,7 @@ 
             $phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
             // Security analysis
-            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);   // Contains the setEventMessages
+            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
             if (!$errorphpcheck) {
                 $robotcontent = '';
@@ -1763,7 +1763,7 @@ 
             $phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
             // Security analysis
-            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);   // Contains the setEventMessages
+            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
             if (!$errorphpcheck) {
                 $htaccesscontent = '';
@@ -1787,7 +1787,7 @@ 
             $phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
             // Security analysis
-            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);   // Contains the setEventMessages
+            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
             if (!$errorphpcheck) {
                 $manifestjsoncontent = '';
@@ -1826,7 +1826,7 @@ 
             $phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
             // Security analysis
-            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);   // Contains the setEventMessages
+            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
             if (!$errorphpcheck) {
                 $readmecontent = '';
@@ -1865,7 +1865,7 @@ 
             $phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
             // Security analysis
-            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);   // Contains the setEventMessages
+            $errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
             if (!$errorphpcheck) {
                 $licensecontent = '';
@@ -1907,7 +1907,7 @@ 
             if (!GETPOSTISSET('updateandstay')) {   // If we click on "Save And Stay", we don not make the redirect
                 $action = 'preview';
                 if ($backtopage) {
-                    $backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage);    // Clean backtopage url
+                    $backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage); // Clean backtopage url
                     header("Location: " . $backtopage);
                     exit;
                 }
@@ -1926,7 +1926,7 @@ 
 
     $object->fk_default_home = $pageid;
     $res = $object->update($user);
-    if (! ($res > 0)) {
+    if (!($res > 0)) {
         $error++;
         setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -2540,7 +2540,7 @@ 
                 $fileofzip = '';
                 if (GETPOSTISSET('templateuserfile')) {
                     // Case we selected one template
-                    $fileofzip = DOL_DATA_ROOT . '/doctemplates/websites/' . GETPOST('templateuserfile', 'alpha');  // $fileofzip will be sanitized later into the importWebSite()
+                    $fileofzip = DOL_DATA_ROOT . '/doctemplates/websites/' . GETPOST('templateuserfile', 'alpha'); // $fileofzip will be sanitized later into the importWebSite()
                 } elseif (!empty($_FILES) && is_array($_FILES['userfile'])) {
                     // Case we upload a new template
                     if (is_array($_FILES['userfile']['tmp_name'])) {
@@ -2622,7 +2622,7 @@ 
     if ($website->virtualhost) {
         $domainname = $website->virtualhost;
     }
-    if (! preg_match('/^http/i', $domainname)) {
+    if (!preg_match('/^http/i', $domainname)) {
         $domainname = 'https://' . $domainname;
     }
 
@@ -2688,7 +2688,7 @@ 
                 $url->appendChild($lastmod);
                 // Add suggested frequency for refresh
                 if (getDolGlobalString('WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ')) {
-                    $changefreq = $domtree->createElement('changefreq', 'weekly');  // TODO Manage other values
+                    $changefreq = $domtree->createElement('changefreq', 'weekly'); // TODO Manage other values
                     $url->appendChild($changefreq);
                 }
                 // Add higher priority for home page
@@ -2793,7 +2793,7 @@ 
                 $url->appendChild($lastmod);
                 // Add suggested frequency for refresh
                 if (getDolGlobalString('WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ')) {
-                    $changefreq = $domtree->createElement('changefreq', 'weekly');  // TODO Manage other values
+                    $changefreq = $domtree->createElement('changefreq', 'weekly'); // TODO Manage other values
                     $url->appendChild($changefreq);
                 }
 
@@ -3618,7 +3618,7 @@ 
                 } else {
                     $disabled = '';
                     $title = '';
-                    $url = $_SERVER["PHP_SELF"] . '?action=delete&token=' . newToken() . '&pageid=' . ((int) $websitepage->id) . '&website=' . urlencode($website->ref);    // action=delete for webpage, deletesite for website
+                    $url = $_SERVER["PHP_SELF"] . '?action=delete&token=' . newToken() . '&pageid=' . ((int) $websitepage->id) . '&website=' . urlencode($website->ref); // action=delete for webpage, deletesite for website
                 }
                 print '<a href="' . $url . '" class="button buttonDelete bordertransp' . ($disabled ? ' disabled' : '') . '"' . $disabled . ' title="' . dol_escape_htmltag($title) . '">' . img_picto('', 'delete', 'class=""') . '<span class="hideonsmartphone paddingleft">' . $langs->trans("Delete") . '</span></a>';
                 print '</span>';
@@ -3838,7 +3838,7 @@ 
         // Clean the php htaccesscontent file to remove php code and get only html part
         $htaccesscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP( \?>)?\n*/ims', '', $htaccesscontent);
     } else {
-        $htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');   // We must use 'nohtml' and not 'alphanohtml' because we must accept "
+        $htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml'); // We must use 'nohtml' and not 'alphanohtml' because we must accept "
     }
     if (!trim($htaccesscontent)) {
         $htaccesscontent .= "# Order allow,deny\n";
@@ -3939,7 +3939,7 @@ 
     $maxfilesizearray = getMaxFileSizeArray();
     $maxmin = $maxfilesizearray['maxmin'];
     if ($maxmin > 0) {
-        print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
+        print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
     }
     print '<input type="file" class="flat minwidth300" name="addedfile" id="addedfile"/>';
 
@@ -4196,7 +4196,7 @@ 
         $maxfilesizearray = getMaxFileSizeArray();
         $maxmin = $maxfilesizearray['maxmin'];
         if ($maxmin > 0) {
-            print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
+            print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
         }
         print '<input class="flat minwidth400" type="file" name="userfile[]" accept=".zip">';
         print '<input type="submit" class="button small" name="buttonsubmitimportfile" value="' . dol_escape_htmltag($langs->trans("Upload")) . '">';
@@ -4854,7 +4854,7 @@ 
 
 
     $module = 'medias';
-    $formalreadyopen = 2;   // So the form to submit a new file will not be open another time inside the core/tpl/filemanager.tpl.php
+    $formalreadyopen = 2; // So the form to submit a new file will not be open another time inside the core/tpl/filemanager.tpl.php
     if (empty($url)) {
         $url = constant('BASE_URL') . '/website/index.php'; // Must be an url without param
     }
@@ -5089,8 +5089,8 @@ 
             print getTitleFieldOfList("Categories", 0, $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'center ') . "\n";
             print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
             print getTitleFieldOfList("UserCreation", 0, $_SERVER['PHP_SELF'], 'fk_user_creat', '', $param, '', $sortfield, $sortorder, '') . "\n";
-            print getTitleFieldOfList("DateCreation", 0, $_SERVER['PHP_SELF'], 'date_creation', '', $param, '', $sortfield, $sortorder, 'center ') . "\n";        // Date creation
-            print getTitleFieldOfList("DateLastModification", 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n";      // Date last modif
+            print getTitleFieldOfList("DateCreation", 0, $_SERVER['PHP_SELF'], 'date_creation', '', $param, '', $sortfield, $sortorder, 'center ') . "\n"; // Date creation
+            print getTitleFieldOfList("DateLastModification", 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n"; // Date last modif
             print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
             // Action column
             if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

public/htdocs/dav/fileserver.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
      * @param string    $password   Password to validate for $username
      * @return bool                 True if login ok, false if not
      */
-    static function ($username, $password) {
+    static function($username, $password) {
         global $user, $conf;
         global $dolibarr_main_authentication, $dolibarr_auto_user;
 

public/htdocs/zapier/class/hook.class.php

Indentation +2 added lines, -2 removed lines

@@ -576,7 +576,7 @@ 
         return $this->LibStatut($this->status, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the status
      *
@@ -587,7 +587,7 @@ 
      */
     public function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         if (empty($this->labelStatus) || empty($this->labelStatusShort)) {

public/htdocs/zapier/class/api_zapier.class.php

Indentation +27 added lines, -27 removed lines

@@ -295,7 +295,7 @@ 
         );
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas
      *
@@ -304,30 +304,30 @@ 
      */
     public function _cleanObjectDatas($object)
     {
-		// phpcs:disable
-		$object = parent::_cleanObjectDatas($object);
-
-		return $object;
-	}
-
-	/**
-	 * Validate fields before create or update object
-	 *
-	 * @param   array       $data       Array of data to validate
-	 * @param   array       $fields     Array of fields needed
-	 * @return  array
-	 *
-	 * @throws  RestException
-	 */
-	private function validate($data, $fields)
-	{
-		$hook = array();
-		foreach ($fields as $field) {
-			if (!isset($data[$field])) {
-				throw new RestException(400, $field." field missing");
-			}
-			$hook[$field] = $data[$field];
-		}
-		return $hook;
-	}
+        // phpcs:disable
+        $object = parent::_cleanObjectDatas($object);
+
+        return $object;
+    }
+
+    /**
+     * Validate fields before create or update object
+     *
+     * @param   array       $data       Array of data to validate
+     * @param   array       $fields     Array of fields needed
+     * @return  array
+     *
+     * @throws  RestException
+     */
+    private function validate($data, $fields)
+    {
+        $hook = array();
+        foreach ($fields as $field) {
+            if (!isset($data[$field])) {
+                throw new RestException(400, $field." field missing");
+            }
+            $hook[$field] = $data[$field];
+        }
+        return $hook;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -324,7 +324,7 @@
 		$hook = array();
 		foreach ($fields as $field) {
 			if (!isset($data[$field])) {
-				throw new RestException(400, $field." field missing");
+				throw new RestException(400, $field . " field missing");
 			}
 			$hook[$field] = $data[$field];
 		}

public/htdocs/takepos/admin/other.php

Spacing +3 added lines, -3 removed lines

@@ -33,9 +33,9 @@
 
 // If socid provided by ajax company selector
 if (GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha')) {
-    $_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');        // Keep this ?
-    $_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');       // Keep this ?
-    $_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');    // Keep this ?
+    $_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ?
+    $_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ?
+    $_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ?
 }
 
 // Security check

public/htdocs/takepos/ajax/ajax.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
 $hookmanager->initHooks(array('takeposproductsearch')); // new context for product search hooks
 
-$pricelevel = 1;    // default price level if PRODUIT_MULTIPRICES. TODO Get price level from thirdparty.
+$pricelevel = 1; // default price level if PRODUIT_MULTIPRICES. TODO Get price level from thirdparty.
 
 
 
@@ -261,7 +261,7 @@ 
         }
     }
 
-    $sql = 'SELECT p.rowid, p.ref, p.label, p.tosell, p.tobuy, p.barcode, p.price, p.price_ttc' ;
+    $sql = 'SELECT p.rowid, p.ref, p.label, p.tosell, p.tobuy, p.barcode, p.price, p.price_ttc';
     if (getDolGlobalInt('TAKEPOS_PRODUCT_IN_STOCK') == 1) {
         if (getDolGlobalInt('CASHDESK_ID_WAREHOUSE' . $_SESSION['takeposterminal'])) {
             $sql .= ', ps.reel';

public/htdocs/takepos/receipt.php

Indentation +14 added lines, -14 removed lines

@@ -163,15 +163,15 @@ 
         <th class="right"><?php print $langs->trans("Qty"); ?></th>
         <th class="right"><?php if ($gift != 1) {
             print $langs->trans("Price");
-                          } ?></th>
+                            } ?></th>
         <?php  if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) { ?>
         <th class="right"><?php if ($gift != 1) {
             print $langs->trans("TotalHT");
-                          } ?></th>
+                            } ?></th>
         <?php } ?>
         <th class="right"><?php if ($gift != 1) {
             print $langs->trans("TotalTTC");
-                          } ?></th>
+                            } ?></th>
     </tr>
     </thead>
     <tbody>
@@ -201,17 +201,17 @@ 
             <td class="right"><?php echo $line->qty; ?></td>
             <td class="right"><?php if ($gift != 1) {
                 echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1);
-                              } ?></td>
+                                } ?></td>
             <?php
             if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) { ?>
                         <td class="right"><?php if ($gift != 1) {
                             echo price($line->total_ht, 1);
-                                          } ?></td>
+                                            } ?></td>
                 <?php
             } ?>
             <td class="right"><?php if ($gift != 1) {
                 echo price($line->total_ttc, 1);
-                              } ?></td>
+                                } ?></td>
         </tr>
             <?php
         }
@@ -224,10 +224,10 @@ 
 <tr>
     <th class="right"><?php if ($gift != 1) {
         echo $langs->trans("TotalHT");
-                      } ?></th>
+                        } ?></th>
     <td class="right"><?php if ($gift != 1) {
         echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                      } ?></td>
+                        } ?></td>
 </tr>
 <?php if (getDolGlobalString('TAKEPOS_TICKET_VAT_GROUPPED')) {
         $vat_groups = array();
@@ -243,10 +243,10 @@ 
     <tr>
         <th align="right"><?php if ($gift != 1) {
                 echo $langs->trans("VAT") . ' ' . vatrate($key, 1);
-                          } ?></th>
+                            } ?></th>
         <td align="right"><?php if ($gift != 1) {
                 echo price($val, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                          } ?></td>
+                            } ?></td>
     </tr>
         <?php
     }
@@ -254,7 +254,7 @@ 
 <tr>
     <th class="right"><?php if ($gift != 1) {
         echo $langs->trans("TotalVAT") . '</th><td class="right">' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                      } ?></td>
+                        } ?></td>
 </tr>
 <?php }
 
@@ -264,20 +264,20 @@ 
 <tr>
     <th class="right"><?php if ($gift != 1) {
         echo '' . $langs->trans("TotalLT1") . '</th><td class="right">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                      } ?></td>
+                        } ?></td>
 </tr>
 <?php } ?>
 <?php if (price2num($object->total_localtax2, 'MU') || $mysoc->useLocalTax(2)) { ?>
 <tr>
     <th class="right"><?php if ($gift != 1) {
         echo '' . $langs->trans("TotalLT2") . '</th><td class="right">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                      } ?></td>
+                        } ?></td>
 </tr>
 <?php } ?>
 <tr>
     <th class="right"><?php if ($gift != 1) {
         echo '' . $langs->trans("TotalTTC") . '</th><td class="right">' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                      } ?></td>
+                        } ?></td>
 </tr>
 <?php
 if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"]) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {

Spacing +1 added lines, -1 removed lines

@@ -341,7 +341,7 @@
                 if ((!isModEnabled('multicurrency') || $object->multicurrency_tx == 1) && $row->code == "LIQ" && $row->pos_change > 0) {
                     echo '<tr>';
                     echo '<td class="right">';
-                    echo $langs->trans("Change");   // ChangeBack ?
+                    echo $langs->trans("Change"); // ChangeBack ?
                     echo '</td>';
                     echo '<td class="right">';
                     echo price($row->pos_change, 1, '', 1, - 1, - 1, $currency);

public/htdocs/takepos/public/auto_order.php

Spacing +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
     accessforbidden('Auto order is not allwed'); // If Auto Order is disabled never allow access to this page (that is a NO LOGIN access)
 }
 
-$_SESSION["basiclayout"] = 1;   // For the simple layout for public submission
-$_SESSION["takeposterminal"] = getDolGlobalInt('TAKEPOS_TERMINAL_NB_FOR_PUBLIC', 1);    // Default terminal for public submission is 1
+$_SESSION["basiclayout"] = 1; // For the simple layout for public submission
+$_SESSION["takeposterminal"] = getDolGlobalInt('TAKEPOS_TERMINAL_NB_FOR_PUBLIC', 1); // Default terminal for public submission is 1
 
 define('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE', 1);
 if (GETPOSTISSET("mobilepage")) {

public/htdocs/takepos/invoice.php

Spacing +12 added lines, -12 removed lines

@@ -173,7 +173,7 @@ 
  */
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -188,9 +188,9 @@ 
             $bankaccount = GETPOSTINT('accountid');
         } else {
             if ($pay == 'LIQ') {
-                $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH' . $_SESSION["takeposterminal"]);            // For backward compatibility
+                $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH' . $_SESSION["takeposterminal"]); // For backward compatibility
             } elseif ($pay == "CHQ") {
-                $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE' . $_SESSION["takeposterminal"]);    // For backward compatibility
+                $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE' . $_SESSION["takeposterminal"]); // For backward compatibility
             } else {
                 $accountname = "CASHDESK_ID_BANKACCOUNT_" . $pay . $_SESSION["takeposterminal"];
                 $bankaccount = getDolGlobalInt($accountname);
@@ -379,7 +379,7 @@ 
         $creditnote->socid = $invoice->socid;
         $creditnote->date = dol_now();
         $creditnote->module_source = 'takepos';
-        $creditnote->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
+        $creditnote->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '';
         $creditnote->type = Facture::TYPE_CREDIT_NOTE;
         $creditnote->fk_facture_source = $placeid;
         //$creditnote->remise_absolue = $invoice->remise_absolue;
@@ -536,9 +536,9 @@ 
     // If we add a line and no invoice yet, we create the invoice
     if (($action == "addline" || $action == "freezone") && $placeid == 0 && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
         $invoice->socid = getDolGlobalInt($constforcompanyid);
-        $invoice->date = dol_now('tzuserrel');      // We use the local date, only the day will be saved.
+        $invoice->date = dol_now('tzuserrel'); // We use the local date, only the day will be saved.
         $invoice->module_source = 'takepos';
-        $invoice->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
+        $invoice->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '';
         $invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
 
         if ($invoice->socid <= 0) {
@@ -748,7 +748,7 @@ 
 
             // complete line by hook
             $parameters = array('prod' => $prod, 'line' => $line);
-            $reshook = $hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action);    // Note that $action and $line may have been modified by some hooks
+            $reshook = $hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action); // Note that $action and $line may have been modified by some hooks
             if ($reshook < 0) {
                 setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
             }
@@ -943,7 +943,7 @@ 
                     }
                     if (!$permissiontoupdateline) {
                         dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos") . ' - No permission to updateprice', null, 1);
-                    } elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT')  == 1) {
+                    } elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT') == 1) {
                         $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);
                     } else {
                         $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, 'TTC', $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);
@@ -1007,7 +1007,7 @@ 
 
     if ($action == "setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
         $constantforkey = 'CASHDESK_ID_WAREHOUSE' . $_SESSION["takeposterminal"];
-        $warehouseid = getDolGlobalInt($constantforkey);    // TODO Get the wrehouse id from GETPOSTINT('warehouseid');
+        $warehouseid = getDolGlobalInt($constantforkey); // TODO Get the wrehouse id from GETPOSTINT('warehouseid');
         $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet SET batch = '" . $db->escape($batch) . "', fk_warehouse = " . ((int) $warehouseid);
         $sql .= " WHERE rowid=" . ((int) $idoflineadded);
         $db->query($sql);
@@ -1631,7 +1631,7 @@ 
 
 // Complete header by hook
 $parameters = array();
-$reshook = $hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -1798,7 +1798,7 @@ 
 
                 // complete line by hook
                 $parameters = array('line' => $line);
-                $reshook = $hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+                $reshook = $hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) {
                     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
                 }
@@ -1911,7 +1911,7 @@ 
 
                 // complete line by hook
                 $parameters = array('line' => $line);
-                $reshook = $hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+                $reshook = $hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) {
                     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
                 }