From 5c885af961d983c52fb01a11de8d2c96dbc3a7ae Mon Sep 17 00:00:00 2001 From: TheCoreDev Date: Tue, 2 Mar 2021 18:00:11 +0100 Subject: [PATCH] =?UTF-8?q?PointRetrait=20:=20g=C3=A9olocalisation=20sur?= =?UTF-8?q?=20la=20carte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Front/Controller/OrderController.php | 4 ++ .../backOffice/default}/assets/img/pin.svg | 0 .../default/includes/area-cities.html | 4 +- .../default/scheduled-deliveries.html | 6 +-- local/modules/PointRetrait/I18n/fr_FR.php | 2 + .../backOffice/default/assets/css/styles.css | 21 ++++++++ .../backOffice/default/assets/img/compass.svg | 1 + .../default/assets/img/logo-reserve.png | Bin 10248 -> 0 bytes .../backOffice/default/assets/img/pin.svg | 16 +++++++ .../backOffice/default/includes/main.html | 30 ++++++------ .../backOffice/default/js/main-js.html | 45 ++++++++++++++++-- .../backOffice/default/place-edit.html | 9 ++++ .../backOffice/default/places-list.html | 2 +- .../default/scheduled-withdrawals.html | 6 +-- .../{flag-orange.png => drapeau-orange.png} | Bin .../img/{flag-red.png => drapeau-rouge.png} | Bin .../img/{flag-green.png => drapeau-vert.png} | Bin 17 files changed, 119 insertions(+), 27 deletions(-) rename {templates/backOffice/custom => local/modules/LivraisonParSecteurs/templates/backOffice/default}/assets/img/pin.svg (100%) create mode 100644 local/modules/PointRetrait/templates/backOffice/default/assets/img/compass.svg delete mode 100644 local/modules/PointRetrait/templates/backOffice/default/assets/img/logo-reserve.png create mode 100644 local/modules/PointRetrait/templates/backOffice/default/assets/img/pin.svg rename templates/backOffice/custom/assets/img/{flag-orange.png => drapeau-orange.png} (100%) rename templates/backOffice/custom/assets/img/{flag-red.png => drapeau-rouge.png} (100%) rename templates/backOffice/custom/assets/img/{flag-green.png => drapeau-vert.png} (100%) diff --git a/local/modules/Front/Controller/OrderController.php b/local/modules/Front/Controller/OrderController.php index 6b9ebd88..5b678956 100644 --- a/local/modules/Front/Controller/OrderController.php +++ b/local/modules/Front/Controller/OrderController.php @@ -23,6 +23,9 @@ namespace Front\Controller; use Front\Front; +use LivraisonParSecteurs\LivraisonParSecteurs; +use LivraisonParSecteurs\Model\LpsAreaCityQuery; +use LivraisonParSecteurs\Model\LpsAreaQuery; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Exception\PropelException; use Symfony\Component\HttpFoundation\Response as BaseResponse; @@ -46,6 +49,7 @@ use Thelia\Model\Order; use Thelia\Model\OrderProductQuery; use Thelia\Model\OrderQuery; use Thelia\Module\AbstractDeliveryModule; +use Thelia\Module\BaseModule; use Thelia\Module\Exception\DeliveryException; /** diff --git a/templates/backOffice/custom/assets/img/pin.svg b/local/modules/LivraisonParSecteurs/templates/backOffice/default/assets/img/pin.svg similarity index 100% rename from templates/backOffice/custom/assets/img/pin.svg rename to local/modules/LivraisonParSecteurs/templates/backOffice/default/assets/img/pin.svg diff --git a/local/modules/LivraisonParSecteurs/templates/backOffice/default/includes/area-cities.html b/local/modules/LivraisonParSecteurs/templates/backOffice/default/includes/area-cities.html index dc930a33..0174acb6 100644 --- a/local/modules/LivraisonParSecteurs/templates/backOffice/default/includes/area-cities.html +++ b/local/modules/LivraisonParSecteurs/templates/backOffice/default/includes/area-cities.html @@ -26,7 +26,7 @@ height: 30px !important; } - .pin { + .pin-lps { height: 25px; margin-left: 12px; } @@ -82,7 +82,7 @@ {loop name="cities" type="lps_area_cities" area_id="$area_id" order="title"} {$ZIPCODE} - {$TITLE}{if $LATITUDE eq '' or $LONGITUDE eq ''}Pas de coordonnées{/if} + {$TITLE}{if $LATITUDE eq '' or $LONGITUDE eq ''}Pas de coordonnées{/if}
{loop name="auth-delete" type="auth" role="ADMIN" resource="admin.lps.cities" access="DELETE" module="LivraisonParSecteurs"} diff --git a/local/modules/LivraisonParSecteurs/templates/backOffice/default/scheduled-deliveries.html b/local/modules/LivraisonParSecteurs/templates/backOffice/default/scheduled-deliveries.html index 1ea9d47e..38d5fd6e 100644 --- a/local/modules/LivraisonParSecteurs/templates/backOffice/default/scheduled-deliveries.html +++ b/local/modules/LivraisonParSecteurs/templates/backOffice/default/scheduled-deliveries.html @@ -29,15 +29,15 @@ {loop name="deliveries-loop" type="scheduled_deliveries" domicile_ou_retrait="domicile" only_future="true" order="date"} {if $DELTA <= 7} - {assign var=path value="{image file='/assets/img/flag-green.png'}"} + {assign var=path value="{image file='assets/img/drapeau-vert.png'}"} {assign var=alt value='Drapeau vert'} {/if} {if $DELTA <= 4} - {assign var=path value="{image file='/assets/img/flag-orange.png'}"} + {assign var=path value="{image file='assets/img/drapeau-orange.png'}"} {assign var=alt value='Drapeau orange'} {/if} {if $DELTA <= 1} - {assign var=path value="{image file='/assets/img/flag-red.png'}"} + {assign var=path value="{image file='assets/img/drapeau-rouge.png'}"} {assign var=alt value='Drapeau rouge'} {/if} {assign var=title value="{$DELTA} jour(s) de délai"} diff --git a/local/modules/PointRetrait/I18n/fr_FR.php b/local/modules/PointRetrait/I18n/fr_FR.php index 111f7a6c..cc03eca9 100644 --- a/local/modules/PointRetrait/I18n/fr_FR.php +++ b/local/modules/PointRetrait/I18n/fr_FR.php @@ -10,12 +10,14 @@ return array( 'Edit a place' => 'Modifier un lieu de retrait', '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 : il est conseillé de localiser l\'adresse, pour les clients', 'Minimum amount' => 'Minimum de commande', 'Module name' => 'Point de Retrait AuxBieauxLegumes', 'My places' => 'Point de retrait AuxBieauxLegumes', 'My withdrawal places' => 'Mes points de retrait AuxBieauxLegumes', 'Order number' => 'N° de commande', 'Place' => 'Point de retrait', + 'Recenter map' => 'Recentrer la carte sur l\'adresse', 'Revert origin position' => 'Revenir à la position d\'origine', 'Schedule' => 'Horaires de retrait', 'Scheduled date' => 'Date de retrait prévue', diff --git a/local/modules/PointRetrait/templates/backOffice/default/assets/css/styles.css b/local/modules/PointRetrait/templates/backOffice/default/assets/css/styles.css index 51b10a72..3c10fc5e 100644 --- a/local/modules/PointRetrait/templates/backOffice/default/assets/css/styles.css +++ b/local/modules/PointRetrait/templates/backOffice/default/assets/css/styles.css @@ -42,4 +42,25 @@ margin-top: 25px; text-align: center; font-style: italic; +} + +#submit-geoloc { + width: 50px; + cursor: pointer; +} + +.bouton-geoloc { + display: inline-block; + align-items: center; + margin-top: 25px; +} + +.bouton-geoloc span { + font-size: larger; + font-weight: 600; +} + +.pin-pdr { + height: 25px; + margin-left: 12px; } \ No newline at end of file diff --git a/local/modules/PointRetrait/templates/backOffice/default/assets/img/compass.svg b/local/modules/PointRetrait/templates/backOffice/default/assets/img/compass.svg new file mode 100644 index 00000000..9bad51ff --- /dev/null +++ b/local/modules/PointRetrait/templates/backOffice/default/assets/img/compass.svg @@ -0,0 +1 @@ +Compass \ No newline at end of file diff --git a/local/modules/PointRetrait/templates/backOffice/default/assets/img/logo-reserve.png b/local/modules/PointRetrait/templates/backOffice/default/assets/img/logo-reserve.png deleted file mode 100644 index 4c3a5ae9378a4e2377c48ba19f2b7f810a7871cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10248 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 V+O8n{|6cn5U!;|#Y9&lV{s$mMjZpvq diff --git a/local/modules/PointRetrait/templates/backOffice/default/assets/img/pin.svg b/local/modules/PointRetrait/templates/backOffice/default/assets/img/pin.svg new file mode 100644 index 00000000..35417c6c --- /dev/null +++ b/local/modules/PointRetrait/templates/backOffice/default/assets/img/pin.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/local/modules/PointRetrait/templates/backOffice/default/includes/main.html b/local/modules/PointRetrait/templates/backOffice/default/includes/main.html index f33ab611..c0559cce 100644 --- a/local/modules/PointRetrait/templates/backOffice/default/includes/main.html +++ b/local/modules/PointRetrait/templates/backOffice/default/includes/main.html @@ -23,7 +23,7 @@ {/form_field}
-
+
{form_field form=$form field="title"}
-
+
{form_field form=$form field="minimum_amount"}
-
- {form_field form=$form field="latitude"} - - {/form_field} - {form_field form=$form field="longitude"} - - {/form_field} -
- - -
@@ -163,7 +152,7 @@
-
+
{form_field form=$form field="access_comment"}
+
+
+ Geolocate + {intl l="Recenter map" d="pointretrait"} +
+ {form_field form=$form field="latitude"} + + {/form_field} + {form_field form=$form field="longitude"} + + {/form_field} +
+
diff --git a/local/modules/PointRetrait/templates/backOffice/default/js/main-js.html b/local/modules/PointRetrait/templates/backOffice/default/js/main-js.html index 7e6157d1..7b2ab7cf 100644 --- a/local/modules/PointRetrait/templates/backOffice/default/js/main-js.html +++ b/local/modules/PointRetrait/templates/backOffice/default/js/main-js.html @@ -1,6 +1,7 @@ \ No newline at end of file diff --git a/local/modules/PointRetrait/templates/backOffice/default/place-edit.html b/local/modules/PointRetrait/templates/backOffice/default/place-edit.html index 49075d7a..ccb32b68 100644 --- a/local/modules/PointRetrait/templates/backOffice/default/place-edit.html +++ b/local/modules/PointRetrait/templates/backOffice/default/place-edit.html @@ -11,6 +11,9 @@ {/block} {block name="main-content"} + + +
{assign "place_id" $smarty.get.place_id} @@ -43,6 +46,8 @@ {/loop}
+ +
{* @@ -69,6 +74,10 @@ var hash = location.hash.slice(1); if (!hash) hash = "main"; $('#tabbed-menu a[href="#' + hash + '"]').tab('show'); + + if ($("#latitude").val() == '') + alert ($('#message-pas-de-coordonnees').val()); + }); {/javascripts} diff --git a/local/modules/PointRetrait/templates/backOffice/default/places-list.html b/local/modules/PointRetrait/templates/backOffice/default/places-list.html index 00ae4307..3dc21804 100644 --- a/local/modules/PointRetrait/templates/backOffice/default/places-list.html +++ b/local/modules/PointRetrait/templates/backOffice/default/places-list.html @@ -49,7 +49,7 @@ mais{extends file="admin-layout.tpl"}
- {$ADDRESS1}
{$ZIPCODE} {$CITY} + {$ADDRESS1}
{$ZIPCODE} {$CITY}{if $LATITUDE eq '' or $LONGITUDE eq ''}Pas de coordonnées{/if} {$DELIVERY_DAYS}{if $DELIVERY_DAYS eq ''}{intl l="There is no schedule for this place" d='pointretrait'}{/if} {$PRICE} € {$MINIMUM_AMOUNT} € diff --git a/local/modules/PointRetrait/templates/backOffice/default/scheduled-withdrawals.html b/local/modules/PointRetrait/templates/backOffice/default/scheduled-withdrawals.html index ff2be328..7b2450bb 100644 --- a/local/modules/PointRetrait/templates/backOffice/default/scheduled-withdrawals.html +++ b/local/modules/PointRetrait/templates/backOffice/default/scheduled-withdrawals.html @@ -28,15 +28,15 @@ {loop name="deliveries-loop" type="scheduled_deliveries" domicile_ou_retrait="retrait" only_future="true" order="date"} {if $DELTA <= 7} - {assign var=path value="{image file='/assets/img/flag-green.png'}"} + {assign var=path value="{image file='assets/img/drapeau-vert.png'}"} {assign var=alt value='Drapeau vert'} {/if} {if $DELTA <= 4} - {assign var=path value="{image file='/assets/img/flag-orange.png'}"} + {assign var=path value="{image file='assets/img/drapeau-orange.png'}"} {assign var=alt value='Drapeau orange'} {/if} {if $DELTA <= 1} - {assign var=path value="{image file='/assets/img/flag-red.png'}"} + {assign var=path value="{image file='assets/img/drapeau-rouge.png'}"} {assign var=alt value='Drapeau rouge'} {/if} {assign var=title value="{$DELTA} jour(s) de délai"} diff --git a/templates/backOffice/custom/assets/img/flag-orange.png b/templates/backOffice/custom/assets/img/drapeau-orange.png similarity index 100% rename from templates/backOffice/custom/assets/img/flag-orange.png rename to templates/backOffice/custom/assets/img/drapeau-orange.png diff --git a/templates/backOffice/custom/assets/img/flag-red.png b/templates/backOffice/custom/assets/img/drapeau-rouge.png similarity index 100% rename from templates/backOffice/custom/assets/img/flag-red.png rename to templates/backOffice/custom/assets/img/drapeau-rouge.png diff --git a/templates/backOffice/custom/assets/img/flag-green.png b/templates/backOffice/custom/assets/img/drapeau-vert.png similarity index 100% rename from templates/backOffice/custom/assets/img/flag-green.png rename to templates/backOffice/custom/assets/img/drapeau-vert.png