dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Rémi Gaillard committed 2013-07-18 18:31:35 +02:00
2 parents 958d92c9fa c70fe92dac
commit 354622857f
4 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/Manufacturer.php
+1
View File
@@ -198,6 +198,7 @@ class ManufacturerCore extends ObjectModel
LEFT JOIN `'._DB_PREFIX_.'manufacturer` as m ON (m.`id_manufacturer`= p.`id_manufacturer`) LEFT JOIN `'._DB_PREFIX_.'manufacturer` as m ON (m.`id_manufacturer`= p.`id_manufacturer`)
WHERE m.`id_manufacturer` = '.(int)$manufacturer['id_manufacturer']. WHERE m.`id_manufacturer` = '.(int)$manufacturer['id_manufacturer'].
($active ? ' AND product_shop.`active` = 1 ' : ''). ($active ? ' AND product_shop.`active` = 1 ' : '').
' AND p.visibility NOT IN (\'none\')'.
($all_group ? '' : ' AND p.`id_product` IN ( ($all_group ? '' : ' AND p.`id_product` IN (
SELECT cp.`id_product` SELECT cp.`id_product`
FROM `'._DB_PREFIX_.'category_group` cg FROM `'._DB_PREFIX_.'category_group` cg
classes/Validate.php
+1 -1
View File
@@ -380,7 +380,7 @@ class ValidateCore
*/ */
public static function isGenericName($name) public static function isGenericName($name)
{ {
return empty($name) || preg_match('/^[^<>=#{}]*$/u', $name); return empty($name) || preg_match('/^[^<>={}]*$/u', $name);
} }
/** /**
controllers/admin/AdminCountriesController.php
+3 -3
View File
@@ -433,10 +433,10 @@ class AdminCountriesControllerCore extends AdminController
public function processStatus() public function processStatus()
{ {
$return = parent::processStatus(); parent::processStatus();
if (Validate::isLoadedObject($object = $this->loadObject()) && $object->active == 1) if (Validate::isLoadedObject($object = $this->loadObject()) && $object->active == 1)
$return &= Country::addModuleRestrictions(array(), array(array('id_country' => $object->id)), array()); return Country::addModuleRestrictions(array(), array(array('id_country' => $object->id)), array());
return $return; return false;
} }
public function processBulkStatusSelection($way) public function processBulkStatusSelection($way)
modules/referralprogram/referralprogram.php
+1 -2
View File
@@ -649,8 +649,7 @@ class ReferralProgram extends Module
{ {
$cartRule = new CartRule((int)$referralprogram->id_cart_rule_sponsor); $cartRule = new CartRule((int)$referralprogram->id_cart_rule_sponsor);
$currency = new Currency((int)$order->id_currency); $currency = new Currency((int)$order->id_currency);
$discount_display = ReferralProgram::displayDiscount($cartRule->reduction_percent ? $cartRule->reduction_percent : $cartRule->reduction_amount, $cartRule->reduction_percent ? 1 : 2, $currency); $discount_display = ReferralProgram::displayDiscount( (float) $cartRule->reduction_percent ? (float) $cartRule->reduction_percent : (int) $cartRule->reduction_amount, (float) $cartRule->reduction_percent ? 1 : 2, $currency); $data = array('{sponsored_firstname}' => $customer->firstname, '{sponsored_lastname}' => $customer->lastname, '{discount_display}' => $discount_display, '{discount_name}' => $cartRule->code);
$data = array('{sponsored_firstname}' => $customer->firstname, '{sponsored_lastname}' => $customer->lastname, '{discount_display}' => $discount_display, '{discount_name}' => $cartRule->code);
Mail::Send((int)$order->id_lang, 'referralprogram-congratulations', Mail::l('Congratulations!', (int)$order->id_lang), $data, $sponsor->email, $sponsor->firstname.' '.$sponsor->lastname, strval(Configuration::get('PS_SHOP_EMAIL')), strval(Configuration::get('PS_SHOP_NAME')), NULL, NULL, dirname(__FILE__).'/mails/'); Mail::Send((int)$order->id_lang, 'referralprogram-congratulations', Mail::l('Congratulations!', (int)$order->id_lang), $data, $sponsor->email, $sponsor->firstname.' '.$sponsor->lastname, strval(Configuration::get('PS_SHOP_EMAIL')), strval(Configuration::get('PS_SHOP_NAME')), NULL, NULL, dirname(__FILE__).'/mails/');
return true; return true;
} }