From 4adb6115534a9a9cb4fbb015bb9ebd9a2933879f Mon Sep 17 00:00:00 2001 From: Alexandre Bothamy Date: Fri, 1 Jun 2018 16:34:24 +0200 Subject: [PATCH 1/2] Modification file AreaFreeshippingPr --- Loop/AreaFreeshippingPr.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Loop/AreaFreeshippingPr.php b/Loop/AreaFreeshippingPr.php index c4bbed9..ffce37c 100644 --- a/Loop/AreaFreeshippingPr.php +++ b/Loop/AreaFreeshippingPr.php @@ -18,18 +18,24 @@ class AreaFreeshippingPr extends BaseLoop implements PropelSearchLoopInterface protected function getArgDefinitions() { return new ArgumentCollection( - Argument::createIntTypeArgument('id') + Argument::createIntTypeArgument('area_id'), + Argument::createIntTypeArgument('delivery_mode_id') ); } public function buildModelCriteria() { - $mode = $this->getId(); + $areaId = $this->getAreaId(); + $mode = $this->getDeliveryModeId(); $modes = SocolissimoAreaFreeshippingPrQuery::create(); if (null !== $mode) { - $modes->filterById($mode); + $modes->filterByDeliveryModeId($mode); + } + + if (null !== $areaId) { + $modes->filterByAreaId($areaId); } return $modes; From 12ca4f739510a31cc1b6258c6577d1f0eac20679 Mon Sep 17 00:00:00 2001 From: Alexandre Bothamy Date: Mon, 4 Jun 2018 08:57:27 +0200 Subject: [PATCH 2/2] Update Version module & CHANGELOG.MD --- CHANGELOG.md | 3 +++ Config/module.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e27552c..577f79c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.4.5 +- fix AreaFreeshipingPr.php + # 1.4.4 - create loops: AreaFreeshippingDom and AreaFreeshippingPr - update template for to add these loops diff --git a/Config/module.xml b/Config/module.xml index 9848ed6..4daddf6 100755 --- a/Config/module.xml +++ b/Config/module.xml @@ -7,7 +7,7 @@ So Colissimo - 1.4.4 + 1.4.5 Thelia info@thelia.net