@@ -1496,11 +1496,11 @@ |
||
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.'" />'; |
@@ -124,7 +124,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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();'); |
@@ -202,7 +202,7 @@ |
||
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">'; |
@@ -104,7 +104,7 @@ |
||
104 | 104 | $match = preg_grep('/(' . preg_quote($htmlname, '/') . '[0-9]+)/', array_keys($_GET)); |
105 | 105 | sort($match); |
106 | 106 | |
107 | - $id = (!empty($match[0]) ? $match[0] : ''); // Take first key found into GET array with matching $htmlname123 |
|
107 | + $id = (!empty($match[0]) ? $match[0] : ''); // Take first key found into GET array with matching $htmlname123 |
|
108 | 108 | |
109 | 109 | // When used from jQuery, the search term is added as GET param "term". |
110 | 110 | $searchkey = (($id && GETPOST($id, 'alpha')) ? GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ? GETPOST($htmlname, 'alpha') : '')); |
@@ -1250,7 +1250,7 @@ |
||
1250 | 1250 | $maxfilesizearray = getMaxFileSizeArray(); |
1251 | 1251 | $maxmin = $maxfilesizearray['maxmin']; |
1252 | 1252 | if ($maxmin > 0) { |
1253 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
1253 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
1254 | 1254 | } |
1255 | 1255 | print '<input type="file" class="flat maxwidth200" name="photo" id="photoinput">'; |
1256 | 1256 | print '</td></tr>'; |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | return $object; |
82 | 82 | } |
83 | 83 | |
84 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
84 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
85 | 85 | /** |
86 | 86 | * Set content of ->tpl array, to use into template |
87 | 87 | * |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | */ |
92 | 92 | public function assign_values(&$action, $id) |
93 | 93 | { |
94 | - // phpcs:enable |
|
94 | + // phpcs:enable |
|
95 | 95 | global $conf, $langs, $user, $canvas; |
96 | 96 | global $form, $formcompany, $objsoc; |
97 | 97 | |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | } |
276 | 276 | } |
277 | 277 | |
278 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
278 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
279 | 279 | /** |
280 | 280 | * Assign POST values into object |
281 | 281 | * |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | */ |
284 | 284 | private function assign_post() |
285 | 285 | { |
286 | - // phpcs:enable |
|
286 | + // phpcs:enable |
|
287 | 287 | global $langs, $mysoc; |
288 | 288 | |
289 | 289 | $this->object->socid = GETPOSTINT("socid"); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | return $out; |
75 | 75 | } |
76 | 76 | |
77 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
77 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
78 | 78 | /** |
79 | 79 | * Assign custom values for canvas |
80 | 80 | * |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function assign_values(&$action, $id) |
86 | 86 | { |
87 | - // phpcs:enable |
|
87 | + // phpcs:enable |
|
88 | 88 | global $conf, $db, $langs, $user; |
89 | 89 | global $form; |
90 | 90 |
@@ -94,7 +94,7 @@ |
||
94 | 94 | } |
95 | 95 | $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission |
96 | 96 | |
97 | -$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php |
|
97 | +$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php |
|
98 | 98 | |
99 | 99 | |
100 | 100 | /* |
@@ -198,7 +198,7 @@ |
||
198 | 198 | $maxfilesizearray = getMaxFileSizeArray(); |
199 | 199 | $maxmin = $maxfilesizearray['maxmin']; |
200 | 200 | if ($maxmin > 0) { |
201 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
201 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
202 | 202 | } |
203 | 203 | print '<input type="file" class="flat" name="photo" id="photoinput">'; |
204 | 204 | print '</td></tr>'; |
@@ -337,7 +337,7 @@ |
||
337 | 337 | print '<table class="border centpercent tableforfield">' . "\n"; |
338 | 338 | |
339 | 339 | // Common attributes |
340 | - $keyforbreak = 'date_acquisition'; // We change column just before this field |
|
340 | + $keyforbreak = 'date_acquisition'; // We change column just before this field |
|
341 | 341 | //unset($object->fields['fk_project']); // Hide field already shown in banner |
342 | 342 | //unset($object->fields['fk_soc']); // Hide field already shown in banner |
343 | 343 | include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php'; |