lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22633 from andreubisquerra/develop

Browse Source 
NEW Add price to product box in TakePOS
This commit is contained in:
Laurent Destailleur 2022-10-24 19:36:53 +02:00 committed by GitHub
commit 364f0b0337
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/takepos/ajax/ajax.php
View File

@ -84,6 +84,7 @@ if ($action == 'getProducts') {
}
unset($prod->fields);
unset($prod->db);
$prod->price_formated=price(price2num($prod->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency);
$res[] = $prod;
}
}
@ -301,7 +302,7 @@ if ($action == 'getProducts') {
'object' => 'product',
'img' => $ig,
'qty' => 1,
//'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency)
'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency)
);
// Add entries to row from hooks
$parameters=array();

18
htdocs/takepos/css/pos.css.php
View File

@ -826,10 +826,6 @@ div#moreinfo, div#infowarehouse {
clear: both;
}
.div5 .price {
display: none;
}
.div5 .imgadd {
display: none;
}
@ -925,18 +921,12 @@ div#moreinfo, div#infowarehouse {
.div5 .arrow .centerinmiddle {
transform: translate(0, 0);
}
.div5 .price {
font-size: 14px;
margin-left: auto;
margin-right: 30px;
padding-right: 10px;
font-weight: bold;
color: #ff6d6d;
display: flex;
}
.div5 .imgadd {
display: flex;
}
div.wrapper2{
height:10%;
}
}

3
htdocs/takepos/index.php
View File

@ -1375,9 +1375,6 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
<div class="description" id="prodivdesc<?php echo $count; ?>">
<div class="description_content" id="prodesc<?php echo $count; ?>"></div>
</div>
<div class="price" id="prodivprice<?php echo $count; ?>">
</div>
<span class="fa fa-plus"></span>
<?php } ?>
<div class="catwatermark" id='prowatermark<?php echo $count; ?>'>...</div>
</div>