Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Config/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<descriptive locale="fr_FR">
<title>So Colissimo</title>
</descriptive>
<version>1.4.4</version>
<version>1.4.5</version>
<author>
<name>Thelia</name>
<email>info@thelia.net</email>
Expand Down
12 changes: 9 additions & 3 deletions Loop/AreaFreeshippingPr.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down