sunnysideup / silverstripe-ecommerce_countries

code/model/address/CountryPrice_EcommerceCountry.php

Doc Comments +4 added lines

@@ -303,6 +303,10 @@
         return self::$_get_real_country_cache[$cacheKey];
     }
 
+    /**
+     * @param string $countryOrCountryCodeA
+     * @param string $countryOrCountryCodeB
+     */
     public static function countries_belong_to_same_group($countryOrCountryCodeA, $countryOrCountryCodeB)
     {
         $countryA = EcommerceCountry::get_country_from_mixed_var($countryOrCountryCodeA);

Indentation +3 added lines, -3 removed lines

@@ -168,9 +168,9 @@
     }
 
     /**
-    * checks if the country has a distributor
-    * and returns the primary country for the distributor.
-    * If not, returns the default country.
+     * checks if the country has a distributor
+     * and returns the primary country for the distributor.
+     * If not, returns the default country.
      *
      * @return EcommerceCountry
      *

Spacing +11 added lines, -11 removed lines

@@ -88,7 +88,7 @@ 
                     'Root.FAQPage',
                     new LiteralField(
                         "FAQPageExplanation",
-                        "<p class=\"message warning\">FAQ information can only be added to the main country for a ". _t('Distributor.SINGULAR_NAME', 'Distributor') ."</p>"
+                        "<p class=\"message warning\">FAQ information can only be added to the main country for a "._t('Distributor.SINGULAR_NAME', 'Distributor')."</p>"
                     )
                 );
             }
@@ -211,7 +211,7 @@ 
             $originalCountry = $country;
 
             //no country provided
-            if (! $country) {
+            if (!$country) {
                 $urlCountryCode = CountryPrice_Translation::get_country_url_provider()->CurrentCountrySegment();
 
                 // 2. CHECK WHAT THE SYSTEM THINKS THE COUNTRY CHOULD BE
@@ -226,7 +226,7 @@ 
                 }
 
                 //if we still dont have a country then we use the standard e-commerce methods ...
-                if (! $countryCode) {
+                if (!$countryCode) {
                     $countryCode = EcommerceCountry::get_country();
                 }
 
@@ -246,7 +246,7 @@ 
                     if (
                             ($country && $country->Code !== $urlCountryCode)
                         ||
-                            ! $country
+                            !$country
 
                     ) {
                         $country = DataObject::get_one('EcommerceCountry', ['Code' => $urlCountryCode]);
@@ -307,17 +307,17 @@ 
     {
         $countryA = EcommerceCountry::get_country_from_mixed_var($countryOrCountryCodeA);
         $countryB = EcommerceCountry::get_country_from_mixed_var($countryOrCountryCodeB);
-        if($countryA && $countryB) {
-            if($countryA->ID === $countryB->ID) {
+        if ($countryA && $countryB) {
+            if ($countryA->ID === $countryB->ID) {
                 return true;
             }
-            if($countryA->AlwaysTheSameAsID === $countryB->ID) {
+            if ($countryA->AlwaysTheSameAsID === $countryB->ID) {
                 return true;
             }
-            if($countryA->ID === $countryB->AlwaysTheSameAsID) {
+            if ($countryA->ID === $countryB->AlwaysTheSameAsID) {
                 return true;
             }
-            if($countryA->AlwaysTheSameAsID && $countryA->AlwaysTheSameAsID === $countryB->AlwaysTheSameAsID) {
+            if ($countryA->AlwaysTheSameAsID && $countryA->AlwaysTheSameAsID === $countryB->AlwaysTheSameAsID) {
                 return true;
             }
         }
@@ -333,9 +333,9 @@ 
     public static function get_backup_country()
     {
         $obj = EcommerceCountry::get()->filter(array("IsBackupCountry" => true))->first();
-        if (! $obj) {
+        if (!$obj) {
             $obj = EcommerceCountry::get()->filter(array("Code" => EcommerceConfig::get('EcommerceCountry', 'default_country_code')))->first();
-            if (! $obj) {
+            if (!$obj) {
                 $obj = EcommerceCountry::get()->first();
             }
         }

code/control/CountryPrice_ChangeCountryController.php

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
     {
         $newCountryCode = strtoupper($newCountryCode);
         $o = Shoppingcart::current_order();
-        if($o && $o->exists()) {
+        if ($o && $o->exists()) {
             $orderCountry = $o->getCountry();
             if ($orderCountry === $newCountryCode || CountryPrice_EcommerceCountry::countries_belong_to_same_group($orderCountry, $newCountryCode)) {
                 //nothing to see here, please move on!
@@ -90,7 +90,7 @@ 
 
         //redirect now
         if (isset($_GET['force']) && $_GET['force']) {
-            return $this->redirect($this->Link($newCountryCode) . '?force-back-home');
+            return $this->redirect($this->Link($newCountryCode).'?force-back-home');
         }
         if (isset($_GET['force-back-home']) && $_GET['force-back-home']) {
             return $this->redirect(Director::baseURL('/'));
@@ -111,7 +111,7 @@ 
             $action
         );
 
-        return $link . '/';
+        return $link.'/';
     }
 
     /**
@@ -165,10 +165,10 @@ 
 
             $path = isset($parsedUrl['path']) ? $parsedUrl['path'] : '';
 
-            $query = empty($query) ? '' :  '?'. http_build_query($query);
+            $query = empty($query) ? '' : '?'.http_build_query($query);
             $newURL =
-                $parsedUrl['scheme'] .
-                '://' .
+                $parsedUrl['scheme'].
+                '://'.
                 Controller::join_links(
                     $parsedUrl['host'],
                     $parsedUrl['path']