@@ -167,7 +167,7 @@ discard block |
||
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 |
||
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> |
@@ -180,7 +180,7 @@ |
||
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>'); |
@@ -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>'; |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | $object->fields = dol_sort_array($object->fields, 'position'); |
272 | 272 | //$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right'); |
273 | 273 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
274 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
274 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
275 | 275 | |
276 | 276 | |
277 | 277 | if (($id > 0 || !empty($ref)) && $action != 'add') { |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | |
513 | 513 | // Add fields from hooks - ListFrom |
514 | 514 | $parameters = array(); |
515 | -$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
|
515 | +$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
|
516 | 516 | $sql .= $hookmanager->resPrint; |
517 | 517 | $sql .= ' WHERE p.entity IN (' . getEntity('contact') . ')'; |
518 | 518 | if (!empty($userid)) { // propre au commercial |
@@ -943,7 +943,7 @@ discard block |
||
943 | 943 | if (isModEnabled('category') && $user->hasRight('societe', 'creer')) { |
944 | 944 | $arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"') . $langs->trans("AffectTag"); |
945 | 945 | } |
946 | -if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) { |
|
946 | +if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) { |
|
947 | 947 | $arrayofmassactions = array(); |
948 | 948 | } |
949 | 949 |
@@ -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 | /* |
@@ -215,8 +215,8 @@ discard block |
||
215 | 215 | /** |
216 | 216 | * @var int Thirdparty ID |
217 | 217 | */ |
218 | - public $socid; // both socid and fk_soc are used |
|
219 | - public $fk_soc; // both socid and fk_soc are used |
|
218 | + public $socid; // both socid and fk_soc are used |
|
219 | + public $fk_soc; // both socid and fk_soc are used |
|
220 | 220 | |
221 | 221 | /** |
222 | 222 | * @var string Thirdparty name |
@@ -1067,8 +1067,8 @@ discard block |
||
1067 | 1067 | $this->country_code = $obj->country_id ? $obj->country_code : ''; |
1068 | 1068 | $this->country = $obj->country_id ? ($langs->trans('Country' . $obj->country_code) != 'Country' . $obj->country_code ? $langs->transnoentities('Country' . $obj->country_code) : $obj->country) : ''; |
1069 | 1069 | |
1070 | - $this->fk_soc = $obj->fk_soc; // Both fk_soc and socid are used |
|
1071 | - $this->socid = $obj->fk_soc; // Both fk_soc and socid are used |
|
1070 | + $this->fk_soc = $obj->fk_soc; // Both fk_soc and socid are used |
|
1071 | + $this->socid = $obj->fk_soc; // Both fk_soc and socid are used |
|
1072 | 1072 | $this->socname = $obj->socname; |
1073 | 1073 | $this->poste = $obj->poste; |
1074 | 1074 | $this->statut = $obj->statut; |
@@ -1876,7 +1876,7 @@ discard block |
||
1876 | 1876 | $error = 0; |
1877 | 1877 | |
1878 | 1878 | if (!isset($this->roles)) { |
1879 | - return 0; // Avoid to loose roles when property not set |
|
1879 | + return 0; // Avoid to loose roles when property not set |
|
1880 | 1880 | } |
1881 | 1881 | |
1882 | 1882 | $this->db->begin(); |