From f5b51507b25a620affb502eb14af04ea64b00457 Mon Sep 17 00:00:00 2001 From: maks feltrin Date: Sat, 29 Aug 2015 11:22:59 +0200 Subject: [PATCH 1/7] geocode language --- upload/catalog/controller/information/contact.php | 1 + 1 file changed, 1 insertion(+) diff --git a/upload/catalog/controller/information/contact.php b/upload/catalog/controller/information/contact.php index 1db71a9b881..f76cd304b3b 100644 --- a/upload/catalog/controller/information/contact.php +++ b/upload/catalog/controller/information/contact.php @@ -89,6 +89,7 @@ public function index() { $data['store'] = $this->config->get('config_name'); $data['address'] = nl2br($this->config->get('config_address')); $data['geocode'] = $this->config->get('config_geocode'); + $data['geocode_hl'] = $this->config->get('config_language'); $data['telephone'] = $this->config->get('config_telephone'); $data['fax'] = $this->config->get('config_fax'); $data['open'] = nl2br($this->config->get('config_open')); From 664c39c888c626a4b45726660779a1fb217a3369 Mon Sep 17 00:00:00 2001 From: maks feltrin Date: Sat, 29 Aug 2015 11:24:59 +0200 Subject: [PATCH 2/7] Update contact.tpl --- .../catalog/view/theme/default/template/information/contact.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/catalog/view/theme/default/template/information/contact.tpl b/upload/catalog/view/theme/default/template/information/contact.tpl index 90c6fb929d6..8a452f80310 100644 --- a/upload/catalog/view/theme/default/template/information/contact.tpl +++ b/upload/catalog/view/theme/default/template/information/contact.tpl @@ -27,7 +27,7 @@ - +

From 8cbc42be7f66300f26248fc5e65a341883e53c60 Mon Sep 17 00:00:00 2001 From: maks feltrin Date: Sat, 29 Aug 2015 11:48:44 +0200 Subject: [PATCH 3/7] geocode language --- .../catalog/view/theme/default/template/information/contact.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/catalog/view/theme/default/template/information/contact.tpl b/upload/catalog/view/theme/default/template/information/contact.tpl index 8a452f80310..fb311cbca15 100644 --- a/upload/catalog/view/theme/default/template/information/contact.tpl +++ b/upload/catalog/view/theme/default/template/information/contact.tpl @@ -71,7 +71,7 @@ - +

From 94bd1786a9443853df70d96b55cb289edbd484a8 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 2 Sep 2015 10:59:24 +0100 Subject: [PATCH 4/7] LPA - updating platform id code --- upload/catalog/model/payment/amazon_login_pay.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upload/catalog/model/payment/amazon_login_pay.php b/upload/catalog/model/payment/amazon_login_pay.php index d3bab5914d6..6693ba95474 100644 --- a/upload/catalog/model/payment/amazon_login_pay.php +++ b/upload/catalog/model/payment/amazon_login_pay.php @@ -67,9 +67,9 @@ public function sendOrder($order_id, $total, $currency_code) { $update_paramter_data['OrderReferenceAttributes.SellerOrderAttributes.SellerOrderId'] = $order_id; $update_paramter_data['OrderReferenceAttributes.SellerOrderAttributes.StoreName'] = $this->config->get('config_name'); if ($this->config->get('amazon_login_pay_marketplace') == 'us') { - $update_paramter_data['OrderReferenceAttributes.OrderTotal.PlatformId'] = 'A3GK1RS09H3A7D'; + $update_paramter_data['OrderReferenceAttributes.PlatformId'] = 'A3GK1RS09H3A7D'; } else { - $update_paramter_data['OrderReferenceAttributes.OrderTotal.PlatformId'] = 'A3EIRX2USI2KJV'; + $update_paramter_data['OrderReferenceAttributes.PlatformId'] = 'A3EIRX2USI2KJV'; } $address_paramter_data['AddressConsentToken'] = $this->session->data['access_token']; From b8ecc1c1b81b02c775503aa2acfc324647d69ea9 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 2 Sep 2015 13:06:57 +0100 Subject: [PATCH 5/7] LPA - tax region bug fix --- .../controller/payment/amazon_login_pay.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/upload/catalog/controller/payment/amazon_login_pay.php b/upload/catalog/controller/payment/amazon_login_pay.php index 485d94f6380..fe696acb875 100644 --- a/upload/catalog/controller/payment/amazon_login_pay.php +++ b/upload/catalog/controller/payment/amazon_login_pay.php @@ -171,6 +171,10 @@ public function confirm() { } } + if (!isset($this->session->data['lpa']['shipping_method']) || !isset($this->session->data['lpa']['address'])) { + $this->response->redirect($this->url->link('payment/amazon_login_pay/address', '', 'SSL')); + } + $total_data = array(); $total = 0; $taxes = $this->cart->getTaxes(); @@ -180,12 +184,6 @@ public function confirm() { $sort_order = array(); - if (isset($this->session->data['lpa']['shipping_method'])) { - $this->session->data['shipping_method'] = $this->session->data['lpa']['shipping_method']; - } else { - $this->response->redirect($this->url->link('payment/amazon_login_pay/address', '', 'SSL')); - } - $results = $this->model_extension_extension->getExtensions('total'); foreach ($results as $key => $value) { @@ -788,6 +786,10 @@ public function setShipping() { } $this->session->data['lpa']['shipping_method'] = $this->session->data['lpa']['shipping_methods'][$shipping_method[0]]['quote'][$shipping_method[1]]; + $this->session->data['shipping_method'] = $this->session->data['lpa']['shipping_method']; + $this->session->data['shipping_address'] = $this->session->data['lpa']['address']; + $this->session->data['shipping_country_id'] = $this->session->data['lpa']['address']['country_id']; + $this->session->data['shipping_zone_id'] = $this->session->data['lpa']['address']['zone_id']; $json['redirect'] = $this->url->link('payment/amazon_login_pay/paymentMethod', '', 'SSL'); } else { From 86121e1b82c843d6e194ee8639bfc50f806086a8 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 2 Sep 2015 14:57:15 +0100 Subject: [PATCH 6/7] LPA - debug error code --- .../theme/default/template/payment/amazon_login_pay_confirm.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/catalog/view/theme/default/template/payment/amazon_login_pay_confirm.tpl b/upload/catalog/view/theme/default/template/payment/amazon_login_pay_confirm.tpl index 8c1a31ec716..e45072b7e8b 100644 --- a/upload/catalog/view/theme/default/template/payment/amazon_login_pay_confirm.tpl +++ b/upload/catalog/view/theme/default/template/payment/amazon_login_pay_confirm.tpl @@ -12,7 +12,7 @@

- +

From e8b2fc5faea23afff44b1d2dace53715fd8ab8da Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 2 Sep 2015 15:58:23 +0100 Subject: [PATCH 7/7] G2A - form bug fix --- upload/catalog/view/theme/default/template/payment/g2apay.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/catalog/view/theme/default/template/payment/g2apay.tpl b/upload/catalog/view/theme/default/template/payment/g2apay.tpl index 48c11666e16..e0f5557744a 100644 --- a/upload/catalog/view/theme/default/template/payment/g2apay.tpl +++ b/upload/catalog/view/theme/default/template/payment/g2apay.tpl @@ -1,4 +1,4 @@ -
+