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
controllers/admin/AdminAccountingConfigurationController.php
+1 -1
View File
@@ -141,7 +141,7 @@ class AdminAccountingConfigurationControllerCore extends AdminController
foreach ($this->acc_conf as $name => $val)
$this->acc_conf[$name] = Tools::getValue($name);
Configuration::updateValue(Accounting::CONF_NAME, serialize($this->acc_conf));
Accounting::updateConfiguration($this->acc_conf);
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token.'&update=true');
}
else if (Tools::getValue('update'))
controllers/admin/AdminAccountingManagementController.php
+3 -5
View File
@@ -59,11 +59,11 @@ class AdminAccountingManagementControllerCore extends AdminController
$shop['default_account_number'] = Configuration::get('default_account_number', null, null, $id_shop);
ksort($shop['zones']);
$zoneShopList = Accounting::getAccountNumberZoneShop($id_shop);
$zone_shop_list = Accounting::getAccountNumberZoneShop($id_shop);
// Set Account number to the id_zone for the id_shop if exist
foreach ($zoneShopList as $zoneShop)
$shop['zones'][$zoneShop['id_zone']]['account_number'] = $zoneShop['account_number'];
foreach ($zone_shop_list as $zone_shop)
$shop['zones'][$zone_shop['id_zone']]['account_number'] = $zone_shop['account_number'];
}
$this->context->smarty->assign(array(
@@ -130,8 +130,6 @@ class AdminAccountingManagementControllerCore extends AdminController
$this->confirmations[] = $this->l('Account numbers have been updated');
else
$this->errors[] = $this->l('Account Numbers could not be updated or added in the database');
//$token = Tools::getValue('token') ? Tools::getValue('token') : $this->token;
//Tools::redirectAdmin(self::$currentIndex.'&token='.$token);
}
}
controllers/admin/AdminAccountingRegisteredNumberController.php
+4 -5
View File
@@ -63,7 +63,7 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
'title' => $this->l('Taxes Account number list'),
'list' => array()),
// Gift wrapping definition, for now Only one available using Configuration
// Gift wrapping definition
'gift_wrapping' => array(
'func_call' => 'getAccountingNumberConfiguration',
'key' => 'account_gift_wripping',
@@ -74,7 +74,7 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
'title' => $this->l('Gift wrapping account number list'),
'list' => array()),
// Submited shipping charge definition, for now Only one available using Configuration
// Submited shipping charge definition
'submited_shipping_charge' => array(
'func_call' => 'getAccountingNumberConfiguration',
'key' => 'account_submit_shipping_charge',
@@ -85,7 +85,7 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
'title' => $this->l('Submited shipping charge account number list'),
'list' => array()),
// Unsubmited shipping charge definition, for now Only one available using Configuration
// Unsubmited shipping charge definition
'unsubmited_shipping_charge' => array(
'func_call' => 'getAccountingNumberConfiguration',
'key' => 'account_unsubmit_shipping_charge',
@@ -127,7 +127,6 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
{
$this->initToolbarTitle();
$this->toolbar_btn = array();
}
public function initContent()
@@ -144,7 +143,7 @@ class AdminAccountingRegisteredNumberControllerCore extends AdminController
}
/**
* Return the gift wripping number set.
* Return the value configuration requested.
*
* @TODO : Add the possibility to check in all shop
* @param string $key of the Accounting configuration