diff --git a/local/media/images/store/6017c6f9178ed-logo-rvb.jpg.ico b/local/media/images/store/6017c6f9178ed-logo-rvb.jpg.ico deleted file mode 100644 index 9a6cf0a3..00000000 Binary files a/local/media/images/store/6017c6f9178ed-logo-rvb.jpg.ico and /dev/null differ diff --git a/local/media/images/store/6017c7cc57b4b-logo.jpg b/local/media/images/store/6017c7cc57b4b-logo.jpg deleted file mode 100644 index bb13ff5c..00000000 Binary files a/local/media/images/store/6017c7cc57b4b-logo.jpg and /dev/null differ diff --git a/local/media/images/store/6076b3746726f-favicon-auxbieauxlegumes.png b/local/media/images/store/6076b3746726f-favicon-auxbieauxlegumes.png new file mode 100644 index 00000000..90db20a1 Binary files /dev/null and b/local/media/images/store/6076b3746726f-favicon-auxbieauxlegumes.png differ diff --git a/local/media/images/store/6076b37469f7b-25CE99BF-CB2B-494E-B932-2ACB70C2C72A b/local/media/images/store/6076b37469f7b-25CE99BF-CB2B-494E-B932-2ACB70C2C72A new file mode 100644 index 00000000..768b18a1 Binary files /dev/null and b/local/media/images/store/6076b37469f7b-25CE99BF-CB2B-494E-B932-2ACB70C2C72A differ diff --git a/local/modules/ClickAndCollect/Hook/AdminHook.php b/local/modules/ClickAndCollect/Hook/AdminHook.php index 02b53f28..727436b1 100644 --- a/local/modules/ClickAndCollect/Hook/AdminHook.php +++ b/local/modules/ClickAndCollect/Hook/AdminHook.php @@ -62,20 +62,25 @@ class AdminHook extends BaseHook if ((null !== $orderId) && ($moduleId == ClickAndCollect::getModuleId())) { $sessionData = $this->getSession()->get('cncData'); - $selectedDay = $sessionData->getDeliveryDate(); - $beginTime = $sessionData->getDeliveryStartTime(); - $endTime = $sessionData->getDeliveryEndTime(); + if (null !== $sessionData) { + $selectedDay = $sessionData->getDeliveryDate(); + $beginTime = $sessionData->getDeliveryStartTime(); + $endTime = $sessionData->getDeliveryEndTime(); + + if ( (null !== $selectedDay) && (null !== $beginTime) && (null !== $endTime) ) + { + $event->add( + $this->render( + 'delivery-address.html', [ + 'day' => $selectedDay, + 'begin_time' => $beginTime, + 'end_time' => $endTime + ]) + ); + } + } + else { - if ( (null !== $selectedDay) && (null !== $beginTime) && (null !== $endTime) ) - { - $event->add( - $this->render( - 'delivery-address.html', [ - 'day' => $selectedDay, - 'begin_time' => $beginTime, - 'end_time' => $endTime - ]) - ); } } } diff --git a/local/modules/PlanificationLivraison/Loop/ScheduledDeliveriesLoop.php b/local/modules/PlanificationLivraison/Loop/ScheduledDeliveriesLoop.php index 489bba83..8ae96134 100644 --- a/local/modules/PlanificationLivraison/Loop/ScheduledDeliveriesLoop.php +++ b/local/modules/PlanificationLivraison/Loop/ScheduledDeliveriesLoop.php @@ -7,6 +7,7 @@ use LivraisonParSecteurs\Model\LpsArea; use LivraisonParSecteurs\Model\LpsAreaCityQuery; use LivraisonParSecteurs\Model\LpsAreaQuery; use PlanificationLivraison\Model\OrderDeliveryScheduleQuery; +use PlanificationLivraison\PlanificationLivraison; use PointRetrait\Model\PdrPlacesQuery; use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Core\Template\Element\BaseLoop; @@ -49,6 +50,10 @@ class ScheduledDeliveriesLoop extends BaseLoop implements PropelSearchLoopInterf $order = OrderQuery::create()->findOneById($deliveries->getOrderId()); $customer = $order->getCustomer()->getFirstname() . ' ' . $order->getCustomer()->getLastname(); + $city = null; + $area = null; + $place = null; + if (null != $deliveries->getDeliveryAddressId()) { $city = OrderAddressQuery::create()->findOneById($order->getDeliveryOrderAddressId())->getCity(); $area = LpsAreaQuery::create()->findOneById(LpsAreaCityQuery::create()->findOneById($deliveries->getDeliveryAddressId())->getIdArea())->getTitle(); @@ -63,8 +68,8 @@ class ScheduledDeliveriesLoop extends BaseLoop implements PropelSearchLoopInterf ->set("ADDRESS_ID", $deliveries->getDeliveryAddressId()) ->set("PLACE_ID", $deliveries->getDeliveryPlaceId()) ->set("SCHEDULE_ID", $deliveries->getScheduleId()) - ->set("START_DATE", $deliveries->getDueDeliveryTimeStart()) - ->set("END_DATE", $deliveries->getDueDeliveryTimeEnd()) + ->set("START_DATE", date_format($deliveries->getDueDeliveryTimeStart(), PlanificationLivraison::FORMAT_DATE_COMPLETE)) + ->set("END_DATE", date_format($deliveries->getDueDeliveryTimeEnd(), PlanificationLivraison::FORMAT_DATE_COMPLETE)) ->set("DELTA", $delta->days) ->set("CUSTOMER", $customer) ->set("AREA", $area) diff --git a/local/modules/PlanificationLivraison/PlanificationLivraison.php b/local/modules/PlanificationLivraison/PlanificationLivraison.php index cd526a7a..1b27f285 100644 --- a/local/modules/PlanificationLivraison/PlanificationLivraison.php +++ b/local/modules/PlanificationLivraison/PlanificationLivraison.php @@ -17,6 +17,7 @@ class PlanificationLivraison extends BaseModule const FORMAT_DATES = 'd/m/Y'; const FORMAT_DATE_AVEC_JOUR = 'w d/m/Y'; const FORMAT_DATE_COMPLETE = 'Y-m-d H:i:s'; + const FORMAT_HEURE = 'H:i'; const DAYS_OF_WEEK = [ 0 => 'monday', 1 => 'tuesday', diff --git a/templates/backOffice/custom/includes/module-block.html b/templates/backOffice/custom/includes/module-block.html index b4c71421..2dffde35 100644 --- a/templates/backOffice/custom/includes/module-block.html +++ b/templates/backOffice/custom/includes/module-block.html @@ -1,3 +1,5 @@ + +
diff --git a/templates/frontOffice/custom/assets/src/css/custom.css b/templates/frontOffice/custom/assets/src/css/custom.css index 958a6dae..e7f7b08a 100644 --- a/templates/frontOffice/custom/assets/src/css/custom.css +++ b/templates/frontOffice/custom/assets/src/css/custom.css @@ -45,3 +45,6 @@ .navbar-form .form-control.large { width: auto; } +.logo-boutique { + width: 200px; +} \ No newline at end of file diff --git a/templates/frontOffice/custom/layout.tpl b/templates/frontOffice/custom/layout.tpl index 3efe3e1b..3100f1dd 100644 --- a/templates/frontOffice/custom/layout.tpl +++ b/templates/frontOffice/custom/layout.tpl @@ -129,7 +129,7 @@ GNU General Public License : http://www.gnu.org/licenses/

{local_media type="logo"} - {$store_name} + {$store_name} {/local_media}