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/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 +7 added lines, -7 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();
                     }
                 }
@@ -157,7 +157,7 @@ 
 
     public function canEdit($member = null)
     {
-        if (! $member) {
+        if (!$member) {
             $member = Member::currentUser();
         }
         if ($member) {
@@ -268,7 +268,7 @@ 
                 $countryMessageObject->CountrySpecificEmailMessage
             );
         }
-        if($step->SendEmailToDistributor) {
+        if ($step->SendEmailToDistributor) {
             if ($distributor = $this->owner->Distributor()) {
                 $distributorEmail = $distributor->Email;
                 if ($distributorEmail) {

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()) {

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 +4 added lines, -4 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>"
                     )
                 );
             }
@@ -200,7 +200,7 @@ 
         $order = ShoppingCart::current_order();
 
         //get country from EcommerceCountry
-        if (! $country) {
+        if (!$country) {
             $country = EcommerceCountry::get_country();
         }
 
@@ -240,9 +240,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/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,