sunnysideup / silverstripe-ecommerce_countries

code/control/cms/CountryPrice_TestController.php

Doc Comments +1 added lines, -1 removed lines

@@ -347,7 +347,7 @@
     /**
      * returns the Distributor for the user
      * Needs to be in model so we can access from the order in the template.
-     * @return Varchar Field
+     * @return Distributor Field
      */
     public function MyDistributor()
     {

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
     public function init()
     {
         parent::init();
-        if (! Permission::check('ADMIN')) {
+        if (!Permission::check('ADMIN')) {
             return Security::permissionFailure($this, 'This page is secured and you need administrator rights to access it. You can also save the page in the CMS to get 15 minutes access without being logged in.');
         }
     }
@@ -181,17 +181,17 @@ 
             "MyCountryCode" => "This is the key function",
             "MyCountryTitle" => "",
             "MyCurrency" => "Based on the currency set in the order.",
-            "MyDistributor" => "You have to set the ". _t('Distributor.SINGULAR_NAME', 'Distributor') . "'s countries in order to work out someone's ". _t('Distributor.SINGULAR_NAME', 'Distributor') . ".",
+            "MyDistributor" => "You have to set the "._t('Distributor.SINGULAR_NAME', 'Distributor')."'s countries in order to work out someone's "._t('Distributor.SINGULAR_NAME', 'Distributor').".",
             "MyDistributorCountry" => "This is the country that is being used for the sale.  For dodgy countries, we use the backup country.",
-            "MyDeliveryCostNote" => "Set in country, ". _t('Distributor.SINGULAR_NAME', 'Distributor') . " and default country.",
-            "MyShippingDeliveryInfo" => "Set in country, ". _t('Distributor.SINGULAR_NAME', 'Distributor') . " and default country.",
-            "MyShippingReturnInfo" => "Set in country, ". _t('Distributor.SINGULAR_NAME', 'Distributor') . " and default country.",
-            "MyProductNotAvailableNote" => "Set in country, ". _t('Distributor.SINGULAR_NAME', 'Distributor') . ", default country, AND the Ecommerce Config.",
+            "MyDeliveryCostNote" => "Set in country, "._t('Distributor.SINGULAR_NAME', 'Distributor')." and default country.",
+            "MyShippingDeliveryInfo" => "Set in country, "._t('Distributor.SINGULAR_NAME', 'Distributor')." and default country.",
+            "MyShippingReturnInfo" => "Set in country, "._t('Distributor.SINGULAR_NAME', 'Distributor')." and default country.",
+            "MyProductNotAvailableNote" => "Set in country, "._t('Distributor.SINGULAR_NAME', 'Distributor').", default country, AND the Ecommerce Config.",
             "MyStockistSearchPage" => "",
             "MyStockistCountryPage" => "The stockist page that is related to the visitor's country",
             "MyCountryFAQPage" => "",
             "MyBackupCountryCode" => "This country is used if the information for the selected country is not available.",
-            "MyDefaultDistributor" => "You can set one default ". _t('Distributor.SINGULAR_NAME', 'Distributor') . " (head office) with a tickbox for any ". _t('Distributor.SINGULAR_NAME', 'Distributor') ,
+            "MyDefaultDistributor" => "You can set one default "._t('Distributor.SINGULAR_NAME', 'Distributor')." (head office) with a tickbox for any "._t('Distributor.SINGULAR_NAME', 'Distributor'),
 
         );
         $array = array(
@@ -211,7 +211,7 @@ 
             "MyDefaultDistributor" => "Object",
         );
         echo "<h1>Current Settings</h1>";
-        echo "<p>Most of these settings can be adjusted in the country, ". _t('Distributor.SINGULAR_NAME', 'Distributor') . " and generic e-commerce settings.</p>";
+        echo "<p>Most of these settings can be adjusted in the country, "._t('Distributor.SINGULAR_NAME', 'Distributor')." and generic e-commerce settings.</p>";
         foreach ($array as $name => $type) {
             $style = "created";
             $notSet = false;
@@ -245,7 +245,7 @@ 
                     }
                 }
             }
-            if (! $string) {
+            if (!$string) {
                 $string = "NOT SET";
                 $style = "deleted";
             }

code/control/CountryPrice_ChangeCountryController.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,8 +69,8 @@
     /**
      * Remove a query string parameter from an URL.
      *
-     * @param string $url
      * @param string $varname
+     * @param string $newCountryCode
      *
      * @return string
      */

Spacing +2 added lines, -2 removed lines

@@ -114,9 +114,9 @@
             }
 
             $path = isset($parsedUrl['path']) ? $parsedUrl['path'] : '';
-            $query = !empty($query) ? '?'. http_build_query($query) : '';
+            $query = !empty($query) ? '?'.http_build_query($query) : '';
 
-            $url = $parsedUrl['scheme']. '://'. $parsedUrl['host']. $path. $query;
+            $url = $parsedUrl['scheme'].'://'.$parsedUrl['host'].$path.$query;
 
             return $url;
         }

code/model/buyables/CountryPrice_BuyableExtension.php

Doc Comments +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
     /**
      * This is called from /ecommerce/code/Product
      * returning NULL is like returning TRUE, i.e. ignore this.
-     * @param Member (optional)   $member
+     * @param Member Member   $member
      * @param bool (optional)     $checkPrice
      * @return false | null
      */
@@ -400,7 +400,7 @@ 
      * as long as we do not give distributors access to the Products
      * this is fairly safe.
      * @param member (optiona) $member
-     * @return null / bool
+     * @return boolean / bool
      */
     public function canEdit($member = null)
     {

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/buyables/CountryPrice_CopyPrices.php

Doc Comments -1 removed lines

@@ -96,7 +96,6 @@
      *  - ID
      * searches through children, until all all childpages have been added
      *
-     * @param  string $country [description]
      * @param  array  $values  [description]
      * @return array          [description]
      */

Spacing +2 added lines, -2 removed lines

@@ -25,11 +25,11 @@
             } else {
                 $fromCountriesArray = array();
             }
-            $allCountries =  EcommerceCountry::get();
+            $allCountries = EcommerceCountry::get();
             $toCountries = array();
             foreach ($allCountries as $country) {
                 $country = CountryPrice_EcommerceCountry::get_real_country($country);
-                $toCountries[$country->Code] = $country->Name . ($country->DoNotAllowSales ? ' (Sales not allowed)' : '');
+                $toCountries[$country->Code] = $country->Name.($country->DoNotAllowSales ? ' (Sales not allowed)' : '');
             }
             $countryCurrencies = CountryPrice_EcommerceCurrency::get_currency_per_country();
             $link = CountryPrice_CopyPrices_Controller::get_link($this->owner);

code/model/CountryPrice.php

Doc Comments +1 added lines, -1 removed lines

@@ -244,7 +244,7 @@
 
     /**
      * Returns if the currency is an old currency not used anymore.
-     * @return Boolean
+     * @return boolean|null
      */
     public function isObsolete()
     {

Spacing +9 added lines, -9 removed lines

@@ -65,9 +65,9 @@ 
      */
     public function Buyable()
     {
-        if(! $this->_myBuyable) {
+        if (!$this->_myBuyable) {
             $className = $this->ObjectClass;
-            if ( class_exists($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/process/extensions/CountryPrice_OrderDOD.php

Doc Comments +1 added lines

@@ -47,6 +47,7 @@
      * this method basically makes sure that the Order
      * has all the localised stuff attached to it, specifically
      * the right currency
+     * @param string $countryCode
      */
     public static function localise_order($countryCode = null, $force = false)
     {

Indentation +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
         $order = Order::get()->byID($order->ID);
         $orderHasBeenChanged = false;
 
-         //check currency ...
+            //check currency ...
         if ($order->CurrencyUsedID != $currencyObject->ID) {
             $order->SetCurrency($currencyObject);
             $orderHasBeenChanged = true;
@@ -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 +6 added lines, -6 removed lines

@@ -61,7 +61,7 @@ 
         if ($order->IsSubmitted()) {
             return true;
         }
-        if (! $countryCode) {
+        if (!$countryCode) {
             $countryCode = $order->getCountry();
         }
         $currencyObject = CountryPrice_EcommerceCurrency::get_currency_for_country($countryCode);
@@ -75,13 +75,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();
             }
@@ -90,7 +90,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;
@@ -111,7 +111,7 @@ 
             if ($items) {
                 foreach ($items as $item) {
                     $buyable = $item->Buyable(true);
-                    if (! $buyable->canPurchase()) {
+                    if (!$buyable->canPurchase()) {
                         $item->delete();
                     }
                 }
@@ -162,7 +162,7 @@ 
 
     public function canEdit($member = null)
     {
-        if (! $member) {
+        if (!$member) {
             $member = Member::currentUser();
         }
         if ($member) {

code/forms/CountryPrice_OrderFormAddressExtension.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
         if ($allowedCountries->count()) {
             $allowedCountryCodes = $allowedCountries->column('Code');
             foreach ($newSource as $key => $value) {
-                if (! in_array($key, $allowedCountryCodes)) {
+                if (!in_array($key, $allowedCountryCodes)) {
                     unset($newSource[$key]);
                 }
             }

code/model/Distributor.php

Spacing +6 added lines, -6 removed lines

@@ -111,7 +111,7 @@ 
         //secondary for another country
         $fields->removeByName('Versions');
         if ($listOfCountriesCovered && $listOfCountriesCovered->count()) {
-            $countryArray =  array(" -- please select --") + $listOfCountriesCovered->toArray();
+            $countryArray = array(" -- please select --") + $listOfCountriesCovered->toArray();
             $fields->addFieldToTab("Root.CountryDetails", DropdownField::create("PrimaryCountryID", "Primary Country", $countryArray));
         } else {
             $fields->removeByName('PrimaryCountryID');
@@ -143,7 +143,7 @@ 
                         'IsDefault' => 'Default',
                         'Email' => 'Email'
                     );
-                    $table = '<table class="versions"><thead><tr><th>' . implode('</th><th>', $columns) . '</th></tr></thead><tbody>';
+                    $table = '<table class="versions"><thead><tr><th>'.implode('</th><th>', $columns).'</th></tr></thead><tbody>';
                     $version = $this->Version - 1;
                     while ($version > 0) {
                         $versionDO = Versioned::get_version('Distributor', $this->ID, $version--);
@@ -151,7 +151,7 @@ 
                         foreach ($columns as $column => $title) {
                             $values[] = $versionDO->$column;
                         }
-                        $table .= '<tr><td>' . implode('</td><td>', $values) . '</td></tr>';
+                        $table .= '<tr><td>'.implode('</td><td>', $values).'</td></tr>';
                     }
                     $table .= '</tbody></table>';
                     $table .= "<style type=\"text/css\">
@@ -234,7 +234,7 @@ 
         }
         if ($this->PrimaryCountryID > 0 && EcommerceCountry::get()->byID(intval($this->PrimaryCountryID))) {
             $primaryCountry = $this->PrimaryCountry();
-            if (! $this->Countries()->byID($this->PrimaryCountryID)) {
+            if (!$this->Countries()->byID($this->PrimaryCountryID)) {
                 $this->Countries()->add($primaryCountry);
             }
         } else {
@@ -253,7 +253,7 @@ 
     public function onAfterWrite()
     {
         parent::onAfterWrite();
-        if (! self::$_ran_after_write) {
+        if (!self::$_ran_after_write) {
             self::$_ran_after_write = true;
             $this->setupUser();
         }
@@ -371,7 +371,7 @@ 
                 $member = Member::create($filter);
                 //$thisMember->SetPassword = substr(session_id, 0, 8);
             }
-            $member->FirstName = trim(_t('Distributor.SINGULAR_NAME', 'Distributor') . _t('Distributor.FOR', ' for '));
+            $member->FirstName = trim(_t('Distributor.SINGULAR_NAME', 'Distributor')._t('Distributor.FOR', ' for '));
             $member->Surname = $this->Name;
             $member->DistributorID = $this->ID;
             $member->write();

code/model/process/extensions/CountryPrice_OrderStatusLog_AND_OrderAtribute.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
     }
     public function canView($member = null)
     {
-        if (! $this->owner->ID) {
+        if (!$this->owner->ID) {
             return true;
         } elseif ($member && $member->DistributorID) {
             if ($order = $this->owner->Order()) {