mondialrelay
'.$this->l('Configure Mondial Relay Rate Module').'
+
+ '.
+ $this->l('Try to turn off the cache and put the force compilation to on if you have any problems with the module after an update').'
+
- '.$this->l('Enter and save your Mondial Relay account settings').''.$this->l('The Carrier page').' '.$this->l('Settings updated').'
'.$this->l('Settings updated').'
'.$this->l('Delete successful').'
'.$this->l('Settings updated').'
-
'.$this->l('Click to display / hide the options').'
'.
@@ -934,9 +947,9 @@ class MondialRelay extends Module
'
';
- return $form;
+ return $form;
}
-
+
/*
** Form to allow personalization fields sent for MondialRelay
** Not used anymore but still present if needed
@@ -945,27 +958,27 @@ class MondialRelay extends Module
{
$form = '';
$warn = '';
-
+
// Load the Default value from the configuration
- $addr1 = (Configuration::get('PS_MR_SHOP_NAME')) ?
- Configuration::get('PS_MR_SHOP_NAME') :
+ $addr1 = (Configuration::get('PS_MR_SHOP_NAME')) ?
+ Configuration::get('PS_MR_SHOP_NAME') :
Configuration::get('PS_SHOP_NAME');
-
+
// Check if a request exist and if errors occured, use the post variable
if (Tools::isSubmit('PS_MRSubmitFieldPersonalization') && count($this->_postErrors))
$addr1 = Tools::safeOutput(Tools::getValue('Expe_ad1'));
-
+
if (!Configuration::get('PS_MR_SHOP_NAME'))
$warn .= ''.
$this->l('Its seems you updated Mondialrelay without use the uninstall / install method, you have to set up this part to make working the generating ticket process').
- '
';
+ '';
// Form
$form = '
';
$output .= '
';
$output .= ' '.$language['name'].' ';
-
+
$output .= '
' . $this->l('Weight Coefficient:') . '*
- (' . $this->l('grammes = 1 ') . Configuration::get('PS_WEIGHT_UNIT').')
-
+
@@ -1078,12 +1091,12 @@ class MondialRelay extends Module
{
$html = '';
$simpleresul = Db::getInstance()->executeS('
- SELECT * FROM ' . _DB_PREFIX_ . 'mr_selected
+ SELECT * FROM ' . _DB_PREFIX_ . 'mr_selected
WHERE id_cart='.(int)($id_cart));
-
- if (trim($simpleresul[0]['exp_number']) != '0')
+
+ if (trim($simpleresul[0]['exp_number']) != '0')
$html .= $this->l('Nb expedition:').$simpleresul[0]['exp_number']."".$this->l('Label URL')." ".$this->l('Follow-up URL')."
socolissimo
' . $this->l('Url of back office SoColissimo.') . '
+ '.$this->l('Fancybox').' :
+
+
'.$this->l('Supervision').' :
@@ -334,6 +345,7 @@ class Socolissimo extends CarrierModule
AND Configuration::updateValue('SOCOLISSIMO_OVERCOST', (float)(Tools::getValue('overcost')))
AND Configuration::updateValue('SOCOLISSIMO_SUP_URL', Tools::getValue('url_sup'))
AND Configuration::updateValue('SOCOLISSIMO_OVERCOST_TAX', Tools::getValue('id_tax_rules_group'))
+ AND Configuration::updateValue('SOCOLISSIMO_USE_FANCYBOX', Tools::getValue('SOCOLISSIMO_USE_FANCYBOX'))
AND Configuration::updateValue('SOCOLISSIMO_SUP', (int)(Tools::getValue('sup_active'))))
{
//save old carrier id if change
@@ -378,7 +390,10 @@ class Socolissimo extends CarrierModule
'CETOWN' => substr($this->upper($params['address']->city),0,32),
'DYWEIGHT' => ((float)($params['cart']->getTotalWeight()) * 1000),
'SIGNATURE' => htmlentities($signature,ENT_NOQUOTES, 'UTF-8'),
- 'TRPARAMPLUS' => (int)($carrierSo->id),
+ 'carrier_id' => (int)($carrierSo->id),
+ 'gift' => '',
+ 'gift_message' => '',
+ 'TRPARAMPLUS' => '',
'DYFORWARDINGCHARGES' => number_format((float)($params['cart']->getOrderShippingCost($carrierSo->id)), 2, ',', ''),
'DYPREPARATIONTIME' => (int)(Configuration::Get('SOCOLISSIMO_PREPARATION_TIME')),
'TRRETURNURLKO' => htmlentities($this->url,ENT_NOQUOTES, 'UTF-8'),
@@ -389,16 +404,25 @@ class Socolissimo extends CarrierModule
$serialsInput .= '&'.$key.'='.$val;
$serialsInput = ltrim($serialsInput, '&');
$row['id_carrier'] = (int)($carrierSo->id);
- $this->context->smarty->assign(array('urlSo' => Configuration::get('SOCOLISSIMO_URL').'?trReturnUrlKo='.htmlentities($this->url,ENT_NOQUOTES, 'UTF-8'),'id_carrier' => (int)($row['id_carrier']),
- 'inputs' => $inputs, 'serialsInput' => $serialsInput, 'finishProcess' => $this->l('To choose SoColissimo, click on a delivery method')));
+
+ $this->context->smarty->assign(array(
+ 'select_label' => $this->l('Select delivery mode'),
+ 'edit_label' => $this->l('Edit delivery mode'),
+ 'token' => sha1('socolissimo'._COOKIE_KEY_.$cookie->id_cart),
+ 'urlSo' => Configuration::get('SOCOLISSIMO_URL').'?trReturnUrlKo='.htmlentities($this->url,ENT_NOQUOTES, 'UTF-8'),
+ 'id_carrier' => (int)$row['id_carrier'],
+ 'inputs' => $inputs, 'serialsInput' => $serialsInput, 'finishProcess' => $this->l('To choose SoColissimo, click on a delivery method'),
+ ));
$country = new Country((int)($params['address']->id_country));
- $carriers = Carrier::getCarriers($this->context->language->id, true , false,false, NULL, Carrier::ALL_CARRIERS);
+
+ $carriers = Carrier::getCarriers($this->context->language->id, true , false, false, null, (defined('ALL_CARRIERS') ? ALL_CARRIERS : Carrier::ALL_CARRIERS));
+
$ids = array();
foreach($carriers as $carrier)
$ids[] = $carrier['id_carrier'];
- if ($this->getDeliveryInfos($this->context->cart->id, $this->context->customer->id))
+ if ($params['cart']->id_carrier == Configuration::Get('SOCOLISSIMO_CARRIER_ID') && $this->getDeliveryInfos($this->context->cart->id, $this->context->customer->id))
$this->context->smarty->assign('already_select_delivery', true);
else
$this->context->smarty->assign('already_select_delivery', false);
@@ -408,7 +432,10 @@ class Socolissimo extends CarrierModule
AND $this->checkSoCarrierAvailable((int)(Configuration::get('SOCOLISSIMO_CARRIER_ID')))
AND in_array((int)(Configuration::get('SOCOLISSIMO_CARRIER_ID')),$ids))
{
- return $this->display(__FILE__, 'socolissimo_carrier.tpl');
+ if (Configuration::get('PS_ORDER_PROCESS_TYPE') || Configuration::get('SOCOLISSIMO_USE_FANCYBOX'))
+ return $this->display(__FILE__, 'socolissimo_fancybox.tpl');
+ else
+ return $this->display(__FILE__, 'socolissimo_redirect.tpl');
}
else
{
@@ -497,6 +524,12 @@ class Socolissimo extends CarrierModule
}
+ public function hookpaymentTop($params)
+ {
+ if ($params['cart']->id_carrier == Configuration::Get('SOCOLISSIMO_CARRIER_ID') AND !$this->getDeliveryInfos((int)$params['cookie']->id_cart, (int)$params['cookie']->id_customer))
+ $params['cart']->id_carrier = 0;
+ }
+
public function make_key($ceName, $dyPraparationTime, $dyForwardingCharges, $trClientNumber, $orderId)
{
return sha1(Configuration::get('SOCOLISSIMO_ID').$ceName.$dyPraparationTime.$dyForwardingCharges.$trClientNumber.self::formatOrderId($orderId).Configuration::get('SOCOLISSIMO_KEY'));
diff --git a/modules/socolissimo/socolissimo_fancybox.tpl b/modules/socolissimo/socolissimo_fancybox.tpl
new file mode 100755
index 000000000..9f539aa3d
--- /dev/null
+++ b/modules/socolissimo/socolissimo_fancybox.tpl
@@ -0,0 +1,182 @@
+{*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author PrestaShop SA
+* @copyright 2007-2011 PrestaShop SA
+* @version Release: $Revision: 6735 $
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*}
+
+
+* @copyright 2007-2011 PrestaShop SA
+* @version Release: $Revision: 6735 $
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*}
+
+{foreach from=$inputs item=input key=name name=myLoop}
+ '.$so->displaySoError('999').': ';
$errors = explode(',', str_replace('+',',', $return['ERRORCODE']));
foreach($errors as $error)
- echo $so->displaySoError(rtrim($error));
+ echo $so->displaySoError(rtrim($error));
echo '
« Retour
'
+ ? '