Merge pull request #10168 from webkul-dilip/tax_calculation

improvment in tax calculation
opencart · Aug 20, 2021 · 8c06097 · 8c06097
2 parents 9950052 + 1abe39b
commit 8c06097
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/upload/catalog/controller/extension/total/shipping.php b/upload/catalog/controller/extension/total/shipping.php
@@ -67,9 +67,13 @@ public function quote() {
 
 		if (!$json) {
 			$this->tax->unsetRates();
-			$this->tax->setPaymentAddress($this->request->post['country_id'], $this->request->post['zone_id']);
 			$this->tax->setShippingAddress($this->request->post['country_id'], $this->request->post['zone_id']);
-
+			if (isset($this->session->data['payment_address']['country_id']) && isset($this->session->data['payment_address']['zone_id'])) {
+				$this->tax->setPaymentAddress($this->session->data['payment_address']['country_id'], $this->session->data['payment_address']['zone_id']);
+			} elseif ($this->config->get('config_tax_default') == 'payment') {
+				$this->tax->setPaymentAddress($this->config->get('config_country_id'), $this->config->get('config_zone_id'));
+			}
+			$this->tax->setStoreAddress($this->config->get('config_country_id'), $this->config->get('config_zone_id'));
 			if ($country_info) {
 				$country = $country_info['name'];
 				$iso_code_2 = $country_info['iso_code_2'];