sunnysideup / silverstripe-ecommerce_countries

code/model/buyables/CountryPrice_BuyableExtension.php

Spacing +3 added lines, -3 removed lines

@@ -223,7 +223,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;
@@ -311,7 +311,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: ');
                 }
@@ -408,7 +408,7 @@ 
      */
     public function canEdit($member = null)
     {
-        if (! $member) {
+        if (!$member) {
             $member = Member::currentUser();
         }
         if ($member) {

code/model/translations/CountryPrice_SiteTreeExtensions.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
     public function loadTranslatedValues($countryID = 0, $variableOrMethod = '')
     {
         $translation = null;
-        if (! $countryID) {
+        if (!$countryID) {
             $countryObject = CountryPrice_EcommerceCountry::get_real_country();
             if ($countryObject) {
                 $countryID = $countryObject->ID;
@@ -75,9 +75,9 @@ 
             $fieldsToReplace = $translation->FieldsToReplace();
             foreach ($fieldsToReplace as $replaceFields) {
                 $pageField = $replaceFields->PageField;
-                $pageFieldTranslated = $pageField . 'Translated';
+                $pageFieldTranslated = $pageField.'Translated';
                 $translationField = $replaceFields->TranslationField;
-                if (! $variableOrMethod || $variableOrMethod === $pageField) {
+                if (!$variableOrMethod || $variableOrMethod === $pageField) {
                     if ($translation->hasMethod($translationField)) {
                         $this->owner->$pageField = $translation->$translationField();
                         $this->owner->$pageFieldTranslated = $translation->$translationField();

code/interfaces/CountryURLProviderInterface.php

Doc Comments +3 added lines

@@ -3,14 +3,17 @@
 interface CountryURLProviderInterface
 {
     /**
+     * @return boolean
      */
     public function hasCountrySegment($url = '');
 
     /**
+     * @return string
      */
     public function replaceCountryCodeInUrl($countryCode, $url = '');
 
     /**
+     * @return string
      */
     public function addCountryCodeToUrl($countryCode, $url = '');
 }

code/model/translations/CountryPrice_Translation.php

Spacing +5 added lines, -5 removed lines

@@ -98,7 +98,7 @@ 
         $countryDropdownField = DropdownField::create(
             'EcommerceCountryID',
             $fields->dataFieldByName('EcommerceCountryID')->Title(),
-            array('' => '-- make sure to select a country --')+$countries
+            array('' => '-- make sure to select a country --') + $countries
         );
 
         // //$fields->removeFieldFromTab("Root.Main", 'ParentID');
@@ -131,7 +131,7 @@ 
                 );
             }
             if ($fields->dataFieldByName($useField)) {
-                $fields->dataFieldByName($useField)->setDescription(_t('CountryPrice_Translation.IGNORE', 'Use untranslated value for ') . $dbField);
+                $fields->dataFieldByName($useField)->setDescription(_t('CountryPrice_Translation.IGNORE', 'Use untranslated value for ').$dbField);
             }
         }
         if ($this->exists() && $this->ParentID) {
@@ -210,7 +210,7 @@ 
         );
         $this->extend('updateFieldsToReplace', $al);
         foreach ($al as $fieldToReplace) {
-            $ignoreField = 'UseOriginal' . $fieldToReplace->PageField;
+            $ignoreField = 'UseOriginal'.$fieldToReplace->PageField;
             if (!empty($this->owner->$ignoreField)) {
                 $al->remove($fieldToReplace);
             }
@@ -261,7 +261,7 @@ 
                                     'ParentID' => $buyable->ID
                                 );
                                 $ecommerceCountries[$countryObject->ID] = $countryObject;
-                                if (! CountryPrice_Translation::get()->filter($filter)->first()) {
+                                if (!CountryPrice_Translation::get()->filter($filter)->first()) {
                                     DB::alteration_message(
                                         'Creating fake translation for '.$buyable->Title.' for country '.$countryObject->Code,
                                         'created'
@@ -282,7 +282,7 @@ 
                             'EcommerceCountryID' => $countryObject->ID,
                             'ParentID' => $productGroup->ID
                         );
-                        if (! CountryPrice_Translation::get()->filter($filter)->first()) {
+                        if (!CountryPrice_Translation::get()->filter($filter)->first()) {
                             DB::alteration_message(
                                 'Creating fake translation for '.$productGroup->Title.' for country '.$countryObject->Code,
                                 'created'

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/model/CountryPrice.php

Spacing +8 added lines, -8 removed lines

@@ -65,7 +65,7 @@ 
      */
     public function Buyable()
     {
-        if (! $this->_myBuyable) {
+        if (!$this->_myBuyable) {
             $className = $this->ObjectClass;
             if (class_exists($this->ObjectClass)) {
                 $this->_myBuyable = $className::get()->byID($this->ObjectID);
@@ -87,9 +87,9 @@ 
      */
     public function CountryObject()
     {
-        if (! $this->_myCountryObject) {
+        if (!$this->_myCountryObject) {
             if ($this->Country) {
-                $this->_myCountryObject =  EcommerceCountry::get()
+                $this->_myCountryObject = EcommerceCountry::get()
                     ->filter(array("Code" => $this->Country))
                     ->First();
             }
@@ -146,7 +146,7 @@ 
      */
     public function getFullPrice()
     {
-        return "$this->Price $this->Currency" . ($this->isObsolete() ? ' (obsolete!)' : '');
+        return "$this->Price $this->Currency".($this->isObsolete() ? ' (obsolete!)' : '');
     }
 
     public function getCMSFields()
@@ -218,7 +218,7 @@ 
     public function canEdit($member = null)
     {
         $canEdit = parent::canEdit();
-        if (! $canEdit) {
+        if (!$canEdit) {
             $member = Member::currentUser();
             $distributor = $member->Distributor();
             if ($distributor->exists()) {
@@ -236,16 +236,16 @@ 
     protected function validate()
     {
         $result = parent::validate();
-        if (! $this->ObjectClass && isset($_REQUEST["MyObjectClass"])) {
+        if (!$this->ObjectClass && isset($_REQUEST["MyObjectClass"])) {
             if (class_exists($_REQUEST["MyObjectClass"])) {
                 $this->ObjectClass = Convert::raw2sql($_REQUEST["MyObjectClass"]);
             }
         }
-        if (! $this->ObjectID && isset($_REQUEST["MyObjectID"])) {
+        if (!$this->ObjectID && isset($_REQUEST["MyObjectID"])) {
             $this->ObjectID = intval($_REQUEST["MyObjectID"]);
         }
         //check for duplicates in case it has not been created yet...
-        if (! $this->ObjectClass || ! $this->ObjectID) {
+        if (!$this->ObjectClass || !$this->ObjectID) {
             $result->error('Object could not be created. Please contact your developer.');
             return $result;
         }

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) {
                 $param = Config::inst()->get('CountryPrice_Translation', 'locale_get_parameter');
 
                 // 1. CHECK FROM URL
@@ -231,7 +231,7 @@ 
                 }
 
                 //if we still dont have a country then we use the standard e-commerce methods ...
-                if (! $countryCode) {
+                if (!$countryCode) {
                     $countryCode = EcommerceCountry::get_country();
                 }
 
@@ -250,7 +250,7 @@ 
                     if (
                             ($country && $country->Code !== $urlCountryCode)
                         ||
-                            ! $country
+                            !$country
 
                     ) {
                         $country = DataObject::get_one('EcommerceCountry', ['Code' => $urlCountryCode]);
@@ -321,9 +321,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 +8 added lines, -8 removed lines

@@ -10,7 +10,7 @@ 
 
 class CountryURLProvider extends Object implements CountryURLProviderInterface
 {
-    private static $country_segments  = array('nz', 'au', 'gb', 'eu', 'jp', 'us', 'zz');
+    private static $country_segments = array('nz', 'au', 'gb', 'eu', 'jp', 'us', 'zz');
 
     public function hasCountrySegment($url = '')
     {
@@ -18,7 +18,7 @@ 
         $parsedUrl = parse_url($url);
         $pathSegments = explode("/", $parsedUrl['path']);
         $firstSegment = '';
-        $countries =  Config::inst()->get('CountryURLProvider', 'country_segments');
+        $countries = Config::inst()->get('CountryURLProvider', 'country_segments');
         foreach ($pathSegments as $position => $segment) {
             if ($segment) {
                 $firstSegment = $segment;
@@ -36,7 +36,7 @@ 
         $url = $this->getDefaultURL($url);
         $parsedUrl = parse_url($url);
         $pathParts = explode('/', $parsedUrl['path']);
-        $countries =  Config::inst()->get('CountryURLProvider', 'country_segments');
+        $countries = Config::inst()->get('CountryURLProvider', 'country_segments');
         foreach ($pathParts as $pathPartsKey => $pathPart) {
             //check for first match
             if (in_array($pathPart, $countries)) {
@@ -45,9 +45,9 @@ 
             }
         }
         $parsedUrl['path'] = implode('/', $pathParts);
-        $url = $parsedUrl['scheme']. '://'. $parsedUrl['host']. $parsedUrl['path'];
+        $url = $parsedUrl['scheme'].'://'.$parsedUrl['host'].$parsedUrl['path'];
         if (isset($parsedUrl['query'])) {
-            $url = $url . $parsedUrl['query'];
+            $url = $url.$parsedUrl['query'];
         }
         return $url;
     }
@@ -56,9 +56,9 @@ 
     {
         $url = $this->getDefaultURL($url);
         $parsedUrl = parse_url($url);
-        $url = $parsedUrl['scheme']. '://'. $parsedUrl['host']. '/'. strtolower($countryCode) . $parsedUrl['path'];
+        $url = $parsedUrl['scheme'].'://'.$parsedUrl['host'].'/'.strtolower($countryCode).$parsedUrl['path'];
         if (isset($parsedUrl['query'])) {
-            $url = $url . $parsedUrl['query'];
+            $url = $url.$parsedUrl['query'];
         }
         return $url;
     }
@@ -68,6 +68,6 @@ 
         if ($url) {
             return Director::absoluteURL($url);
         }
-        return (isset($_SERVER['HTTPS']) ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
+        return (isset($_SERVER['HTTPS']) ? "https" : "http")."://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
     }
 }

code/control/cms/CountryPrice_DistributorManagementTool.php

Spacing +28 added lines, -28 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,7 +424,7 @@ 
                 $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');
@@ -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,