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

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

Browse Source
This commit is contained in:
TheCoreDev
2021-04-14 15:00:10 +02:00
parent 6384deedc8
commit 276603d372
12 changed files with 71 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,20 +46,21 @@ class AdminHook extends BaseHook
if ((null !== $orderId) && ($moduleId == LivraisonParSecteurs::getModuleId()))
{
$lpsData = $this->getSession()->get('lpsData');
$selectedDay = $lpsData->getDeliveryDate();
$beginTime = $lpsData->getDeliveryStartTime();
$endTime = $lpsData->getDeliveryEndTime();
if (null !== $lpsData) {
$selectedDay = $lpsData->getDeliveryDate();
$beginTime = $lpsData->getDeliveryStartTime();
$endTime = $lpsData->getDeliveryEndTime();
if ( (null !== $selectedDay) && (null !== $beginTime) && (null !== $endTime) )
{
$event->add(
$this->render(
'delivery-address.html', [
'day' => $selectedDay,
'begin_time' => $beginTime,
'end_time' => $endTime
])
);
if ((null !== $selectedDay) && (null !== $beginTime) && (null !== $endTime)) {
$event->add(
$this->render(
'delivery-address.html', [
'day' => $selectedDay,
'begin_time' => $beginTime,
'end_time' => $endTime
])
);
}
}
}
}

27
local/modules/PointRetrait/Hook/AdminHook.php
View File

@@ -61,20 +61,21 @@ class AdminHook extends BaseHook
if ((null !== $orderId) && ($moduleId == PointRetrait::getModuleId()))
{
$sessionData = $this->getSession()->get('pdrData');
$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
])
);
if ((null !== $selectedDay) && (null !== $beginTime) && (null !== $endTime)) {
$event->add(
$this->render(
'delivery-address.html', [
'day' => $selectedDay,
'begin_time' => $beginTime,
'end_time' => $endTime
])
);
}
}
}
}

22
templates/frontOffice/custom/Gruntfile.js
View File

@@ -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: {

1
templates/frontOffice/custom/assets/dist/css/custom.min.css vendored Normal file
View File

@@ -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}

BIN
templates/frontOffice/custom/assets/dist/fonts/SofiaPro/sofiapro-light-webfont.woff vendored Normal file
View File

Binary file not shown.

BIN
templates/frontOffice/custom/assets/dist/fonts/SofiaPro/sofiapro-light-webfont.woff2 vendored Normal file
View File

Binary file not shown.

BIN
templates/frontOffice/custom/assets/dist/fonts/SofiaPro/sofiapro-light.otf vendored Normal file
View File

Binary file not shown.

21
templates/frontOffice/custom/assets/src/css/custom.css
View File

@@ -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;

BIN
templates/frontOffice/custom/assets/src/fonts/SofiaPro/sofiapro-light-webfont.woff Normal file
View File

Binary file not shown.

BIN
templates/frontOffice/custom/assets/src/fonts/SofiaPro/sofiapro-light-webfont.woff2 Normal file
View File

Binary file not shown.

BIN
templates/frontOffice/custom/assets/src/fonts/SofiaPro/sofiapro-light.otf Normal file
View File

Binary file not shown.

2
templates/frontOffice/custom/layout.tpl
View File

@@ -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}