Rajout de la police perso + correction du bogue d'affichage des commandes dans le BO

local/modules/LivraisonParSecteurs/Hook/AdminHook.php

@@ -46,12 +46,12 @@ class AdminHook extends BaseHook
         if ((null !== $orderId) && ($moduleId == LivraisonParSecteurs::getModuleId()))
         {
             $lpsData = $this->getSession()->get('lpsData');
+            if (null !==  $lpsData) {
                 $selectedDay = $lpsData->getDeliveryDate();
                 $beginTime = $lpsData->getDeliveryStartTime();
                 $endTime = $lpsData->getDeliveryEndTime();
 
-            if ( (null !==  $selectedDay) && (null !==  $beginTime) && (null !==  $endTime) )
-            {
+                if ((null !== $selectedDay) && (null !== $beginTime) && (null !== $endTime)) {
                     $event->add(
                         $this->render(
                             'delivery-address.html', [
@@ -63,6 +63,7 @@ class AdminHook extends BaseHook
                 }
             }
         }
+    }
 
     /* Pour afficher la liste des livraisons à effectuer dans la page d'accueil backOffice */
     public function displayScheduledDeliveries(HookRenderBlockEvent $event)

local/modules/PointRetrait/Hook/AdminHook.php

@@ -61,12 +61,12 @@ class AdminHook extends BaseHook
         if ((null !== $orderId) && ($moduleId == PointRetrait::getModuleId()))
         {
             $sessionData = $this->getSession()->get('pdrData');
+            if (null !==  $sessionData) {
                 $selectedDay = $sessionData->getDeliveryDate();
                 $beginTime = $sessionData->getDeliveryStartTime();
                 $endTime = $sessionData->getDeliveryEndTime();
 
-            if ( (null !==  $selectedDay) && (null !==  $beginTime) && (null !==  $endTime) )
-            {
+                if ((null !== $selectedDay) && (null !== $beginTime) && (null !== $endTime)) {
                     $event->add(
                         $this->render(
                             'delivery-address.html', [
@@ -79,3 +79,4 @@ class AdminHook extends BaseHook
             }
         }
     }
+}

templates/frontOffice/custom/Gruntfile.js

@@ -37,9 +37,14 @@ module.exports = function (grunt) {
         },
         cssmin: {
             target: {
-                files: {
+                files: [
+                    {
                     'assets/dist/css/thelia.min.css': 'assets/src/css/thelia.css'
+                    },
+                    {
+                    'assets/dist/css/custom.min.css': 'assets/src/css/custom.css'
                     }
+                ]
             }
         },
         imagemin: {
@@ -143,6 +148,19 @@ module.exports = function (grunt) {
                         dest: 'assets/dist/fonts/fontawesome',
                         src: ['bower_components/fontawesome/fonts/*.*']
                     }
+                    ,
+                    {
+                        expand: true,
+                        flatten: true,
+                        dest: 'assets/src/fonts/sofiapro',
+                        src: ['bower_components/sofiapro/fonts/*.*']
+                    },
+                    {
+                        expand: true,
+                        flatten: true,
+                        dest: 'assets/dist/fonts/sofiapro',
+                        src: ['bower_components/sofiapro/fonts/*.*']
+                    }
                 ]
             },
             less: {

templates/frontOffice/custom/assets/dist/css/custom.min.css

@@ -0,0 +1 @@
+@font-face{font-family:sofia_prolight;src:url(../fonts/sofiapro/sofiapro-light-webfont.woff2) format('woff2'),url(../../fonts/sofiapro/sofiapro-light-webfont.woff) format('woff');font-weight:400;font-style:normal}html{font-family:sofia_prolight,sans-serif!important}#products-new .overlay:after,#products-offer .overlay:after,#products-upsell .overlay:after,body{font-family:sofia_prolight,'Open Sans',sans-serif!important}s @media (min-width:1200px){.container{width:1170px}}@media (min-width:992px){.header__main{width:95%}}@media (min-width:768px){.header__content{flex-direction:column}}.header__content{display:flex}.header__main{align-items:center;display:flex;flex-direction:row;justify-content:space-between}.navbar-default{background-color:transparent}.navbar li>a.home:before{display:none}.nav>li{text-transform:uppercase}.header__content .container-fluid{padding-left:0;padding-right:0}.navbar-form .form-control{width:50px}.navbar-form .form-control.large{width:auto}.logo-boutique{width:200px}

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

@@ -1,3 +1,24 @@
+@font-face {
+    font-family: 'sofia_prolight';
+    src: url('../fonts/sofiapro/sofiapro-light-webfont.woff2') format('woff2'),
+    url('../../fonts/sofiapro/sofiapro-light-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+
+html {
+    font-family: 'sofia_prolight', sans-serif !important;
+}
+
+#products-offer .overlay:after,
+#products-new .overlay:after,
+#products-upsell .overlay:after,
+#products-offer .overlay:after,
+body {
+    font-family: 'sofia_prolight', 'Open Sans', sans-serif !important;
+}s
+
+
 @media (min-width: 1200px) {
     .container {
         width: 1170px;

templates/frontOffice/custom/layout.tpl

@@ -72,7 +72,7 @@ GNU General Public License : http://www.gnu.org/licenses/
     {/stylesheets}
 
     *}
-    {stylesheets file='assets/src/css/custom.css'}
+    {stylesheets file='assets/dist/css/custom.min.css'}
         <link rel="stylesheet" href="{$asset_url}">
     {/stylesheets}