Modif du logo

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
-                    ])
-                );
             }
         }
     }

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)

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',

templates/backOffice/custom/includes/module-block.html

@@ -1,3 +1,5 @@
+<!--  TheCoreDev : pour corriger le bogue Thelia de droits d'accès à la config des modules depuis le BO //-->
+
 <div class="general-block-decorator">
     <div class="table-responsive">
         <table class="table table-striped table-condensed table-left-aligned">

templates/frontOffice/custom/assets/src/css/custom.css

@@ -45,3 +45,6 @@
 .navbar-form .form-control.large {
     width: auto;
 }
+.logo-boutique {
+    width: 200px;
+}

templates/frontOffice/custom/layout.tpl

@@ -129,7 +129,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                             <h1 class="logo hidden-xs">
                                 <a href="{navigate to="index"}" title="{$store_name}">
                                     {local_media type="logo"}
-                                        <img src="{$MEDIA_URL}" alt="{$store_name}">
+                                        <img src="{$MEDIA_URL}" alt="{$store_name}" class="logo-boutique">
                                     {/local_media}
                                 </a>
                             </h1>