diff --git a/admin/themes/default/template/controllers/cart_rules/modal_confirm_bulk_delete.tpl b/admin/themes/default/template/controllers/cart_rules/modal_confirm_bulk_delete.tpl index b4403b359..6e77c7386 100644 --- a/admin/themes/default/template/controllers/cart_rules/modal_confirm_bulk_delete.tpl +++ b/admin/themes/default/template/controllers/cart_rules/modal_confirm_bulk_delete.tpl @@ -19,28 +19,63 @@

 {l s='Confirm Delete'}

-

{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.'}

+ {if isset($cartRules)} +

{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.'}

+ {else} +

{l s='Are you sure, you want to delete the selected cart rules?'}

+ + {/if}
-
-
- - {foreach $cartRules as $cartRule} - - - - - - {/foreach} -
- - - #{$cartRule['id_cart_rule']} - - {if $cartRule['generated_by'] == CartRule::GENERATED_BY_REFUND} - {l s='Generated against refund'} - {else if $cartRule['generated_by'] == CartRule::GENERATED_BY_ORDER_SLIP} - {l s='Generated against credit slip'} - {/if} -
+{if isset($cartRules)} +
+
+ + + + + + + + + + + {foreach $cartRules as $cartRule} + + + + + + + + + {/foreach} +
+ + {l s='Cart Rule'} + + {l s='Reason'} + + {l s='Order'} + + {l s='Amount'} +
+ + + #{$cartRule['id_cart_rule']} + + {if $cartRule['generated_by'] == CartRule::GENERATED_BY_REFUND} + {l s='Generated against refund'} + (#{$cartRule['id_generated_by']}) + {else if $cartRule['generated_by'] == CartRule::GENERATED_BY_ORDER_SLIP} + {l s='Generated against credit slip'} + (#{$cartRule['id_generated_by']}) + {/if} + + #{$cartRule['order']->id} + + {displayPrice price=$cartRule['cart_rule']->reduction_amount currency=$cartRule['cart_rule']->reduction_currency} +
+
-
\ No newline at end of file +{/if} \ No newline at end of file diff --git a/admin/themes/default/template/controllers/cart_rules/modal_confirm_delete.tpl b/admin/themes/default/template/controllers/cart_rules/modal_confirm_delete.tpl index fe60f1a2b..00a54b253 100644 --- a/admin/themes/default/template/controllers/cart_rules/modal_confirm_delete.tpl +++ b/admin/themes/default/template/controllers/cart_rules/modal_confirm_delete.tpl @@ -21,39 +21,43 @@

{l s='Confirm Delete'}

{l s='Are you sure, you want to delete this cart rule?'}

-
-
-
- -

- {$cartRule->code} (#{$cartRule->id}) -

-
-
- -

- {if $generatedBy == CartRule::GENERATED_BY_REFUND} - {l s='Generated against refund'} - {else if $generatedBy == CartRule::GENERATED_BY_ORDER_SLIP} - {l s='Generated against credit slip'} - {/if} -

-
-
- -

{displayPrice price=$cartRule->reduction_amount currency=$cartRule->reduction_currency}

-
-
- -

- {$customer->firstname} {$customer->lastname} (#{$customer->id}) -

-
-
- -

- {$order->reference} (#{$order->id}) -

+{if isset($cartRule)} +
+
+
+ +

+ {$cartRule->code} (#{$cartRule->id}) +

+
+
+ +

+ {if $generatedBy == CartRule::GENERATED_BY_REFUND} + {l s='Generated against refund'} + (#{$generatedById}) + {else if $generatedBy == CartRule::GENERATED_BY_ORDER_SLIP} + {l s='Generated against credit slip'} + (#{$generatedById}) + {/if} +

+
+
+ +

{displayPrice price=$cartRule->reduction_amount currency=$cartRule->reduction_currency}

+
+
+ +

+ {$customer->firstname} {$customer->lastname} (#{$customer->id}) +

+
+
+ +

+ {$order->reference} (#{$order->id}) +

+
-
\ No newline at end of file +{/if} \ No newline at end of file diff --git a/admin/themes/default/template/controllers/slip/modal_confirm_update.tpl b/admin/themes/default/template/controllers/slip/modal_confirm_update.tpl index a8942c335..ac6e1d40d 100644 --- a/admin/themes/default/template/controllers/slip/modal_confirm_update.tpl +++ b/admin/themes/default/template/controllers/slip/modal_confirm_update.tpl @@ -19,7 +19,7 @@

 {l s='Confirm Update'}

-

{l s='Are you sure you want to change the status?'}

+

{l s='This action is irreversable, Are you sure you want to change the status?'}

diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index bf97d82c8..2622067b8 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -147,12 +147,14 @@ class AdminCartRulesControllerCore extends AdminController public function ajaxProcessInitRuleDeleteModal() { $response = array('success' => false); + $modalConfirmDelete = $this->createTemplate('modal_confirm_delete.tpl'); + $modalClass = 'modal-md'; if ($idCartRule = Tools::getValue('id_cart_rule')) { if ($generatedByDetails = CartRule::getGeneratedBy($idCartRule)) { if (Validate::isLoadedObject($objCartRule = new CartRule($idCartRule, $this->context->language->id))) { if ($generatedByDetails['generated_by'] == CartRule::GENERATED_BY_REFUND) { $obj = new OrderReturn($generatedByDetails['id_generated_by']); - } else if ($generatedByDetails['generated_by'] == CartRule::GENERATED_BY_ORDER_SLIP) { + } else { $obj = new OrderSlip($generatedByDetails['id_generated_by']); } $objOrder = new Order($obj->id_order); @@ -162,30 +164,32 @@ class AdminCartRulesControllerCore extends AdminController $modalConfirmDelete->assign(array( 'generatedBy' => $generatedByDetails['generated_by'], 'generatedById' => $generatedByDetails['id_generated_by'], - 'Customer' => $objCustomer, - 'Order' => $objOrder, - 'CartRule' => $objCartRule, + 'customer' => $objCustomer, + 'order' => $objOrder, + 'cartRule' => $objCartRule, 'link' => $this->context->link )); - $tpl = $this->createTemplate('modal.tpl'); - $tpl->assign(array( - 'modal_id' => 'moduleConfirmDelete', - 'modal_class' => 'modal-lg', - 'modal_content' => $modalConfirmDelete->fetch(), - 'modal_actions' => array( - array( - 'type' => 'button', - 'class' => 'process_delete btn-primary', - 'label' => $this->l('Delete'), - ), - ), - - )); - $response['confirm_delete'] = true; - $response['modalHtml'] = $tpl->fetch(); + $modalClass = 'modal-lg'; } } } + $tpl = $this->createTemplate('modal.tpl'); + $tpl->assign(array( + 'modal_id' => 'moduleConfirmDelete', + 'modal_class' => $modalClass, + 'modal_content' => $modalConfirmDelete->fetch(), + 'modal_actions' => array( + array( + 'type' => 'button', + 'class' => 'process_delete btn-primary', + 'label' => $this->l('Delete'), + ), + ), + + )); + $response['confirm_delete'] = true; + $response['modalHtml'] = $tpl->fetch(); + $response['confirm_delete'] = true; $response['success'] = true; die(Tools::jsonEncode($response)); @@ -194,37 +198,48 @@ class AdminCartRulesControllerCore extends AdminController public function ajaxProcessInitRuleBulkDeleteModal() { $response = array('success' => false); + $modalConfirmDelete = $this->createTemplate('modal_confirm_bulk_delete.tpl'); if ($idCartRules = Tools::getValue('id_cart_rule')) { $toConfirm = array(); foreach($idCartRules as $idCartRule) { - if ($generatedByDetails = CartRule::getGeneratedBy($idCartRule)) { - $toConfirm[] = array_merge(['id_cart_rule' => $idCartRule], $generatedByDetails); + if ($ruleDetails = CartRule::getGeneratedBy($idCartRule)) { + $ruleDetails['id_cart_rule'] = $idCartRule; + $objCartRule = new CartRule($idCartRule, $this->context->language->id); + $ruleDetails['cart_rule'] = $objCartRule; + if ($ruleDetails['generated_by'] == CartRule::GENERATED_BY_REFUND) { + $obj = new OrderReturn($ruleDetails['id_generated_by']); + } else { + $obj = new OrderSlip($ruleDetails['id_generated_by']); + } + $objOrder = new Order($obj->id_order); + $ruleDetails['order'] = $objOrder; + $toConfirm[] = $ruleDetails; } } if (count($toConfirm)) { - $modalConfirmDelete = $this->createTemplate('modal_confirm_bulk_delete.tpl'); $modalConfirmDelete->assign(array( 'cartRules' => $toConfirm, 'link' => $this->context->link )); - $tpl = $this->createTemplate('modal.tpl'); - $tpl->assign(array( - 'modal_id' => 'moduleConfirmDelete', - 'modal_class' => 'modal-md', - 'modal_content' => $modalConfirmDelete->fetch(), - 'modal_actions' => array( - array( - 'type' => 'button', - 'class' => 'process_delete btn-primary', - 'label' => $this->l('Delete'), - ), - ), - )); - $response['confirm_delete'] = true; - $response['modalHtml'] = $tpl->fetch(); } } + $tpl = $this->createTemplate('modal.tpl'); + $tpl->assign(array( + 'modal_id' => 'moduleConfirmDelete', + 'modal_class' => 'modal-md', + 'modal_content' => $modalConfirmDelete->fetch(), + 'modal_actions' => array( + array( + 'type' => 'button', + 'class' => 'process_delete btn-primary', + 'label' => $this->l('Delete'), + ), + ), + + )); + $response['confirm_delete'] = true; + $response['modalHtml'] = $tpl->fetch(); $response['success'] = true; die(Tools::jsonEncode($response));