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

13031 - adapt socolissmo fancy tpl js

Browse Source
This commit is contained in:
Srv Privilege de marque 2017-06-09 18:07:30 +02:00
parent 30deec0f7f
commit 37489f6426
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/socolissimo/CHANGELOG
View File

@ -22,6 +22,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of La Poste SA
*/
# 3.0.5
[-] MO :fix town name
# 3.0.4
[-] MO :fix for unauthorized countries

12
modules/socolissimo/socolissimo.php
View File

@ -70,7 +70,7 @@ class Socolissimo extends CarrierModule
{
$this->name = 'socolissimo';
$this->tab = 'shipping_logistics';
$this->version = '3.0.4';
$this->version = '3.0.5';
$this->author = 'Quadra Informatique';
$this->module_key = '8b991db851bdf7c64ca441f1a4481964';
$this->need_instance = 0;
@ -1004,6 +1004,8 @@ class Socolissimo extends CarrierModule
$weight = (float)$params['cart']->getTotalWeight() * 1000;
}
// Keep this fields order (see doc.)
// town fix
$town = str_replace('\'', ' ', Tools::substr($params['address']->city, 0, 32));
$inputs = array(
'pudoFOId' => Configuration::get('SOCOLISSIMO_ID'),
'ceName' => $this->replaceAccentedChars(Tools::substr($params['address']->lastname, 0, 34)),
@ -1019,7 +1021,7 @@ class Socolissimo extends CarrierModule
'ceAdress3' => $this->replaceAccentedChars(Tools::substr($params['address']->address1, 0, 38)),
'ceAdress4' => $this->replaceAccentedChars(Tools::substr($params['address']->address2, 0, 38)),
'ceZipCode' => $this->replaceAccentedChars($params['address']->postcode),
'ceTown' => $this->replaceAccentedChars(Tools::substr($params['address']->city, 0, 32)),
'ceTown' => $this->replaceAccentedChars($town),
'ceEmail' => $this->replaceAccentedChars($params['cookie']->email),
'cePhoneNumber' => $this->replaceAccentedChars(
str_replace(array(
@ -1078,7 +1080,7 @@ class Socolissimo extends CarrierModule
$tax_mention = $this->l(' TTC');
if ($free_shipping) {
$from_mention = '';
$initial_cost = $this->l('Free (Will be apply after address selection)');
$initial_cost = $this->l('Gratuit');
$tax_mention = '';
}
$this->context->smarty->assign(array(
@ -1467,7 +1469,7 @@ class Socolissimo extends CarrierModule
$new_address->lastname = trim($this->formatName($lastname));
$new_address->firstname = trim($this->formatName($firstname));
$new_address->postcode = $return['przipcode'];
$new_address->city = $return['prtown'];
$new_address->city = str_replace('\'',' ',$return['prtown']);
$new_address->id_country = $iso_code;
$new_address->alias = 'Colissimo - '.date('d-m-Y');
$new_address->phone_mobile = $return['cephonenumber'];
@ -1487,7 +1489,7 @@ class Socolissimo extends CarrierModule
((isset($return['pradress1'])) ? $new_address->other .= $return['pradress1'] : $new_address->other = '');
((isset($return['pradress4'])) ? $new_address->other .= ' | '.$return['pradress4'] : $new_address->other = '');
$new_address->postcode = $return['przipcode'];
$new_address->city = $return['prtown'];
$new_address->city = str_replace('\'',' ',$return['prtown']);
$new_address->id_country = $iso_code;
$new_address->alias = 'Colissimo - '.date('d-m-Y');
$new_address->add();

3
modules/socolissimo/views/templates/front/socolissimo_fancybox.tpl
View File

@ -141,7 +141,8 @@
});
} else {
$('[name=processCarrier]').unbind('click').live('click', function () {
if (($('#id_carrier' + soCarrierId).is(':checked')) || ($('.delivery_option_radio:checked').val() == soCarrierId + ','))
if (($('.delivery_option_radio:checked').val() == soSellerId + ',') ||
($('.delivery_option_radio:checked').val() == soCarrierId + ','))
{
if (acceptCGV()) {
$('#soLink').attr('href', link_socolissimo + serialiseInput(soInputs));