@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | 'Root.FAQPage', |
| 89 | 89 | new LiteralField( |
| 90 | 90 | "FAQPageExplanation", |
| 91 | - "<p class=\"message warning\">FAQ information can only be added to the main country for a ". _t('Distributor.SINGULAR_NAME', 'Distributor') ."</p>" |
|
| 91 | + "<p class=\"message warning\">FAQ information can only be added to the main country for a "._t('Distributor.SINGULAR_NAME', 'Distributor')."</p>" |
|
| 92 | 92 | ) |
| 93 | 93 | ); |
| 94 | 94 | } |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | $order = ShoppingCart::current_order(); |
| 201 | 201 | |
| 202 | 202 | //get country from EcommerceCountry |
| 203 | - if (! $country) { |
|
| 203 | + if (!$country) { |
|
| 204 | 204 | $country = EcommerceCountry::get_country(); |
| 205 | 205 | } |
| 206 | 206 | |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | else { |
| 225 | 225 | //last chance ... do this only once ... |
| 226 | 226 | $countryCode = EcommerceCountry::get_country_default(); |
| 227 | - if($countryCode && !$originalCountry) { |
|
| 227 | + if ($countryCode && !$originalCountry) { |
|
| 228 | 228 | return self::get_real_country($countryCode); |
| 229 | 229 | } |
| 230 | 230 | } |
@@ -238,9 +238,9 @@ discard block |
||
| 238 | 238 | public static function get_backup_country() |
| 239 | 239 | { |
| 240 | 240 | $obj = EcommerceCountry::get()->filter(array("IsBackupCountry" => true))->first(); |
| 241 | - if (! $obj) { |
|
| 241 | + if (!$obj) { |
|
| 242 | 242 | $obj = EcommerceCountry::get()->filter(array("Code" => EcommerceConfig::get('EcommerceCountry', 'default_country_code')))->first(); |
| 243 | - if (! $obj) { |
|
| 243 | + if (!$obj) { |
|
| 244 | 244 | $obj = EcommerceCountry::get()->first(); |
| 245 | 245 | } |
| 246 | 246 | } |
@@ -220,8 +220,7 @@ |
||
| 220 | 220 | $country = $realCountry; |
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | - } |
|
| 224 | - else { |
|
| 223 | + } else { |
|
| 225 | 224 | //last chance ... do this only once ... |
| 226 | 225 | $countryCode = EcommerceCountry::get_country_default(); |
| 227 | 226 | if($countryCode && !$originalCountry) { |