sunnysideup / silverstripe-ecommerce_countries

code/model/address/CountryPrice_EcommerceCountry.php

Indentation +3 added lines, -3 removed lines

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

Spacing +8 added lines, -8 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>"
                     )
                 );
             }
@@ -196,7 +196,7 @@ 
      */
     public static function get_real_country($country = null)
     {
-        if ($country && (! is_object($country))) {
+        if ($country && (!is_object($country))) {
             if (isset(self::$_get_real_country_cache[$country])) {
                 return self::$_get_real_country_cache[$country];
             } else {
@@ -204,10 +204,10 @@ 
             }
         }
         $order = ShoppingCart::current_order();
-        if (! $country) {
+        if (!$country) {
             $country = $order->getCountry();
         }
-        if (! $country) {
+        if (!$country) {
             $country = EcommerceCountry::get_country();
         }
         if ($country instanceof EcommerceCountry) {
@@ -229,7 +229,7 @@ 
                 }
             }
         }
-        if (! $country instanceof EcommerceCountry) {
+        if (!$country instanceof EcommerceCountry) {
             user_error('No country could be found');
         }
         if (!empty($originalCode)) {
@@ -244,9 +244,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();
             }
         }
@@ -296,7 +296,7 @@ 
      */
     public function ComputedLanguageAndCountryCode()
     {
-        if($this->owner->LanguageAndCountryCode) {
+        if ($this->owner->LanguageAndCountryCode) {
             return $this->owner->LanguageAndCountryCode;
         }
         return strtolower('en-'.$this->owner->Code);

code/control/cms/CountryPrice_DistributorManagementTool.php

Spacing +29 added lines, -29 removed lines

@@ -69,7 +69,7 @@ 
                         return $this->redirect(CountryPrices_ChangeCountryController::new_country_link($distributorPrimaryCountryCode));
                     }
                 } else {
-                    die("ERROR: No primary country has been set for this ".  _t('Distributor.SINGULAR_NAME', 'Distributor') .".");
+                    die("ERROR: No primary country has been set for this "._t('Distributor.SINGULAR_NAME', 'Distributor').".");
                 }
             }
             if ($countries && $countries->count()) {
@@ -77,7 +77,7 @@ 
             }
         }
         if (!$canViewAndEdit) {
-            Security::permissionFailure($this, 'Please log in first or log in as a '. _t('Distributor.SINGULAR_NAME', 'Distributor'). '.');
+            Security::permissionFailure($this, 'Please log in first or log in as a '._t('Distributor.SINGULAR_NAME', 'Distributor').'.');
         }
     }
 
@@ -106,7 +106,7 @@ 
         $fields['Price'] = 'Price';
 
         foreach ($fields as $field) {
-            if (! isset($_REQUEST[$field])) {
+            if (!isset($_REQUEST[$field])) {
                 return "$field value missing";
             }
         }
@@ -121,13 +121,13 @@ 
                 $valid = true;
             }
         }
-        if (! $valid) {
+        if (!$valid) {
             return 'ObjectClass value incorrect';
         }
 
         $objectID = intval($_REQUEST['ObjectID']);
         $object = $objectClass::get()->byID($objectID);
-        if (! $object) {
+        if (!$object) {
             return 'ObjectID value incorrect';
         }
 
@@ -143,12 +143,12 @@ 
             $valid = true;
             if ($this->distributor) {
                 $countries = $this->distributor->Countries()->map('Code', 'Code')->toArray();
-                if (! in_array($countryCode, $countries)) {
+                if (!in_array($countryCode, $countries)) {
                     $valid = false;
                 }
             }
         }
-        if (! $valid) {
+        if (!$valid) {
             return 'Country value incorrect';
         }
 
@@ -158,7 +158,7 @@ 
         }
 
         $price = $_REQUEST['Price'];
-        if (! is_numeric($price)) {
+        if (!is_numeric($price)) {
             return 'Price value incorrect';
         }
 
@@ -179,13 +179,13 @@ 
      */
     public function setobjectfield()
     {
-        if (isset($_REQUEST["F"]) && $_REQUEST["F"]== "TESTONLY") {
+        if (isset($_REQUEST["F"]) && $_REQUEST["F"] == "TESTONLY") {
             return "THIS IS FOR TESTING ONLY";
         }
         // 1) Check that all parameters have been specified
 
         foreach (array('T', 'I', 'F', 'V') as $field) {
-            if (! isset($_REQUEST[$field])) {
+            if (!isset($_REQUEST[$field])) {
                 return "$field value missing";
             }
         }
@@ -195,7 +195,7 @@ 
         $result = 1; // Updated
 
         $objectClass = $_REQUEST['T'];
-        if (! class_exists($objectClass)) {
+        if (!class_exists($objectClass)) {
             return 'ObjectClass value incorrect';
         }
 
@@ -207,7 +207,7 @@ 
         } elseif (intval($objectID)) {
             $objectID = intval($objectID);
             $object = $objectClass::get()->byID($objectID);
-            if (! $object) {
+            if (!$object) {
                 return 'ObjectID (ID: $objectID, Class Name: $objectClass) value incorrect';
             }
         } else {
@@ -221,7 +221,7 @@ 
         $fieldName = Convert::raw2sql($_REQUEST['F']);
         $value = $_REQUEST['V'];
 
-        if ($fieldName == 'Price' && (! is_numeric($value) || $value < 0)) {
+        if ($fieldName == 'Price' && (!is_numeric($value) || $value < 0)) {
             return 'Price value incorrect';
         }
         if ($value == '0') {
@@ -333,7 +333,7 @@ 
                 }
                 if (Permission::check("ADMIN")) {
                     $html .= $this->createEditNode(
-                        "Default " . _t('Distributor.SINGULAR_NAME', 'Distributor'),
+                        "Default "._t('Distributor.SINGULAR_NAME', 'Distributor'),
                         $distributor->IsDefault ? "YES" : "NO"
                     );
                 }
@@ -342,7 +342,7 @@ 
                 $countryList = array();
                 $countries = $distributor->Countries();
                 foreach ($countries as $country) {
-                    $countryList[] = $country->Name . ($country->DoNotAllowSales ? ' (Sales not allowed)' : '');
+                    $countryList[] = $country->Name.($country->DoNotAllowSales ? ' (Sales not allowed)' : '');
                 }
                 $html .= $this->createEditNode(
                     'Countries',
@@ -424,14 +424,14 @@ 
                 $data = array('T' => 'EcommerceCountry', 'I' => $country->ID);
                 $distributorName = $country->Distributor()->Name;
                 if (!$distributorName) {
-                    $distributorName = "<p class=\"message bad\">No ". _t('Distributor.SINGULAR_NAME', 'Distributor') ." has been assigned to this country.</p>";
+                    $distributorName = "<p class=\"message bad\">No "._t('Distributor.SINGULAR_NAME', 'Distributor')." has been assigned to this country.</p>";
                 }
                 $html .= $this->createTreeNode($country->Code." - ".$country->Name, $country->Code, array($country));
                 $distributorTitlePlural = _t('Distributor.PLURAL_NAME', 'Distributor');
                 $distributorTitleSingluar = _t('Distributor.SINGULAR_NAME', 'Distributor');
                 $html .= $this->createEditNode($distributorTitleSingluar, $distributorName);
                 $html .= $this->createEditNode("FAQ Content", "", $country->FAQContent, $data + array("F" => "FAQContent"), "textarea");
-                $html .= $this->createEditNode("Top Bar Message", "",  $country->TopBarMessage, $data + array("F" => "TopBarMessage"), "");
+                $html .= $this->createEditNode("Top Bar Message", "", $country->TopBarMessage, $data + array("F" => "TopBarMessage"), "");
                 $html .= $this->createEditNode("Country Specific Messages", $countrySpecificMessages);
                 $html .= $this->createEditNode("Delivery Options", $deliveryOptions);
                 $html .= $this->createEditNode("Taxes", $taxes);
@@ -441,15 +441,15 @@ 
                 $html .= $this->closeTreeNode();
             }
         }
-        $countries =  EcommerceCountry::get()->filter(array("DistributorID" => 0, "DoNotAllowSales" => 0));
+        $countries = EcommerceCountry::get()->filter(array("DistributorID" => 0, "DoNotAllowSales" => 0));
         if ($countries && $countries->count()) {
             $list = implode(", ", $countries->map("ID", "Code")->toArray());
-            $html .= $this->createEditNode("Countries without a ". _t('Distributor.SINGULAR_NAME', 'Distributor') ." that allow sales", $list);
+            $html .= $this->createEditNode("Countries without a "._t('Distributor.SINGULAR_NAME', 'Distributor')." that allow sales", $list);
         }
-        $countries =  EcommerceCountry::get()->filter(array("DistributorID" => 0, "DoNotAllowSales" => 1));
+        $countries = EcommerceCountry::get()->filter(array("DistributorID" => 0, "DoNotAllowSales" => 1));
         if ($countries && $countries->count()) {
             $list = implode(", ", $countries->map("ID", "Code")->toArray());
-            $html .= $this->createEditNode("Countries without a ". _t('Distributor.SINGULAR_NAME', 'Distributor') ." that do not allow sales", $list);
+            $html .= $this->createEditNode("Countries without a "._t('Distributor.SINGULAR_NAME', 'Distributor')." that do not allow sales", $list);
         }
         return $html;
     }
@@ -470,7 +470,7 @@ 
         $defaultPriceText = ' (N.B. This is default for new variations ONLY - set actual prices under variations)';
         if ($products && $products->count()) {
             foreach ($products as $product) {
-                $withDefaultPrices = Permission::check('ADMIN') || (! $product->hasVariations());
+                $withDefaultPrices = Permission::check('ADMIN') || (!$product->hasVariations());
                 $html .= $this->createTreeNode($product->FullName, "pricing", array($product));
 
                 //country exceptions
@@ -492,7 +492,7 @@ 
                     //only show default price for ShopAdmin
                     if ($withDefaultPrices) {
                         $html .= $this->createEditNode(
-                            'Default Price' . ($product->hasVariations() ? $defaultPriceText : ''),
+                            'Default Price'.($product->hasVariations() ? $defaultPriceText : ''),
                             EcommercePayment::site_currency(),
                             $product->Price,
                             array(
@@ -508,7 +508,7 @@ 
                 $outstandingCountries = $this->countryArray;
                 if ($withDefaultPrices) {
                     $html .= $this->createTreeNode(
-                        'Country Prices' . ($product->hasVariations() ? $defaultPriceText : ''),
+                        'Country Prices'.($product->hasVariations() ? $defaultPriceText : ''),
                         " pricing countryPrices"
                     );
                 }
@@ -532,7 +532,7 @@ 
                             $countryName = EcommerceCountry::find_title($countryPricesObject->Country);
                             if ($withDefaultPrices) {
                                 $html .= $this->createEditNode(
-                                    $countryPricesObject->Country . ' - '. $countryName,
+                                    $countryPricesObject->Country.' - '.$countryName,
                                     $countryPricesObject->Currency,
                                     $countryPricesObject->Price,
                                     $data,
@@ -566,7 +566,7 @@ 
                         $countryName = EcommerceCountry::find_title($countryCode);
                         if ($withDefaultPrices) {
                             $html .= $this->createEditNode(
-                                $countryCode . ' - '. $countryName,
+                                $countryCode.' - '.$countryName,
                                 $currencyObject->Code,
                                 $addText,
                                 $data,
@@ -619,8 +619,8 @@ 
                                                 "F" => "Price"
                                             );
                                             $countryName = EcommerceCountry::find_title($countryPricesObject->Country);
-                                            $html .=  $this->createEditNode(
-                                                $countryPricesObject->Country . ' - '. $countryName,
+                                            $html .= $this->createEditNode(
+                                                $countryPricesObject->Country.' - '.$countryName,
                                                 $countryPricesObject->Currency,
                                                 $countryPricesObject->Price,
                                                 $data,
@@ -666,7 +666,7 @@ 
                                         );
                                         $countryName = EcommerceCountry::find_title($countryCode);
                                         $html .= $this->createEditNode(
-                                            $countryCode . ' - '. $countryName,
+                                            $countryCode.' - '.$countryName,
                                             $currency->Code,
                                             $addText,
                                             $data,

code/model/translations/CountryPrice_SiteTreeExtions.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
     public function loadTranslatedValues($countryID = 0, $variableOrMethod = '')
     {
         $translation = null;
-        if (! $countryID) {
+        if (!$countryID) {
             $countryObject = CountryPrice_EcommerceCountry::get_real_country();
             if ($countryObject) {
                 $countryID = $countryObject->ID;
@@ -42,7 +42,7 @@ 
         }
         if ($countryID) {
             $key = $this->owner->ID.'_'.$countryID;
-            if (! isset(self::$_translations[$key])) {
+            if (!isset(self::$_translations[$key])) {
                 $translation = $this->owner
                     ->CountryPriceTranslations()
                     ->filter(
@@ -62,7 +62,7 @@ 
             foreach ($fieldsToReplace as $replaceFields) {
                 $pageField = $replaceFields->PageField;
                 $translationField = $replaceFields->TranslationField;
-                if (! $variableOrMethod || $variableOrMethod === $pageField) {
+                if (!$variableOrMethod || $variableOrMethod === $pageField) {
                     if ($translation->hasMethod($translationField)) {
                         $pageFieldTranslated = $pageField.'Translated';
                         $this->owner->$pageField = $translation->$translationField();

code/control/CountryPrice_Page_Controller_Extension.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
         if ($countryObject) {
             $countryID = $countryObject->ID;
             $newURL = $this->addCountryCodeToUrlIfRequired($countryObject->Code);
-            if($newURL) {
+            if ($newURL) {
                 $this->owner->redirect($newURL);
             }
         }
@@ -95,7 +95,7 @@ 
         parse_str($urlParts['query'], $params);
 
         $param = Config::inst()->get('CountryPrice_Translation', 'locale_get_parameter');
-        $params[$param] = $countryCode;     // Overwrite if exists
+        $params[$param] = $countryCode; // Overwrite if exists
 
         // Note that this will url_encode all values
         $urlParts['query'] = http_build_query($params);
@@ -104,7 +104,7 @@ 
         if (function_exists('http_build_url')) {
             $newURL = http_build_url($urlParts);
         } else {
-            $newURL =  $urlParts['scheme'] . '://' . $urlParts['host'] . $urlParts['path'] . '?' . $urlParts['query'];
+            $newURL = $urlParts['scheme'].'://'.$urlParts['host'].$urlParts['path'].'?'.$urlParts['query'];
         }
 
         if ($oldURL !== $newURL && self::$_redirection_count < 3) {

Doc Comments +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
 
     /**
      * 
-     * @return DataList
+     * @return string
      */
     function AlternativeHrefLangLinksCachingKey()
     {

code/model/translations/CountryPrice_Translation.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
             DropdownField::create(
                 'EcommerceCountryID',
                 $fields->dataFieldByName('EcommerceCountryID')->Title(),
-                array('' => '-- make sure to select a country --')+$countries
+                array('' => '-- make sure to select a country --') + $countries
             ),
             'Title'
         );
@@ -151,7 +151,7 @@ 
     function Link()
     {
         $link = $this->Parent()->Link();
-        if($this->EcommerceCountryID) {
+        if ($this->EcommerceCountryID) {
             $link .= '?'.$this->Config()->get('locale_get_parameter').'='.$this->EcommerceCountry()->Code;
         }
         return $link;