antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-12417-RedirectLogged' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-02-01 12:24:58 +01:00
commit 7f57941994
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/bulkupdate/AdminBulkUpdate.php
View File

@ -1262,6 +1262,7 @@ class AdminBulkUpdate extends AdminTab {
fputcsv($f, array(
'supplier_reference',
'ean13',
'id_product',
'id_product_attribute',
'position',
@ -1271,7 +1272,6 @@ class AdminBulkUpdate extends AdminTab {
'quantity',
'product_name',
'combination',
'ean13',
'NC8',
'Pays de fabrication',
// 'location',
@ -1424,6 +1424,7 @@ class AdminBulkUpdate extends AdminTab {
sort($names, SORT_STRING);
fputcsv($f, array(
$v['supplier_reference'],
$v['ean13'],
$p->id,
$k,
$p->position,
@ -1433,7 +1434,6 @@ class AdminBulkUpdate extends AdminTab {
$v['qty'],
$p->name[$id_lang],
implode(' - ', $names),
$v['ean13'],
$customs['nc8'],
$customs['id_country'],
// $v['location'],
@ -1487,6 +1487,7 @@ class AdminBulkUpdate extends AdminTab {
fputcsv($f, array(
$p->supplier_reference,
$p->ean13,
$p->id,
0,
$p->position,
@ -1496,7 +1497,6 @@ class AdminBulkUpdate extends AdminTab {
$p->quantity,
$p->name[$id_lang],
'',
$p->ean13,
$customs['nc8'],
$customs['id_country'],
// $p->location,
@ -1569,6 +1569,7 @@ class AdminBulkUpdate extends AdminTab {
fputcsv($f, array(
'supplier_reference',
'ean13',
'id_product',
'id_product_attribute',
'position',
@ -1578,7 +1579,6 @@ class AdminBulkUpdate extends AdminTab {
'quantity',
'product_name',
'combination',
'ean13',
'NC8',
'Pays de fabrication',
// 'location',
@ -1730,6 +1730,7 @@ class AdminBulkUpdate extends AdminTab {
fputcsv($f, array(
$v['supplier_reference'],
$v['ean13'],
$p->id,
$k,
$p->position,
@ -1739,7 +1740,6 @@ class AdminBulkUpdate extends AdminTab {
$v['qty'],
$p->name[$id_lang],
implode(' - ', $names),
$v['ean13'],
$customs['nc8'],
$customs['id_country'],
// $v['location'],
@ -1795,6 +1795,7 @@ class AdminBulkUpdate extends AdminTab {
fputcsv($f, array(
$p->supplier_reference,
$p->ean13,
$p->id,
0,
$p->position,
@ -1804,7 +1805,6 @@ class AdminBulkUpdate extends AdminTab {
$p->quantity,
$p->name[$id_lang],
'',
$p->ean13,
$customs['nc8'],
$customs['id_country'],
// $p->location,

6
modules/logistics/carriers/laposte/webservice_wsu.php
View File

@ -152,7 +152,7 @@ class Parcel {
if($this->product_type == 'BOM') {
$this->product_type = 'DOM';
}
if(!in_array($so_data['cecountry'], array('BE', 'AD', 'MC', 'FR', 'GP', 'RE', 'MQ', 'YT', 'NC', 'PM', 'GF'))) {
if(!in_array($so_data['cecountry'], array('ES', 'BE', 'AD', 'MC', 'FR', 'GP', 'RE', 'MQ', 'YT', 'NC', 'PM', 'GF'))) {
$this->product_type = 'DOS';
}
@ -173,6 +173,10 @@ class Parcel {
$this->dst_address['firstName'] = mb_substr(str_replace(array('°', 'º', 'º', 'º', 'ª', 'ā','ª','Á','ł','','İ'), array(' ', '', '', '', 'a', 'a','a','A','l',' ','i'), $so_data['prfirstname']), 0, 29);
}
if(!empty($so_data['cecompanyname'])) {
$this->dst_address['companyName'] = mb_substr(str_replace(array('°', 'º', 'º', 'º', 'ª', 'ā','ª','Á','ł','','İ'), array(' ', '', '', '', 'a', 'a','a','A','l',' ','i'), $so_data['cecompanyname']), 0, 35);
}
$address_lines = array();
for($i = 1; $i < 5; $i++) {
if(($line = (string) mb_substr($so_data['pradress'.$i], 0, 32)) != '') {

12
modules/privatesales_logistique/AdminPrivateSalesLogistique.php
View File

@ -673,6 +673,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
fputcsv($f, array(
'supplier_reference',
'ean13',
'id_product',
'id_product_attribute',
'position',
@ -682,7 +683,6 @@ class AdminPrivateSalesLogistique extends AdminTab {
'quantity',
'product_name',
'combination',
'ean13',
'NC8',
'Pays de fabrication',
// 'location',
@ -834,6 +834,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
fputcsv($f, array(
$v['supplier_reference'],
$v['ean13'],
$p->id,
$k,
$p->position,
@ -843,7 +844,6 @@ class AdminPrivateSalesLogistique extends AdminTab {
$v['qty'],
$p->name[$id_lang],
implode(' - ', $names),
$v['ean13'],
$customs['nc8'],
$customs['id_country'],
// $v['location'],
@ -900,6 +900,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
fputcsv($f, array(
$p->supplier_reference,
$p->ean13,
$p->id,
0,
$p->position,
@ -909,7 +910,6 @@ class AdminPrivateSalesLogistique extends AdminTab {
$p->quantity,
$p->name[$id_lang],
'',
$p->ean13,
$customs['nc8'],
$customs['id_country'],
// $p->location,
@ -983,6 +983,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
fputcsv($f, array(
'supplier_reference',
'ean13',
'id_product',
'id_product_attribute',
'position',
@ -992,7 +993,6 @@ class AdminPrivateSalesLogistique extends AdminTab {
'quantity',
'product_name',
'combination',
'ean13',
'NC8',
'Pays de fabrication',
'public_price_wt',
@ -1140,6 +1140,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
sort($names, SORT_STRING);
fputcsv($f, array(
$v['supplier_reference'],
$v['ean13'],
$p->id,
$k,
$p->position,
@ -1149,7 +1150,6 @@ class AdminPrivateSalesLogistique extends AdminTab {
$v['qty'],
$p->name[$id_lang],
implode(' - ', $names),
$v['ean13'],
$customs['nc8'],
$customs['id_country'],
str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2, NULL, FALSE, FALSE)),
@ -1199,6 +1199,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
fputcsv($f, array(
$p->supplier_reference,
$p->ean13,
$p->id,
0,
$p->position,
@ -1208,7 +1209,6 @@ class AdminPrivateSalesLogistique extends AdminTab {
$p->quantity,
$p->name[$id_lang],
'',
$p->ean13,
$customs['nc8'],
$customs['id_country'],
str_replace('.', ',', $p->getPrice(TRUE, NULL, 2, NULL, FALSE, FALSE)),

3
modules/privatesales_logistique/exportOrderForm.php
View File

@ -6,7 +6,8 @@ require_once(dirname(__FILE__).'/../../init.php');
require_once(_PS_MODULE_DIR_.'privatesales/Sale.php');
require_once('AdminPrivateSalesLogistique.php');
require_once dirname(__FILE__).'/classes/SaleStats.php';
ini_set('memory_limit', '1024M');
ini_set('memory_limit', '4096M');
ini_set('max_execution_time', 0);
set_include_path(get_include_path() . PATH_SEPARATOR . _PS_MODULE_DIR_.'privatesales_logistique/classes/');
include_once('PHPExcel.php');

2
override/controllers/AuthController.php
View File

@ -80,7 +80,7 @@ class AuthController extends AuthControllerCore {
Module::hookExec('preprocess');
if(self::$cookie->isLogged() && !Tools::isSubmit('ajax')) {
Tools::redirect('my-account.php');
Tools::redirect('/');
}
if(Tools::getValue('create_account')) {