diff --git a/local/modules/LivraisonParSecteurs/templates/frontOffice/default/order-delivery-extra.html b/local/modules/LivraisonParSecteurs/templates/frontOffice/default/order-delivery-extra.html index 458b3349..191a19e3 100644 --- a/local/modules/LivraisonParSecteurs/templates/frontOffice/default/order-delivery-extra.html +++ b/local/modules/LivraisonParSecteurs/templates/frontOffice/default/order-delivery-extra.html @@ -29,15 +29,16 @@ - {if {cart attr='total_taxed_price_without_discount'} < $minimum} -
-
{intl l="Message info minimum de commande" d="livraisonparsecteurs" minimum=$minimum delta=$minimum-{cart attr='total_taxed_price_without_discount'}}
-
- {/if} -
+ + {if {cart attr='total_taxed_price_without_discount'} < $minimum} +
+
{intl l="Message info minimum de commande" d="livraisonparsecteurs" minimum=$minimum delta=$minimum-{cart attr='total_taxed_price_without_discount'}}
+
+ {/if} + {form name="thelia.order.delivery"}
diff --git a/local/modules/PointRetrait/I18n/fr_FR.php b/local/modules/PointRetrait/I18n/fr_FR.php index e98b8b79..8d74a4c5 100644 --- a/local/modules/PointRetrait/I18n/fr_FR.php +++ b/local/modules/PointRetrait/I18n/fr_FR.php @@ -17,6 +17,7 @@ return array( 'Do you really want to remove this schedule entry ?' => 'Voulez-vous réellement supprimer ce créneau de retrait ?', 'Edit a place' => 'Modifier un lieu de retrait', 'Edit this withdrawal day' => 'Modifier ce jour de retrait', + 'Free' => 'Gratuit', 'Location set' => 'Coordonnées GPS présentes ?', 'Main' => 'Généralités', 'Message no location' => 'Ce point de retrait ne possède pas de coordonnées GPS : pour vos clients, il est conseillé de géolocaliser l\'adresse.', diff --git a/local/modules/PointRetrait/templates/frontOffice/default/assets/css/styles.css b/local/modules/PointRetrait/templates/frontOffice/default/assets/css/styles.css index f268a474..6287eaaa 100644 --- a/local/modules/PointRetrait/templates/frontOffice/default/assets/css/styles.css +++ b/local/modules/PointRetrait/templates/frontOffice/default/assets/css/styles.css @@ -14,42 +14,29 @@ .custom-map-control-button:hover { background: #ebebeb; } - .locationMap { height:450px; width:100%; } -.legende { - margin-top: 25px; - text-align: center; - font-style: italic; -} -.pin-pdr { - height: 25px; - margin-left: 12px; -} - -tr .ligne > td { +tr.ligne-pdr > td { border: 1px solid gray !important; } - -.ligne > td { +.ligne-pdr > td { padding: 5px !important; } - .creneau > td { text-align: left !important; font-size: 1.2rem; } -.titre { +div.titre-pdr { font-size: 1.6rem; - color: red; + color: #e74c3c; font-weight: 600; + margin-bottom: 10px; } - .adresse { font-size: 1.4rem; } @@ -57,9 +44,22 @@ tr .ligne > td { .table-main { margin-bottom: 0 !important; } - .table-schedule { - background-color: #aeaeae !important; - color: white !important; - border-color: #aeaeae !important; -} \ No newline at end of file + background-color: #f5f5f5 !important; + border-color: white !important; +} + +.img-pin { + width: 30px; +} +span.pin-number { + color: black !important; + position: relative; + left: -19px; + top: -2px; + z-index: 50; +} +.additional-price { + color: #e74c3c; + font-weight: 600; +} diff --git a/local/modules/PointRetrait/templates/frontOffice/default/assets/img/pin.png b/local/modules/PointRetrait/templates/frontOffice/default/assets/img/pin.png new file mode 100644 index 00000000..75292744 Binary files /dev/null and b/local/modules/PointRetrait/templates/frontOffice/default/assets/img/pin.png differ diff --git a/local/modules/PointRetrait/templates/frontOffice/default/order-delivery-extra.html b/local/modules/PointRetrait/templates/frontOffice/default/order-delivery-extra.html index f7e025ab..700b03ea 100644 --- a/local/modules/PointRetrait/templates/frontOffice/default/order-delivery-extra.html +++ b/local/modules/PointRetrait/templates/frontOffice/default/order-delivery-extra.html @@ -26,9 +26,9 @@
{loop type="pdr_places" name="places-loop" active=true order="city"} - + {/loop} @@ -104,15 +111,26 @@ } function initMap() { + const LIMITES = { + north: 50.85043724044059, + east: 2.6869845409159923, + south: 50.616717259788544, + west: 1.8122213465336767, + }; + var opt = { center: new google.maps.LatLng($("#map-center-lat").val(), $("#map-center-lon").val()), zoom: 12, streetViewControl: false, - mapTypeControl: false + mapTypeControl: false, + disableDefaultUI: true, + restriction: { + latLngBounds: LIMITES, + strictBounds: false, + } }; Data.map = new google.maps.Map(document.getElementById('pdr_map'), opt); - Data.geocoder = new google.maps.Geocoder(); displayPins(); } @@ -129,8 +147,10 @@ map: Data.map }); }); + } + /*********************************************************/ var Data = {
- ({$ID}) {$TITLE}
+
{$ID}{$TITLE}
{$ADDRESS1}
{$ZIPCODE} {$CITY}
@@ -39,6 +39,13 @@ {/loop}
+
+ {if $PRICE > 0} + {format_number number=$PRICE} € + {else} + {intl l="Free" d="pointretrait"} + {/if} +