[06/11/2022] Quelques modifs esthétiques sur les modes de livraison principalement

This commit is contained in:
2022-11-06 23:41:32 +01:00
parent e064596a86
commit 490bb68746
1906 changed files with 699261 additions and 21 deletions

View File

@@ -8,12 +8,12 @@ return array(
'Find a pickup location around you' => 'Trouver un point relais autour de vous',
'Loading...' => 'Chargement...',
'Mondial Relay home delivery' => 'Livraison Mondial Relay à mon domicile',
'Mondial Relay pickup location' => 'Adresse du point relais Mondial Relay',
'Mondial Relay pickup location' => 'Point relais Mondial Relay',
'Mondial Relay pickup location #%num' => 'Point relais Mondial Relay No. %num',
'No pickup locations were found for this address.' => 'Nous n\'avons pas trouvé de point relais autour de cette adresse.',
'Oops, something goes wrong, please try again.' => 'Oups, quelque chose n\'a pas fonctionné correctement. Merci de recommencer.',
'Pickup location #%number' => 'Point relais No. %number',
'Pickup location address' => 'Adresse du point relais',
'Pickup location address' => 'Point relais',
'Pickup location opening hours' => 'Horaires d\'ouverture du relais',
'Please select a pickup location.' => 'Merci de choisir un point relais.',
'Search radius' => 'Rayon de recherche',

View File

@@ -5,6 +5,39 @@
{$withHome = false}
{loop type="mondialrelay.delivery-price" name="home-prices" mode="home" country_id=$country state_id=$state}
{$withHome = true}
<table class="table table-condensed table-delivery">
<tr>
<td class="module-mondialrelay">
<label for="mondialrelay_home">
{form name="thelia.order.delivery"}
{form_field field='delivery-module'}
<label for="delivery-method_{$module_id}_home">
<input type="radio" data-mondial-relay-delivery-mode="home" name="{$name}" id="delivery-method_{$module_id}_home" value="{$module_id}">
<strong>{intl d="mondialrelay.fo.default" l="Mondial Relay home delivery"}</strong>
<span class="texte-complementaire-module">(France/Europe)</span>
<br>
<span class="help-block">
{intl l="Expected delivery date: %delivery_date" delivery_date={format_date date=$DELIVERY_DATE output="date"} d="mondialrelay.fo.default" }
</span>
</label>
{/form_field}
{/form}
</label>
</td>
<td class="image module-mondialrelay">
{loop type="image" name="deliveryspicture" source="module" source_id=$module_id force_return="true" width="100" height="72"}
<img src="{$IMAGE_URL nofilter}" alt="{$TITLE}">
{/loop}
</td>
<td class="module-mondialrelay">
<div class="price text-right">
{format_money number=$PRICE symbol={currency attr='symbol'}}
</div>
</td>
</tr>
</table>
<!--
<div class="row">
<div class="col-sm-6">
<label for="mondialrelay_home">
@@ -13,6 +46,7 @@
<label for="delivery-method_{$module_id}_home">
<input type="radio" data-mondial-relay-delivery-mode="home" name="{$name}" id="delivery-method_{$module_id}_home" value="{$module_id}">
<strong>{intl d="mondialrelay.fo.default" l="Mondial Relay home delivery"}</strong>
<span class="texte-complementaire-module">{$POSTSCRIPTUM}</span>
<br>
<span class="help-block">
{intl l="Expected delivery date: %delivery_date" delivery_date={format_date date=$DELIVERY_DATE output="date"} d="mondialrelay.fo.default" }
@@ -33,14 +67,47 @@
</div>
</div>
</div>
//-->
{/loop}
{$withRelay = false}
{loop type="mondialrelay.delivery-price" name="relay-prices" mode="relay" country_id=$country state_id=$state}
<div {if $withHome}class="pickup-home-separator"{/if}></div>
<!-- <div {if $withHome}class="pickup-home-separator"{/if}></div> //-->
{$withRelay = true}
<table class="table table-condensed table-delivery">
<tr>
<td class="module-mondialrelay">
<label for="mondialrelay_pickup">
{form name="thelia.order.delivery"}
{form_field field='delivery-module'}
<label for="delivery-method_{$module_id}_pickup">
<input type="radio" data-mondial-relay-delivery-mode="pickup" name="{$name}" id="delivery-method_{$module_id}_pickup" value="{$module_id}">
<strong>{intl d="mondialrelay.fo.default" l="Mondial Relay pickup location"}</strong>
<span class="texte-complementaire-module">(France/Europe)</span>
<br>
<span class="help-block">
{intl l="Expected delivery date: %delivery_date" delivery_date={format_date date=$DELIVERY_DATE output="date"} d="mondialrelay.fo.default" }
</span>
</label>
{/form_field}
{/form}
</label>
</td>
<td class="image module-mondialrelay">
{loop type="image" name="deliveryspicture" source="module" source_id=$module_id force_return="true" width="100" height="72"}
<img src="{$IMAGE_URL nofilter}" alt="{$TITLE}">
{/loop}
</td>
<td class="module-mondialrelay">
<div class="price text-right">
{format_money number=$PRICE symbol={currency attr='symbol'}}
</div>
</td>
</tr>
</table>
<!--
<div class="row">
<div class="col-sm-4">
<label for="mondialrelay_pickup">
@@ -49,6 +116,7 @@
<label for="delivery-method_{$module_id}_pickup">
<input type="radio" data-mondial-relay-delivery-mode="pickup" name="{$name}" id="delivery-method_{$module_id}_pickup" value="{$module_id}">
<strong>{intl d="mondialrelay.fo.default" l="Mondial Relay pickup location"}</strong>
<span class="texte-complementaire-module">(France/Europe)</span>
<br>
<span class="help-block">
{intl l="Expected delivery date: %delivery_date" delivery_date={format_date date=$DELIVERY_DATE output="date"} d="mondialrelay.fo.default" }
@@ -71,7 +139,7 @@
</div>
</div>
</div>
//-->
<div id="mondial-relay-pickup">
<div class="row">
<div class="location-form clearfix">
@@ -83,7 +151,7 @@
<div class="col-sm-2">
<input type="text" required class="form-control" id="mondial_relay_zipcode" name="mondial_relay_zipcode" placeholder="{intl l="Zip code" d="mondialrelay.fo.default"}" value="{$ZIPCODE}">
</div>
4558
<div class="col-sm-4">
<input type="text" class="form-control" id="mondial_relay_city" name="mondial_relay_city" placeholder="{intl l="City" d="mondialrelay.fo.default"}" value="{$CITY}">
</div>