Merge pull request PrestaShop#7482 from aleeks/4415

Use default state for tax purposes
Shakarhaba · Feb 8, 2017 · ef36c8a · ef36c8a
2 parents 471f9c4 + 904dfb5
commit ef36c8a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/classes/Address.php b/classes/Address.php
@@ -446,9 +446,9 @@ public static function initialize($id_address = null, $with_geoloc = false)
             } else {
                 // set the default address
                 $address             = new Address();
-                $address->id_country = (int)$context->country->id;
-                $address->id_state   = 0;
-                $address->postcode   = 0;
+                $address->id_country = Configuration::get('PS_SHOP_COUNTRY_ID') ? Configuration::get('PS_SHOP_COUNTRY_ID') : Configuration::get('PS_COUNTRY_DEFAULT');
+                $address->id_state   = Configuration::get('PS_SHOP_STATE_ID');
+                $address->postcode   = Configuration::get('PS_SHOP_CODE');
             }
             Cache::store($cache_id, $address);