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

[-] BO : Update Accounting geolocalization for France

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14014 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vSchoener
2012-03-09 14:36:43 +00:00
parent 0731890ea8
commit 3c1ab4ba56
6 changed files with 67 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Accounting.php
+24 -14
View File
@@ -31,30 +31,29 @@ class AccountingCore
/**
* Default Values
*
* @TODO: Check to put the default value into the localization pack
* All key modification have to be changed into the localization pack and xml
* This configuration is applied for a specific shop
*
* @var array
*/
public static $acc_conf = array(
'customer_prefix' => '411',
'journal' => 'VE',
'account_length' => 13,
'account_submit_shipping_charge' => '708510',
'account_unsubmit_shipping_charge' => '708520',
'customer_prefix' => '',
'journal' => '',
'account_length' => '',
'account_submit_shipping_charge' => '',
'account_unsubmit_shipping_charge' => '',
'account_gift_wripping' => '',
'account_handling' => ''
'account_handling' => ''
);
public static $acc_conf_cached = false;
/**
* Set an account number to a zone (will be refactoring for a dynamic use depending of the Controller)
* @var array $assoZoneShopList correspond to an associated list of id_zone - id_shop - num
* @var array $asso_zone_shop_list correspond to an associated list of id_zone - id_shop - num
* @return bool To know if any modification in the database succeed
*/
public static function setAccountNumberByZoneShop($assoZoneShopList)
public static function setAccountNumberByZoneShop($asso_zone_shop_list)
{
$query = '
REPLACE INTO`'._DB_PREFIX_.'accounting_zone_shop`
@@ -64,7 +63,7 @@ class AccountingCore
$values = '';
// Build the query for the update
foreach ($assoZoneShopList as $asso)
foreach ($asso_zone_shop_list as $asso)
if (array_key_exists('id_zone', $asso) &&
array_key_exists('id_shop', $asso) &&
array_key_exists('num', $asso))
@@ -78,10 +77,10 @@ class AccountingCore
/**
* Add or update product accounting information for a product (will be refactoring for a dynamic use depending of the Controller)
* @param array $assoProductZoneShop
* @param array $asso_product_zone_shop
* @return mixed bool|array
*/
public static function saveProductAccountingInformations($assoProductZoneShop)
public static function saveProductAccountingInformations($asso_product_zone_shop)
{
$query = '
REPLACE INTO`'._DB_PREFIX_.'accounting_product_zone_shop`
@@ -89,7 +88,7 @@ class AccountingCore
VALUES %s';
$values = '';
foreach ($assoProductZoneShop as $asso)
foreach ($asso_product_zone_shop as $asso)
if (array_key_exists('id_zone', $asso) &&
array_key_exists('id_shop', $asso) &&
array_key_exists('id_product', $asso) &&
@@ -155,6 +154,17 @@ class AccountingCore
return (!$key) ? self::$acc_conf : ((isset(self::$acc_conf[$key]) ? self::$acc_conf[$key] : false));
}
/**
* Update Accounting configuration
*
* @static
* @param $acc_conf
*/
public static function updateConfiguration($acc_conf)
{
Configuration::updateValue(Accounting::CONF_NAME, serialize($acc_conf));
}
/**
* Get the list of export done
*
classes/LocalizationPack.php
+25
View File
@@ -53,6 +53,7 @@ class LocalizationPackCore
$res &= $this->installConfiguration($xml);
$res &= $this->installModules($xml);
$res &= $this->updateDefaultGroupDisplayMethod($xml);
$res &= $this->installAccounting($xml);
if (!defined('_PS_MODE_DEV_') || !_PS_MODE_DEV_)
$res &= $this->_installLanguages($xml, $install_mode);
@@ -75,6 +76,30 @@ class LocalizationPackCore
return true;
}
/**
* Install the default value for accounting
*
* @param $xml
* @return true
*/
protected function installAccounting($xml)
{
if (isset($xml->accounting->conf))
{
$acc_conf = Accounting::getConfiguration();
foreach ($xml->accounting->conf as $conf)
{
$attributes = $conf->attributes();
if (isset($attributes['name']) &&
isset($attributes['value']) &&
isset($acc_conf[(string)($attributes['name'])]))
$acc_conf[(string)($attributes['name'])] = (string)$attributes['value'];
}
Accounting::updateConfiguration($acc_conf);
}
return true;
}
protected function _installStates($xml)
{
if (isset($xml->states->state))