Add new payment and shipping parsers for various integrations
- Implemented Google Pay parser in bongooglepay.js - Added Buckaroo 3 payment parser in buckaroo3.js - Introduced DataTrans CW Mastercard parser in datatranscw.js - Created DataTrans CW Credit Card parser in datatranscw_creditcard.js - Developed DHL Assistant shipping parser in dhlassistant.js - Added Estimated Delivery parser in estimateddelivery.js - Implemented Floapay payment parser in floapay.js - Created FS Pickup at Store shipping parser in fspickupatstore.js - Developed Generic Iframe parser in generic_iframe_parser.js - Added Geodis Officiel shipping parser in geodisofficiel.js - Implemented Glob Kurier module shipping parser in globkuriermodule.js - Created Latvija Post Express Pickup Terminal parser in latvijaspastsexpresspastspostterminalslv.js - Developed LP Shipping parser in lpshipping.js - Added Mijora Venipak parser in mijoravenipak.js - Implemented Apple Pay parser in pm_applepay.js - Created Przelewy24 payment parser in przelewy24.js - Developed Pshugls shipping parser in pshugls.js - Added Redsys Insite payment parser in redsysinsite.js - Implemented Tpay payment parser in tpay.js - Updated third-party integration documentation for FedEx DotCom
This commit is contained in:
@@ -31,15 +31,15 @@
|
||||
<div class="card-block">
|
||||
{foreach from=$cart.subtotals item="subtotal"}
|
||||
{if isset($subtotal.value) && $subtotal.value && $subtotal.type !== 'tax'}
|
||||
<div class="cart-summary-line{if $waitForShippingCls && 'products' != $subtotal.type}{$waitForShippingCls}{/if}{if !$subtotal.amount} free{/if}" id="cart-subtotal-{$subtotal.type}">
|
||||
<div class="cart-summary-line{if $waitForShippingCls && 'products' != $subtotal.type}{$waitForShippingCls|escape:'javascript':'UTF-8'}{/if}{if !$subtotal.amount} free{/if}" id="cart-subtotal-{$subtotal.type|escape:'javascript':'UTF-8'}">
|
||||
<span class="label{if 'products' === $subtotal.type} js-subtotal{/if}">
|
||||
{if 'products' == $subtotal.type}
|
||||
{$cart.summary_string}
|
||||
{$cart.summary_string|escape:'htmlall':'UTF-8'}
|
||||
{else}
|
||||
{$subtotal.label}
|
||||
{$subtotal.label|escape:'htmlall':'UTF-8'}
|
||||
{/if}
|
||||
</span>
|
||||
<span class="value">{$subtotal.value}</span>
|
||||
<span class="value">{$subtotal.value|escape:'htmlall':'UTF-8'}</span>
|
||||
{if $subtotal.type === 'shipping'}
|
||||
<div>
|
||||
<small class="value">{hook h='displayCheckoutSubtotalDetails' subtotal=$subtotal}</small>
|
||||
@@ -48,6 +48,7 @@
|
||||
</div>
|
||||
{/if}
|
||||
{/foreach}
|
||||
{hook h="displayPaymentRuleCartSummary"}
|
||||
</div>
|
||||
|
||||
{block name='cart_voucher'}
|
||||
@@ -59,34 +60,53 @@
|
||||
<div class="card-block">
|
||||
{if (isset($cart.subtotals.tax) && $cart.subtotals.tax.amount > 0) || (!$configuration.display_prices_tax_incl && $configuration.taxes_enabled) }
|
||||
{* tax displayed in cart summary, we show Total (tax excl.), Tax and Total (tax incl.) *}
|
||||
<div class="cart-summary-line cart-total-tax-excluded{$waitForShippingCls}">
|
||||
<span class="label">{$cart.totals.total_excluding_tax.label}</span>
|
||||
<span class="value">{$cart.totals.total_excluding_tax.value}</span>
|
||||
<div class="cart-summary-line cart-total-tax-excluded{$waitForShippingCls|escape:'javascript':'UTF-8'}">
|
||||
<span class="label">{$cart.totals.total_excluding_tax.label|escape:'htmlall':'UTF-8'}</span>
|
||||
<span class="value">{$cart.totals.total_excluding_tax.value|escape:'htmlall':'UTF-8'}</span>
|
||||
</div>
|
||||
{if isset($cart.subtotals.tax)}
|
||||
<div class="cart-summary-line cart-total-tax{$waitForShippingCls}">
|
||||
<span class="label">{$cart.subtotals.tax.label}</span>
|
||||
<span class="value">{$cart.subtotals.tax.value}</span>
|
||||
<div class="cart-summary-line cart-total-tax{$waitForShippingCls|escape:'javascript':'UTF-8'}">
|
||||
|
||||
<div class="label" style="display: inline">{$cart.subtotals.tax.label|escape:'javascript':'UTF-8'}
|
||||
{if $cart.totals.total_excluding_tax.amount > 0}
|
||||
{math equation='(a/b)*100' a=$cart.subtotals.tax.amount b=$cart.totals.total_excluding_tax.amount assign='effective_tax_rate'}
|
||||
{math equation='abs(round(a)-a)' a=$effective_tax_rate assign='rounding_delta'}
|
||||
{if $rounding_delta < 0.09}
|
||||
{math equation='round(a)' a=$effective_tax_rate assign='effective_tax_rate_rounded'}
|
||||
{else}
|
||||
{math equation='a' a=$effective_tax_rate assign='effective_tax_rate_rounded' format="%.1f"}
|
||||
{/if}
|
||||
<span class="effective-tax-rate">({$effective_tax_rate_rounded|escape:'javascript':'UTF-8'}%)</span>
|
||||
{/if}
|
||||
</div>
|
||||
<span class="value">{$cart.subtotals.tax.value|escape:'javascript':'UTF-8'}</span>
|
||||
</div>
|
||||
{/if}
|
||||
{* tax is set and non-zero cart summary, we show Total (tax incl.) *}
|
||||
<div class="cart-summary-line cart-total cart-total-tax-included{$waitForShippingCls}">
|
||||
<span class="label">{$cart.totals.total_including_tax.label}</span>
|
||||
<span class="value">{$cart.totals.total_including_tax.value}</span>
|
||||
<div class="cart-summary-line cart-total cart-total-tax-included{$waitForShippingCls|escape:'javascript':'UTF-8'}">
|
||||
<span class="label">{$cart.totals.total_including_tax.label|escape:'htmlall':'UTF-8'}</span>
|
||||
<span class="value">{$cart.totals.total_including_tax.value|escape:'htmlall':'UTF-8'}</span>
|
||||
</div>
|
||||
{else}
|
||||
{* tax is zero or not used in cart summary, we show Total (tax_label) *}
|
||||
<div class="cart-summary-line cart-total cart-total-auto-tax{$waitForShippingCls}">
|
||||
<span class="label">{$cart.totals.total.label} {if isset($configuration) && $configuration.taxes_enabled}{$cart.labels.tax_short}{/if}</span>
|
||||
<span class="value">{$cart.totals.total.value}</span>
|
||||
<div class="cart-summary-line cart-total cart-total-auto-tax{$waitForShippingCls|escape:'javascript':'UTF-8'}">
|
||||
<span class="label">{$cart.totals.total.label|escape:'htmlall':'UTF-8'}{if isset($configuration) && $configuration.taxes_enabled}<span class="tax-lbl"> {$cart.labels.tax_short|escape:'htmlall':'UTF-8'}</span>{/if}</span>
|
||||
<span class="value">{$cart.totals.total.value|escape:'htmlall':'UTF-8'}</span>
|
||||
</div>
|
||||
{if isset($cart.subtotals.tax)}
|
||||
<div class="cart-summary-line cart-total-tax{$waitForShippingCls}">
|
||||
<span class="label">{$cart.subtotals.tax.label}</span>
|
||||
<span class="value">{$cart.subtotals.tax.value}</span>
|
||||
<div class="cart-summary-line cart-total-tax{$waitForShippingCls|escape:'javascript':'UTF-8'}">
|
||||
<div class="label" style="display: inline">{$cart.subtotals.tax.label|escape:'javascript':'UTF-8'}
|
||||
<span class="effective-tax-rate">(0%)</span>
|
||||
</div>
|
||||
<span class="value">{$cart.subtotals.tax.value|escape:'javascript':'UTF-8'}</span>
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
{if $cart.totals.total_excluding_tax.amount == $cart.totals.total.amount && $configuration.taxes_enabled}
|
||||
<div style="display: none;" class="cart-summary-line vat-exempt">
|
||||
<span class="label">{l s='Your order is now 0% VAT' mod='thecheckout'}</span>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
|
||||
{assign var='ps_freeshipping_price' value=Configuration::get('PS_SHIPPING_FREE_PRICE')}
|
||||
@@ -97,10 +117,10 @@
|
||||
{math equation='a-b' a=$ps_freeshipping_price b=$total_without_shipping assign='remaining_to_spend'}
|
||||
{math equation='(100*a)/b' a=$total_without_shipping b=$ps_freeshipping_price assign='completed_percentage'}
|
||||
{if $remaining_to_spend > 0}
|
||||
<div class="remaining-amount-to-free-shipping-container">
|
||||
<div class="remaining-amount-to-free-shipping-container{if isset($cart.subtotals) && isset($cart.subtotals.shipping) && isset($cart.subtotals.shipping.amount) && $cart.subtotals.shipping.amount == 0} free{/if}">
|
||||
<div class="remaining-amount-msg">{l s='Remaining amount to get free shipping: ' mod='thecheckout'} <span class="remaining-amount">{Tools::displayPrice($remaining_to_spend,$currency)}</span></div>
|
||||
<div class="remaining-amount-progress">
|
||||
<div class="inside-bar" style="width: {$completed_percentage}%"></div>
|
||||
<div class="inside-bar" style="width: {$completed_percentage|escape:'javascript':'UTF-8'}%"></div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
Reference in New Issue
Block a user