Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'webkul:develop' into gli-1671

Browse Source
This commit is contained in:
abhishek-webkul
2024-01-16 18:24:10 +05:30
committed by GitHub
parent 87e45007bf 9af78bcf14
commit 849d2fb285
66 changed files with 469 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
controllers/admin/AdminSpecificPriceRuleController.php
View File

@@ -295,16 +295,25 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
),
),
);
if (($value = $this->getFieldValue($this->object, 'price')) != -1) {
$price = number_format($value, 6);
$price = $this->getFieldValue($this->object, 'price');
if ($price != -1 && Validate::isPrice($price)) {
$price = number_format($price, 6);
} else {
$price = '';
}
$reduction = $this->getFieldValue($this->object, 'reduction');
if (Validate::isPrice($reduction)) {
$reduction = number_format($reduction, 6);
} else {
$reduction = 0;
}
$this->fields_value = array(
'price' => $price,
'from_quantity' => (($value = $this->getFieldValue($this->object, 'from_quantity')) ? $value : 1),
'reduction' => number_format((($value = $this->getFieldValue($this->object, 'reduction')) ? $value : 0), 6),
'reduction' => $reduction,
'leave_bprice_on' => $price ? 0 : 1,
'shop_id' => (($value = $this->getFieldValue($this->object, 'id_shop')) ? $value : 1)
);