TheCoreDev/aux-bieaux-legumes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quelques corrections + init du module ClickAndCollect

Browse Source
This commit is contained in:
TheCoreDev
2021-03-11 18:47:03 +01:00
parent 2e82f5643a
commit 57e69ddd2f
48 changed files with 2224 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
local/modules/PlanificationLivraison/Loop/ScheduledDeliveriesLoop.php
View File

@@ -3,7 +3,11 @@
namespace PlanificationLivraison\Loop;
use DateTime;
use LivraisonParSecteurs\Model\LpsArea;
use LivraisonParSecteurs\Model\LpsAreaCityQuery;
use LivraisonParSecteurs\Model\LpsAreaQuery;
use PlanificationLivraison\Model\OrderDeliveryScheduleQuery;
use PointRetrait\Model\PdrPlacesQuery;
use Propel\Runtime\ActiveQuery\Criteria;
use Thelia\Core\Template\Element\BaseLoop;
use Thelia\Core\Template\Element\LoopResult;
@@ -11,6 +15,11 @@ use Thelia\Core\Template\Element\LoopResultRow;
use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Model\Base\OrderStatus;
use Thelia\Model\CustomerQuery;
use Thelia\Model\OrderAddressQuery;
use Thelia\Model\OrderQuery;
use Thelia\Model\OrderStatusQuery;
/**
* Class ScheduledDeliveriesLoop
@@ -18,9 +27,9 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
*/
class ScheduledDeliveriesLoop extends BaseLoop implements PropelSearchLoopInterface
{
const DOMICILE = "domicile";
const RETRAIT = "retrait";
const DOMICILE = "domicile";
const RETRAIT = "retrait";
const CLICK_AND_COLLECT = "clickandcollect";
public $countable = true;
@@ -36,6 +45,17 @@ class ScheduledDeliveriesLoop extends BaseLoop implements PropelSearchLoopInterf
$loopResultRow = new LoopResultRow($deliveries);
$delta = date_diff($deliveries->getDueDeliveryTimeStart(), new DateTime("now"));
$order = OrderQuery::create()->findOneById($deliveries->getOrderId());
$customer = $order->getCustomer()->getFirstname() . ' ' . $order->getCustomer()->getLastname();
if (null != $deliveries->getDeliveryAddressId()) {
$city = OrderAddressQuery::create()->findOneById($order->getDeliveryOrderAddressId())->getCity();
$area = LpsAreaQuery::create()->findOneById(LpsAreaCityQuery::create()->findOneById($deliveries->getDeliveryAddressId())->getIdArea())->getTitle();
}
if (null != $deliveries->getDeliveryPlaceId())
$place = PdrPlacesQuery::create()->findOneById($deliveries->getDeliveryPlaceId())->getTitle();
$loopResultRow
->set("ORDER_ID", $deliveries->getOrderId())
@@ -45,6 +65,10 @@ class ScheduledDeliveriesLoop extends BaseLoop implements PropelSearchLoopInterf
->set("START_DATE", $deliveries->getDueDeliveryTimeStart())
->set("END_DATE", $deliveries->getDueDeliveryTimeEnd())
->set("DELTA", $delta->days)
->set("CUSTOMER", $customer)
->set("AREA", $area)
->set("CITY", $city)
->set("PLACE", $place)
;
$loopResult->addRow($loopResultRow);
}
@@ -59,14 +83,15 @@ class ScheduledDeliveriesLoop extends BaseLoop implements PropelSearchLoopInterf
{
return new ArgumentCollection(
Argument::createIntTypeArgument('order_id'),
Argument::createEnumListTypeArgument('domicile_ou_retrait', [
Argument::createEnumListTypeArgument('list_type', [
self::DOMICILE,
self::RETRAIT
self::RETRAIT,
self::CLICK_AND_COLLECT
], self::DOMICILE),
Argument::createBooleanTypeArgument('only_future', true),
Argument::createEnumListTypeArgument('order', [
'date',
'date-reverse'
'date-reverse',
], 'date')
);
}
@@ -78,19 +103,26 @@ class ScheduledDeliveriesLoop extends BaseLoop implements PropelSearchLoopInterf
{
$deliveries = OrderDeliveryScheduleQuery::create();
if (null !== $this->getOrderId()) {
return $deliveries->filterByOrderId($this->getOrderId());
}
// Déjà, on n'affiche que les commandes non annulées
$deliveries->filterByOrderId(self::onlyNotCanceledOrders());
foreach ($this->getDomicileOuRetrait() as $parametre) {
$clickAndCollectPlaces = PdrPlacesQuery::create()->filterByClickAndCollect(1)->find()->getData();
foreach ($this->getListType() as $parametre) {
switch ($parametre) {
case self::DOMICILE:
$deliveries->filterByDeliveryAddressId(null, Criteria::NOT_EQUAL);
break;
case self::RETRAIT:
$deliveries->filterByDeliveryPlaceId(null, Criteria::NOT_EQUAL);
$deliveries->filterByDeliveryPlaceId(null, Criteria::NOT_EQUAL)->filterByDeliveryPlaceId($clickAndCollectPlaces, Criteria::NOT_IN);
break;
case self::CLICK_AND_COLLECT:
$deliveries->filterByDeliveryPlaceId(null, Criteria::NOT_EQUAL)->filterByDeliveryPlaceId($clickAndCollectPlaces, Criteria::IN);
break;
default:
break;
}
}
@@ -108,10 +140,23 @@ class ScheduledDeliveriesLoop extends BaseLoop implements PropelSearchLoopInterf
case 'date-reverse':
$deliveries->orderByDueDeliveryTimeStart(Criteria::DESC);
break;
default:
break;
}
}
return $deliveries;
}
private function onlyNotCanceledOrders() {
$notCanceledOrders = [];
$notCanceledData = OrderQuery::create()->filterByStatusId(OrderStatusQuery::create()->findOneByCode('canceled')->getId(), Criteria::NOT_EQUAL)->find()->getData();
foreach ($notCanceledData as $data) {
array_push($notCanceledOrders, $data->getId());
}
return $notCanceledOrders;
}
}