Merge pull request #586 from bummzack/fix-globaltaxmodifier

Merge #586
silvershop · Feb 20, 2017 · d677eb1 · d677eb1
2 parents 3cf6013 + 46d6a5e
commit d677eb1
Showing 1 changed file with 28 additions and 4 deletions.
diff --git a/code/modifiers/tax/GlobalTaxModifier.php b/code/modifiers/tax/GlobalTaxModifier.php
@@ -27,18 +27,42 @@ public function value($incoming)
 
     public function Rate()
     {
+        // If the order is no longer in cart, rely on the saved data
+        if ($this->OrderID && !$this->Order()->IsCart()){
+            return $this->getField('Rate');
+        }
+
         $rates = self::config()->country_rates;
-        if (isset($rates[$this->Country])) {
-            return $this->Rate = $rates[$this->Country]['rate'];
+        $country = $this->Country();
+        if ($country && isset($rates[$country])) {
+            return $this->Rate = $rates[$country]['rate'];
         }
         $defaults = self::config()->defaults;
         return $this->Rate = $defaults['Rate'];
     }
 
     public function TableTitle()
     {
-        $country = $this->Country ? " for " . $this->Country . " " : "";
+        $country = $this->Country() ? ' (' . $this->Country() . ') ' : '';
         return parent::TableTitle() . $country .
-        ($this->Type == "Chargable" ? '' : _t("GlobalTaxModifier.Included", ' (included in the above price)'));
+            ($this->Type == "Chargable" ? '' : _t("GlobalTaxModifier.Included", ' (included in the above price)'));
+    }
+
+    public function Country()
+    {
+        if ($this->OrderID && $address = $this->Order()->getBillingAddress()) {
+            return $address->Country;
+        }
+
+        return null;
+    }
+
+    public function onBeforeWrite()
+    {
+        parent::onBeforeWrite();
+        // While the order is still in "Cart" status, persist country code to DB
+        if ($this->OrderID && $this->Order()->IsCart()){
+            $this->setField('Country', $this->Country());
+        }
     }
 }