Merge branch 'master' of https://github.com/opencart/opencart

opencart · Sep 2, 2015 · 3a5e767 · 3a5e767
2 parents 67a69c8 + ae345f2
commit 3a5e767
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git 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'));

diff --git 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 {

diff --git 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'];

diff --git a/upload/catalog/view/theme/default/template/information/contact.tpl b/upload/catalog/view/theme/default/template/information/contact.tpl
@@ -27,7 +27,7 @@
               <?php echo $address; ?>
               </address>
               <?php if ($geocode) { ?>
-              <a href="https://maps.google.com/maps?q=<?php echo urlencode($geocode); ?>&hl=en&t=m&z=15" target="_blank" class="btn btn-info"><i class="fa fa-map-marker"></i> <?php echo $button_map; ?></a>
+              <a href="https://maps.google.com/maps?q=<?php echo urlencode($geocode); ?>&hl=<?php echo $geocode_hl; ?>&t=m&z=15" target="_blank" class="btn btn-info"><i class="fa fa-map-marker"></i> <?php echo $button_map; ?></a>
               <?php } ?>
             </div>
             <div class="col-sm-3"><strong><?php echo $text_telephone; ?></strong><br>
@@ -71,7 +71,7 @@
                   <?php echo $location['address']; ?>
                   </address>
                   <?php if ($location['geocode']) { ?>
-                  <a href="https://maps.google.com/maps?q=<?php echo urlencode($location['geocode']); ?>&hl=en&t=m&z=15" target="_blank" class="btn btn-info"><i class="fa fa-map-marker"></i> <?php echo $button_map; ?></a>
+                  <a href="https://maps.google.com/maps?q=<?php echo urlencode($location['geocode']); ?>&hl=<?php echo $geocode_hl; ?>&t=m&z=15" target="_blank" class="btn btn-info"><i class="fa fa-map-marker"></i> <?php echo $button_map; ?></a>
                   <?php } ?>
                 </div>
                 <div class="col-sm-3"> <strong><?php echo $text_telephone; ?></strong><br>

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
@@ -12,7 +12,7 @@
 			<?php } ?>
 			<div style="display: inline-block; width: 400px; height: 185px;" id="readOnlyAddressBookWidgetDiv"></div>
 			<br>
-			<?php if($amazon_login_pay_test){ ?>
+			<?php if(isset($amazon_login_pay_test)){ ?>
 			<label>Debug Error Code     :</label>
 			<div id="errorCode_wallet"></div>
 			<br>

diff --git a/upload/catalog/view/theme/default/template/payment/g2apay.tpl b/upload/catalog/view/theme/default/template/payment/g2apay.tpl
@@ -1,4 +1,4 @@
-<form target="_blank" action="<?php echo $action; ?>" method="post">
+<form action="<?php echo $action; ?>" method="post">
     <div class="buttons">
         <div class="pull-right">
             <input type="submit" value="<?php echo $button_confirm; ?>" class="btn btn-primary" />