sunnysideup / silverstripe-ecommerce_countries

code/control/CountryPrice_Page_Controller_Extension.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
         //provided by stealth ...
         $countryObject = CountryPrice_EcommerceCountry::get_real_country();
 
-        if($countryObject) {
+        if ($countryObject) {
 
             //check if a redirect is required ...
             $this->checkForOffsiteRedirects($countryObject);
@@ -94,7 +94,7 @@ 
         $oldURL = $protocol.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
 
         $hasCountrySegment = CountryPrice_Translation::get_country_url_provider()->hasCountrySegment($oldURL);
-        if($hasCountrySegment){
+        if ($hasCountrySegment) {
             $newURL = CountryPrice_Translation::get_country_url_provider()->replaceCountryCodeInUrl($countryCode, $oldURL);
         }
         else {
@@ -149,7 +149,7 @@ 
     public function AlternativeHrefLangLinksCachingKey()
     {
         $countryObject = CountryPrice_EcommerceCountry::get_real_country();
-        if($countryObject && $countryObject->Code) {
+        if ($countryObject && $countryObject->Code) {
             return 'AlternativeHrefLangLinksCachingKey-'.$countryObject->Code.'-'.$this->owner->dataRecord->ID.'-'.strtotime($this->owner->dataRecord->LastEdited);
         }
         return 'AlternativeHrefLangLinksCachingKey'.$this->owner->dataRecord->ID.'-'.$this->owner->dataRecord->ID.'-'.strtotime($this->owner->dataRecord->LastEdited);
@@ -162,7 +162,7 @@ 
     public function UpdateCanonicalLink(&$link)
     {
         $obj = $this->owner->dataRecord->CanonicalObject();
-        if($obj) {
+        if ($obj) {
             $link = $obj->Link();
         } else {
             $link = $this->owner->dataRecord->AbsoluteLink();

code/model/address/CountryPrice_EcommerceCountry.php

Spacing +15 added lines, -15 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>"
                     )
                 );
             }
@@ -198,21 +198,21 @@ 
     public static function get_real_country($country = null)
     {
 
-        if($country && $country instanceof EcommerceCountry) {
+        if ($country && $country instanceof EcommerceCountry) {
             $cacheKey = $country->Code;
-        } elseif($country) {
+        } elseif ($country) {
             $cacheKey = $country;
         } else {
             $cacheKey = 'notprovided';
         }
-        if(isset(self::$_get_real_country_cache[$cacheKey]) && self::$_get_real_country_cache[$cacheKey]) {
+        if (isset(self::$_get_real_country_cache[$cacheKey]) && self::$_get_real_country_cache[$cacheKey]) {
 
         } else {
             //save original - just in case...
             $originalCountry = $country;
 
             //no country provided
-            if (! $country) {
+            if (!$country) {
                 $param = Config::inst()->get('CountryPrice_Translation', 'locale_get_parameter');
 
                 // 1. CHECK FROM URL
@@ -225,7 +225,7 @@ 
 
                 //now we check it from order / session ....
                 $order = ShoppingCart::current_order();
-                if($order && $order->exists()) {
+                if ($order && $order->exists()) {
                     Session::clear('temporary_country_order_store');
                     $countryCode = $order->getCountry();
                 } else {
@@ -233,30 +233,30 @@ 
                 }
 
                 //if we still dont have a country then we use the standard e-commerce methods ...
-                if(! $countryCode) {
+                if (!$countryCode) {
                     $countryCode = EcommerceCountry::get_country();
                 }
 
                 //lets make our object!
-                if($countryCode) {
+                if ($countryCode) {
                     $country = DataObject::get_one('EcommerceCountry', ['Code' => $countryCode]);
                 }
 
-                if($country && $country instanceof EcommerceCountry) {
+                if ($country && $country instanceof EcommerceCountry) {
                     //do nothing
                 } else {
                     $country = null;
                 }
                 //IF THE COUNTRY DOES NOT MATCH THE URL COUNTRY THEN THE URL WINS!!!!
-                if($urlCountryCode) {
+                if ($urlCountryCode) {
                     if (
                             ($country && $country->Code !== $urlCountryCode)
                         ||
-                            ! $country
+                            !$country
 
-                    ){
+                    ) {
                         $country = DataObject::get_one('EcommerceCountry', ['Code' => $urlCountryCode]);
-                        if($country) {
+                        if ($country) {
                             //change country Object
                             //reset everything ...
                             CountryPrices_ChangeCountryController::set_new_country($country);
@@ -326,9 +326,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/model/buyables/CountryPrice_BuyableExtension.php

Spacing +15 added lines, -15 removed lines

@@ -107,11 +107,11 @@ 
     {
         $countryObject = CountryPrice_EcommerceCountry::get_real_country($countryCode);
         if ($countryObject) {
-            if ($this->debug) {debug::log('found country object: '.$countryObject->Code);}
+            if ($this->debug) {debug::log('found country object: '.$countryObject->Code); }
             $countryCode = $countryObject->Code;
         }
         if ($countryCode == '') {
-            if ($this->debug) {debug::log('There is no country Code! ');}
+            if ($this->debug) {debug::log('There is no country Code! '); }
 
             //we can not decide
             return null;
@@ -121,7 +121,7 @@ 
             //easy  ... overrules all ...
             if ($this->owner->AllCountries) {
                 //is there a valid price ???
-                if ($this->debug) {debug::log('All countries applies - updated  ... new price = '.floatval($this->owner->updateCalculatedPrice()));}
+                if ($this->debug) {debug::log('All countries applies - updated  ... new price = '.floatval($this->owner->updateCalculatedPrice())); }
                 $canSell = true;
             } else {
 
@@ -129,7 +129,7 @@ 
                 //excluded first...
                 $excluded = $this->owner->getManyManyComponents('ExcludedCountries', "\"Code\" = '$countryCode'")->Count();
                 if ($excluded) {
-                    if ($this->debug) {debug::log('excluded country');}
+                    if ($this->debug) {debug::log('excluded country'); }
 
                     //no!
                     return false;
@@ -137,12 +137,12 @@ 
 
                 //default country is included by default ...
                 if ($countryCode == EcommerceConfig::get('EcommerceCountry', 'default_country_code')) {
-                    if ($this->debug) {debug::log('we are in the default country! exiting now ... ');}
+                    if ($this->debug) {debug::log('we are in the default country! exiting now ... '); }
                     $canSell = true;
-                } elseif($this->owner->IncludedCountries()->count()) {
+                } elseif ($this->owner->IncludedCountries()->count()) {
                     $included = $this->owner->getManyManyComponents('IncludedCountries', "\"Code\" = '$countryCode'")->Count();
                     if ($included) {
-                        if ($this->debug) {debug::log('In included countries');}
+                        if ($this->debug) {debug::log('In included countries'); }
                         //null basically means - ignore ...
                         $canSell = true;
                     } else {
@@ -151,11 +151,11 @@ 
                     }
                 }
             }
-            if ($this->debug) {debug::log('the product is '.($canSell ? '' : 'NOT ').' for sale - lets check price ... ');}
+            if ($this->debug) {debug::log('the product is '.($canSell ? '' : 'NOT ').' for sale - lets check price ... '); }
 
             //is there a valid price ???
             $countryPrice = $this->owner->getCalculatedPrice(true);
-            if ($this->debug) {debug::log('nothing applies, but we have a country price... '.$countryPrice);}
+            if ($this->debug) {debug::log('nothing applies, but we have a country price... '.$countryPrice); }
 
             return floatval($countryPrice) > 0 ? null : false;
         }
@@ -218,7 +218,7 @@ 
             return null;
         }
         $key = $this->owner->ClassName."___".$this->owner->ID.'____'.$countryCode;
-        if (! isset(self::$_buyable_price[$key])) {
+        if (!isset(self::$_buyable_price[$key])) {
             //basics
             $currency = null;
             $currencyCode = null;
@@ -226,17 +226,17 @@ 
             if ($countryCode) {
                 $order = ShoppingCart::current_order();
                 //if the order has never been localised, then we do this now!!!!
-                if(count(self::$_buyable_price) === 0) {
+                if (count(self::$_buyable_price) === 0) {
                     CountryPrice_OrderDOD::localise_order($countryCode, $force = true, $runAgain = true);
 
                     // CRUCIAL!!!!
                     // reload order with new values!
                     $order = ShoppingCart::current_order();
                 }
-                if($order && $order->exists()) {
+                if ($order && $order->exists()) {
                     $currency = $order->CurrencyUsed();
                 }
-                if($currency && $currency->exists()) {
+                if ($currency && $currency->exists()) {
                     //do nothing
                 } else {
                     $currency = CountryPrice_EcommerceCurrency::get_currency_for_country($countryCode);
@@ -320,7 +320,7 @@ 
                 }
             }
             //order must have a country and a currency
-            if (! $currencyCode ||  ! $countryCode) {
+            if (!$currencyCode || !$countryCode) {
                 if ($this->debug) {
                     debug::log('No currency ('.$currencyCode.') or no country code ('.$countryCode.') for order: ');
                 }
@@ -413,7 +413,7 @@ 
      */
     public function canEdit($member = null)
     {
-        if (! $member) {
+        if (!$member) {
             $member = Member::currentUser();
         }
         if ($member) {

code/model/process/extensions/CountryPrice_OrderDOD.php

Indentation +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
             $order = Order::get()->byID($order->ID);
             $orderHasBeenChanged = false;
 
-             //check currency ...
+                //check currency ...
             if ($order->CurrencyUsedID != $currencyObject->ID) {
                 $order->SetCurrency($currencyObject);
                 $orderHasBeenChanged = true;
@@ -149,7 +149,7 @@ 
                 'Root.Country',
                 DropdownField::create(
                     'DistributorID',
-                     _t('Distributor.SINGULAR_NAME', 'Distributor'),
+                        _t('Distributor.SINGULAR_NAME', 'Distributor'),
                     array(''=> '--- Please select ---') + Distributor::get()->map()->toArray()
                 )
             );

Spacing +12 added lines, -12 removed lines

@@ -50,7 +50,7 @@ 
      */
     public static function localise_order($countryCode = null, $force = false, $runAgain = false)
     {
-        if($runAgain) {
+        if ($runAgain) {
             self::$_number_of_times_we_have_run_localise_order = 0;
         }
         if (self::$_number_of_times_we_have_run_localise_order > 2) {
@@ -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();
                         }
                     }
@@ -161,10 +161,10 @@ 
      */
     public function onAfterWrite()
     {
-        if(! $this->owner->DistributorID) {
-            if($defaultDistributor = Distributor::get_default_distributor()) {
-                if($defaultDistributor->exists()) {
-                    if($defaultDistributor->ID) {
+        if (!$this->owner->DistributorID) {
+            if ($defaultDistributor = Distributor::get_default_distributor()) {
+                if ($defaultDistributor->exists()) {
+                    if ($defaultDistributor->ID) {
                         $this->owner->DistributorID = $defaultDistributor->ID;
                         $this->owner->write();
                     }
@@ -180,7 +180,7 @@ 
 
     public function canEdit($member = null)
     {
-        if (! $member) {
+        if (!$member) {
             $member = Member::currentUser();
         }
         if ($member) {
@@ -291,7 +291,7 @@ 
                 $countryMessageObject->CountrySpecificEmailMessage
             );
         }
-        if($step->SendEmailToDistributor) {
+        if ($step->SendEmailToDistributor) {
             if ($distributor = $this->owner->Distributor()) {
                 $distributorEmail = $distributor->Email;
                 if ($distributorEmail) {