dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] BO #PSFV-94 : Added AdminImportController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9974 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-11-08 17:54:08 +00:00
parent c8556afc76
commit fc8b5cda7c
10 changed files with 2210 additions and 1872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Address.php
+1 -1
View File
@@ -333,7 +333,7 @@ class AddressCore extends ObjectModel
$address = new Address((int)$id_address);
if (!Validate::isLoadedObject($address))
throw new Exception('Invalid address');
throw new PrestashopException('Invalid address');
}
return $address;
classes/HelperForm.php
-1
View File
@@ -86,7 +86,6 @@ class HelperFormCore extends Helper
'title' => $this->title,
'firstCall' => $this->first_call,
'current' => $this->currentIndex,
'title' => $this->title,
'token' => $this->token,
'table' => $this->table,
'languages' => $this->languages,
classes/shop/Shop.php
+22
View File
@@ -259,6 +259,28 @@ class ShopCore extends ObjectModel
return $shop;
}
/**
* @return Address the current shop address
*/
public function getAddress()
{
if (!isset($this->address))
{
$address = new Address();
$address->company = Configuration::get('PS_SHOP_NAME');
$address->id_country = Configuration::get('PS_SHOP_COUNTRY_ID');
$address->id_state = Configuration::get('PS_SHOP_STATE_ID');
$address->address1 = Configuration::get('PS_SHOP_ADDR1');
$address->address2 = Configuration::get('PS_SHOP_ADDR2');
$address->postcode = Configuration::get('PS_SHOP_CODE');
$address->city = Configuration::get('PS_SHOP_CITY');
$this->address = $address;
}
return $this->address;
}
/**
* Get shop theme name
*