-
Notifications
You must be signed in to change notification settings - Fork 515
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1167 from shreesh-webkul/gli-2202
Added: Confirmation modal when deleting cart rules and while changes credit slip status
- Loading branch information
Showing
10 changed files
with
573 additions
and
6 deletions.
There are no files selected for viewing
83 changes: 83 additions & 0 deletions
83
admin/themes/default/template/controllers/cart_rules/modal_confirm_bulk_delete.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| {* | ||
| * Since 2010 Webkul. | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * All right is reserved, | ||
| * Please go through this link for complete license : https://store.webkul.com/license.html | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade this module to newer | ||
| * versions in the future. If you wish to customize this module for your | ||
| * needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. | ||
| * | ||
| * @author Webkul IN <[email protected]> | ||
| * @copyright Since 2010 Webkul IN | ||
| * @license https://store.webkul.com/license.html | ||
| *} | ||
| <div class="modal-header"> | ||
| <button type="button" class="close" data-dismiss="modal"><i class="icon-remove-sign"></i></button> | ||
| <h4 class="modal-title"><i class="icon icon-exclamation-triangle"></i> {l s='Confirm Delete'}</h4> | ||
| {if isset($cartRules)} | ||
| <p>{l s='The following cart rules in your selection were created dynamically from refunds or credit slips. Please confirm if you also intend to delete these cart rules?'}</p> | ||
| {else} | ||
| <p>{l s='Are you sure, you want to delete the selected cart rules?'}</p> | ||
|
|
||
| {/if} | ||
| </div> | ||
| {if isset($cartRules)} | ||
| <div class="modal-body"> | ||
| <div class="table-responsive"> | ||
| <table class="table"> | ||
| <thead> | ||
| <tr> | ||
| <th> | ||
| </th> | ||
| <th> | ||
| {l s='Cart Rule'} | ||
| </th> | ||
| <th> | ||
| {l s='Reason'} | ||
| </th> | ||
| <th> | ||
| {l s='Order'} | ||
| </th> | ||
| <th> | ||
| {l s='Amount'} | ||
| </th> | ||
| </tr> | ||
| </thead> | ||
| {foreach $cartRules as $cartRule} | ||
| <tr> | ||
| <td> | ||
| <input type="checkbox" class="cart_rule_to_delete" value="{$cartRule['id_cart_rule']}" checked> | ||
| </td> | ||
| <td> | ||
| <a href="{$link->getAdminLink('AdminCartRules')}&updatecart_rule&id_cart_rule={$cartRule['id_cart_rule']}" target="_blank">#{$cartRule['id_cart_rule']}</a> | ||
| </td> | ||
| <td> | ||
| {if $cartRule['generated_by'] == CartRule::GENERATED_BY_REFUND} | ||
| <b>{l s='Generated against refund'}</b> | ||
| (<a href="{$link->getAdminLink('AdminOrderRefundRequests')}&vieworder_return&id_order_return={$cartRule['id_generated_by']}" target="_blank">#{$cartRule['id_generated_by']}</a>) | ||
| {else if $cartRule['generated_by'] == CartRule::GENERATED_BY_ORDER_SLIP} | ||
| <b>{l s='Generated against credit slip'}</b> | ||
| (<a href="{$link->getAdminLink('AdminPdf')}&submitAction=generateOrderSlipPDF&id_order_slip={$cartRule['id_generated_by']}" target="_blank">#{$cartRule['id_generated_by']}</a>) | ||
| {/if} | ||
| {if !$cartRule['cart_rule']->quantity} | ||
| <span class="badge badge-danger">{l s='Used'}</span> | ||
| {/if} | ||
| </td> | ||
| <td> | ||
| <a href="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$cartRule['order']->id}" target="_blank">#{$cartRule['order']->id}</a> | ||
| </td> | ||
| <td> | ||
| {displayPrice price=$cartRule['cart_rule']->reduction_amount currency=$cartRule['cart_rule']->reduction_currency} | ||
| </td> | ||
|
|
||
| </tr> | ||
| {/foreach} | ||
| </table> | ||
| </div> | ||
| </div> | ||
| {/if} |
71 changes: 71 additions & 0 deletions
71
admin/themes/default/template/controllers/cart_rules/modal_confirm_delete.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| {* | ||
| * Since 2010 Webkul. | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * All right is reserved, | ||
| * Please go through this link for complete license : https://store.webkul.com/license.html | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade this module to newer | ||
| * versions in the future. If you wish to customize this module for your | ||
| * needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. | ||
| * | ||
| * @author Webkul IN <[email protected]> | ||
| * @copyright Since 2010 Webkul IN | ||
| * @license https://store.webkul.com/license.html | ||
| *} | ||
| <div class="modal-header"> | ||
| <button type="button" class="close" data-dismiss="modal"><i class="icon-remove-sign"></i></button> | ||
| <h4 class="modal-title"><i class="icon icon-exclamation-triangle"></i> {l s='Confirm Delete'}</h4> | ||
| <p>{l s='Are you sure, you want to delete this cart rule?'}</p> | ||
| </div> | ||
| {if isset($cartRule)} | ||
| <div class="modal-body"> | ||
| <div class="row"> | ||
| <div class="col-sm-4"> | ||
| <label>{l s='Voucher'}</label> | ||
| <p class="control-value"> | ||
| {$cartRule->code} (<a href="{$link->getAdminLink('AdminCartRules')}&updatecart_rule&id_cart_rule={$cartRule->id}" target="_blank">#{$cartRule->id}</a>) | ||
| </p> | ||
| </div> | ||
| <div class="col-sm-4"> | ||
| <label>{l s='Reason'}</label> | ||
| <p class="control-value"> | ||
| {if $generatedBy == CartRule::GENERATED_BY_REFUND} | ||
| {l s='Generated against refund'} | ||
| (<a href="{$link->getAdminLink('AdminOrderRefundRequests')}&vieworder_return&id_order_return={$generatedById}" target="_blank">#{$generatedById}</a>) | ||
| {else if $generatedBy == CartRule::GENERATED_BY_ORDER_SLIP} | ||
| {l s='Generated against credit slip'} | ||
| (<a href="{$link->getAdminLink('AdminPdf')}&submitAction=generateOrderSlipPDF&id_order_slip={$generatedById}" target="_blank">#{$generatedById}</a>) | ||
| {/if} | ||
| </p> | ||
| </div> | ||
| <div class="col-sm-4"> | ||
| <label>{l s='Amount'}</label> | ||
| <p class="control-value">{displayPrice price=$cartRule->reduction_amount currency=$cartRule->reduction_currency}</p> | ||
| </div> | ||
| <div class="col-sm-4"> | ||
| <label>{l s='Customer'}</label> | ||
| <p class="control-value"> | ||
| {$customer->firstname} {$customer->lastname} (<a href="{$link->getAdminLink('AdminCustomers')}&viewcustomer&id_customer={$customer->id}" target="_blank">#{$customer->id}</a>) | ||
| </p> | ||
| </div> | ||
| <div class="col-sm-4"> | ||
| <label>{l s='Order'}</label> | ||
| <p class="control-value"> | ||
| {$order->reference} (<a href="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}" target="_blank">#{$order->id}</a>) | ||
| </p> | ||
| </div> | ||
| {if !$cartRule->quantity} | ||
| <div class="col-sm-4"> | ||
| <label>{l s='Status'}</label> | ||
| <p class="control-value"> | ||
| <span class="badge badge-danger">{l s='Used'}</span> | ||
| </p> | ||
| </div> | ||
| {/if} | ||
| </div> | ||
| </div> | ||
| {/if} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
admin/themes/default/template/controllers/slip/modal_confirm_update.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| {* | ||
| * Since 2010 Webkul. | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * All right is reserved, | ||
| * Please go through this link for complete license : https://store.webkul.com/license.html | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade this module to newer | ||
| * versions in the future. If you wish to customize this module for your | ||
| * needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. | ||
| * | ||
| * @author Webkul IN <[email protected]> | ||
| * @copyright Since 2010 Webkul IN | ||
| * @license https://store.webkul.com/license.html | ||
| *} | ||
| <div class="modal-header"> | ||
| <button type="button" class="close" data-dismiss="modal"><i class="icon-remove-sign"></i></button> | ||
| <h4 class="modal-title"><i class="icon icon-exclamation-triangle"></i> {l s='Confirm Update'}</h4> | ||
| <p>{l s='This action is irreversable, Are you sure you want to change the status?'}</p> | ||
| </div> | ||
| <div class="modal-body"> | ||
| <div class="row"> | ||
| <div class="col-sm-6"> | ||
| <label>{l s='Credit Slip'}</label> | ||
| <p class="control-value"> | ||
| <a href="{$link->getAdminLink('AdminCartRules')}&updatecart_rule&id_cart_rule={$orderSlip->id}" target="_blank">#{$orderSlip->id}</a> | ||
| </p> | ||
| </div> | ||
| <div class="col-sm-6"> | ||
| <label>{l s='Amount'}</label> | ||
| <p class="control-value">{displayPrice price=$orderSlip->amount currency=$order->id_currency}</p> | ||
| </div> | ||
| <div class="col-sm-6"> | ||
| <label>{l s='Customer'}</label> | ||
| <p class="control-value"> | ||
| {$customer->firstname} {$customer->lastname} (<a href="{$link->getAdminLink('AdminCustomers')}&viewcustomer&id_customer={$customer->id}" target="_blank">#{$customer->id}</a>) | ||
| </p> | ||
| </div> | ||
| <div class="col-sm-6"> | ||
| <label>{l s='Order'}</label> | ||
| <p class="control-value"> | ||
| {$order->reference} (<a href="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}" target="_blank">#{$order->id}</a>) | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.