Browse Source

FIX get TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCE const in TakePos

lvessiller 3 years ago
parent
commit
68cfe61fb8
2 changed files with 3 additions and 3 deletions
  1. 1 1
      htdocs/takepos/admin/setup.php
  2. 2 2
      htdocs/takepos/ajax/ajax.php

+ 1 - 1
htdocs/takepos/admin/setup.php

@@ -392,7 +392,7 @@ if (!empty($conf->barcode->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("TakeposBarcodeRuleToInsertProduct"), $langs->trans("TakeposBarcodeRuleToInsertProductDesc"));
 	print '<td colspan="2">';
-	print '<input type="text" name="TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT" value="' . (!empty($conf->global->TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT) ? $conf->global->TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT : '') . '">';
+	print '<input type="text" name="TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT" value="' . (getDolGlobalString('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT')) . '">';
 	print "</td></tr>\n";
 }
 

+ 2 - 2
htdocs/takepos/ajax/ajax.php

@@ -111,8 +111,8 @@ if ($action == 'getProducts') {
 		}
 	}
 
-	if (!empty($conf->barcode->enabled) && !empty($conf->global->TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT)) {
-		$barcode_rules = $conf->global->TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT;
+	$barcode_rules = getDolGlobalString('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT');
+	if (!empty($conf->barcode->enabled) && !empty($barcode_rules)) {
 		$barcode_rules_list = array();
 
 		// get barcode rules