mohitj
/
theme-elegance
forked from brooksbingham/theme-elegance
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'main' of https://git.bopconsultancy.com/brooksbingham/theme-elegance

pagebuilder
Dinesh Salunke 2023-12-05 16:30:45 +05:30
parent 1d6e2a217a 02c06a307e
commit c5fd398c42
8 changed files with 444 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/ps_cashondelivery/views/templates/hook/paymentOptions-additionalInformation.tpl Normal file
View File

@ -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 <contact@prestashop.com>
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
*}
<div class="px-4">
<div class='w-full mt-2 p-2 bg-blue-100 border border-blue-300'>
<span>{l s='You pay for the merchandise upon delivery.' d='Modules.Cashondelivery.Shop'}</span>
</div>
</div>

38
modules/ps_checkpayment/views/templates/front/payment_infos.tpl Normal file
View File

@ -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 <contact@prestashop.com>
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*}
<div class="px-4">
<div class='flex flex-col gap-2 w-full mt-2 p-2 bg-blue-100 border border-blue-300'>
<span>{l s='Please send us your check following these rules:' d='Modules.Checkpayment.Shop'}</span>
<dl>
<dt class="font-semibold">{l s='Amount' d='Modules.Checkpayment.Shop'}</dt>
<dd class="text-sm mb-3">{$checkTotal} {$checkTaxLabel}</dd>
<dt class="font-semibold">{l s='Payee:' d='Modules.Checkpayment.Shop'}</dt>
<dd class="text-sm mb-3">{$checkOrder}</dd>
<dt class="font-semibold">{l s='Send your check to this address:' d='Modules.Checkpayment.Shop'}</dt>
<dd class="text-sm">{$checkAddress nofilter}</dd>
</dl>
</div>
</div>

30
modules/ps_wirepayment/views/templates/hook/_partials/payment_infos.tpl Normal file
View File

@ -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 <contact@prestashop.com>
* @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
*}
<dl>
<dt class="font-semibold">{l s='Amount' d='Modules.Wirepayment.Shop'}</dt>
<dd class="text-sm mb-3">{$total}</dd>
<dt class="font-semibold">{l s='Name of account owner' d='Modules.Wirepayment.Shop'}</dt>
<dd class="text-sm mb-3">{$bankwireOwner}</dd>
<dt class="font-semibold">{l s='Please include these details' d='Modules.Wirepayment.Shop'}</dt>
<dd class="text-sm mb-3">{$bankwireDetails nofilter}</dd>
<dt class="font-semibold">{l s='Bank name' d='Modules.Wirepayment.Shop'}</dt>
<dd class="text-sm">{$bankwireAddress nofilter}</dd>
</dl>

32
modules/ps_wirepayment/views/templates/hook/ps_wirepayment_intro.tpl Normal file
View File

@ -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 <contact@prestashop.com>
* @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
*}
<div class="px-4">
<div class='flex flex-col gap-2 w-full mt-2 p-2 bg-blue-100 border border-blue-300'>
<div class="flex flex-col gap-1">
<span>{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'}</span>
{if $bankwireReservationDays}
<span>{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'}</span>
{/if}
<span>{l s='Payment is made by transfer of the invoice amount to the following account:' d='Modules.Wirepayment.Shop'}</span>
</div>
{include file='module:ps_wirepayment/views/templates/hook/_partials/payment_infos.tpl'}
{$bankwireCustomText nofilter}
</div>
</div>

3
templates/checkout/_partials/cart-detailed-totals.tpl
View File

@ -24,10 +24,9 @@
*}
{block name='cart_detailed_totals'}
<div class="flex flex-col gap-4">
<div class="flex flex-col gap-8">
{foreach from=$cart.subtotals item="subtotal"}
{if $subtotal.value && $subtotal.type !== 'tax'}
{if $subtotal && $subtotal.value|count_characters > 0 && $subtotal.type !== 'tax'}
<div class="flex font-medium" id="cart-subtotal-{$subtotal.type}">
<span class="flex-1 label{if 'products' === $subtotal.type} js-subtotal{/if}">
{if 'products' == $subtotal.type}

2
templates/checkout/_partials/steps/addresses.tpl
View File

@ -25,6 +25,7 @@
{extends file='checkout/_partials/steps/checkout-step.tpl'}
{block name='step_content'}
{if !$step_is_complete}
<div class="js-address-form">
<form
method="POST"
@ -134,4 +135,5 @@
</form>
</div>
{/if}
{/block}

19
templates/checkout/_partials/steps/payment.tpl
View File

@ -1,6 +1,8 @@
{extends file='checkout/_partials/steps/checkout-step.tpl'}
{block name='step_content'}
{if !$step_is_complete}
<div class="w-full flex flex-col gap-4 p-4">
{hook h='displayPaymentTop'}
@ -16,7 +18,7 @@
{if $is_free}
<p>{l s='No payment needed for this order' d='Shop.Theme.Checkout'}</p>
{/if}
<div class="payment-options {if $is_free}hidden-xs-up{/if}">
<div class="payment-options flex flex-col gap-2 {if $is_free}hidden-xs-up{/if}">
{foreach from=$payment_options item="module_options"}
{foreach from=$module_options item="option"}
<div>
@ -95,11 +97,10 @@
</p>
<form id="conditions-to-approve" method="GET">
<ul>
<ul class="flex flex-col gap-2">
{foreach from=$conditions_to_approve item="condition" key="condition_name"}
<li>
<div class="float-xs-left">
<span class="custom-checkbox">
<div class="flex items-center gap-2 focus:border-0">
<input id = "conditions_to_approve[{$condition_name}]"
name = "conditions_to_approve[{$condition_name}]"
required
@ -107,14 +108,10 @@
value = "1"
class = "ps-shown-by-js"
>
<span><i class="material-icons rtl-no-flip checkbox-checked">&#xE5CA;</i></span>
</span>
</div>
<div class="condition-label">
<label class="js-terms" for="conditions_to_approve[{$condition_name}]">
{$condition nofilter}
</label>
</div>
</li>
{/foreach}
</ul>
@ -127,7 +124,7 @@
<div id="payment-confirmation">
<div class="ps-shown-by-js">
<button type="submit" {if !$selected_payment_option} disabled {/if} class="btn btn-primary center-block">
<button type="submit" {if !$selected_payment_option} disabled {/if} class="uppercase font-medium py-2 text-center w-full bg-blue-950 text-gray-50 disabled:bg-gray-600">
{l s='Order with an obligation to pay' d='Shop.Theme.Checkout'}
</button>
{if $show_final_summary}
@ -154,7 +151,7 @@
{hook h='displayPaymentByBinaries'}
<div class="modal fade" id="modal">
<div class="modal fade hidden" id="modal">
<div class="modal-dialog" role="document">
<div class="modal-content">
<button type="button" class="close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
@ -164,4 +161,6 @@
</div>
</div>
</div>
{/if}
</div>
{/block}

40
templates/checkout/_partials/steps/shipping.tpl
View File

@ -25,23 +25,24 @@
{extends file='checkout/_partials/steps/checkout-step.tpl'}
{block name='step_content'}
{if !$step_is_complete}
<div id="hook-display-before-carrier">
{$hookDisplayBeforeCarrier nofilter}
</div>
<div class="delivery-options-list">
<div class="flex w-full p-4">
{if $delivery_options|count}
<form
class="clearfix"
class="flex flex-col w-full gap-4"
id="js-delivery"
data-url-update="{url entity='order' params=['ajax' => 1, 'action' => 'selectDeliveryOption']}"
method="post"
>
<div class="form-fields">
{block name='delivery_options'}
<div class="delivery-options">
<div class="delivery-options flex flex-col gap-2">
{foreach from=$delivery_options item=carrier key=carrier_id}
<div class="row delivery-option">
<div class="flex items-center delivery-option">
<div class="col-sm-1">
<span class="custom-radio float-xs-left">
<input type="radio" name="delivery_option[{$id_address}]" id="delivery_option_{$carrier.id}" value="{$carrier_id}"{if $delivery_option == $carrier_id} checked{/if}>
@ -49,24 +50,26 @@
</span>
</div>
<label for="delivery_option_{$carrier.id}" class="col-sm-11 delivery-option-2">
<div class="row">
<div class="flex items-center gap-2">
<div class="col-sm-5 col-xs-12">
<div class="row">
<div class=" flex items-center gap-2">
{if $carrier.logo}
<div class="col-xs-3">
<div>
<img src="{$carrier.logo}" alt="{$carrier.name}" />
</div>
{/if}
<div class="{if $carrier.logo}col-xs-9{else}col-xs-12{/if}">
<div class="text-lg font-semibold">
<span class="h6 carrier-name">{$carrier.name}</span>
</div>
</div>
</div>
<div class="col-sm-4 col-xs-12">
<span class="carrier-delay">{$carrier.delay}</span>
<div class="flex gap-2 flex-wrap">
<div class="">
<span class="carrier-delay">( {$carrier.delay} )</span>
</div>
<div class="">
<span class="carrier-price">( {$carrier.price} )</span>
</div>
<div class="col-sm-3 col-xs-12">
<span class="carrier-price">{$carrier.price}</span>
</div>
</div>
</label>
@ -78,10 +81,10 @@
{/foreach}
</div>
{/block}
<div class="order-options">
<div id="delivery">
<label for="delivery_message">{l s='If you would like to add a comment about your order, please write it in the field below.' d='Shop.Theme.Checkout'}</label>
<textarea rows="2" cols="120" id="delivery_message" name="delivery_message">{$delivery_message}</textarea>
<div class="flex w-full">
<div id="delivery" class="flex w-full flex-col gap-2">
<label for="delivery_message" class="text-sm">{l s='If you would like to add a comment about your order, please write it in the field below.' d='Shop.Theme.Checkout'}</label>
<textarea rows="2" id="delivery_message" name="delivery_message">{$delivery_message}</textarea>
</div>
{if $recyclablePackAllowed}
@ -107,12 +110,12 @@
</div>
</div>
<button type="submit" class="continue btn btn-primary float-xs-right" name="confirmDeliveryOption" value="1">
<button type="submit" class="uppercase font-medium py-2 text-center w-full bg-blue-950 text-gray-50" name="confirmDeliveryOption" value="1">
{l s='Continue' d='Shop.Theme.Actions'}
</button>
</form>
{else}
<p class="alert alert-danger">{l s='Unfortunately, there are no carriers available for your delivery address.' d='Shop.Theme.Checkout'}</p>
<p class="font-semibold text-red-500">{l s='Unfortunately, there are no carriers available for your delivery address.' d='Shop.Theme.Checkout'}</p>
{/if}
</div>
@ -121,4 +124,5 @@
</div>
<div id="extra_carrier"></div>
{/if}
{/block}