Passed
Push — GENERAL_BUG_REVIEW_240911 ( 776d89...c757bd )
by Rafael
50:33
created
public/htdocs/takepos/admin/other.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,9 +33,9 @@
 block discarded – undo
33 33
 
34 34
 // If socid provided by ajax company selector
35 35
 if (GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha')) {
36
-    $_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');        // Keep this ?
37
-    $_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');       // Keep this ?
38
-    $_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');    // Keep this ?
36
+    $_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ?
37
+    $_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ?
38
+    $_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ?
39 39
 }
40 40
 
41 41
 // Security check
Please login to merge, or discard this patch.
public/htdocs/takepos/ajax/ajax.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
59 59
 $hookmanager->initHooks(array('takeposproductsearch')); // new context for product search hooks
60 60
 
61
-$pricelevel = 1;    // default price level if PRODUIT_MULTIPRICES. TODO Get price level from thirdparty.
61
+$pricelevel = 1; // default price level if PRODUIT_MULTIPRICES. TODO Get price level from thirdparty.
62 62
 
63 63
 
64 64
 
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
         }
262 262
     }
263 263
 
264
-    $sql = 'SELECT p.rowid, p.ref, p.label, p.tosell, p.tobuy, p.barcode, p.price, p.price_ttc' ;
264
+    $sql = 'SELECT p.rowid, p.ref, p.label, p.tosell, p.tobuy, p.barcode, p.price, p.price_ttc';
265 265
     if (getDolGlobalInt('TAKEPOS_PRODUCT_IN_STOCK') == 1) {
266 266
         if (getDolGlobalInt('CASHDESK_ID_WAREHOUSE' . $_SESSION['takeposterminal'])) {
267 267
             $sql .= ', ps.reel';
Please login to merge, or discard this patch.
public/htdocs/takepos/receipt.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -163,15 +163,15 @@  discard block
 block discarded – undo
163 163
         <th class="right"><?php print $langs->trans("Qty"); ?></th>
164 164
         <th class="right"><?php if ($gift != 1) {
165 165
             print $langs->trans("Price");
166
-                          } ?></th>
166
+                            } ?></th>
167 167
         <?php  if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) { ?>
168 168
         <th class="right"><?php if ($gift != 1) {
169 169
             print $langs->trans("TotalHT");
170
-                          } ?></th>
170
+                            } ?></th>
171 171
         <?php } ?>
172 172
         <th class="right"><?php if ($gift != 1) {
173 173
             print $langs->trans("TotalTTC");
174
-                          } ?></th>
174
+                            } ?></th>
175 175
     </tr>
176 176
     </thead>
177 177
     <tbody>
@@ -201,17 +201,17 @@  discard block
 block discarded – undo
201 201
             <td class="right"><?php echo $line->qty; ?></td>
202 202
             <td class="right"><?php if ($gift != 1) {
203 203
                 echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1);
204
-                              } ?></td>
204
+                                } ?></td>
205 205
             <?php
206 206
             if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) { ?>
207 207
                         <td class="right"><?php if ($gift != 1) {
208 208
                             echo price($line->total_ht, 1);
209
-                                          } ?></td>
209
+                                            } ?></td>
210 210
                 <?php
211 211
             } ?>
212 212
             <td class="right"><?php if ($gift != 1) {
213 213
                 echo price($line->total_ttc, 1);
214
-                              } ?></td>
214
+                                } ?></td>
215 215
         </tr>
216 216
             <?php
217 217
         }
@@ -224,10 +224,10 @@  discard block
 block discarded – undo
224 224
 <tr>
225 225
     <th class="right"><?php if ($gift != 1) {
226 226
         echo $langs->trans("TotalHT");
227
-                      } ?></th>
227
+                        } ?></th>
228 228
     <td class="right"><?php if ($gift != 1) {
229 229
         echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
230
-                      } ?></td>
230
+                        } ?></td>
231 231
 </tr>
232 232
 <?php if (getDolGlobalString('TAKEPOS_TICKET_VAT_GROUPPED')) {
233 233
         $vat_groups = array();
@@ -243,10 +243,10 @@  discard block
 block discarded – undo
243 243
     <tr>
244 244
         <th align="right"><?php if ($gift != 1) {
245 245
                 echo $langs->trans("VAT") . ' ' . vatrate($key, 1);
246
-                          } ?></th>
246
+                            } ?></th>
247 247
         <td align="right"><?php if ($gift != 1) {
248 248
                 echo price($val, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
249
-                          } ?></td>
249
+                            } ?></td>
250 250
     </tr>
251 251
         <?php
252 252
     }
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 <tr>
255 255
     <th class="right"><?php if ($gift != 1) {
256 256
         echo $langs->trans("TotalVAT") . '</th><td class="right">' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
257
-                      } ?></td>
257
+                        } ?></td>
258 258
 </tr>
259 259
 <?php }
260 260
 
@@ -264,20 +264,20 @@  discard block
 block discarded – undo
264 264
 <tr>
265 265
     <th class="right"><?php if ($gift != 1) {
266 266
         echo '' . $langs->trans("TotalLT1") . '</th><td class="right">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
267
-                      } ?></td>
267
+                        } ?></td>
268 268
 </tr>
269 269
 <?php } ?>
270 270
 <?php if (price2num($object->total_localtax2, 'MU') || $mysoc->useLocalTax(2)) { ?>
271 271
 <tr>
272 272
     <th class="right"><?php if ($gift != 1) {
273 273
         echo '' . $langs->trans("TotalLT2") . '</th><td class="right">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
274
-                      } ?></td>
274
+                        } ?></td>
275 275
 </tr>
276 276
 <?php } ?>
277 277
 <tr>
278 278
     <th class="right"><?php if ($gift != 1) {
279 279
         echo '' . $langs->trans("TotalTTC") . '</th><td class="right">' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
280
-                      } ?></td>
280
+                        } ?></td>
281 281
 </tr>
282 282
 <?php
283 283
 if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"]) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -341,7 +341,7 @@
 block discarded – undo
341 341
                 if ((!isModEnabled('multicurrency') || $object->multicurrency_tx == 1) && $row->code == "LIQ" && $row->pos_change > 0) {
342 342
                     echo '<tr>';
343 343
                     echo '<td class="right">';
344
-                    echo $langs->trans("Change");   // ChangeBack ?
344
+                    echo $langs->trans("Change"); // ChangeBack ?
345 345
                     echo '</td>';
346 346
                     echo '<td class="right">';
347 347
                     echo price($row->pos_change, 1, '', 1, - 1, - 1, $currency);
Please login to merge, or discard this patch.
public/htdocs/takepos/public/auto_order.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
     accessforbidden('Auto order is not allwed'); // If Auto Order is disabled never allow access to this page (that is a NO LOGIN access)
40 40
 }
41 41
 
42
-$_SESSION["basiclayout"] = 1;   // For the simple layout for public submission
43
-$_SESSION["takeposterminal"] = getDolGlobalInt('TAKEPOS_TERMINAL_NB_FOR_PUBLIC', 1);    // Default terminal for public submission is 1
42
+$_SESSION["basiclayout"] = 1; // For the simple layout for public submission
43
+$_SESSION["takeposterminal"] = getDolGlobalInt('TAKEPOS_TERMINAL_NB_FOR_PUBLIC', 1); // Default terminal for public submission is 1
44 44
 
45 45
 define('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE', 1);
46 46
 if (GETPOSTISSET("mobilepage")) {
Please login to merge, or discard this patch.
public/htdocs/takepos/invoice.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
  */
174 174
 
175 175
 $parameters = array();
176
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
176
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
177 177
 if ($reshook < 0) {
178 178
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
179 179
 }
@@ -188,9 +188,9 @@  discard block
 block discarded – undo
188 188
             $bankaccount = GETPOSTINT('accountid');
189 189
         } else {
190 190
             if ($pay == 'LIQ') {
191
-                $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH' . $_SESSION["takeposterminal"]);            // For backward compatibility
191
+                $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH' . $_SESSION["takeposterminal"]); // For backward compatibility
192 192
             } elseif ($pay == "CHQ") {
193
-                $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE' . $_SESSION["takeposterminal"]);    // For backward compatibility
193
+                $bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE' . $_SESSION["takeposterminal"]); // For backward compatibility
194 194
             } else {
195 195
                 $accountname = "CASHDESK_ID_BANKACCOUNT_" . $pay . $_SESSION["takeposterminal"];
196 196
                 $bankaccount = getDolGlobalInt($accountname);
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
         $creditnote->socid = $invoice->socid;
380 380
         $creditnote->date = dol_now();
381 381
         $creditnote->module_source = 'takepos';
382
-        $creditnote->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
382
+        $creditnote->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '';
383 383
         $creditnote->type = Facture::TYPE_CREDIT_NOTE;
384 384
         $creditnote->fk_facture_source = $placeid;
385 385
         //$creditnote->remise_absolue = $invoice->remise_absolue;
@@ -536,9 +536,9 @@  discard block
 block discarded – undo
536 536
     // If we add a line and no invoice yet, we create the invoice
537 537
     if (($action == "addline" || $action == "freezone") && $placeid == 0 && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
538 538
         $invoice->socid = getDolGlobalInt($constforcompanyid);
539
-        $invoice->date = dol_now('tzuserrel');      // We use the local date, only the day will be saved.
539
+        $invoice->date = dol_now('tzuserrel'); // We use the local date, only the day will be saved.
540 540
         $invoice->module_source = 'takepos';
541
-        $invoice->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
541
+        $invoice->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '';
542 542
         $invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
543 543
 
544 544
         if ($invoice->socid <= 0) {
@@ -748,7 +748,7 @@  discard block
 block discarded – undo
748 748
 
749 749
             // complete line by hook
750 750
             $parameters = array('prod' => $prod, 'line' => $line);
751
-            $reshook = $hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action);    // Note that $action and $line may have been modified by some hooks
751
+            $reshook = $hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action); // Note that $action and $line may have been modified by some hooks
752 752
             if ($reshook < 0) {
753 753
                 setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
754 754
             }
@@ -943,7 +943,7 @@  discard block
 block discarded – undo
943 943
                     }
944 944
                     if (!$permissiontoupdateline) {
945 945
                         dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos") . ' - No permission to updateprice', null, 1);
946
-                    } elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT')  == 1) {
946
+                    } elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT') == 1) {
947 947
                         $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);
948 948
                     } else {
949 949
                         $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 @@  discard block
 block discarded – undo
1007 1007
 
1008 1008
     if ($action == "setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
1009 1009
         $constantforkey = 'CASHDESK_ID_WAREHOUSE' . $_SESSION["takeposterminal"];
1010
-        $warehouseid = getDolGlobalInt($constantforkey);    // TODO Get the wrehouse id from GETPOSTINT('warehouseid');
1010
+        $warehouseid = getDolGlobalInt($constantforkey); // TODO Get the wrehouse id from GETPOSTINT('warehouseid');
1011 1011
         $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet SET batch = '" . $db->escape($batch) . "', fk_warehouse = " . ((int) $warehouseid);
1012 1012
         $sql .= " WHERE rowid=" . ((int) $idoflineadded);
1013 1013
         $db->query($sql);
@@ -1631,7 +1631,7 @@  discard block
 block discarded – undo
1631 1631
 
1632 1632
 // Complete header by hook
1633 1633
 $parameters = array();
1634
-$reshook = $hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
1634
+$reshook = $hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
1635 1635
 if ($reshook < 0) {
1636 1636
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
1637 1637
 }
@@ -1798,7 +1798,7 @@  discard block
 block discarded – undo
1798 1798
 
1799 1799
                 // complete line by hook
1800 1800
                 $parameters = array('line' => $line);
1801
-                $reshook = $hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
1801
+                $reshook = $hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
1802 1802
                 if ($reshook < 0) {
1803 1803
                     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
1804 1804
                 }
@@ -1911,7 +1911,7 @@  discard block
 block discarded – undo
1911 1911
 
1912 1912
                 // complete line by hook
1913 1913
                 $parameters = array('line' => $line);
1914
-                $reshook = $hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
1914
+                $reshook = $hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
1915 1915
                 if ($reshook < 0) {
1916 1916
                     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
1917 1917
                 }
Please login to merge, or discard this patch.
public/htdocs/takepos/split.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 <script>
168 168
 function Split(selectedline, split) {
169 169
     $.ajax({
170
-        url: "split.php?action=split&token=<?php echo newToken(); ?>&line="+selectedline+"&split="+split+"&place=<?php echo $place;?>",
170
+        url: "split.php?action=split&token=<?php echo newToken(); ?>&line="+selectedline+"&split="+split+"&place=<?php echo $place; ?>",
171 171
         context: document.body
172 172
     }).done(function() {
173 173
         $("#currentplace").load("invoice.php?place="+parent.place+"&invoiceid="+parent.invoiceid, function() {
@@ -204,8 +204,8 @@  discard block
 block discarded – undo
204 204
 
205 205
 
206 206
 
207
-    $("#headersplit1").html("<?php echo $langs->trans("Place");?> "+parent.place);
208
-    $("#headersplit2").html("<?php echo $langs->trans("SplitSale");?>");
207
+    $("#headersplit1").html("<?php echo $langs->trans("Place"); ?> "+parent.place);
208
+    $("#headersplit2").html("<?php echo $langs->trans("SplitSale"); ?>");
209 209
 
210 210
 });
211 211
 </script>
Please login to merge, or discard this patch.
public/htdocs/takepos/floors.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -228,9 +228,9 @@
 block discarded – undo
228 228
         $floor--;
229 229
         echo $floor;
230 230
         $floor++;
231
-                                                                                                             } else {
232
-                                                                                                                 echo "1";
233
-                                                                                                             } ?>';">
231
+                                                                                                                } else {
232
+                                                                                                                    echo "1";
233
+                                                                                                                } ?>';">
234 234
     <?php } ?>
235 235
     <span class="valignmiddle"><?php echo $langs->trans("Floor") . " " . $floor; ?></span>
236 236
     <img src="./img/arrow-next.png" class="valignmiddle" width="5%" onclick="location.href='floors.php?floor=<?php $floor++;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -180,7 +180,7 @@
 block discarded – undo
180 180
 
181 181
 
182 182
 $( document ).ready(function() {
183
-    $.getJSON('./floors.php?action=getTables&token=<?php echo newToken();?>&floor=<?php echo $floor; ?>', function(data) {
183
+    $.getJSON('./floors.php?action=getTables&token=<?php echo newToken(); ?>&floor=<?php echo $floor; ?>', function(data) {
184 184
         $.each(data, function(key, val) {
185 185
             <?php if ($mode == "edit") {?>
186 186
             $('body').append('<div class="tablediv" contenteditable onblur="updatename('+val.rowid+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="tablename'+val.rowid+'">'+val.label+'</div>');
Please login to merge, or discard this patch.
public/htdocs/takepos/index.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1496,11 +1496,11 @@
 block discarded – undo
1496 1496
             ?>
1497 1497
             <div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) {
1498 1498
                 echo 'onclick="MoreCategories(\'less\')"';
1499
-                                 } elseif ($count == ($MAXCATEG - 1)) {
1500
-                                     echo 'onclick="MoreCategories(\'more\')"';
1501
-                                 } else {
1502
-                                     echo 'onclick="LoadProducts(' . $count . ')"';
1503
-                                 } ?> id="catdiv<?php echo $count; ?>">
1499
+                                    } elseif ($count == ($MAXCATEG - 1)) {
1500
+                                        echo 'onclick="MoreCategories(\'more\')"';
1501
+                                    } else {
1502
+                                        echo 'onclick="LoadProducts(' . $count . ')"';
1503
+                                    } ?> id="catdiv<?php echo $count; ?>">
1504 1504
                 <?php
1505 1505
                 if ($count == ($MAXCATEG - 2)) {
1506 1506
                     //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 $arrayofcss = array('/takepos/css/pos.css.php', '/takepos/css/colorbox.css');
125 125
 
126 126
 if (getDolGlobalInt('TAKEPOS_COLOR_THEME') == 1) {
127
-    $arrayofcss[] =  '/takepos/css/colorful.css';
127
+    $arrayofcss[] = '/takepos/css/colorful.css';
128 128
 }
129 129
 
130 130
 
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
         limit = maxproduct-1;
352 352
     }
353 353
     // Only show products for sale (tosell=1)
354
-    $.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&token=<?php echo newToken();?>&thirdpartyid=' + jQuery('#thirdpartyid').val() + '&category='+currentcat+'&tosell=1&limit='+limit+'&offset=0', function(data) {
354
+    $.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&token=<?php echo newToken(); ?>&thirdpartyid=' + jQuery('#thirdpartyid').val() + '&category='+currentcat+'&tosell=1&limit='+limit+'&offset=0', function(data) {
355 355
         console.log("Call ajax.php (in LoadProducts) to get Products of category "+currentcat+" then loop on result to fill image thumbs");
356 356
         console.log(data);
357 357
 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
     }
470 470
     var offset = <?php echo($MAXPRODUCT - 2); ?> * pageproducts;
471 471
     // Only show products for sale (tosell=1)
472
-    $.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&token=<?php echo newToken();?>&category='+currentcat+'&tosell=1&limit='+limit+'&offset='+offset, function(data) {
472
+    $.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&token=<?php echo newToken(); ?>&category='+currentcat+'&tosell=1&limit='+limit+'&offset='+offset, function(data) {
473 473
         console.log("Call ajax.php (in MoreProducts) to get Products of category "+currentcat);
474 474
 
475 475
         if (typeof (data[0]) == "undefined" && moreorless=="more"){ // Return if no more pages
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 function ChangeThirdparty(idcustomer) {
556 556
      console.log("ChangeThirdparty");
557 557
         // Call page list.php to change customer
558
-        $("#poslines").load("<?php echo DOL_URL_ROOT ?>/societe/list.php?action=change&token=<?php echo newToken();?>&type=t&contextpage=poslist&idcustomer="+idcustomer+"&place="+place+"", function() {
558
+        $("#poslines").load("<?php echo DOL_URL_ROOT ?>/societe/list.php?action=change&token=<?php echo newToken(); ?>&type=t&contextpage=poslist&idcustomer="+idcustomer+"&place="+place+"", function() {
559 559
         });
560 560
 
561 561
     ClearSearch(false);
@@ -661,7 +661,7 @@  discard block
 block discarded – undo
661 661
 
662 662
     console.log("New with place = <?php echo $place; ?>, js place="+place+", invoiceid="+invoiceid);
663 663
 
664
-    $.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getInvoice&token=<?php echo newToken();?>&id='+invoiceid, function(data) {
664
+    $.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getInvoice&token=<?php echo newToken(); ?>&id='+invoiceid, function(data) {
665 665
         var r;
666 666
 
667 667
         if (parseInt(data['paye']) === 1) {
@@ -734,7 +734,7 @@  discard block
 block discarded – undo
734 734
             pageproducts = 0;
735 735
             jQuery(".wrapper2 .catwatermark").hide();
736 736
             var nbsearchresults = 0;
737
-            $.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&token=<?php echo newToken();?>&term=' + search_term + '&thirdpartyid=' + jQuery('#thirdpartyid').val() + '&search_start=' + search_start + '&search_limit=' + search_limit, function (data) {
737
+            $.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&token=<?php echo newToken(); ?>&term=' + search_term + '&thirdpartyid=' + jQuery('#thirdpartyid').val() + '&search_start=' + search_start + '&search_limit=' + search_limit, function (data) {
738 738
                 for (i = 0; i < <?php echo $MAXPRODUCT ?>; i++) {
739 739
                     if (typeof (data[i]) == "undefined") {
740 740
                         $("#prowatermark" + i).html("");
@@ -829,7 +829,7 @@  discard block
 block discarded – undo
829 829
                 }
830 830
                 else {
831 831
                     $("#prodiv<?php echo $MAXPRODUCT - 2; ?> span").show();
832
-                    var search_start_less = Math.max(0, parseInt(search_start) - parseInt(<?php echo $MAXPRODUCT - 2;?>));
832
+                    var search_start_less = Math.max(0, parseInt(search_start) - parseInt(<?php echo $MAXPRODUCT - 2; ?>));
833 833
                     $("#search_start_less").val(search_start_less);
834 834
                 }
835 835
                 if (nbsearchresults != <?php echo $MAXPRODUCT - 2; ?>) {
@@ -837,7 +837,7 @@  discard block
 block discarded – undo
837 837
                 }
838 838
                 else {
839 839
                     $("#prodiv<?php echo $MAXPRODUCT - 1; ?> span").show();
840
-                    var search_start_more = parseInt(search_start) + parseInt(<?php echo $MAXPRODUCT - 2;?>);
840
+                    var search_start_more = parseInt(search_start) + parseInt(<?php echo $MAXPRODUCT - 2; ?>);
841 841
                     $("#search_start_more").val(search_start_more);
842 842
                 }
843 843
             });
@@ -934,14 +934,14 @@  discard block
 block discarded – undo
934 934
 
935 935
 function TakeposPrintingOrder(){
936 936
     console.log("TakeposPrintingOrder");
937
-    $("#poslines").load("invoice.php?action=order&token=<?php echo newToken();?>&place="+place, function() {
937
+    $("#poslines").load("invoice.php?action=order&token=<?php echo newToken(); ?>&place="+place, function() {
938 938
         //$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
939 939
     });
940 940
 }
941 941
 
942 942
 function TakeposPrintingTemp(){
943 943
     console.log("TakeposPrintingTemp");
944
-    $("#poslines").load("invoice.php?action=temp&token=<?php echo newToken();?>&place="+place, function() {
944
+    $("#poslines").load("invoice.php?action=temp&token=<?php echo newToken(); ?>&place="+place, function() {
945 945
         //$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
946 946
     });
947 947
 }
@@ -963,7 +963,7 @@  discard block
 block discarded – undo
963 963
 }
964 964
 
965 965
 function DolibarrOpenDrawer() {
966
-    console.log("DolibarrOpenDrawer call ajax url /takepos/ajax/ajax.php?action=opendrawer&token=<?php echo newToken();?>&term=<?php print urlencode(empty($_SESSION["takeposterminal"]) ? '' : $_SESSION["takeposterminal"]); ?>");
966
+    console.log("DolibarrOpenDrawer call ajax url /takepos/ajax/ajax.php?action=opendrawer&token=<?php echo newToken(); ?>&term=<?php print urlencode(empty($_SESSION["takeposterminal"]) ? '' : $_SESSION["takeposterminal"]); ?>");
967 967
     $.ajax({
968 968
         type: "GET",
969 969
         data: { token: '<?php echo currentToken(); ?>' },
@@ -1370,7 +1370,7 @@  discard block
 block discarded – undo
1370 1370
         $menus[$r++] = array('title' => '<span class="far fa-building paddingrightonly"></span><div class="trunc">' . $langs->trans("Customer") . '</div>', 'action' => 'Customer();');
1371 1371
     }
1372 1372
 }
1373
-if (! getDolGlobalString('TAKEPOS_HIDE_HISTORY')) {
1373
+if (!getDolGlobalString('TAKEPOS_HIDE_HISTORY')) {
1374 1374
     $menus[$r++] = array('title' => '<span class="fa fa-history paddingrightonly"></span><div class="trunc">' . $langs->trans("History") . '</div>', 'action' => 'History();');
1375 1375
 }
1376 1376
 $menus[$r++] = array('title' => '<span class="fa fa-cube paddingrightonly"></span><div class="trunc">' . $langs->trans("FreeZone") . '</div>', 'action' => 'FreeZone();');
Please login to merge, or discard this patch.
public/htdocs/printing/admin/printing.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -202,7 +202,7 @@
 block discarded – undo
202 202
             $i++;
203 203
 
204 204
             if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS') {
205
-                $keyforprovider = '';   // @BUG This must be set
205
+                $keyforprovider = ''; // @BUG This must be set
206 206
 
207 207
                 // Token
208 208
                 print '<tr class="oddeven">';
Please login to merge, or discard this patch.