mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-12 10:52:37 +01:00
Fix POS has some product unvisible when using smartphone
This commit is contained in:
@@ -299,7 +299,7 @@ function MoreCategories(moreorless) {
|
||||
// LoadProducts
|
||||
function LoadProducts(position, issubcat) {
|
||||
console.log("LoadProducts position="+position+" issubcat="+issubcat);
|
||||
var maxproduct = <?php echo($MAXPRODUCT - 2); ?>;
|
||||
var maxproduct = <?php echo (int) ($MAXPRODUCT - 2); ?>;
|
||||
|
||||
if (position=="supplements") {
|
||||
currentcat="supplements";
|
||||
@@ -336,8 +336,9 @@ function LoadProducts(position, issubcat) {
|
||||
$("#proimg"+ishow).attr("src","genimg/index.php?query=cat&id="+val.rowid);
|
||||
$("#prodiv"+ishow).data("rowid",val.rowid);
|
||||
$("#prodiv"+ishow).attr("data-rowid",val.rowid);
|
||||
$("#prodiv"+ishow).data("iscat",1);
|
||||
$("#prodiv"+ishow).attr("data-iscat",1);
|
||||
$("#prodiv"+ishow).data("iscat", 1);
|
||||
$("#prodiv"+ishow).attr("data-iscat", 1);
|
||||
$("#prodiv"+ishow).removeClass("divempty");
|
||||
$("#prowatermark"+ishow).show();
|
||||
ishow++;
|
||||
}
|
||||
@@ -346,7 +347,7 @@ function LoadProducts(position, issubcat) {
|
||||
idata=0; //product data counter
|
||||
var limit = 0;
|
||||
if (maxproduct >= 1) {
|
||||
limit = maxproduct-1;
|
||||
limit = maxproduct - 1;
|
||||
}
|
||||
// Only show products for sale (tosell=1)
|
||||
$.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) {
|
||||
@@ -373,6 +374,9 @@ function LoadProducts(position, issubcat) {
|
||||
$("#prodiv"+ishow).data("rowid","");
|
||||
$("#prodiv"+ishow).attr("data-rowid","");
|
||||
|
||||
$("#prodiv"+ishow).data("iscat","0");
|
||||
$("#prodiv"+ishow).attr("data-iscat","0");
|
||||
|
||||
$("#prodiv"+ishow).attr("class","wrapper2 divempty");
|
||||
} else {
|
||||
<?php
|
||||
@@ -529,7 +533,7 @@ function ClickProduct(position, qty = 1) {
|
||||
console.log("ClickProduct at position"+position);
|
||||
$('#proimg'+position).animate({opacity: '0.5'}, 1);
|
||||
$('#proimg'+position).animate({opacity: '1'}, 100);
|
||||
if ($('#prodiv'+position).data('iscat')==1){
|
||||
if ($('#prodiv'+position).data('iscat') == 1){
|
||||
console.log("Click on a category at position "+position);
|
||||
LoadProducts(position, true);
|
||||
}
|
||||
@@ -1558,16 +1562,17 @@ if (getDolGlobalString('TAKEPOS_WEIGHING_SCALE')) {
|
||||
} ?>">
|
||||
<?php
|
||||
$count = 0;
|
||||
|
||||
while ($count < $MAXPRODUCT) {
|
||||
print '<div class="wrapper2 arrow" id="prodiv'.$count.'" '; ?>
|
||||
<?php if ($count == ($MAXPRODUCT - 2)) {
|
||||
?> onclick="MoreProducts('less')" <?php
|
||||
}
|
||||
if ($count == ($MAXPRODUCT - 1)) {
|
||||
?> onclick="MoreProducts('more')" <?php
|
||||
} else {
|
||||
echo 'onclick="ClickProduct('.$count.')"';
|
||||
} ?>>
|
||||
print '<div class="wrapper2'.(($count >= ($MAXPRODUCT - 2)) ? ' arrow' : '').'" id="prodiv'.$count.'" '; ?>
|
||||
<?php if ($count == ($MAXPRODUCT - 2)) {
|
||||
?> onclick="MoreProducts('less')" <?php
|
||||
}
|
||||
if ($count == ($MAXPRODUCT - 1)) {
|
||||
?> onclick="MoreProducts('more')" <?php
|
||||
} else {
|
||||
echo 'onclick="ClickProduct('.$count.')"';
|
||||
} ?>>
|
||||
<?php
|
||||
if ($count == ($MAXPRODUCT - 2)) {
|
||||
//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';
|
||||
|
||||
Reference in New Issue
Block a user