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

V1.4.0 released: Upsell feature, New Product Page, New Stats Module, Security fixes

Browse Source
This commit is contained in:
Rohit Jain
2019-06-28 18:41:13 +05:30
parent 102343d2c0
commit b5d5bd7129
3884 changed files with 124528 additions and 70020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
controllers/admin/AdminSpecificPriceRuleController.php
View File

@@ -1,6 +1,6 @@
<?php
/**
* 2007-2015 PrestaShop
* 2007-2017 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2015 PrestaShop SA
* @copyright 2007-2017 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
@@ -196,7 +196,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
'label' => $this->l('Currency'),
'name' => 'id_currency',
'options' => array(
'query' => array_merge(array(0 => array('id_currency' => 0, 'name' => $this->l('All currencies'))), Currency::getCurrencies()),
'query' => array_merge(array(0 => array('id_currency' => 0, 'name' => $this->l('All currencies'))), Currency::getCurrencies(false, true, true)),
'id' => 'id_currency',
'name' => 'name'
),
@@ -308,7 +308,8 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
'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),
'leave_bprice_on' => $price ? 0 : 1
'leave_bprice_on' => $price ? 0 : 1,
'shop_id' => (($value = $this->getFieldValue($this->object, 'id_shop')) ? $value : 1)
);
$attribute_groups = array();