Skip to content

Fix carrier table issues #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cienislaw wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix carrier table issues #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e4058b
Add carrier table labels
cienislaw Apr 12, 2025
6691b0a
Remove extra child class
cienislaw Apr 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions order-carrier-advanced.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@
<table class="resume table table-bordered{if !$option.unique_carrier} hide{/if}">
<tr>
<td class="delivery_option_radio">
<input id="delivery_option_{$id_address|intval}_{$option@index}" class="delivery_option_radio" type="radio" name="delivery_option[{$id_address|intval}]" data-key="{$key}" data-id_address="{$id_address|intval}" value="{$key}"{if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key} checked="checked"{/if}><span class="label-text"></span>
<label for="delivery_option_{$id_address|intval}_{$option@index}">
<input id="delivery_option_{$id_address|intval}_{$option@index}" class="delivery_option_radio" type="radio" name="delivery_option[{$id_address|intval}]" data-key="{$key}" data-id_address="{$id_address|intval}" value="{$key}"{if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key} checked="checked"{/if}><span class="label-text"></span>
</label>
</td>
<td class="delivery_option_logo">
<label for="delivery_option_{$id_address|intval}_{$option@index}">
{foreach $option.carrier_list as $carrier}
{if $carrier.logo}
<img class="order_carrier_logo" src="{$carrier.logo|escape:'htmlall':'UTF-8'}" alt="{$carrier.instance->name|escape:'htmlall':'UTF-8'}">
Expand All @@ -52,8 +55,10 @@
{if !$carrier@last} - {/if}
{/if}
{/foreach}
</label>
</td>
<td>
<label for="delivery_option_{$id_address|intval}_{$option@index}">
{if $option.unique_carrier}
{foreach $option.carrier_list as $carrier}
<strong>{$carrier.instance->name|escape:'htmlall':'UTF-8'}</strong>
Expand All @@ -74,9 +79,11 @@
<span class="best_grade best_grade_price">{l s='The best price'}</span>
{/if}
{/if}
</label>
</td>
<td class="delivery_option_price">
<div class="delivery_option_price">
<label for="delivery_option_{$id_address|intval}_{$option@index}">
<div>
{if $option.total_price_with_tax && !$option.is_free && (!isset($free_shipping) || (isset($free_shipping) && !$free_shipping))}
{if $use_taxes == 1}
{if $priceDisplay == 1}
Expand All @@ -90,7 +97,8 @@
{else}
{l s='Free'}
{/if}
</div>
</div>
</label>
</td>
</tr>
</table>
Expand Down
38 changes: 23 additions & 15 deletions order-carrier-opc-advanced.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@
<table class="resume table table-bordered{if !$option.unique_carrier} hide{/if}">
<tr>
<td class="delivery_option_radio">
<input id="delivery_option_{$id_address|intval}_{$option@index}" class="delivery_option_radio" type="radio" name="delivery_option[{$id_address|intval}]" data-key="{$key}" data-id_address="{$id_address|intval}" value="{$key}"{if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key} checked="checked"{/if}><span class="label-text"></span>
<label for="delivery_option_{$id_address|intval}_{$option@index}">
<input id="delivery_option_{$id_address|intval}_{$option@index}" class="delivery_option_radio" type="radio" name="delivery_option[{$id_address|intval}]" data-key="{$key}" data-id_address="{$id_address|intval}" value="{$key}"{if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key} checked="checked"{/if}><span class="label-text"></span>
</label>
</td>
<td class="delivery_option_logo">
<label for="delivery_option_{$id_address|intval}_{$option@index}">
{foreach $option.carrier_list as $carrier}
{if $carrier.logo}
<img class="order_carrier_logo" src="{$carrier.logo|escape:'htmlall':'UTF-8'}" alt="{$carrier.instance->name|escape:'htmlall':'UTF-8'}">
Expand All @@ -38,15 +41,17 @@
{if !$carrier@last} - {/if}
{/if}
{/foreach}
</label>
</td>
<td>
<label for="delivery_option_{$id_address|intval}_{$option@index}">
{if $option.unique_carrier}
{foreach $option.carrier_list as $carrier}
<strong>{$carrier.instance->name|escape:'htmlall':'UTF-8'}</strong>
{if isset($carrier.instance->delay[$cookie->id_lang])}
<br>{l s='Delivery time:'}&nbsp;{$carrier.instance->delay[$cookie->id_lang]|escape:'htmlall':'UTF-8'}
{/if}
{/foreach}
{if isset($carrier.instance->delay[$cookie->id_lang])}
<br>{l s='Delivery time:'}&nbsp;{$carrier.instance->delay[$cookie->id_lang]|escape:'htmlall':'UTF-8'}
{/if}
{/if}
{if count($option_list) > 1}
<br>
Expand All @@ -60,9 +65,11 @@
<span class="best_grade best_grade_price">{l s='The best price'}</span>
{/if}
{/if}
</label>
</td>
<td class="delivery_option_price">
<div class="delivery_option_price">
<label for="delivery_option_{$id_address|intval}_{$option@index}">
<div>
{if $option.total_price_with_tax && !$option.is_free && (!isset($free_shipping) || (isset($free_shipping) && !$free_shipping))}
{if $use_taxes == 1}
{if $priceDisplay == 1}
Expand All @@ -76,7 +83,8 @@
{else}
{l s='Free'}
{/if}
</div>
</div>
</label>
</td>
</tr>
</table>
Expand Down Expand Up @@ -261,9 +269,9 @@
<p class="carrier_title">{l s='Leave a message'}</p>
<div>
<p>{l s='If you would like to add a comment about your order, please write it in the field below.'}</p>
<textarea class="form-control" cols="120" rows="2" name="message" id="message">{strip}
{if isset($oldMessage)}{$oldMessage|escape:'html':'UTF-8'}{/if}
{/strip}</textarea>
<textarea class="form-control" cols="120" rows="2" name="message" id="message">{strip}
{if isset($oldMessage)}{$oldMessage|escape:'html':'UTF-8'}{/if}
{/strip}</textarea>
</div>
{/if}
{if $recyclablePackAllowed}
Expand All @@ -287,12 +295,12 @@
{if $gift_wrapping_price > 0}
&nbsp;<i>({l s='Additional cost of'}
<span class="price" id="gift-price">
{if $priceDisplay == 1}
{convertPrice price=$total_wrapping_tax_exc_cost}
{else}
{convertPrice price=$total_wrapping_cost}
{/if}
</span>
{if $priceDisplay == 1}
{convertPrice price=$total_wrapping_tax_exc_cost}
{else}
{convertPrice price=$total_wrapping_cost}
{/if}
</span>
{if $use_taxes && $display_tax_label}
{if $priceDisplay == 1}
{l s='(tax excl.)'}
Expand Down
2 changes: 1 addition & 1 deletion order-carrier.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</td>
<td class="delivery_option_price">
<label for="delivery_option_{$id_address|intval}_{$option@index}">
<div class="delivery_option_price">
<div>
{if $option.total_price_with_tax && !$option.is_free && (!isset($free_shipping) || (isset($free_shipping) && !$free_shipping))}
{if $use_taxes == 1}
{if $priceDisplay == 1}
Expand Down