Skip to content

Commit 099ec56

Browse files
author
Etienne Perriere
committed
Fix PHP 5.4 compatibility
1 parent afd34dc commit 099ec56

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

Config/module.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<descriptive locale="fr_FR">
88
<title>Famille de clients</title>
99
</descriptive>
10-
<version>1.3</version>
10+
<version>1.3.1</version>
1111
<author>
1212
<name>Guillaume Barral</name>
1313
<email>gbarral@openstudio.fr</email>

EventListeners/CustomerFamilyPriceListener.php

+8-5
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,10 @@ public function extendProductParseResult(LoopExtendsParseResultsEvent $event)
122122
/** @var \Thelia\Model\Product | \Thelia\Model\ProductSaleElements $product */
123123
$product = $loopResultRow->model;
124124

125-
if (!empty($product->getVirtualColumn('CUSTOMER_FAMILY_PRICE')) ||
126-
!empty($product->getVirtualColumn('CUSTOMER_FAMILY_PROMO_PRICE'))
127-
) {
125+
$customerFamilyPriceVirtualColumn = $product->getVirtualColumn('CUSTOMER_FAMILY_PRICE');
126+
$customerFamilyPromoPriceVirtualColumn = $product->getVirtualColumn('CUSTOMER_FAMILY_PROMO_PRICE');
127+
128+
if (!empty($customerFamilyPriceVirtualColumn) || !empty($customerFamilyPromoPriceVirtualColumn)) {
128129
$this->changeProductPrice(
129130
$product,
130131
$loopResultRow,
@@ -211,7 +212,8 @@ protected function changeProductPrice(
211212
$taxedPromoPrice = $loopResultRow->get('TAXED_PROMO_PRICE');
212213

213214
// Replace price
214-
if (!empty($product->getVirtualColumn('CUSTOMER_FAMILY_PRICE'))) {
215+
$customerFamilyPriceVirtualColumn = $product->getVirtualColumn('CUSTOMER_FAMILY_PRICE');
216+
if (!empty($customerFamilyPriceVirtualColumn)) {
215217
$price = round($product->getVirtualColumn('CUSTOMER_FAMILY_PRICE'), 2);
216218

217219
// If the customer has permanent discount, apply it
@@ -242,7 +244,8 @@ protected function changeProductPrice(
242244
}
243245

244246
// Replace promo price
245-
if (!empty($product->getVirtualColumn('CUSTOMER_FAMILY_PROMO_PRICE'))) {
247+
$customerFamilyPromoPriceVirtualColumn = $product->getVirtualColumn('CUSTOMER_FAMILY_PROMO_PRICE');
248+
if (!empty($customerFamilyPromoPriceVirtualColumn)) {
246249
$promoPrice = round($product->getVirtualColumn('CUSTOMER_FAMILY_PROMO_PRICE'), 2);
247250

248251
// If the customer has permanent discount, apply it

0 commit comments

Comments
 (0)