|
@@ -220,7 +220,7 @@ function setFocusOnSearchField() {
|
|
|
|
|
|
function PrintCategories(first) {
|
|
function PrintCategories(first) {
|
|
console.log("PrintCategories");
|
|
console.log("PrintCategories");
|
|
- for (i = 0; i < <?php echo ($MAXCATEG - 2); ?>; i++) {
|
|
|
|
|
|
+ for (i = 0; i < <?php echo($MAXCATEG - 2); ?>; i++) {
|
|
if (typeof (categories[parseInt(i)+parseInt(first)]) == "undefined")
|
|
if (typeof (categories[parseInt(i)+parseInt(first)]) == "undefined")
|
|
{
|
|
{
|
|
$("#catdivdesc"+i).hide();
|
|
$("#catdivdesc"+i).hide();
|
|
@@ -257,13 +257,13 @@ function MoreCategories(moreorless) {
|
|
if (pagecategories==0) return; //Return if no less pages
|
|
if (pagecategories==0) return; //Return if no less pages
|
|
pagecategories=pagecategories-1;
|
|
pagecategories=pagecategories-1;
|
|
}
|
|
}
|
|
- if (typeof (categories[<?php echo ($MAXCATEG - 2); ?> * pagecategories] && moreorless == "more") == "undefined") { // Return if no more pages
|
|
|
|
|
|
+ if (typeof (categories[<?php echo($MAXCATEG - 2); ?> * pagecategories] && moreorless == "more") == "undefined") { // Return if no more pages
|
|
pagecategories=pagecategories-1;
|
|
pagecategories=pagecategories-1;
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- for (i = 0; i < <?php echo ($MAXCATEG - 2); ?>; i++) {
|
|
|
|
- if (typeof (categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]) == "undefined") {
|
|
|
|
|
|
+ for (i = 0; i < <?php echo($MAXCATEG - 2); ?>; i++) {
|
|
|
|
+ if (typeof (categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]) == "undefined") {
|
|
// complete with empty record
|
|
// complete with empty record
|
|
console.log("complete with empty record");
|
|
console.log("complete with empty record");
|
|
$("#catdivdesc"+i).hide();
|
|
$("#catdivdesc"+i).hide();
|
|
@@ -275,12 +275,12 @@ function MoreCategories(moreorless) {
|
|
$("#catdivdesc"+i).show();
|
|
$("#catdivdesc"+i).show();
|
|
<?php
|
|
<?php
|
|
if (getDolGlobalString('TAKEPOS_SHOW_CATEGORY_DESCRIPTION') == 1) { ?>
|
|
if (getDolGlobalString('TAKEPOS_SHOW_CATEGORY_DESCRIPTION') == 1) { ?>
|
|
- $("#catdesc"+i).html(categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['label'].bold() + ' - ' + categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['description']);
|
|
|
|
|
|
+ $("#catdesc"+i).html(categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]['label'].bold() + ' - ' + categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]['description']);
|
|
<?php } else { ?>
|
|
<?php } else { ?>
|
|
- $("#catdesc"+i).text(categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['label']);
|
|
|
|
|
|
+ $("#catdesc"+i).text(categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]['label']);
|
|
<?php } ?>
|
|
<?php } ?>
|
|
- $("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
|
|
|
|
- $("#catdiv"+i).data("rowid",categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
|
|
|
|
|
|
+ $("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
|
|
|
|
+ $("#catdiv"+i).data("rowid",categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
|
|
$("#catwatermark"+i).show();
|
|
$("#catwatermark"+i).show();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -290,7 +290,7 @@ function MoreCategories(moreorless) {
|
|
// LoadProducts
|
|
// LoadProducts
|
|
function LoadProducts(position, issubcat) {
|
|
function LoadProducts(position, issubcat) {
|
|
console.log("LoadProducts");
|
|
console.log("LoadProducts");
|
|
- var maxproduct = <?php echo ($MAXPRODUCT - 2); ?>;
|
|
|
|
|
|
+ var maxproduct = <?php echo($MAXPRODUCT - 2); ?>;
|
|
|
|
|
|
if (position=="supplements") currentcat="supplements";
|
|
if (position=="supplements") currentcat="supplements";
|
|
else
|
|
else
|
|
@@ -406,10 +406,10 @@ function MoreProducts(moreorless) {
|
|
console.log("MoreProducts");
|
|
console.log("MoreProducts");
|
|
|
|
|
|
if ($('#search_pagination').val() != '') {
|
|
if ($('#search_pagination').val() != '') {
|
|
- return Search2('<?php echo (isset($keyCodeForEnter) ? $keyCodeForEnter : ''); ?>', moreorless);
|
|
|
|
|
|
+ return Search2('<?php echo(isset($keyCodeForEnter) ? $keyCodeForEnter : ''); ?>', moreorless);
|
|
}
|
|
}
|
|
|
|
|
|
- var maxproduct = <?php echo ($MAXPRODUCT - 2); ?>;
|
|
|
|
|
|
+ var maxproduct = <?php echo($MAXPRODUCT - 2); ?>;
|
|
|
|
|
|
if (moreorless=="more"){
|
|
if (moreorless=="more"){
|
|
$('#proimg31').animate({opacity: '0.5'}, 1);
|
|
$('#proimg31').animate({opacity: '0.5'}, 1);
|
|
@@ -429,7 +429,7 @@ function MoreProducts(moreorless) {
|
|
if (maxproduct >= 1) {
|
|
if (maxproduct >= 1) {
|
|
limit = maxproduct-1;
|
|
limit = maxproduct-1;
|
|
}
|
|
}
|
|
- var offset = <?php echo ($MAXPRODUCT - 2); ?> * pageproducts;
|
|
|
|
|
|
+ var offset = <?php echo($MAXPRODUCT - 2); ?> * pageproducts;
|
|
// Only show products for sale (tosell=1)
|
|
// Only show products for sale (tosell=1)
|
|
$.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) {
|
|
$.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) {
|
|
console.log("Call ajax.php (in MoreProducts) to get Products of category "+currentcat);
|
|
console.log("Call ajax.php (in MoreProducts) to get Products of category "+currentcat);
|
|
@@ -492,7 +492,9 @@ function ClickProduct(position, qty = 1) {
|
|
if (idproduct=="") return;
|
|
if (idproduct=="") return;
|
|
// Call page invoice.php to generate the section with product lines
|
|
// Call page invoice.php to generate the section with product lines
|
|
$("#poslines").load("invoice.php?action=addline&token=<?php echo newToken() ?>&place="+place+"&idproduct="+idproduct+"&selectedline="+selectedline+"&qty="+qty, function() {
|
|
$("#poslines").load("invoice.php?action=addline&token=<?php echo newToken() ?>&place="+place+"&idproduct="+idproduct+"&selectedline="+selectedline+"&qty="+qty, function() {
|
|
- <?php if (getDolGlobalString('TAKEPOS_CUSTOMER_DISPLAY')) echo "CustomerDisplay();";?>
|
|
|
|
|
|
+ <?php if (getDolGlobalString('TAKEPOS_CUSTOMER_DISPLAY')) {
|
|
|
|
+ echo "CustomerDisplay();";
|
|
|
|
+ }?>
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
@@ -585,7 +587,7 @@ function New() {
|
|
if (parseInt(data['paye']) === 1) {
|
|
if (parseInt(data['paye']) === 1) {
|
|
r = true;
|
|
r = true;
|
|
} else {
|
|
} else {
|
|
- r = confirm('<?php echo ($place > 0 ? $langs->transnoentitiesnoconv("ConfirmDeletionOfThisPOSSale") : $langs->transnoentitiesnoconv("ConfirmDiscardOfThisPOSSale")); ?>');
|
|
|
|
|
|
+ r = confirm('<?php echo($place > 0 ? $langs->transnoentitiesnoconv("ConfirmDeletionOfThisPOSSale") : $langs->transnoentitiesnoconv("ConfirmDiscardOfThisPOSSale")); ?>');
|
|
}
|
|
}
|
|
|
|
|
|
if (r == true) {
|
|
if (r == true) {
|
|
@@ -1043,16 +1045,14 @@ if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
|
|
<?php echo getDolGlobalString("TAKEPOS_TERMINAL_NAME_".$_SESSION["takeposterminal"], $langs->trans("TerminalName", $_SESSION["takeposterminal"])); ?>
|
|
<?php echo getDolGlobalString("TAKEPOS_TERMINAL_NAME_".$_SESSION["takeposterminal"], $langs->trans("TerminalName", $_SESSION["takeposterminal"])); ?>
|
|
</span>
|
|
</span>
|
|
<?php
|
|
<?php
|
|
- echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
|
|
|
|
- ?>
|
|
|
|
|
|
+ echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>'; ?>
|
|
</a>
|
|
</a>
|
|
<?php
|
|
<?php
|
|
if (isModEnabled('multicurrency')) {
|
|
if (isModEnabled('multicurrency')) {
|
|
print '<a class="valignmiddle tdoverflowmax100" id="multicurrency" onclick="ModalBox(\'ModalCurrency\')" title=""><span class="fas fa-coins paddingrightonly"></span>';
|
|
print '<a class="valignmiddle tdoverflowmax100" id="multicurrency" onclick="ModalBox(\'ModalCurrency\')" title=""><span class="fas fa-coins paddingrightonly"></span>';
|
|
print '<span class="hideonsmartphone">'.$langs->trans("Currency").'</span>';
|
|
print '<span class="hideonsmartphone">'.$langs->trans("Currency").'</span>';
|
|
print '</a>';
|
|
print '</a>';
|
|
- }
|
|
|
|
- ?>
|
|
|
|
|
|
+ } ?>
|
|
</div>
|
|
</div>
|
|
<!-- section for customer -->
|
|
<!-- section for customer -->
|
|
<div class="inline-block valignmiddle" id="customerandsales"></div>
|
|
<div class="inline-block valignmiddle" id="customerandsales"></div>
|
|
@@ -1066,28 +1066,26 @@ if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
|
|
<!-- More info about warehouse -->
|
|
<!-- More info about warehouse -->
|
|
<div class="inline-block valignmiddle tdoverflowmax150onsmartphone" id="infowarehouse"></div>
|
|
<div class="inline-block valignmiddle tdoverflowmax150onsmartphone" id="infowarehouse"></div>
|
|
<?php
|
|
<?php
|
|
- }
|
|
|
|
- ?>
|
|
|
|
|
|
+ } ?>
|
|
</div>
|
|
</div>
|
|
<div id="topnav-right" class="topnav-right">
|
|
<div id="topnav-right" class="topnav-right">
|
|
<?php
|
|
<?php
|
|
$reshook = $hookmanager->executeHooks('takepos_login_block_other');
|
|
$reshook = $hookmanager->executeHooks('takepos_login_block_other');
|
|
- if ($reshook == 0) { //Search method ?>
|
|
|
|
|
|
+ if ($reshook == 0) { //Search method?>
|
|
<div class="login_block_other">
|
|
<div class="login_block_other">
|
|
<input type="text" id="search" name="search" class="input-nobottom" onkeyup="Search2('<?php echo dol_escape_js($keyCodeForEnter); ?>', null);" placeholder="<?php echo dol_escape_htmltag($langs->trans("Search")); ?>" autofocus>
|
|
<input type="text" id="search" name="search" class="input-nobottom" onkeyup="Search2('<?php echo dol_escape_js($keyCodeForEnter); ?>', null);" placeholder="<?php echo dol_escape_htmltag($langs->trans("Search")); ?>" autofocus>
|
|
<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>
|
|
<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>
|
|
<a href="<?php echo DOL_URL_ROOT.'/'; ?>" target="backoffice" rel="opener"><!-- we need rel="opener" here, we are on same domain and we need to be able to reuse this tab several times -->
|
|
<a href="<?php echo DOL_URL_ROOT.'/'; ?>" target="backoffice" rel="opener"><!-- we need rel="opener" here, we are on same domain and we need to be able to reuse this tab several times -->
|
|
<span class="fas fa-home"></span></a>
|
|
<span class="fas fa-home"></span></a>
|
|
- <?php if (empty($conf->dol_use_jmobile)) {?>
|
|
|
|
|
|
+ <?php if (empty($conf->dol_use_jmobile)) {?>
|
|
<a class="hideonsmartphone" onclick="FullScreen();" title="<?php echo dol_escape_htmltag($langs->trans("ClickFullScreenEscapeToLeave")); ?>"><span class="fa fa-expand-arrows-alt"></span></a>
|
|
<a class="hideonsmartphone" onclick="FullScreen();" title="<?php echo dol_escape_htmltag($langs->trans("ClickFullScreenEscapeToLeave")); ?>"><span class="fa fa-expand-arrows-alt"></span></a>
|
|
- <?php }?>
|
|
|
|
|
|
+ <?php }?>
|
|
</div>
|
|
</div>
|
|
- <?php
|
|
|
|
- }?>
|
|
|
|
|
|
+ <?php
|
|
|
|
+ } ?>
|
|
<div class="login_block_user">
|
|
<div class="login_block_user">
|
|
<?php
|
|
<?php
|
|
- print top_menu_user(1);
|
|
|
|
- ?>
|
|
|
|
|
|
+ print top_menu_user(1); ?>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="arrows">
|
|
<div class="arrows">
|
|
@@ -1108,7 +1106,8 @@ if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
|
|
if (!getDolGlobalString('TAKEPOS_FORCE_TERMINAL_SELECT')) {
|
|
if (!getDolGlobalString('TAKEPOS_FORCE_TERMINAL_SELECT')) {
|
|
?>
|
|
?>
|
|
<span class="close" href="#" onclick="document.getElementById('ModalTerminal').style.display = 'none';">×</span>
|
|
<span class="close" href="#" onclick="document.getElementById('ModalTerminal').style.display = 'none';">×</span>
|
|
- <?php } ?>
|
|
|
|
|
|
+ <?php
|
|
|
|
+ } ?>
|
|
<h3><?php print $langs->trans("TerminalSelect"); ?></h3>
|
|
<h3><?php print $langs->trans("TerminalSelect"); ?></h3>
|
|
</div>
|
|
</div>
|
|
<div class="modal-body">
|
|
<div class="modal-body">
|
|
@@ -1176,7 +1175,7 @@ if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<div class="row1<?php if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
|
|
<div class="row1<?php if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
|
|
- print 'withhead';
|
|
|
|
|
|
+ print 'withhead';
|
|
} ?>">
|
|
} ?>">
|
|
|
|
|
|
<div id="poslines" class="div1">
|
|
<div id="poslines" class="div1">
|
|
@@ -1213,7 +1212,7 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) {
|
|
$resql = $db->query($sql);
|
|
$resql = $db->query($sql);
|
|
$paiementsModes = array();
|
|
$paiementsModes = array();
|
|
if ($resql) {
|
|
if ($resql) {
|
|
- while ( $obj = $db->fetch_object($resql) ) {
|
|
|
|
|
|
+ while ($obj = $db->fetch_object($resql)) {
|
|
$paycode = $obj->code;
|
|
$paycode = $obj->code;
|
|
if ($paycode == 'LIQ') {
|
|
if ($paycode == 'LIQ') {
|
|
$paycode = 'CASH';
|
|
$paycode = 'CASH';
|
|
@@ -1224,7 +1223,7 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) {
|
|
|
|
|
|
$constantforkey = "CASHDESK_ID_BANKACCOUNT_" . $paycode . $_SESSION["takeposterminal"];
|
|
$constantforkey = "CASHDESK_ID_BANKACCOUNT_" . $paycode . $_SESSION["takeposterminal"];
|
|
//var_dump($constantforkey.' '.getDolGlobalInt($constantforkey));
|
|
//var_dump($constantforkey.' '.getDolGlobalInt($constantforkey));
|
|
- if ( !empty($conf->global->$constantforkey) && getDolGlobalInt($constantforkey) > 0) {
|
|
|
|
|
|
+ if (!empty($conf->global->$constantforkey) && getDolGlobalInt($constantforkey) > 0) {
|
|
array_push($paiementsModes, $obj);
|
|
array_push($paiementsModes, $obj);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1264,7 +1263,7 @@ if (getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
|
|
$menus[$r++] = array('title'=>'<span class="far fa-building paddingrightonly"></span><div class="trunc">'.$langs->trans("Customer").'</div>', 'action'=>'Customer();');
|
|
$menus[$r++] = array('title'=>'<span class="far fa-building paddingrightonly"></span><div class="trunc">'.$langs->trans("Customer").'</div>', 'action'=>'Customer();');
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-if ( ! getDolGlobalString('TAKEPOS_HIDE_HISTORY')) {
|
|
|
|
|
|
+if (! getDolGlobalString('TAKEPOS_HIDE_HISTORY')) {
|
|
$menus[$r++] = array('title'=>'<span class="fa fa-history paddingrightonly"></span><div class="trunc">'.$langs->trans("History").'</div>', 'action'=>'History();');
|
|
$menus[$r++] = array('title'=>'<span class="fa fa-history paddingrightonly"></span><div class="trunc">'.$langs->trans("History").'</div>', 'action'=>'History();');
|
|
}
|
|
}
|
|
$menus[$r++] = array('title'=>'<span class="fa fa-cube paddingrightonly"></span><div class="trunc">'.$langs->trans("FreeZone").'</div>', 'action'=>'FreeZone();');
|
|
$menus[$r++] = array('title'=>'<span class="fa fa-cube paddingrightonly"></span><div class="trunc">'.$langs->trans("FreeZone").'</div>', 'action'=>'FreeZone();');
|
|
@@ -1334,7 +1333,7 @@ if ($resql) {
|
|
$parameters = array('menus'=>$menus);
|
|
$parameters = array('menus'=>$menus);
|
|
$reshook = $hookmanager->executeHooks('ActionButtons', $parameters);
|
|
$reshook = $hookmanager->executeHooks('ActionButtons', $parameters);
|
|
if ($reshook == 0) { //add buttons
|
|
if ($reshook == 0) { //add buttons
|
|
- if (is_array($hookmanager->resArray) ) {
|
|
|
|
|
|
+ if (is_array($hookmanager->resArray)) {
|
|
foreach ($hookmanager->resArray as $resArray) {
|
|
foreach ($hookmanager->resArray as $resArray) {
|
|
foreach ($resArray as $butmenu) {
|
|
foreach ($resArray as $butmenu) {
|
|
$menus[$r++] = $butmenu;
|
|
$menus[$r++] = $butmenu;
|
|
@@ -1342,7 +1341,7 @@ if ($reshook == 0) { //add buttons
|
|
}
|
|
}
|
|
} elseif ($reshook == 1) {
|
|
} elseif ($reshook == 1) {
|
|
$r = 0; //replace buttons
|
|
$r = 0; //replace buttons
|
|
- if (is_array($hookmanager->resArray) ) {
|
|
|
|
|
|
+ if (is_array($hookmanager->resArray)) {
|
|
foreach ($hookmanager->resArray as $resArray) {
|
|
foreach ($hookmanager->resArray as $resArray) {
|
|
foreach ($resArray as $butmenu) {
|
|
foreach ($resArray as $butmenu) {
|
|
$menus[$r++] = $butmenu;
|
|
$menus[$r++] = $butmenu;
|
|
@@ -1393,7 +1392,7 @@ if (getDolGlobalString('TAKEPOS_WEIGHING_SCALE')) {
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<div class="row2<?php if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
|
|
<div class="row2<?php if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
|
|
- print 'withhead';
|
|
|
|
|
|
+ print 'withhead';
|
|
} ?>">
|
|
} ?>">
|
|
|
|
|
|
<!-- Show categories -->
|
|
<!-- Show categories -->
|
|
@@ -1425,8 +1424,7 @@ if (getDolGlobalString('TAKEPOS_WEIGHING_SCALE')) {
|
|
if (!getDolGlobalString('TAKEPOS_HIDE_CATEGORY_IMAGES')) {
|
|
if (!getDolGlobalString('TAKEPOS_HIDE_CATEGORY_IMAGES')) {
|
|
echo '<img class="imgwrapper" id="catimg'.$count.'" />';
|
|
echo '<img class="imgwrapper" id="catimg'.$count.'" />';
|
|
}
|
|
}
|
|
- }
|
|
|
|
- ?>
|
|
|
|
|
|
+ } ?>
|
|
<?php if ($count != ($MAXCATEG - 2) && $count != ($MAXCATEG - 1)) { ?>
|
|
<?php if ($count != ($MAXCATEG - 2) && $count != ($MAXCATEG - 1)) { ?>
|
|
<div class="description" id="catdivdesc<?php echo $count; ?>">
|
|
<div class="description" id="catdivdesc<?php echo $count; ?>">
|
|
<div class="description_content" id="catdesc<?php echo $count; ?>"></div>
|
|
<div class="description_content" id="catdesc<?php echo $count; ?>"></div>
|
|
@@ -1441,15 +1439,17 @@ if (getDolGlobalString('TAKEPOS_WEIGHING_SCALE')) {
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<!-- Show product -->
|
|
<!-- Show product -->
|
|
- <div class="div5<?php if (getDolGlobalInt('TAKEPOS_HIDE_CATEGORIES') == 1) { print ' centpercent'; } ?>">
|
|
|
|
|
|
+ <div class="div5<?php if (getDolGlobalInt('TAKEPOS_HIDE_CATEGORIES') == 1) {
|
|
|
|
+ print ' centpercent';
|
|
|
|
+ } ?>">
|
|
<?php
|
|
<?php
|
|
$count = 0;
|
|
$count = 0;
|
|
while ($count < $MAXPRODUCT) {
|
|
while ($count < $MAXPRODUCT) {
|
|
- print '<div class="wrapper2 arrow" id="prodiv'.$count.'" ';
|
|
|
|
- ?>
|
|
|
|
|
|
+ print '<div class="wrapper2 arrow" id="prodiv'.$count.'" '; ?>
|
|
<?php if ($count == ($MAXPRODUCT - 2)) {
|
|
<?php if ($count == ($MAXPRODUCT - 2)) {
|
|
?> onclick="MoreProducts('less')" <?php
|
|
?> onclick="MoreProducts('less')" <?php
|
|
- } if ($count == ($MAXPRODUCT - 1)) {
|
|
|
|
|
|
+ }
|
|
|
|
+ if ($count == ($MAXPRODUCT - 1)) {
|
|
?> onclick="MoreProducts('more')" <?php
|
|
?> onclick="MoreProducts('more')" <?php
|
|
} else {
|
|
} else {
|
|
echo 'onclick="ClickProduct('.$count.')"';
|
|
echo 'onclick="ClickProduct('.$count.')"';
|
|
@@ -1470,8 +1470,7 @@ if (getDolGlobalString('TAKEPOS_WEIGHING_SCALE')) {
|
|
} else {
|
|
} else {
|
|
print '<img class="imgwrapper" title="" id="proimg'.$count.'">';
|
|
print '<img class="imgwrapper" title="" id="proimg'.$count.'">';
|
|
}
|
|
}
|
|
- }
|
|
|
|
- ?>
|
|
|
|
|
|
+ } ?>
|
|
<?php if ($count != ($MAXPRODUCT - 2) && $count != ($MAXPRODUCT - 1) && !getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) { ?>
|
|
<?php if ($count != ($MAXPRODUCT - 2) && $count != ($MAXPRODUCT - 1) && !getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) { ?>
|
|
<div class="description" id="prodivdesc<?php echo $count; ?>">
|
|
<div class="description" id="prodivdesc<?php echo $count; ?>">
|
|
<div class="description_content" id="prodesc<?php echo $count; ?>"></div>
|
|
<div class="description_content" id="prodesc<?php echo $count; ?>"></div>
|