diff --git a/modules/ps_cashondelivery/views/templates/hook/paymentOptions-additionalInformation.tpl b/modules/ps_cashondelivery/views/templates/hook/paymentOptions-additionalInformation.tpl new file mode 100644 index 0000000..6df4033 --- /dev/null +++ b/modules/ps_cashondelivery/views/templates/hook/paymentOptions-additionalInformation.tpl @@ -0,0 +1,24 @@ +{** + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + *} + +
+
+ {l s='You pay for the merchandise upon delivery.' d='Modules.Cashondelivery.Shop'} +
+
diff --git a/modules/ps_checkpayment/views/templates/front/payment_infos.tpl b/modules/ps_checkpayment/views/templates/front/payment_infos.tpl new file mode 100644 index 0000000..d9f2699 --- /dev/null +++ b/modules/ps_checkpayment/views/templates/front/payment_infos.tpl @@ -0,0 +1,38 @@ +{** + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.md. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade PrestaShop to newer + * versions in the future. If you wish to customize PrestaShop for your + * needs please refer to https://devdocs.prestashop.com/ for more information. + * + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + *} + +
+
+ {l s='Please send us your check following these rules:' d='Modules.Checkpayment.Shop'} +
+
{l s='Amount' d='Modules.Checkpayment.Shop'}
+
{$checkTotal} {$checkTaxLabel}
+
{l s='Payee:' d='Modules.Checkpayment.Shop'}
+
{$checkOrder}
+
{l s='Send your check to this address:' d='Modules.Checkpayment.Shop'}
+
{$checkAddress nofilter}
+
+
+
diff --git a/modules/ps_wirepayment/views/templates/hook/_partials/payment_infos.tpl b/modules/ps_wirepayment/views/templates/hook/_partials/payment_infos.tpl new file mode 100644 index 0000000..9398bb8 --- /dev/null +++ b/modules/ps_wirepayment/views/templates/hook/_partials/payment_infos.tpl @@ -0,0 +1,30 @@ +{** + * 2007-2020 PrestaShop and Contributors + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA + *} + + +
+
{l s='Amount' d='Modules.Wirepayment.Shop'}
+
{$total}
+
{l s='Name of account owner' d='Modules.Wirepayment.Shop'}
+
{$bankwireOwner}
+
{l s='Please include these details' d='Modules.Wirepayment.Shop'}
+
{$bankwireDetails nofilter}
+
{l s='Bank name' d='Modules.Wirepayment.Shop'}
+
{$bankwireAddress nofilter}
+
diff --git a/modules/ps_wirepayment/views/templates/hook/ps_wirepayment_intro.tpl b/modules/ps_wirepayment/views/templates/hook/ps_wirepayment_intro.tpl new file mode 100644 index 0000000..6f58441 --- /dev/null +++ b/modules/ps_wirepayment/views/templates/hook/ps_wirepayment_intro.tpl @@ -0,0 +1,32 @@ +{** + * 2007-2020 PrestaShop and Contributors + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA + *} + +
+
+
+ {l s='Please transfer the invoice amount to our bank account. You will receive our order confirmation by email containing bank details and order number.' d='Modules.Wirepayment.Shop'} + {if $bankwireReservationDays} + {l s='Goods will be reserved %s days for you and we\'ll process the order immediately after receiving the payment.' sprintf=[$bankwireReservationDays] d='Modules.Wirepayment.Shop'} + {/if} + {l s='Payment is made by transfer of the invoice amount to the following account:' d='Modules.Wirepayment.Shop'} +
+ {include file='module:ps_wirepayment/views/templates/hook/_partials/payment_infos.tpl'} + {$bankwireCustomText nofilter} +
+
diff --git a/templates/checkout/_partials/cart-detailed-totals.tpl b/templates/checkout/_partials/cart-detailed-totals.tpl index 43615dd..f2ca009 100644 --- a/templates/checkout/_partials/cart-detailed-totals.tpl +++ b/templates/checkout/_partials/cart-detailed-totals.tpl @@ -24,10 +24,9 @@ *} {block name='cart_detailed_totals'}
-
{foreach from=$cart.subtotals item="subtotal"} - {if $subtotal.value && $subtotal.type !== 'tax'} + {if $subtotal && $subtotal.value|count_characters > 0 && $subtotal.type !== 'tax'}
{if 'products' == $subtotal.type} diff --git a/templates/checkout/_partials/steps/addresses.tpl b/templates/checkout/_partials/steps/addresses.tpl index 2dc14b6..a095b13 100644 --- a/templates/checkout/_partials/steps/addresses.tpl +++ b/templates/checkout/_partials/steps/addresses.tpl @@ -25,113 +25,115 @@ {extends file='checkout/_partials/steps/checkout-step.tpl'} {block name='step_content'} -
-
+ {if !$step_is_complete} +
+ - {if !$use_same_address} -

{l s='Shipping Address' d='Shop.Theme.Checkout'}

- {/if} - - {if $use_same_address && !$cart.is_virtual} -

- {l s='The selected address will be used both as your personal address (for invoice) and as your delivery address.' d='Shop.Theme.Checkout'} -

- {elseif $use_same_address && $cart.is_virtual} -

- {l s='The selected address will be used as your personal address (for invoice).' d='Shop.Theme.Checkout'} -

- {/if} - - {if $show_delivery_address_form} -
- {render file = 'checkout/_partials/address-form.tpl' - ui = $address_form - use_same_address = $use_same_address - type = "delivery" - form_has_continue_button = $form_has_continue_button - } -
- {elseif $customer.addresses|count > 0} -
- {include file = 'checkout/_partials/address-selector-block.tpl' - addresses = $customer.addresses - name = "id_address_delivery" - selected = $id_address_delivery - type = "delivery" - interactive = !$show_delivery_address_form and !$show_invoice_address_form - } -
- - {if isset($delivery_address_error)} -

{$delivery_address_error.exception}

- {else} - + {if !$use_same_address} +

{l s='Shipping Address' d='Shop.Theme.Checkout'}

{/if} -

- {l s='add new address' d='Shop.Theme.Actions'} -

- {if $use_same_address && !$cart.is_virtual}

- - {l s='Billing address differs from shipping address' d='Shop.Theme.Checkout'} - + {l s='The selected address will be used both as your personal address (for invoice) and as your delivery address.' d='Shop.Theme.Checkout'} +

+ {elseif $use_same_address && $cart.is_virtual} +

+ {l s='The selected address will be used as your personal address (for invoice).' d='Shop.Theme.Checkout'}

{/if} - {/if} - - {if !$use_same_address} - -

{l s='Your Invoice Address' d='Shop.Theme.Checkout'}

- - {if $show_invoice_address_form} -
+ {if $show_delivery_address_form} +
{render file = 'checkout/_partials/address-form.tpl' ui = $address_form use_same_address = $use_same_address - type = "invoice" + type = "delivery" form_has_continue_button = $form_has_continue_button }
- {else} -
+ {elseif $customer.addresses|count > 0} +
{include file = 'checkout/_partials/address-selector-block.tpl' addresses = $customer.addresses - name = "id_address_invoice" - selected = $id_address_invoice - type = "invoice" + name = "id_address_delivery" + selected = $id_address_delivery + type = "delivery" interactive = !$show_delivery_address_form and !$show_invoice_address_form }
- {if isset($invoice_address_error)} -

{$invoice_address_error.exception}

+ {if isset($delivery_address_error)} +

{$delivery_address_error.exception}

{else} - + {/if}

- {l s='add new address' d='Shop.Theme.Actions'} + {l s='add new address' d='Shop.Theme.Actions'}

+ + {if $use_same_address && !$cart.is_virtual} +

+ + {l s='Billing address differs from shipping address' d='Shop.Theme.Checkout'} + +

+ {/if} + {/if} - {/if} + {if !$use_same_address} - {if !$form_has_continue_button} -
- - -
- {/if} +

{l s='Your Invoice Address' d='Shop.Theme.Checkout'}

- -
+ {if $show_invoice_address_form} +
+ {render file = 'checkout/_partials/address-form.tpl' + ui = $address_form + use_same_address = $use_same_address + type = "invoice" + form_has_continue_button = $form_has_continue_button + } +
+ {else} +
+ {include file = 'checkout/_partials/address-selector-block.tpl' + addresses = $customer.addresses + name = "id_address_invoice" + selected = $id_address_invoice + type = "invoice" + interactive = !$show_delivery_address_form and !$show_invoice_address_form + } +
+ + {if isset($invoice_address_error)} +

{$invoice_address_error.exception}

+ {else} + + {/if} + +

+ {l s='add new address' d='Shop.Theme.Actions'} +

+ {/if} + + {/if} + + {if !$form_has_continue_button} +
+ + +
+ {/if} + + +
+ {/if} {/block} diff --git a/templates/checkout/_partials/steps/payment.tpl b/templates/checkout/_partials/steps/payment.tpl index 2f14dfd..81c9cde 100644 --- a/templates/checkout/_partials/steps/payment.tpl +++ b/templates/checkout/_partials/steps/payment.tpl @@ -1,167 +1,166 @@ {extends file='checkout/_partials/steps/checkout-step.tpl'} {block name='step_content'} + {if !$step_is_complete} +
- {hook h='displayPaymentTop'} + {hook h='displayPaymentTop'} - {* used by javascript to correctly handle cart updates when we are on payment step (eg vouchers added) *} - + {* used by javascript to correctly handle cart updates when we are on payment step (eg vouchers added) *} + - {if !empty($display_transaction_updated_info)} -

- {l s='Transaction amount has been correctly updated' d='Shop.Theme.Checkout'} -

- {/if} + {if !empty($display_transaction_updated_info)} +

+ {l s='Transaction amount has been correctly updated' d='Shop.Theme.Checkout'} +

+ {/if} - {if $is_free} -

{l s='No payment needed for this order' d='Shop.Theme.Checkout'}

- {/if} -
- {foreach from=$payment_options item="module_options"} - {foreach from=$module_options item="option"} -
-
- {* This is the way an option should be selected when Javascript is enabled *} - - {l s='No payment needed for this order' d='Shop.Theme.Checkout'}

+ {/if} +
+ {foreach from=$payment_options item="module_options"} + {foreach from=$module_options item="option"} +
+
+ {* This is the way an option should be selected when Javascript is enabled *} + + + + + {* This is the way an option should be selected when Javascript is disabled *} +
+ {if $option.id === $selected_payment_option} + {l s='Selected' d='Shop.Theme.Checkout'} + {else} + + {/if} +
+ + + +
+
+ + {if $option.additionalInformation} +
- - - {* This is the way an option should be selected when Javascript is disabled *} -
- {if $option.id === $selected_payment_option} - {l s='Selected' d='Shop.Theme.Checkout'} + {$option.additionalInformation nofilter} +
+ {/if} + +
+ {if $option.form} + {$option.form nofilter} {else} - + + {foreach from=$option.inputs item=input} + + {/foreach} + + {/if} - +
+ {/foreach} + {foreachelse} +

{l s='Unfortunately, there are no payment method available.' d='Shop.Theme.Checkout'}

+ {/foreach} +
- + {if $conditions_to_approve|count} +

+ {* At the moment, we're not showing the checkboxes when JS is disabled + because it makes ensuring they were checked very tricky and overcomplicates + the template. Might change later. + *} + {l s='By confirming the order, you certify that you have read and agree with all of the conditions below:' d='Shop.Theme.Checkout'} +

-
-
+
+
    + {foreach from=$conditions_to_approve item="condition" key="condition_name"} +
  • +
    + + + +
    • + {/foreach} +
+
+ {/if} - {if $option.additionalInformation} -
- {$option.additionalInformation nofilter} -
- {/if} + {if $show_final_summary} + {include file='checkout/_partials/order-final-summary.tpl'} + {/if} -
- {if $option.form} - {$option.form nofilter} - {else} -
- {foreach from=$option.inputs item=input} - - {/foreach} - -
+
+
+ + {if $show_final_summary} + + {/if} +
+
+ {if $selected_payment_option and $all_conditions_approved} + {/if}
- {/foreach} - {foreachelse} -

{l s='Unfortunately, there are no payment method available.' d='Shop.Theme.Checkout'}

- {/foreach} -
- - {if $conditions_to_approve|count} -

- {* At the moment, we're not showing the checkboxes when JS is disabled - because it makes ensuring they were checked very tricky and overcomplicates - the template. Might change later. - *} - {l s='By confirming the order, you certify that you have read and agree with all of the conditions below:' d='Shop.Theme.Checkout'} -

- -
-
    - {foreach from=$conditions_to_approve item="condition" key="condition_name"} -
  • -
    - - - - -
    -
    - -
    -
    • - {/foreach} -
-
- {/if} - - {if $show_final_summary} - {include file='checkout/_partials/order-final-summary.tpl'} - {/if} - -
-
- - {if $show_final_summary} - - {/if} -
-
- {if $selected_payment_option and $all_conditions_approved} - - {/if} -
-
- - {hook h='displayPaymentByBinaries'} - - {/block} diff --git a/templates/checkout/_partials/steps/shipping.tpl b/templates/checkout/_partials/steps/shipping.tpl index d6b5182..635476b 100644 --- a/templates/checkout/_partials/steps/shipping.tpl +++ b/templates/checkout/_partials/steps/shipping.tpl @@ -25,100 +25,104 @@ {extends file='checkout/_partials/steps/checkout-step.tpl'} {block name='step_content'} -
- {$hookDisplayBeforeCarrier nofilter} -
+ {if !$step_is_complete} +
+ {$hookDisplayBeforeCarrier nofilter} +
-
- {if $delivery_options|count} -
-
- {block name='delivery_options'} -
- {foreach from=$delivery_options item=carrier key=carrier_id} -
-
- - - - -
-