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

Quelques corrections + init du module ClickAndCollect

Browse Source
This commit is contained in:
TheCoreDev
2021-03-11 18:47:03 +01:00
parent 2e82f5643a
commit 57e69ddd2f
48 changed files with 2224 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
local/modules/PointRetrait/templates/backOffice/default/places-list.html
View File

@@ -51,7 +51,7 @@
</caption>
<tbody>
{loop name="places" type="pdr_places"}
{loop name="places" type="pdr_places" click_and_collect=0}
<tr>
<td><a href="{url path="/admin/module/PointRetrait/edit?place_id=$ID"}">{$TITLE}</a></td>
<td>

18
local/modules/PointRetrait/templates/backOffice/default/scheduled-withdrawals.html
View File

@@ -19,14 +19,13 @@
<div class="scheduled-withdrawal-list">
<table class="table table-striped">
<thead>
<th>&nbsp;</th>
<th>{intl l="Order number" d="pointretrait"}</th>
<th>{intl l="Scheduled date" d="pointretrait"}</th>
<th>{intl l="Delivery delay" d="pointretrait"}</th>
<th>{intl l="Place" d="pointretrait"}</th>
<th>{intl l="Place name" d="pointretrait"}</th>
</thead>
<tbody>
{loop name="deliveries-loop" type="scheduled_deliveries" domicile_ou_retrait="retrait" only_future="true" order="date"}
{loop name="deliveries-loop" type="scheduled_deliveries" list_type="retrait" only_future="true" order="date"}
{if $DELTA <= {module_config module="PlanificationLivraison" key='delay_red_alert' locale="en_US"}}
{assign var=path value="{image file='assets/img/drapeau-rouge.png' source='PlanificationLivraison'}"}
{assign var=alt value='Drapeau rouge'}
@@ -41,20 +40,13 @@
{/if}
{assign var=title value="{$DELTA} jour(s) de délai"}
{loop name="order-loop" type="order" id={$ORDER_ID} customer="*"}
{loop type="customer" name="customer-loop" current="false" id=$CUSTOMER}
{assign var=client value="$FIRSTNAME $LASTNAME"}
{/loop}
{/loop}
<tr>
<td><img src={$path} alt="{$alt}" title="{$title}" style="margin-left: 30px; width:25px"></td>
<td><a href="/admin/order/update/{$ORDER_ID}" target="_blank" title="Client : {$client}">{$ORDER_ID}</a></td>
<td style="text-align: center"><a href="/admin/order/update/{$ORDER_ID}" target="_blank" title="Client : {$CUSTOMER}">{$ORDER_ID}</a></td>
<td>
{format_date date=$START_DATE format="d/m/Y"} entre {format_date date=$START_DATE format="H\hi"} et {format_date date=$END_DATE format="H\hi"}
</td>
<td>{$DELTA} jour(s)</td>
<td>Point de retrait</td>
<td><img src={$path} alt="{$alt}" title="{$title}" style="margin-right: 10px; width:25px">{$DELTA} jour(s)</td>
<td>{$PLACE}</td>
</tr>
{if $LOOP_COUNT == $LOOP_TOTAL}{assign var=nbCommandes value=$LOOP_TOTAL}{/if}

10
local/modules/PointRetrait/templates/frontOffice/default/order-delivery-extra.html
View File

@@ -11,7 +11,7 @@
{form_field field='delivery-module'}
<label for="delivery-method_{$module_id}">
<input type="radio" delivery-mode="pdr" name="{$name}" id="delivery-method_{$module_id}" value="{$module_id}">
<strong>{intl l="Module name" d="pointretrait"}</strong>
<strong>{intl l="Module name - customer" d="pointretrait"}</strong>
<br>
</label>
{/form_field}
@@ -25,7 +25,7 @@
{form name="thelia.order.delivery"}
<div class="table-responsive" style="border: 0px solid gray">
<table class="table table-condensed table-main">
{loop type="pdr_places" name="places-loop" active=true order="city"}
{loop type="pdr_places" name="places-loop" active=true click_and_collect=0 order="city"}
<tr class="ligne-pdr">
<td>
<div class="titre-pdr"><img src="{image file='assets/img/pin.png' source='PointRetrait'}" class="img-pin"><span class="pin-number">{$ID}</span>{$TITLE}</div>
@@ -65,7 +65,7 @@
<input type="hidden" id="map-center-lon" value={{module_config module='PlanificationLivraison' key='map_center_longitude' locale='en_US'}|default:2.252608244005041} />
<table id="coordinates" class="hidden">
{loop type="pdr_places" name="places-loop" active=true order="city"}
{loop type="pdr_places" name="places-loop" active=true click_and_collect=0 order="city"}
<tr>
<td>{$ID}
<td>{$LATITUDE}</td>
@@ -94,10 +94,6 @@
$('input[type=radio][delivery-mode]').click(function() {
$('div[id^="select"]').not($('#select-' + $(this).attr('delivery-mode'))).slideUp();
$('#select-' + $(this).attr('delivery-mode')).slideDown('fast');
if ($('[delivery-mode=pdr]').is(':checked')) {
}
});