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

Il manquait un bout de PlanificationLivraison en conf

Browse Source
This commit is contained in:
TheCoreDev
2021-02-24 15:36:09 +01:00
parent 4ad626c47d
commit fffc4430c5
10 changed files with 985 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
local/modules/LivraisonParSecteurs/Config/config.xml
View File

@@ -22,6 +22,8 @@
<hook id="lps.admin.hook" class="LivraisonParSecteurs\Hook\AdminHook">
<tag name="hook.event_listener" event="module.configuration" type="back" method="onModuleConfig" />
<argument type="service" id="thelia.securityContext"/>
<tag name="hook.event_listener" event="order-edit.bill-delivery-address" type="back" method="displayDeliveryDate" />
<tag name="hook.event_listener" event="home.block" type="back" method="displayScheduledDeliveries" />
</hook>
<hook id="lps.front.hookmanager" class="LivraisonParSecteurs\Hook\FrontHook">
<tag name="hook.event_listener" event="order-delivery.extra" type="front" method="onOrderDeliveryExtra" />

26
local/modules/LivraisonParSecteurs/Hook/AdminHook.php
View File

@@ -34,4 +34,30 @@ class AdminHook extends BaseHook
}
}
public function displayDeliveryDate(HookRenderEvent $event)
{
$moduleId = $event->getArgument('module');
$orderId = $event->getArgument('order_id');
if ((null !== $orderId) && ($moduleId == LivraisonParSecteurs::getModuleId()))
{
$selectedDay = $this->getSession()->get(LivraisonParSecteurs::LPS_DELIVERY_DATE);
$beginTime = $this->getSession()->get(LivraisonParSecteurs::LPS_DELIVERY_BEGIN_TIME);
$endTime = $this->getSession()->get(LivraisonParSecteurs::LPS_DELIVERY_END_TIME);
if ( (null !== $selectedDay) && (null !== $beginTime) && (null !== $endTime) )
{
$event->add(
$this->render(
'delivery-address.html', [
'day' => $selectedDay,
'begin_time' => $beginTime,
'end_time' => $endTime
])
);
}
}
}
}

1
local/modules/LivraisonParSecteurs/Hook/EmailHook.php
View File

@@ -5,7 +5,6 @@ namespace LivraisonParSecteurs\Hook;
use LivraisonParSecteurs\LivraisonParSecteurs;
use Thelia\Core\Event\Hook\HookRenderEvent;
use Thelia\Core\Hook\BaseHook;
use Thelia\Model\Order;
class EmailHook extends BaseHook
{

1
local/modules/LivraisonParSecteurs/I18n/fr_FR.php
View File

@@ -31,6 +31,7 @@ return array(
'Remove this city' => 'Retirer cette commune',
'Save' => 'Sauvegarder',
'Schedule' => 'Horaires de livraison',
'Scheduled date' => 'Livraison prévue le',
'There is no city delivered in this area' => 'Aucune commune desservie dans ce secteur',
'There is no schedule for this area' => 'Aucune livraison actuellement sur ce secteur',
'Title of config view' => 'Module LivraisonParSecteurs - Confiwguration',

8
local/modules/LivraisonParSecteurs/templates/backOffice/default/delivery-address.html Normal file
View File

@@ -0,0 +1,8 @@
<tr><td>&nbsp;</td></tr>
<tr style="background-color:#1A712C; color:white">
<th>{intl l="Scheduled date" d="livraisonparsecteurs"}</th>
<td>{$day} entre {format_date date=$begin_time format="H:i"} et {format_date date=$end_time format="H:i"}</td>
</tr>
<tr><td>&nbsp;</td></tr>

2
local/modules/LivraisonParSecteurs/templates/email/default/delivery-address.html
View File

@@ -1,5 +1,5 @@
<div class="panel panel-default col-sm-6">
<div class="panel-heading"><strong>{intl l="Delivery day" d="livraisonparsecteurs"}</strong></div>
<div class="panel-heading"><strong>{intl l="Scheduled date" d="livraisonparsecteurs"}</strong></div>
<div class="panel-body">
<span>{$day} entre {format_date date=$begin_time format="H:i"} et {format_date date=$end_time format="H:i"}</span>
</div>

2
local/modules/LivraisonParSecteurs/templates/frontOffice/default/delivery-address.html
View File

@@ -20,7 +20,7 @@
</div>
{/loop}
<div class="panel-heading">{intl l="Delivery day" d="livraisonparsecteurs"}</div>
<div class="panel-heading">{intl l="Scheduled date" d="livraisonparsecteurs"}</div>
<div class="panel-body">
<span>{$day} entre {format_date date=$begin_time format="H:i"} et {format_date date=$end_time format="H:i"}</span>
</div>

20
local/modules/PlanificationLivraison/Model/OrderDeliverySchedule.php Normal file
View File

@@ -0,0 +1,20 @@
<?php
namespace PlanificationLivraison\Model;
use PlanificationLivraison\Model\Base\OrderDeliverySchedule as BaseOrderDeliverySchedule;
/**
* Skeleton subclass for representing a row from the 'order_delivery_schedule' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
*/
class OrderDeliverySchedule extends BaseOrderDeliverySchedule
{
}

20
local/modules/PlanificationLivraison/Model/OrderDeliveryScheduleQuery.php Normal file
View File

@@ -0,0 +1,20 @@
<?php
namespace PlanificationLivraison\Model;
use PlanificationLivraison\Model\Base\OrderDeliveryScheduleQuery as BaseOrderDeliveryScheduleQuery;
/**
* Skeleton subclass for performing query and update operations on the 'order_delivery_schedule' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
*/
class OrderDeliveryScheduleQuery extends BaseOrderDeliveryScheduleQuery
{
}