sunnysideup / silverstripe-ecommerce_countries

code/model/process/extensions/CountryPrice_OrderDOD.php

Indentation +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
                 'Root.Country',
                 DropdownField::create(
                     'DistributorID',
-                     _t('Distributor.SINGULAR_NAME', 'Distributor'),
+                        _t('Distributor.SINGULAR_NAME', 'Distributor'),
                     array(''=> '--- Please select ---') + Distributor::get()->map()->toArray()
                 )
             );

Spacing +7 added lines, -7 removed lines

@@ -62,7 +62,7 @@ 
             if ($order->IsSubmitted()) {
                 return true;
             }
-            if (! $countryCode) {
+            if (!$countryCode) {
                 $countryCode = $order->getCountry();
             }
             $currencyObject = CountryPrice_EcommerceCurrency::get_currency_for_country($countryCode);
@@ -76,13 +76,13 @@ 
             //check if the billing and shipping address have a country so that they will not be overridden by previous Orders
             //we do this to make sure that the previous address can not change the region and thereby destroy the order in the cart
             if ($billingAddress = $order->CreateOrReturnExistingAddress('BillingAddress')) {
-                if (! $billingAddress->Country || $force) {
+                if (!$billingAddress->Country || $force) {
                     $billingAddress->Country = $countryCode;
                     $billingAddress->write();
                 }
             }
             if ($shippingAddress = $order->CreateOrReturnExistingAddress('ShippingAddress')) {
-                if (! $shippingAddress->ShippingCountry || $force) {
+                if (!$shippingAddress->ShippingCountry || $force) {
                     $shippingAddress->ShippingCountry = $countryCode;
                     $shippingAddress->write();
                 }
@@ -91,7 +91,7 @@ 
             //if a country code and currency has been set then all is good
             //from there we keep it this way
             if (
-                $order->OriginatingCountryCode ==  $countryCode &&
+                $order->OriginatingCountryCode == $countryCode &&
                 $order->CurrencyUsedID == $currencyObject->ID
             ) {
                 return true;
@@ -113,7 +113,7 @@ 
                 if ($items) {
                     foreach ($items as $item) {
                         $buyable = $item->Buyable(true);
-                        if (! $buyable->canPurchase()) {
+                        if (!$buyable->canPurchase()) {
                             $item->delete();
                         }
                     }
@@ -160,7 +160,7 @@ 
      */
     public function onAfterWrite()
     {
-        if (! $this->owner->DistributorID) {
+        if (!$this->owner->DistributorID) {
             if ($defaultDistributor = Distributor::get_default_distributor()) {
                 if ($defaultDistributor->exists()) {
                     if ($defaultDistributor->ID) {
@@ -179,7 +179,7 @@ 
 
     public function canEdit($member = null)
     {
-        if (! $member) {
+        if (!$member) {
             $member = Member::currentUser();
         }
         if ($member) {

code/control/CountryPrice_ChangeCountryController.php

Doc Comments +3 added lines

@@ -102,6 +102,9 @@
         return [];
     }
 
+    /**
+     * @param string $action
+     */
     public function Link($action = null)
     {
         $link = Controller::join_links(

Spacing +5 added lines, -5 removed lines

@@ -88,7 +88,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('/'));
@@ -109,7 +109,7 @@ 
             $action
         );
 
-        return $link . '/';
+        return $link.'/';
     }
 
     /**
@@ -163,10 +163,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']

code/model/address/CountryPrice_EcommerceCountry.php

Spacing +6 added lines, -6 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>"
                     )
                 );
             }
@@ -210,7 +210,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
@@ -225,7 +225,7 @@ 
                 }
 
                 //if we still dont have a country then we use the standard e-commerce methods ...
-                if (! $countryCode) {
+                if (!$countryCode) {
                     $countryCode = EcommerceCountry::get_country();
                 }
 
@@ -244,7 +244,7 @@ 
                     if (
                             ($country && $country->Code !== $urlCountryCode)
                         ||
-                            ! $country
+                            !$country
 
                     ) {
                         $country = DataObject::get_one('EcommerceCountry', ['Code' => $urlCountryCode]);
@@ -314,9 +314,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/api/CountryURLProvider.php

Spacing +3 added lines, -3 removed lines

@@ -77,14 +77,14 @@
             }
             $parsedUrl['path'] = implode('/', $pathParts);
             $newURL =
-                $parsedUrl['scheme'] .
-                '://' .
+                $parsedUrl['scheme'].
+                '://'.
                 Controller::join_links(
                     $parsedUrl['host'],
                     $parsedUrl['path']
                 );
             if (isset($parsedUrl['query'])) {
-                $newURL = $newURL . '?' . $parsedUrl['query'];
+                $newURL = $newURL.'?'.$parsedUrl['query'];
             }
         }
         if ($oldURL !== $newURL) {