From fd1bd4b66e0e9a30f1fad39d972587439bbca593 Mon Sep 17 00:00:00 2001
From: Daniel Kerr <webmaster@opencart.com>
Date: Thu, 22 Feb 2018 01:16:19 +0800
Subject: [PATCH] language changes to fit the new language var in the url

---
 upload/catalog/controller/account/address.php |   2 -
 .../catalog/controller/account/affiliate.php  |   2 -
 upload/catalog/controller/account/edit.php    |   2 -
 .../catalog/controller/account/register.php   |   2 -
 .../catalog/controller/account/tracking.php   |   2 -
 .../catalog/controller/affiliate/register.php |   2 -
 .../catalog/controller/checkout/checkout.php  |   2 -
 upload/catalog/controller/checkout/guest.php  |   2 -
 .../controller/checkout/guest_shipping.php    |   2 -
 .../catalog/controller/checkout/register.php  |   2 -
 .../extension/credit_card/sagepay_server.php  |   2 -
 .../extension/module/pp_braintree_button.php  |   2 -
 .../extension/payment/amazon_login_pay.php    |   6 +-
 .../extension/payment/authorizenet_aim.php    |   2 -
 .../extension/payment/bluepay_redirect.php    |   2 -
 .../extension/payment/cardconnect.php         |   2 -
 .../extension/payment/cardinity.php           |   2 -
 .../controller/extension/payment/cheque.php   |   2 -
 .../controller/extension/payment/cod.php      |   2 -
 .../controller/extension/payment/divido.php   |   2 -
 .../extension/payment/firstdata_remote.php    |   2 -
 .../extension/payment/free_checkout.php       |   2 -
 .../extension/payment/globalpay_remote.php    |   2 -
 .../extension/payment/klarna_checkout.php     |   4 -
 .../extension/payment/klarna_invoice.php      |   2 -
 .../extension/payment/perpetual_payments.php  |   2 -
 .../extension/payment/pp_braintree.php        |   2 -
 .../extension/payment/pp_express.php          |   2 -
 .../extension/payment/pp_payflow.php          |   2 -
 .../controller/extension/payment/pp_pro.php   |   2 -
 .../extension/payment/realex_remote.php       |   2 -
 .../extension/payment/sagepay_direct.php      |   2 -
 .../extension/payment/sagepay_server.php      |   2 -
 .../extension/payment/sagepay_us.php          |   2 -
 .../extension/payment/securetrading_ws.php    |   2 -
 .../payment/web_payment_software.php          |   2 -
 .../extension/payment/wechat_pay.php          |   2 -
 .../controller/extension/payment/worldpay.php |   2 -
 .../extension/recurring/pp_express.php        |   2 -
 .../controller/extension/total/coupon.php     |   2 -
 .../controller/extension/total/reward.php     |   2 -
 .../controller/extension/total/shipping.php   |   2 -
 .../controller/extension/total/voucher.php    |   2 -
 .../controller/information/tracking.php       |   2 -
 upload/catalog/controller/product/product.php |   2 -
 upload/catalog/view/javascript/common.js      |   4 +-
 .../default/template/account/tracking.twig    |  12 +-
 .../credit_card/sagepay_server_list.twig      |   5 +-
 .../extension/payment/authorizenet_aim.twig   |  12 +-
 .../extension/payment/bank_transfer.twig      |   4 +-
 .../extension/payment/bluepay_redirect.twig   | 237 +++++++++---------
 .../template/extension/payment/cardinity.twig |  20 +-
 .../template/extension/payment/cod.twig       |   4 +-
 53 files changed, 149 insertions(+), 245 deletions(-)

diff --git a/upload/catalog/controller/account/address.php b/upload/catalog/controller/account/address.php
index fb2654466e2..4f226ca6d30 100644
--- a/upload/catalog/controller/account/address.php
+++ b/upload/catalog/controller/account/address.php
@@ -417,8 +417,6 @@ protected function getForm() {
 
 		$data['back'] = $this->url->link('account/address', 'language=' . $this->config->get('config_language'));
 
-		$data['language'] = $this->config->get('config_language');
-
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
 		$data['content_top'] = $this->load->controller('common/content_top');
diff --git a/upload/catalog/controller/account/affiliate.php b/upload/catalog/controller/account/affiliate.php
index c4c6cdb7572..ec71600fcb8 100644
--- a/upload/catalog/controller/account/affiliate.php
+++ b/upload/catalog/controller/account/affiliate.php
@@ -242,8 +242,6 @@ public function getForm() {
 		
 		$data['back'] = $this->url->link('account/account', 'language=' . $this->config->get('config_language'));
 
-		$data['language'] = $this->config->get('config_language');
-
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
 		$data['content_top'] = $this->load->controller('common/content_top');
diff --git a/upload/catalog/controller/account/edit.php b/upload/catalog/controller/account/edit.php
index 35d514110eb..56be491115e 100644
--- a/upload/catalog/controller/account/edit.php
+++ b/upload/catalog/controller/account/edit.php
@@ -142,8 +142,6 @@ public function index() {
 
 		$data['back'] = $this->url->link('account/account', 'language=' . $this->config->get('config_language'));
 
-		$data['language'] = $this->config->get('config_language');
-
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
 		$data['content_top'] = $this->load->controller('common/content_top');
diff --git a/upload/catalog/controller/account/register.php b/upload/catalog/controller/account/register.php
index 1e60c4513c3..a8cd37f685e 100644
--- a/upload/catalog/controller/account/register.php
+++ b/upload/catalog/controller/account/register.php
@@ -211,8 +211,6 @@ public function index() {
 			$data['agree'] = false;
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
 		$data['content_top'] = $this->load->controller('common/content_top');
diff --git a/upload/catalog/controller/account/tracking.php b/upload/catalog/controller/account/tracking.php
index a9d52225bcc..59c2f570d6b 100644
--- a/upload/catalog/controller/account/tracking.php
+++ b/upload/catalog/controller/account/tracking.php
@@ -39,8 +39,6 @@ public function index() {
 	
 			$data['continue'] = $this->url->link('account/account', 'language=' . $this->config->get('config_language'));
 
-			$data['language'] = $this->config->get('config_language');
-
 			$data['column_left'] = $this->load->controller('common/column_left');
 			$data['column_right'] = $this->load->controller('common/column_right');
 			$data['content_top'] = $this->load->controller('common/content_top');
diff --git a/upload/catalog/controller/affiliate/register.php b/upload/catalog/controller/affiliate/register.php
index 920c28bab0b..b6874672c16 100644
--- a/upload/catalog/controller/affiliate/register.php
+++ b/upload/catalog/controller/affiliate/register.php
@@ -303,8 +303,6 @@ public function index() {
 			$data['agree'] = false;
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
 		$data['content_top'] = $this->load->controller('common/content_top');
diff --git a/upload/catalog/controller/checkout/checkout.php b/upload/catalog/controller/checkout/checkout.php
index f892f1113c3..38c7e6bbea7 100644
--- a/upload/catalog/controller/checkout/checkout.php
+++ b/upload/catalog/controller/checkout/checkout.php
@@ -85,8 +85,6 @@ public function index() {
 
 		$data['shipping_required'] = $this->cart->hasShipping();
 
-		$data['language'] = $this->config->get('config_language');
-
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
 		$data['content_top'] = $this->load->controller('common/content_top');
diff --git a/upload/catalog/controller/checkout/guest.php b/upload/catalog/controller/checkout/guest.php
index 98af359b9df..d23211a5b28 100644
--- a/upload/catalog/controller/checkout/guest.php
+++ b/upload/catalog/controller/checkout/guest.php
@@ -137,8 +137,6 @@ public function index() {
 			$data['captcha'] = '';
 		}
 
-		$data['language'] = $this->config->get('config_language');
-		
 		$this->response->setOutput($this->load->view('checkout/guest', $data));
 	}
 
diff --git a/upload/catalog/controller/checkout/guest_shipping.php b/upload/catalog/controller/checkout/guest_shipping.php
index b2578a867fd..976f0acbe59 100644
--- a/upload/catalog/controller/checkout/guest_shipping.php
+++ b/upload/catalog/controller/checkout/guest_shipping.php
@@ -78,8 +78,6 @@ public function index() {
 			$data['address_custom_field'] = array();
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		$this->response->setOutput($this->load->view('checkout/guest_shipping', $data));
 	}
 
diff --git a/upload/catalog/controller/checkout/register.php b/upload/catalog/controller/checkout/register.php
index d6a200fdc1e..19d84df86f3 100644
--- a/upload/catalog/controller/checkout/register.php
+++ b/upload/catalog/controller/checkout/register.php
@@ -71,8 +71,6 @@ public function index() {
 
 		$data['shipping_required'] = $this->cart->hasShipping();
 
-		$data['language'] = $this->config->get('config_language');
-
 		$this->response->setOutput($this->load->view('checkout/register', $data));
 	}
 
diff --git a/upload/catalog/controller/extension/credit_card/sagepay_server.php b/upload/catalog/controller/extension/credit_card/sagepay_server.php
index 41190be310d..294881a1ef2 100644
--- a/upload/catalog/controller/extension/credit_card/sagepay_server.php
+++ b/upload/catalog/controller/extension/credit_card/sagepay_server.php
@@ -70,8 +70,6 @@ public function index() {
 		$data['add'] = $this->url->link('extension/credit_card/sagepay_server/add', 'language=' . $this->config->get('config_language'));
 		$data['back'] = $this->url->link('account/account', 'language=' . $this->config->get('config_language'));
 
-		$data['language'] = $this->config->get('config_language');
-
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
 		$data['content_top'] = $this->load->controller('common/content_top');
diff --git a/upload/catalog/controller/extension/module/pp_braintree_button.php b/upload/catalog/controller/extension/module/pp_braintree_button.php
index 87891d6c419..98059081263 100644
--- a/upload/catalog/controller/extension/module/pp_braintree_button.php
+++ b/upload/catalog/controller/extension/module/pp_braintree_button.php
@@ -34,8 +34,6 @@ public function index() {
 				$data['auth_total'] = $this->cart->getTotal() * 1.5;
 				$data['currency_code'] = $this->session->data['currency'];
 
-				$data['language'] = $this->config->get('config_language');
-
 				return $this->load->view('extension/module/pp_braintree_button', $data);
 			}
 		}
diff --git a/upload/catalog/controller/extension/payment/amazon_login_pay.php b/upload/catalog/controller/extension/payment/amazon_login_pay.php
index 7a45cd8d78c..b86c072cd50 100644
--- a/upload/catalog/controller/extension/payment/amazon_login_pay.php
+++ b/upload/catalog/controller/extension/payment/amazon_login_pay.php
@@ -37,8 +37,6 @@ public function address() {
 
 		$this->document->addScript($amazon_payment_js);
 
-		$data['language'] = $this->config->get('config_language');
-
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
 		$data['content_top'] = $this->load->controller('common/content_top');
@@ -137,12 +135,15 @@ public function confirm() {
 		}
 
 		$data['heading_confirm'] = $this->language->get('heading_confirm');
+
 		$data['column_name'] = $this->language->get('column_name');
 		$data['column_model'] = $this->language->get('column_model');
 		$data['column_quantity'] = $this->language->get('column_quantity');
 		$data['column_price'] = $this->language->get('column_price');
 		$data['column_total'] = $this->language->get('column_total');
+
 		$data['text_confirm'] = $this->language->get('text_confirm');
+		$data['text_back'] = $this->language->get('text_back');
 
 		$products = $this->cart->getProducts();
 
@@ -492,7 +493,6 @@ public function confirm() {
 		}
 
 		$data['back'] = $this->url->link('extension/payment/amazon_login_pay/paymentMethod', 'language=' . $this->config->get('config_language'));
-		$data['text_back'] = $this->language->get('text_back');
 
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
diff --git a/upload/catalog/controller/extension/payment/authorizenet_aim.php b/upload/catalog/controller/extension/payment/authorizenet_aim.php
index 18a7b75fab2..52dc68ab4d5 100644
--- a/upload/catalog/controller/extension/payment/authorizenet_aim.php
+++ b/upload/catalog/controller/extension/payment/authorizenet_aim.php
@@ -23,8 +23,6 @@ public function index() {
 			);
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/authorizenet_aim', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/bluepay_redirect.php b/upload/catalog/controller/extension/payment/bluepay_redirect.php
index 94b9770db11..4eeb3b50b0e 100644
--- a/upload/catalog/controller/extension/payment/bluepay_redirect.php
+++ b/upload/catalog/controller/extension/payment/bluepay_redirect.php
@@ -38,8 +38,6 @@ public function index() {
 			$data['existing_cards'] = $cards;
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/bluepay_redirect', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/cardconnect.php b/upload/catalog/controller/extension/payment/cardconnect.php
index 506617d46d0..393ddf9fce2 100644
--- a/upload/catalog/controller/extension/payment/cardconnect.php
+++ b/upload/catalog/controller/extension/payment/cardconnect.php
@@ -25,8 +25,6 @@ public function index() {
 
 		$data['action'] = $this->url->link('extension/payment/cardconnect/send', 'language=' . $this->config->get('config_language'));
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/cardconnect', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/cardinity.php b/upload/catalog/controller/extension/payment/cardinity.php
index b6e2ea7034b..aadabba72de 100644
--- a/upload/catalog/controller/extension/payment/cardinity.php
+++ b/upload/catalog/controller/extension/payment/cardinity.php
@@ -23,8 +23,6 @@ public function index() {
 			);
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/cardinity', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/cheque.php b/upload/catalog/controller/extension/payment/cheque.php
index 1216a19917b..e6d2feb8bdd 100644
--- a/upload/catalog/controller/extension/payment/cheque.php
+++ b/upload/catalog/controller/extension/payment/cheque.php
@@ -6,8 +6,6 @@ public function index() {
 		$data['payable'] = $this->config->get('payment_cheque_payable');
 		$data['address'] = nl2br($this->config->get('config_address'));
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/cheque', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/cod.php b/upload/catalog/controller/extension/payment/cod.php
index 4bb184bba75..9a2c04c95b9 100644
--- a/upload/catalog/controller/extension/payment/cod.php
+++ b/upload/catalog/controller/extension/payment/cod.php
@@ -1,8 +1,6 @@
 <?php
 class ControllerExtensionPaymentCod extends Controller {
 	public function index() {
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/cod', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/divido.php b/upload/catalog/controller/extension/payment/divido.php
index 261fe1d5693..969a2b325e3 100644
--- a/upload/catalog/controller/extension/payment/divido.php
+++ b/upload/catalog/controller/extension/payment/divido.php
@@ -75,8 +75,6 @@ public function index() {
 			'generic_credit_req_error' => 'Credit request could not be initiated',
 		);
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/divido', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/firstdata_remote.php b/upload/catalog/controller/extension/payment/firstdata_remote.php
index ff707089bec..56ec286fac2 100644
--- a/upload/catalog/controller/extension/payment/firstdata_remote.php
+++ b/upload/catalog/controller/extension/payment/firstdata_remote.php
@@ -34,8 +34,6 @@ public function index() {
 			);
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/firstdata_remote', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/free_checkout.php b/upload/catalog/controller/extension/payment/free_checkout.php
index 852861bbf57..60d63355a3f 100644
--- a/upload/catalog/controller/extension/payment/free_checkout.php
+++ b/upload/catalog/controller/extension/payment/free_checkout.php
@@ -3,8 +3,6 @@ class ControllerExtensionPaymentFreeCheckout extends Controller {
 	public function index() {
 		$data['continue'] = $this->url->link('checkout/success', 'language=' . $this->config->get('config_language'));
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/free_checkout', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/globalpay_remote.php b/upload/catalog/controller/extension/payment/globalpay_remote.php
index aea935bc345..9239e2fa6ee 100644
--- a/upload/catalog/controller/extension/payment/globalpay_remote.php
+++ b/upload/catalog/controller/extension/payment/globalpay_remote.php
@@ -45,8 +45,6 @@ public function index() {
 			);
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/globalpay_remote', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/klarna_checkout.php b/upload/catalog/controller/extension/payment/klarna_checkout.php
index d2ea8d3ded7..95692135f0b 100644
--- a/upload/catalog/controller/extension/payment/klarna_checkout.php
+++ b/upload/catalog/controller/extension/payment/klarna_checkout.php
@@ -8,8 +8,6 @@ public function index() {
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
-		$data['language'] = $this->config->get('config_language');
-
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
 		$data['content_top'] = $this->load->controller('common/content_top');
@@ -411,8 +409,6 @@ public function sidebar() {
 			);
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		$this->response->setOutput($this->load->view('extension/payment/klarna_checkout_sidebar', $data));
 	}
 
diff --git a/upload/catalog/controller/extension/payment/klarna_invoice.php b/upload/catalog/controller/extension/payment/klarna_invoice.php
index 9c6411a0f07..c910a79b3e6 100644
--- a/upload/catalog/controller/extension/payment/klarna_invoice.php
+++ b/upload/catalog/controller/extension/payment/klarna_invoice.php
@@ -129,8 +129,6 @@ public function index() {
 				$data['klarna_fee'] = '';
 			}
 
-			$data['language'] = $this->config->get('config_language');
-
 			return $this->load->view('extension/payment/klarna_invoice', $data);
 		}
 	}
diff --git a/upload/catalog/controller/extension/payment/perpetual_payments.php b/upload/catalog/controller/extension/payment/perpetual_payments.php
index 08de143b94c..3022aea023a 100644
--- a/upload/catalog/controller/extension/payment/perpetual_payments.php
+++ b/upload/catalog/controller/extension/payment/perpetual_payments.php
@@ -32,8 +32,6 @@ public function index() {
 			);
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/perpetual_payments', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/pp_braintree.php b/upload/catalog/controller/extension/payment/pp_braintree.php
index 0dac83c96ba..1502859857c 100644
--- a/upload/catalog/controller/extension/payment/pp_braintree.php
+++ b/upload/catalog/controller/extension/payment/pp_braintree.php
@@ -137,8 +137,6 @@ public function index() {
 			$data['guest'] = true;
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/pp_braintree', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/pp_express.php b/upload/catalog/controller/extension/payment/pp_express.php
index 3d565999104..4cf99496bed 100644
--- a/upload/catalog/controller/extension/payment/pp_express.php
+++ b/upload/catalog/controller/extension/payment/pp_express.php
@@ -17,8 +17,6 @@ public function index() {
 
 		unset($this->session->data['paypal']);
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/pp_express', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/pp_payflow.php b/upload/catalog/controller/extension/payment/pp_payflow.php
index f3bd13efb8e..24ed513b8d0 100644
--- a/upload/catalog/controller/extension/payment/pp_payflow.php
+++ b/upload/catalog/controller/extension/payment/pp_payflow.php
@@ -73,8 +73,6 @@ public function index() {
 			);
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/pp_payflow', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/pp_pro.php b/upload/catalog/controller/extension/payment/pp_pro.php
index 656ce596b9b..a60ef7b33a1 100644
--- a/upload/catalog/controller/extension/payment/pp_pro.php
+++ b/upload/catalog/controller/extension/payment/pp_pro.php
@@ -64,8 +64,6 @@ public function index() {
 			);
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/pp_pro', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/realex_remote.php b/upload/catalog/controller/extension/payment/realex_remote.php
index 2a9d0767217..e4d5a487a16 100644
--- a/upload/catalog/controller/extension/payment/realex_remote.php
+++ b/upload/catalog/controller/extension/payment/realex_remote.php
@@ -58,8 +58,6 @@ public function index() {
 			);
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/realex_remote', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/sagepay_direct.php b/upload/catalog/controller/extension/payment/sagepay_direct.php
index 8b2fd7babd4..8e720e4ebdf 100644
--- a/upload/catalog/controller/extension/payment/sagepay_direct.php
+++ b/upload/catalog/controller/extension/payment/sagepay_direct.php
@@ -100,8 +100,6 @@ public function index() {
 			$data['existing_cards'] = $this->model_extension_payment_sagepay_direct->getCards($this->customer->getId());
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/sagepay_direct', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/sagepay_server.php b/upload/catalog/controller/extension/payment/sagepay_server.php
index da779e0e6d4..ae1f6c15c87 100644
--- a/upload/catalog/controller/extension/payment/sagepay_server.php
+++ b/upload/catalog/controller/extension/payment/sagepay_server.php
@@ -35,8 +35,6 @@ public function index() {
 			$data['cards'] = $this->model_extension_payment_sagepay_server->getCards($this->customer->getId());
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/sagepay_server', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/sagepay_us.php b/upload/catalog/controller/extension/payment/sagepay_us.php
index 074ea164462..3f09182beed 100644
--- a/upload/catalog/controller/extension/payment/sagepay_us.php
+++ b/upload/catalog/controller/extension/payment/sagepay_us.php
@@ -33,8 +33,6 @@ public function index() {
 			);
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/sagepay_us', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/securetrading_ws.php b/upload/catalog/controller/extension/payment/securetrading_ws.php
index 34f03cea3e2..24fdd3f76ff 100644
--- a/upload/catalog/controller/extension/payment/securetrading_ws.php
+++ b/upload/catalog/controller/extension/payment/securetrading_ws.php
@@ -54,8 +54,6 @@ public function index() {
 				$data['cards'][$card_type] = $cards[$card_type];
 			}
 
-			$data['language'] = $this->config->get('config_language');
-
 			return $this->load->view('extension/payment/securetrading_ws', $data);
 		}
 	}
diff --git a/upload/catalog/controller/extension/payment/web_payment_software.php b/upload/catalog/controller/extension/payment/web_payment_software.php
index 707f5696629..227aa60eeae 100644
--- a/upload/catalog/controller/extension/payment/web_payment_software.php
+++ b/upload/catalog/controller/extension/payment/web_payment_software.php
@@ -23,8 +23,6 @@ public function index() {
 			);
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/web_payment_software', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/payment/wechat_pay.php b/upload/catalog/controller/extension/payment/wechat_pay.php
index 77f897f5a2c..c49b04b43bc 100644
--- a/upload/catalog/controller/extension/payment/wechat_pay.php
+++ b/upload/catalog/controller/extension/payment/wechat_pay.php
@@ -73,8 +73,6 @@ public function qrcode() {
 
 		$data['action_success'] = $this->url->link('checkout/success', 'language=' . $this->config->get('config_language'));
 
-		$data['language'] = $this->config->get('config_language');
-
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
 		$data['content_top'] = $this->load->controller('common/content_top');
diff --git a/upload/catalog/controller/extension/payment/worldpay.php b/upload/catalog/controller/extension/payment/worldpay.php
index 441664699ed..d169a2c02dd 100644
--- a/upload/catalog/controller/extension/payment/worldpay.php
+++ b/upload/catalog/controller/extension/payment/worldpay.php
@@ -27,8 +27,6 @@ public function index() {
 			$data['recurring_products'] = true;
 		}
 
-		$data['language'] = $this->config->get('config_language');
-
 		return $this->load->view('extension/payment/worldpay', $data);
 	}
 
diff --git a/upload/catalog/controller/extension/recurring/pp_express.php b/upload/catalog/controller/extension/recurring/pp_express.php
index 5ee041b2a19..8cccd780cf3 100644
--- a/upload/catalog/controller/extension/recurring/pp_express.php
+++ b/upload/catalog/controller/extension/recurring/pp_express.php
@@ -23,8 +23,6 @@ public function index() {
 				$data['order_recurring_id'] = '';
 			}
 
-			$data['language'] = $this->config->get('config_language');
-
 			return $this->load->view('extension/recurring/pp_express', $data);
 		}
 	}
diff --git a/upload/catalog/controller/extension/total/coupon.php b/upload/catalog/controller/extension/total/coupon.php
index 1da57faf3c8..b35574425b7 100644
--- a/upload/catalog/controller/extension/total/coupon.php
+++ b/upload/catalog/controller/extension/total/coupon.php
@@ -10,8 +10,6 @@ public function index() {
 				$data['coupon'] = '';
 			}
 
-			$data['language'] = $this->config->get('config_language');
-
 			return $this->load->view('extension/total/coupon', $data);
 		}
 	}
diff --git a/upload/catalog/controller/extension/total/reward.php b/upload/catalog/controller/extension/total/reward.php
index 2242bbf89da..8ebd5683b66 100644
--- a/upload/catalog/controller/extension/total/reward.php
+++ b/upload/catalog/controller/extension/total/reward.php
@@ -24,8 +24,6 @@ public function index() {
 				$data['reward'] = '';
 			}
 
-			$data['language'] = $this->config->get('config_language');
-
 			return $this->load->view('extension/total/reward', $data);
 		}
 	}
diff --git a/upload/catalog/controller/extension/total/shipping.php b/upload/catalog/controller/extension/total/shipping.php
index 4bf60fc2209..9c5286e3bd2 100644
--- a/upload/catalog/controller/extension/total/shipping.php
+++ b/upload/catalog/controller/extension/total/shipping.php
@@ -32,8 +32,6 @@ public function index() {
 				$data['shipping_method'] = '';
 			}
 
-			$data['language'] = $this->config->get('config_language');
-
 			return $this->load->view('extension/total/shipping', $data);
 		}
 	}
diff --git a/upload/catalog/controller/extension/total/voucher.php b/upload/catalog/controller/extension/total/voucher.php
index 48066eea238..5830d169f48 100644
--- a/upload/catalog/controller/extension/total/voucher.php
+++ b/upload/catalog/controller/extension/total/voucher.php
@@ -10,8 +10,6 @@ public function index() {
 				$data['voucher'] = '';
 			}
 
-			$data['language'] = $this->config->get('config_language');
-
 			return $this->load->view('extension/total/voucher', $data);
 		}
 	}
diff --git a/upload/catalog/controller/information/tracking.php b/upload/catalog/controller/information/tracking.php
index e5d5547fda7..6ac6898eccb 100644
--- a/upload/catalog/controller/information/tracking.php
+++ b/upload/catalog/controller/information/tracking.php
@@ -10,8 +10,6 @@ public function index() {
 			'href' => $this->url->link('common/home', 'language=' . $this->config->get('config_language'))
 		);
 
-		$data['language'] = $this->config->get('config_language');
-
 		$data['column_left'] = $this->load->controller('common/column_left');
 		$data['column_right'] = $this->load->controller('common/column_right');
 		$data['content_top'] = $this->load->controller('common/content_top');
diff --git a/upload/catalog/controller/product/product.php b/upload/catalog/controller/product/product.php
index 20cfd313b25..7a3b5756388 100644
--- a/upload/catalog/controller/product/product.php
+++ b/upload/catalog/controller/product/product.php
@@ -443,8 +443,6 @@ public function index() {
 
 			$this->model_catalog_product->updateViewed($this->request->get['product_id']);
 
-			$data['language'] = $this->config->get('config_language');
-
 			$data['column_left'] = $this->load->controller('common/column_left');
 			$data['column_right'] = $this->load->controller('common/column_right');
 			$data['content_top'] = $this->load->controller('common/content_top');
diff --git a/upload/catalog/view/javascript/common.js b/upload/catalog/view/javascript/common.js
index e698ba7cdd3..f59d9a21f0a 100644
--- a/upload/catalog/view/javascript/common.js
+++ b/upload/catalog/view/javascript/common.js
@@ -254,9 +254,9 @@ var voucher = {
 			},
 			success: function(json) {
 				if (getURLVar('route') == 'checkout/cart' || getURLVar('route') == 'checkout/checkout') {
-					location = 'index.php?route=checkout/cart';
+					location = 'index.php?route=checkout/cart&language=' + getCookie('language');
 				} else {
-					$('#cart').parent().load('index.php?route=common/cart/info');
+					$('#cart').parent().load('index.php?route=common/cart/info&language=' + getCookie('language'));
 				}
 			},
 			error: function(xhr, ajaxOptions, thrownError) {
diff --git a/upload/catalog/view/theme/default/template/account/tracking.twig b/upload/catalog/view/theme/default/template/account/tracking.twig
index 6f86abbdcf3..e232928021b 100644
--- a/upload/catalog/view/theme/default/template/account/tracking.twig
+++ b/upload/catalog/view/theme/default/template/account/tracking.twig
@@ -2,16 +2,16 @@
 <div id="account-tracking" class="container">
   <ul class="breadcrumb">
     {% for breadcrumb in breadcrumbs %}
-    <li><a href="{{ breadcrumb.href }}">{{ breadcrumb.text }}</a></li>
+      <li><a href="{{ breadcrumb.href }}">{{ breadcrumb.text }}</a></li>
     {% endfor %}
   </ul>
   <div class="row">{{ column_left }}
     {% if column_left and column_right %}
-    {% set class = 'col-sm-6' %}
+      {% set class = 'col-sm-6' %}
     {% elseif column_left or column_right %}
-    {% set class = 'col-sm-9' %}
+      {% set class = 'col-sm-9' %}
     {% else %}
-    {% set class = 'col-sm-12' %}
+      {% set class = 'col-sm-12' %}
     {% endif %}
     <div id="content" class="{{ class }}">{{ content_top }}
       <h1>{{ heading_title }}</h1>
@@ -26,7 +26,7 @@
         <div class="form-group">
           <label class="col-sm-2 control-label" for="input-generator"><span data-toggle="tooltip" title="{{ help_generator }}">{{ entry_generator }}</span></label>
           <div class="col-sm-10">
-            <input type="text" name="product" value="" placeholder="{{ entry_generator }}" id="input-generator" class="form-control" />
+            <input type="text" name="product" value="" placeholder="{{ entry_generator }}" id="input-generator" class="form-control"/>
           </div>
         </div>
         <div class="form-group">
@@ -46,7 +46,7 @@
 $('input[name=\'product\']').autocomplete({
 	'source': function(request, response) {
 		$.ajax({
-			url: 'index.php?route=account/tracking/autocomplete&language=' + getCookie('language') + '&filter_name=' +  encodeURIComponent(request) + '&tracking=' + encodeURIComponent($('#input-code').val()),
+			url: 'index.php?route=account/tracking/autocomplete&language=' + getCookie('language') + '&filter_name=' + encodeURIComponent(request) + '&tracking=' + encodeURIComponent($('#input-code').val()),
 			dataType: 'json',
 			success: function(json) {
 				response($.map(json, function(item) {
diff --git a/upload/catalog/view/theme/default/template/extension/credit_card/sagepay_server_list.twig b/upload/catalog/view/theme/default/template/extension/credit_card/sagepay_server_list.twig
index 86a2a4d8e26..50956a08ab7 100644
--- a/upload/catalog/view/theme/default/template/extension/credit_card/sagepay_server_list.twig
+++ b/upload/catalog/view/theme/default/template/extension/credit_card/sagepay_server_list.twig
@@ -11,7 +11,8 @@
   {% if error_warning %}
     <div class="alert alert-danger alert-dismissible"><i class="fa fa-exclamation-circle"></i> {{ error_warning }}</div>
   {% endif %}
-  <div class="row">{{ column_left }}    {% if column_left and column_right %}
+  <div class="row">{{ column_left }}
+    {% if column_left and column_right %}
       {% set class = 'col-sm-6' %}
     {% elseif column_left or column_right %}
       {% set class = 'col-sm-9' %}
@@ -76,7 +77,7 @@ $('#button-add-card').on('click', function() {
 		success: function(json) {
 			// if success
 			if (json['redirect']) {
-				html  = '<form action="' + json['redirect'] + '" method="post" id="redirect">';
+				html = '<form action="' + json['redirect'] + '" method="post" id="redirect">';
 				html += '  <input type="hidden" name="Status" value="' + json['Status'] + '" />';
 				html += '  <input type="hidden" name="StatusDetail" value="' + json['StatusDetail'] + '" />';
 				html += '</form>';
diff --git a/upload/catalog/view/theme/default/template/extension/payment/authorizenet_aim.twig b/upload/catalog/view/theme/default/template/extension/payment/authorizenet_aim.twig
index ee91e6da557..8e7894c5dae 100644
--- a/upload/catalog/view/theme/default/template/extension/payment/authorizenet_aim.twig
+++ b/upload/catalog/view/theme/default/template/extension/payment/authorizenet_aim.twig
@@ -4,13 +4,13 @@
     <div class="form-group required">
       <label class="col-sm-2 control-label" for="input-cc-owner">{{ entry_cc_owner }}</label>
       <div class="col-sm-10">
-        <input type="text" name="cc_owner" value="" placeholder="{{ entry_cc_owner }}" id="input-cc-owner" class="form-control" />
+        <input type="text" name="cc_owner" value="" placeholder="{{ entry_cc_owner }}" id="input-cc-owner" class="form-control"/>
       </div>
     </div>
     <div class="form-group required">
       <label class="col-sm-2 control-label" for="input-cc-number">{{ entry_cc_number }}</label>
       <div class="col-sm-10">
-        <input type="text" name="cc_number" value="" placeholder="{{ entry_cc_number }}" id="input-cc-number" class="form-control" />
+        <input type="text" name="cc_number" value="" placeholder="{{ entry_cc_number }}" id="input-cc-number" class="form-control"/>
       </div>
     </div>
     <div class="form-group required">
@@ -18,14 +18,14 @@
       <div class="col-sm-3">
         <select name="cc_expire_date_month" id="input-cc-expire-date" class="form-control">
           {% for month in months %}
-          <option value="{{ month.value }}">{{ month.text }}</option>
+            <option value="{{ month.value }}">{{ month.text }}</option>
           {% endfor %}
         </select>
       </div>
       <div class="col-sm-3">
         <select name="cc_expire_date_year" class="form-control">
           {% for year in year_expire %}
-          <option value="{{ year.value }}">{{ year.text }}</option>
+            <option value="{{ year.value }}">{{ year.text }}</option>
           {% endfor %}
         </select>
       </div>
@@ -33,14 +33,14 @@
     <div class="form-group required">
       <label class="col-sm-2 control-label" for="input-cc-cvv2">{{ entry_cc_cvv2 }}</label>
       <div class="col-sm-10">
-        <input type="text" name="cc_cvv2" value="" placeholder="{{ entry_cc_cvv2 }}" id="input-cc-cvv2" class="form-control" />
+        <input type="text" name="cc_cvv2" value="" placeholder="{{ entry_cc_cvv2 }}" id="input-cc-cvv2" class="form-control"/>
       </div>
     </div>
   </fieldset>
 </form>
 <div class="buttons">
   <div class="pull-right">
-    <input type="button" value="{{ button_confirm }}" id="button-confirm" class="btn btn-primary" />
+    <input type="button" value="{{ button_confirm }}" id="button-confirm" class="btn btn-primary"/>
   </div>
 </div>
 <script type="text/javascript"><!--
diff --git a/upload/catalog/view/theme/default/template/extension/payment/bank_transfer.twig b/upload/catalog/view/theme/default/template/extension/payment/bank_transfer.twig
index 58e294be9b6..7d110cf690c 100644
--- a/upload/catalog/view/theme/default/template/extension/payment/bank_transfer.twig
+++ b/upload/catalog/view/theme/default/template/extension/payment/bank_transfer.twig
@@ -6,7 +6,7 @@
 </div>
 <div class="buttons">
   <div class="pull-right">
-    <input type="button" value="{{ button_confirm }}" id="button-confirm" data-loading-text="{{ text_loading }}" class="btn btn-primary" />
+    <input type="button" value="{{ button_confirm }}" id="button-confirm" data-loading-text="{{ text_loading }}" class="btn btn-primary"/>
   </div>
 </div>
 <script type="text/javascript"><!--
@@ -22,7 +22,7 @@ $('#button-confirm').on('click', function() {
 		},
 		success: function(json) {
 			if (json['redirect']) {
-				location = json['redirect'];	
+				location = json['redirect'];
 			}
 		},
 		error: function(xhr, ajaxOptions, thrownError) {
diff --git a/upload/catalog/view/theme/default/template/extension/payment/bluepay_redirect.twig b/upload/catalog/view/theme/default/template/extension/payment/bluepay_redirect.twig
index ff19ee09a56..0e0e774104f 100644
--- a/upload/catalog/view/theme/default/template/extension/payment/bluepay_redirect.twig
+++ b/upload/catalog/view/theme/default/template/extension/payment/bluepay_redirect.twig
@@ -1,139 +1,134 @@
 <form class="form-horizontal" action="https://secure.bluepay.com/interfaces/bp10emu" method=POST>
-    <fieldset id="payment">
-        <legend>{{ text_credit_card }}</legend>
-		{% if not existing_cards %}
-			<div class="form-group">
-				<label class="col-sm-2 control-label">{{ entry_card }}</label>
-				<div class="col-sm-10">
-					<label class="radio-inline">
-						<input type="radio" name="new-existing" value="existing" checked="checked"/>
-						{{ entry_card_existing }}
-					</label>
-					<label class="radio-inline">
-						<input type="radio" name="new-existing" value="new" />
-						{{ entry_card_new }}
-					</label>
-				</div>
-			</div>
-			<div id="card-existing">
-				<div class="form-group required">
-					<label class="col-sm-2 control-label" for="Token">{{ entry_cc_choice }}</label>
-					<div class="col-sm-10">
-						<select name="RRNO" class="form-control">
-							{% for existing_card in existing_cards %}
-								<option value="{{ existing_card.token }}">{{ text_card_type }} {{ existing_card.type, {{ text_card_digits }} {{ existing_card.digits }}, {{ text_card_expiry }} {{ existing_card.expiry }}</option>
-							{% endfor %}
-						</select>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="col-sm-2 control-label" for="input-cc-cvv2">{{ entry_cc_cvv2 }}</label>
-					<div class="col-sm-10">
-						<input type="text" name="CVCCVV2" value="" placeholder="{{ entry_cc_cvv2 }}" id="input-cc-cvv2" class="form-control" />
-					</div>
-				</div>
-			</div>
-			<div  style="display: none" id="card-new">
-			{% else %}
-				<div id="card-new">
-				{% endif %}
-                <div class="form-group required">
-                    <label class="col-sm-2 control-label" for="input-cc-number">{{ entry_cc_number }}</label>
-                    <div class="col-sm-10">
-                        <input type="text" name="CC_NUM" value="" placeholder="{{ entry_cc_number }}" id="input-cc-number" class="form-control" />
-                    </div>
-                </div>
-                <div class="form-group required">
-                    <label class="col-sm-2 control-label" for="input-cc-expire-date">{{ entry_cc_expire_date }}</label>
-                    <div class="col-sm-3">
-                        <select name="CC_EXPIRES_MONTH" id="input-cc-expire-date" class="form-control">
-							% for month in months %}
-								<option value="{{ month.value }}">{{ month.text }}</option>
-							{% endfor %}
-                        </select>
-                    </div>
-                    <div class="col-sm-3">
-                        <select name="CC_EXPIRES_YEAR" class="form-control">
-							% for year in year_expire %}
-								<option value="{{ year.value }}">{{ year.text }}</option>
-							{% endfor %}
-                        </select>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-2 control-label" for="input-cc-cvv2">{{ entry_cc_cvv2 }}</label>
-                    <div class="col-sm-10">
-                        <input type="text" name="CVCCVV2" value="" placeholder="{{ entry_cc_cvv2 }}" id="input-cc-cvv2" class="form-control" />
-                    </div>
-                </div>
-				{% if bluepay_redirect_card %}
-					<div class="form-group">
-						<label class="col-sm-2 control-label" for="input-cc-save">{{ entry_card_save }}</label>
-						<div class="col-sm-2">
-							<input id="input-cc-save" type="checkbox" name="CreateToken" value="1" />
-						</div>
-					</div>
-				{% endif %}
-            </div>
+  <fieldset id="payment">
+    <legend>{{ text_credit_card }}</legend>
+    {% if not existing_cards %}
+    <div class="form-group">
+      <label class="col-sm-2 control-label">{{ entry_card }}</label>
+      <div class="col-sm-10">
+        <label class="radio-inline"> <input type="radio" name="new-existing" value="existing" checked="checked"/>
+          {{ entry_card_existing }}
+        </label> <label class="radio-inline"> <input type="radio" name="new-existing" value="new"/>
+          {{ entry_card_new }}
+        </label>
+      </div>
+    </div>
+    <div id="card-existing">
+      <div class="form-group required">
+        <label class="col-sm-2 control-label" for="Token">{{ entry_cc_choice }}</label>
+        <div class="col-sm-10">
+          <select name="RRNO" class="form-control">
+            {% for existing_card in existing_cards %}
+            <option value="{{ existing_card.token }}">{{ text_card_type }} {{ existing_card.type, {{ text_card_digits }} {{ existing_card.digits }}, {{ text_card_expiry }} {{ existing_card.expiry }}</option>
+              {% endfor %}
+          </select>
         </div>
-        <div class="buttons">
-            <div class="pull-right">
-                <input type="button" value="{{ button_confirm }}" id="button-confirm" data-loading-text="{{ text_loading }}" class="btn btn-primary" />
+      </div>
+      <div class="form-group">
+        <label class="col-sm-2 control-label" for="input-cc-cvv2">{{ entry_cc_cvv2 }}</label>
+          <div class="col-sm-10">
+          <input type="text" name="CVCCVV2" value="" placeholder="{{ entry_cc_cvv2 }}" id="input-cc-cvv2" class="form-control" />
+          </div>
+          </div>
+          </div>
+          <div  style="display: none" id="card-new">
+          {% else %}
+          <div id="card-new">
+            {% endif %}
+            <div class="form-group required">
+              <label class="col-sm-2 control-label" for="input-cc-number">{{ entry_cc_number }}</label>
+              <div class="col-sm-10">
+                <input type="text" name="CC_NUM" value="" placeholder="{{ entry_cc_number }}" id="input-cc-number" class="form-control"/>
+              </div>
+            </div>
+            <div class="form-group required">
+              <label class="col-sm-2 control-label" for="input-cc-expire-date">{{ entry_cc_expire_date }}</label>
+              <div class="col-sm-3">
+                <select name="CC_EXPIRES_MONTH" id="input-cc-expire-date" class="form-control"> % for month in months %}
+                  <option value="{{ month.value }}">{{ month.text }}</option>
+                  {% endfor %}
+                </select>
+              </div>
+              <div class="col-sm-3">
+                <select name="CC_EXPIRES_YEAR" class="form-control"> % for year in year_expire %}
+                  <option value="{{ year.value }}">{{ year.text }}</option>
+                  {% endfor %}
+                </select>
+              </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-2 control-label" for="input-cc-cvv2">{{ entry_cc_cvv2 }}</label>
+              <div class="col-sm-10">
+                <input type="text" name="CVCCVV2" value="" placeholder="{{ entry_cc_cvv2 }}" id="input-cc-cvv2" class="form-control"/>
+              </div>
             </div>
+            {% if bluepay_redirect_card %}
+            <div class="form-group">
+              <label class="col-sm-2 control-label" for="input-cc-save">{{ entry_card_save }}</label>
+              <div class="col-sm-2">
+                <input id="input-cc-save" type="checkbox" name="CreateToken" value="1"/>
+              </div>
+            </div>
+            {% endif %}
+          </div>
+      </div>
+      <div class="buttons">
+        <div class="pull-right">
+          <input type="button" value="{{ button_confirm }}" id="button-confirm" data-loading-text="{{ text_loading }}" class="btn btn-primary"/>
         </div>
-    </fieldset>
+      </div>
+  </fieldset>
 </form>
 <script type="text/javascript"><!--
 $(document).ready(function() {
-{% if existing_cards %}
+  {% if existing_cards %}
 	$('#card-new input').prop('disabled', true);
 	$('#card-new input').prop('disabled', true);
 	$('#card-new select').prop('disabled', true);
-{% endif %}
-	});
+  {% endif %}
+});
 //--></script>
 <script type="text/javascript"><!--
-	$('input[name=\'new-existing\']').on('change', function() {
-		if (this.value === 'existing') {
-			$('#card-existing').show();
-			$('#card-new').hide();
-			$('#card-new input').prop('disabled', true);
-			$('#card-new select').prop('disabled', true);
-			$('#card-existing select').prop('disabled', false);
-			$('#input-cc-cvv2').prop('disabled', false);
-		} else {
-			$('#card-existing').hide();
-			$('#card-new').show();
-			$('#card-new input').prop('disabled', false);
-			$('#card-new select').prop('disabled', false);
-			$('#card-existing select').prop('disabled', true);
-			$('#card-existing input').prop('disabled', true);
-		}
-	});
+$('input[name=\'new-existing\']').on('change', function() {
+	if (this.value === 'existing') {
+		$('#card-existing').show();
+		$('#card-new').hide();
+		$('#card-new input').prop('disabled', true);
+		$('#card-new select').prop('disabled', true);
+		$('#card-existing select').prop('disabled', false);
+		$('#input-cc-cvv2').prop('disabled', false);
+	} else {
+		$('#card-existing').hide();
+		$('#card-new').show();
+		$('#card-new input').prop('disabled', false);
+		$('#card-new select').prop('disabled', false);
+		$('#card-existing select').prop('disabled', true);
+		$('#card-existing input').prop('disabled', true);
+	}
+});
 //--></script>
 <script type="text/javascript">
-	$('#button-confirm').bind('click', function() {
-		$.ajax({
-			url: 'index.php?route=extension/payment/bluepay_redirect/send&language=' + getCookie('language'),
-			type: 'post',
-			data: $('#card-new :input[type=\'text\']:enabled, #card-new select:enabled, #card-new :input[type=\'checkbox\']:checked:enabled, #payment select:enabled, #card-existing :input:enabled'),
-			dataType: 'json',
-			cache: false,
-			beforeSend: function() {
-				$('#button-confirm').button('loading');
-			},
-			complete: function() {
-				$('#button-confirm').button('reset');
-			},
-			success: function(json) {
-				if (json['error']) {
-					alert(json['error']);
-				}
+$('#button-confirm').bind('click', function() {
+	$.ajax({
+		url: 'index.php?route=extension/payment/bluepay_redirect/send&language=' + getCookie('language'),
+		type: 'post',
+		data: $('#card-new :input[type=\'text\']:enabled, #card-new select:enabled, #card-new :input[type=\'checkbox\']:checked:enabled, #payment select:enabled, #card-existing :input:enabled'),
+		dataType: 'json',
+		cache: false,
+		beforeSend: function() {
+			$('#button-confirm').button('loading');
+		},
+		complete: function() {
+			$('#button-confirm').button('reset');
+		},
+		success: function(json) {
+			if (json['error']) {
+				alert(json['error']);
+			}
 
-				if (json['redirect']) {
-					location = json['redirect'];
-				}
+			if (json['redirect']) {
+				location = json['redirect'];
 			}
-		});
+		}
 	});
+});
 //</script>
diff --git a/upload/catalog/view/theme/default/template/extension/payment/cardinity.twig b/upload/catalog/view/theme/default/template/extension/payment/cardinity.twig
index 1094d78c247..7a96a3bac1c 100644
--- a/upload/catalog/view/theme/default/template/extension/payment/cardinity.twig
+++ b/upload/catalog/view/theme/default/template/extension/payment/cardinity.twig
@@ -1,46 +1,44 @@
 <div style="display: none;" class="payment-warning alert alert-danger">
-  <i class="fa fa-exclamation-circle"></i>
-  <span class="message"></span>
+  <i class="fa fa-exclamation-circle"></i> <span class="message"></span>
 </div>
 <form class="form-horizontal" id="payment">
   <div class="form-group required">
     <label class="col-sm-2 control-label" for="input-holder">{{ entry_holder }}</label>
     <div class="col-sm-10">
-    <input type="text" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" maxlength="32" name="holder" placeholder="{{ entry_holder }}" id="input-holder" class="form-control" />
+      <input type="text" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" maxlength="32" name="holder" placeholder="{{ entry_holder }}" id="input-holder" class="form-control"/>
     </div>
   </div>
   <div class="form-group required">
     <label class="col-sm-2 control-label" for="input-pan">{{ entry_pan }}</label>
     <div class="col-sm-10">
-    <input type="text" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" maxlength="19" name="pan" placeholder="{{ entry_pan }}" id="input-pan" class="form-control" />
+      <input type="text" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" maxlength="19" name="pan" placeholder="{{ entry_pan }}" id="input-pan" class="form-control"/>
     </div>
   </div>
   <div id="expiry-date-group" class="form-group required">
     <label class="col-sm-2 control-label">{{ entry_expires }}</label>
     <div class="col-sm-3">
       <select name="exp_month" class="form-control">
-       {% for month in months %}
-        <option value="{{ month.value }}">{{ month.text }}</option>
+        {% for month in months %}
+          <option value="{{ month.value }}">{{ month.text }}</option>
         {% endfor %}
       </select>
     </div>
     <div class="col-sm-3">
       <select name="exp_year" class="form-control">
-       {% for year in years %}
+        {% for year in years %}
         <option value="{{ year.value }}">{{ year.text }}</option>
-        {% endfor %}>
-      </select>
+        {% endfor %}> </select>
     </div>
   </div>
   <div class="form-group required">
     <label class="col-sm-2 control-label" for="input-cvc">{{ entry_cvc }}</label>
     <div class="col-sm-10">
-    <input type="text" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" maxlength="4" name="cvc" placeholder="{{ entry_cvc }}" id="input-cvc" class="form-control" />
+      <input type="text" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" maxlength="4" name="cvc" placeholder="{{ entry_cvc }}" id="input-cvc" class="form-control"/>
     </div>
   </div>
   <div class="form-group">
     <div class="col-sm-1 col-sm-offset-2">
-      <input id="button-confirm" type="button" value="{{ button_confirm }}" class="btn btn-primary" />
+      <input id="button-confirm" type="button" value="{{ button_confirm }}" class="btn btn-primary"/>
     </div>
   </div>
 </form>
diff --git a/upload/catalog/view/theme/default/template/extension/payment/cod.twig b/upload/catalog/view/theme/default/template/extension/payment/cod.twig
index fa3fe8729cf..a401ced0f44 100644
--- a/upload/catalog/view/theme/default/template/extension/payment/cod.twig
+++ b/upload/catalog/view/theme/default/template/extension/payment/cod.twig
@@ -1,6 +1,6 @@
 <div class="buttons">
   <div class="pull-right">
-    <input type="button" value="{{ button_confirm }}" id="button-confirm" data-loading-text="{{ text_loading }}" class="btn btn-primary" />
+    <input type="button" value="{{ button_confirm }}" id="button-confirm" data-loading-text="{{ text_loading }}" class="btn btn-primary"/>
   </div>
 </div>
 <script type="text/javascript"><!--
@@ -16,7 +16,7 @@ $('#button-confirm').on('click', function() {
 		},
 		success: function(json) {
 			if (json['redirect']) {
-				location = json['redirect'];	
+				location = json['redirect'];
 			}
 		},
 		error: function(xhr, ajaxOptions, thrownError) {