diff --git a/admin/themes/default/template/controllers/normal_products/helpers/form/form.tpl b/admin/themes/default/template/controllers/normal_products/helpers/form/form.tpl index 2c869bd3c..d87184159 100644 --- a/admin/themes/default/template/controllers/normal_products/helpers/form/form.tpl +++ b/admin/themes/default/template/controllers/normal_products/helpers/form/form.tpl @@ -257,37 +257,6 @@ } return typeIsPack; } - $("#product_form").validate({ - ignore: '.updateCurrentText', - rules: { - inputPackItems: { - required: { - depends: checkIfProductTypeIsPack - }, - } - }, - messages: { - inputPackItems: { - required: "" - } - }, - // override jquery validate plugin defaults for bootstrap 3 - highlight: function(element) { - $(element).closest('.form-group').addClass('has-error'); - }, - unhighlight: function(element) { - $(element).closest('.form-group').removeClass('has-error'); - }, - errorElement: 'span', - errorClass: 'help-block', - errorPlacement: function(error, element) { - if(element.parent('.input-group').length) { - error.insertAfter(element.parent()); - } else { - error.insertAfter(element); - } - } - }); }); diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 3bd058ae9..f1eba0008 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -621,7 +621,7 @@ abstract class PaymentModuleCore extends Module $product_list_txt = ''; $product_list_html = ''; if (count($product_var_tpl_list) > 0) { - $product_list_txt = $this->getEmailTemplateContent('order_conf_product_list.txt', Mail::TYPE_TEXT, $product_var_tpl_list); + $product_list_txt = $this->getEmailTemplateContent('order_conf_product_list_text.tpl', Mail::TYPE_TEXT, $product_var_tpl_list); $product_list_html = $this->getEmailTemplateContent('order_conf_product_list.tpl', Mail::TYPE_HTML, $product_var_tpl_list); } @@ -698,7 +698,7 @@ abstract class PaymentModuleCore extends Module $cart_rules_list_txt = ''; $cart_rules_list_html = ''; if (count($cart_rules_list) > 0) { - $cart_rules_list_txt = $this->getEmailTemplateContent('order_conf_cart_rules.txt', Mail::TYPE_TEXT, $cart_rules_list); + $cart_rules_list_txt = $this->getEmailTemplateContent('order_conf_cart_rules_text.tpl', Mail::TYPE_TEXT, $cart_rules_list); $cart_rules_list_html = $this->getEmailTemplateContent('order_conf_cart_rules.tpl', Mail::TYPE_HTML, $cart_rules_list); } diff --git a/mails/en/order_conf_cart_rules.txt b/mails/en/order_conf_cart_rules.txt deleted file mode 100644 index 72a6970da..000000000 --- a/mails/en/order_conf_cart_rules.txt +++ /dev/null @@ -1,3 +0,0 @@ -{foreach $list as $cart_rule} - {$cart_rule['voucher_name']} {$cart_rule['voucher_reduction']} -{/foreach} \ No newline at end of file diff --git a/mails/en/order_conf_product_list.txt b/mails/en/order_conf_product_list.txt deleted file mode 100644 index 0ffd7db7a..000000000 --- a/mails/en/order_conf_product_list.txt +++ /dev/null @@ -1,21 +0,0 @@ -{foreach $list as $product} - {$product['reference']} - - {$product['name']} - - {$product['price']} - - {$product['quantity']} - - {$product['price']} - - {foreach $product['customization'] as $customization} - {$product['name']} {$customization['customization_text']} - - {$product['price']} - - {$product['customization_quantity']} - - {$product['quantity']} - {/foreach} -{/foreach} \ No newline at end of file