+* @author Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
+* @version $Id: nusoapmime.php,v 1.13 2010/04/26 20:15:08 snichol Exp $
+* @access public
+*/
+class nusoap_server_mime extends nusoap_server {
+ /**
+ * @var array Each array element in the return is an associative array with keys
+ * data, filename, contenttype, cid
+ * @access private
+ */
+ var $requestAttachments = array();
+ /**
+ * @var array Each array element in the return is an associative array with keys
+ * data, filename, contenttype, cid
+ * @access private
+ */
+ var $responseAttachments;
+ /**
+ * @var string
+ * @access private
+ */
+ var $mimeContentType;
+
+ /**
+ * adds a MIME attachment to the current response.
+ *
+ * If the $data parameter contains an empty string, this method will read
+ * the contents of the file named by the $filename parameter.
+ *
+ * If the $cid parameter is false, this method will generate the cid.
+ *
+ * @param string $data The data of the attachment
+ * @param string $filename The filename of the attachment (default is empty string)
+ * @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
+ * @param string $cid The content-id (cid) of the attachment (default is false)
+ * @return string The content-id (cid) of the attachment
+ * @access public
+ */
+ function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
+ if (! $cid) {
+ $cid = md5(uniqid(time()));
+ }
+
+ $info['data'] = $data;
+ $info['filename'] = $filename;
+ $info['contenttype'] = $contenttype;
+ $info['cid'] = $cid;
+
+ $this->responseAttachments[] = $info;
+
+ return $cid;
+ }
+
+ /**
+ * clears the MIME attachments for the current response.
+ *
+ * @access public
+ */
+ function clearAttachments() {
+ $this->responseAttachments = array();
+ }
+
+ /**
+ * gets the MIME attachments from the current request.
+ *
+ * Each array element in the return is an associative array with keys
+ * data, filename, contenttype, cid. These keys correspond to the parameters
+ * for addAttachment.
+ *
+ * @return array The attachments.
+ * @access public
+ */
+ function getAttachments() {
+ return $this->requestAttachments;
+ }
+
+ /**
+ * gets the HTTP body for the current response.
+ *
+ * @param string $soapmsg The SOAP payload
+ * @return string The HTTP body, which includes the SOAP payload
+ * @access private
+ */
+ function getHTTPBody($soapmsg) {
+ if (count($this->responseAttachments) > 0) {
+ $params['content_type'] = 'multipart/related; type="text/xml"';
+ $mimeMessage = new Mail_mimePart('', $params);
+ unset($params);
+
+ $params['content_type'] = 'text/xml';
+ $params['encoding'] = '8bit';
+ $params['charset'] = $this->soap_defencoding;
+ $mimeMessage->addSubpart($soapmsg, $params);
+
+ foreach ($this->responseAttachments as $att) {
+ unset($params);
+
+ $params['content_type'] = $att['contenttype'];
+ $params['encoding'] = 'base64';
+ $params['disposition'] = 'attachment';
+ $params['dfilename'] = $att['filename'];
+ $params['cid'] = $att['cid'];
+
+ if ($att['data'] == '' && $att['filename'] <> '') {
+ if ($fd = fopen($att['filename'], 'rb')) {
+ $data = fread($fd, filesize($att['filename']));
+ fclose($fd);
+ } else {
+ $data = '';
+ }
+ $mimeMessage->addSubpart($data, $params);
+ } else {
+ $mimeMessage->addSubpart($att['data'], $params);
+ }
+ }
+
+ $output = $mimeMessage->encode();
+ $mimeHeaders = $output['headers'];
+
+ foreach ($mimeHeaders as $k => $v) {
+ $this->debug("MIME header $k: $v");
+ if (strtolower($k) == 'content-type') {
+ // PHP header() seems to strip leading whitespace starting
+ // the second line, so force everything to one line
+ $this->mimeContentType = str_replace("\r\n", " ", $v);
+ }
+ }
+
+ return $output['body'];
+ }
+
+ return parent::getHTTPBody($soapmsg);
+ }
+
+ /**
+ * gets the HTTP content type for the current response.
+ *
+ * Note: getHTTPBody must be called before this.
+ *
+ * @return string the HTTP content type for the current response.
+ * @access private
+ */
+ function getHTTPContentType() {
+ if (count($this->responseAttachments) > 0) {
+ return $this->mimeContentType;
+ }
+ return parent::getHTTPContentType();
+ }
+
+ /**
+ * gets the HTTP content type charset for the current response.
+ * returns false for non-text content types.
+ *
+ * Note: getHTTPBody must be called before this.
+ *
+ * @return string the HTTP content type charset for the current response.
+ * @access private
+ */
+ function getHTTPContentTypeCharset() {
+ if (count($this->responseAttachments) > 0) {
+ return false;
+ }
+ return parent::getHTTPContentTypeCharset();
+ }
+
+ /**
+ * processes SOAP message received from client
+ *
+ * @param array $headers The HTTP headers
+ * @param string $data unprocessed request data from client
+ * @return mixed value of the message, decoded into a PHP type
+ * @access private
+ */
+ function parseRequest($headers, $data) {
+ $this->debug('Entering parseRequest() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);
+ $this->requestAttachments = array();
+ if (strstr($headers['content-type'], 'multipart/related')) {
+ $this->debug('Decode multipart/related');
+ $input = '';
+ foreach ($headers as $k => $v) {
+ $input .= "$k: $v\r\n";
+ }
+ $params['input'] = $input . "\r\n" . $data;
+ $params['include_bodies'] = true;
+ $params['decode_bodies'] = true;
+ $params['decode_headers'] = true;
+
+ $structure = Mail_mimeDecode::decode($params);
+
+ foreach ($structure->parts as $part) {
+ if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {
+ $this->debug('Have root part of type ' . $part->headers['content-type']);
+ $return = parent::parseRequest($part->headers, $part->body);
+ } else {
+ $this->debug('Have an attachment of type ' . $part->headers['content-type']);
+ $info['data'] = $part->body;
+ $info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';
+ $info['contenttype'] = $part->headers['content-type'];
+ $info['cid'] = $part->headers['content-id'];
+ $this->requestAttachments[] = $info;
+ }
+ }
+
+ if (isset($return)) {
+ return $return;
+ }
+
+ $this->setError('No root part found in multipart/related content');
+ return;
+ }
+ $this->debug('Not multipart/related');
+ return parent::parseRequest($headers, $data);
+ }
+}
+
+/*
+ * For backwards compatiblity
+ */
+class nusoapservermime extends nusoap_server_mime {
+}
+
+?>
diff --git a/classes/test.php b/classes/test.php
new file mode 100644
index 0000000..c57e72a
--- /dev/null
+++ b/classes/test.php
@@ -0,0 +1,70 @@
+soap_defencoding = 'utf-8';
+// We define the parameters as a string array. Each Key/Val represents a parameter of the soap call
+// On défini les paramètres dans un tableau de chaînes. Chaque paire Clé/Valeur est un paramètre de l'appel
+$params = array(
+'Enseigne' => $MR_WebSiteId,
+ 'Pays' => "FR",
+ //'NumPointRelais' => "",
+ 'Ville' => "LYON",
+ 'CP' => "69008",
+ 'Latitude' => "",
+ 'Longitude' => "",
+ 'Taille' => "",
+ 'Poids' => "70000",
+ 'Action' => "",
+ 'DelaiEnvoi' => "0",
+ 'RayonRecherche' => "20",
+ //'TypeActivite' => "",
+ //'NACE' => "",
+);
+// We generate the request's security code
+// On génère la clé de sécurité de l'appel
+$code = implode("", $params);
+$ip_address = array("78.192.80.40", "127.0.0.1", "::1");
+$ip_key = array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER) ? 'HTTP_X_FORWARDED_FOR' : 'REMOTE_ADDR';
+if(in_array($_SERVER[$ip_key], $ip_address)){
+ echo "";
+ var_dump($code);
+ var_dump($MR_WebSiteKey);
+ echo " ";
+ die;
+}
+$code .= $MR_WebSiteKey;
+$params["Security"] = strtoupper(md5($code));
+// We make the call and load it in the $result var
+// On réalise l'appel et stocke le résultat dans la variable $result
+$result = $client->call(
+ 'WSI3_PointRelais_Recherche',
+ $params,
+ 'http://api.mondialrelay.com/',
+ 'http://api.mondialrelay.com/WSI3_PointRelais_Recherche'
+);// We check their is no error during the process
+// On vérifie qu'il n'y a pas eu d'erreur
+if ($client->fault)
+{
+echo 'Fault (Expect - The request contains an invalid SOAP body) ';
+print_r($result);
+echo ' ';
+}
+else
+{
+$err = $client->getError();
+if ($err) { echo 'Error ' . $err . ' '; }
+else
+{
+echo 'Result ';
+print_r($result);
+echo ' ';
+}
+}
+echo 'Request ' . htmlspecialchars($client->request, ENT_QUOTES) . ' ';
+echo 'Response ' . htmlspecialchars($client->response, ENT_QUOTES) . ' ';
+echo 'Debug ' . htmlspecialchars($client->getDebug(), ENT_QUOTES) . ' ';
+?>
\ No newline at end of file
diff --git a/config.xml b/config.xml
index 32240ea..8ecf352 100644
--- a/config.xml
+++ b/config.xml
@@ -1,12 +1,12 @@
-
- mondialrelay
- 1
- 1
+
+ mondialrelay
+ 1
+ 1
+
\ No newline at end of file
diff --git a/config_fr.xml b/config_fr.xml
new file mode 100644
index 0000000..345b39a
--- /dev/null
+++ b/config_fr.xml
@@ -0,0 +1,12 @@
+
+
+ mondialrelay
+ 1
+ 1
+
\ No newline at end of file
diff --git a/connexion.php b/connexion.php
index 1b794f4..f35f265 100644
--- a/connexion.php
+++ b/connexion.php
@@ -28,33 +28,34 @@
include_once(dirname(__FILE__).'/mondialrelay.php');
include_once(dirname(__FILE__).'/errorCode.php');
try{
- if (!Tools::getValue('token'))
- die('{"error":"Security error"}');
- if (sha1('mr'._COOKIE_KEY_.'Back') != Tools::getValue('token'))
- die('{"error":"Security error"}');
-
- $webservice = MondialRelay::MR_URL.'webservice/Web_Services.asmx?WSDL';
- $client = new SoapClient($webservice);
- $params = array();
- $params['Enseigne'] = Tools::getValue('enseigne');
- $params['Poids'] = '';
- $params['Taille'] = '';
- $params['CP'] = (Configuration::get('PS_SHOP_CODE')) ? Configuration::get('PS_SHOP_CODE') : '75000';
- $params['Ville'] = '';
- $id_country = (Configuration::get('PS_SHOP_COUNTRY_ID')) ? Configuration::get('PS_SHOP_COUNTRY_ID') : Configuration::get('PS_COUNTRY_DEFAULT');
- $params['Pays'] = Country::getIsoById($id_country);
- $params['Action'] = '';
- $concat = $params['Enseigne'].$params['Pays'].$params['Ville'].$params['CP'].$params['Poids'].Tools::getValue('key');
- $params['Security'] = Tools::strtoupper(md5($concat));
- $result_mr = $client->WSI2_RecherchePointRelais($params);
- if (($errorNumber = $result_mr->WSI2_RecherchePointRelaisResult->STAT) != 0)
- {
- echo '{"error":"'.str_replace('"', '', $statCode[$errorNumber]).'"}';
- die();
- }
- echo '{"success":1}';
+ if (!Tools::getValue('token'))
+ die('{"error":"Security error"}');
+ if (sha1('mr'._COOKIE_KEY_.'Back') != Tools::getValue('token'))
+ die('{"error":"Security error"}');
+
+ $webservice = MondialRelay::MR_URL.'webservice/Web_Services.asmx?WSDL';
+ $client = new SoapClient($webservice);
+ $params = array();
+ $params['Enseigne'] = Tools::getValue('enseigne');
+ $params['Poids'] = '';
+ $params['Taille'] = '';
+ $params['CP'] = (Configuration::get('PS_SHOP_CODE')) ? Configuration::get('PS_SHOP_CODE') : '75000';
+ $params['Ville'] = '';
+ $id_country = (Configuration::get('PS_SHOP_COUNTRY_ID')) ? Configuration::get('PS_SHOP_COUNTRY_ID') : Configuration::get('PS_COUNTRY_DEFAULT');
+ $params['Pays'] = Country::getIsoById($id_country);
+ $params['Action'] = '';
+ $params['RayonRecherche'] = '';
+ $concat = $params['Enseigne'].$params['Pays'].$params['Ville'].$params['CP'].$params['Poids'].Tools::getValue('key');
+ $params['Security'] = Tools::strtoupper(md5($concat));
+ $result_mr = $client->WSI2_RecherchePointRelais($params);
+ if (($errorNumber = $result_mr->WSI2_RecherchePointRelaisResult->STAT) != 0)
+ {
+ echo '{"error":"'.str_replace('"', '', $statCode[$errorNumber]).'"}';
+ die();
+ }
+ echo '{"success":1}';
}
catch(Exception $e) {
- echo '{"error":"'.str_replace('"', '', $statCode[99]).'"}';
- die();
+ echo '{"error":"'.str_replace('"', '', $statCode[99]).'"}';
+ die();
}
\ No newline at end of file
diff --git a/cron.php b/cron.php
index fb55596..05157f8 100644
--- a/cron.php
+++ b/cron.php
@@ -28,7 +28,7 @@
include_once('mondialrelay.php');
if (Tools::getValue('secure_key') != Configuration::get('MONDIAL_RELAY_SECURE_KEY'))
- exit;
+ exit;
$account_shop = MondialRelay::getAccountDetail();
@@ -39,10 +39,10 @@
WHERE `exp_number` != 0');
if (empty($expeditions))
- die('No order');
+ die('No order');
else
- echo 'Start progress'.$i.'
';
+ if ($expedition['id_order'] == null)
+ continue;
+ $order = new Order((int)($expedition['id_order']));
+ if ($order->current_state == Configuration::get('PS_OS_DELIVERED'))
+ continue;
+ $params['Expedition'] = $expedition['exp_number'];
+ $params['Security'] = Tools::strtoupper(md5($params['Enseigne'].$params['Expedition'].'FR'.$account_shop['MR_KEY_WEBSERVICE']));
+
+ $is_delivered = 0;
+ $result_mr = $client_mr->WSI2_TracingColisDetaille($params);
+
+ if (isset($result_mr->WSI2_TracingColisDetailleResult->Tracing->ret_WSI2_sub_TracingColisDetaille))
+ foreach ($result_mr->WSI2_TracingColisDetailleResult->Tracing->ret_WSI2_sub_TracingColisDetaille as $result)
+ if (isset($result->Libelle) && $result->Libelle == 'COLIS LIVRÉ')
+ {
+ $is_delivered = 1;
+ break;
+ }
+
+ if ($is_delivered == 1)
+ {
+ $history = new OrderHistory();
+ $history->id_order = (int)($expedition['id_order']);
+ $history->changeIdOrderState((int)(Configuration::get('PS_OS_DELIVERED')), (int)($expedition['id_order']));
+ $history->addWithemail();
+ }
+ $i++;
+
+ echo '
'.$i.'
';
}
echo 'End progress
' + PS_MRTranslationList['errorSelection'] + '
'
+ }],
+ {
+ padding: 0
+ });
+ else
+ alert(PS_MRTranslationList['errorSelection']);
+
+ return false;
+ }
+}
+
+function isOnePageCheckout(){
+
+ if($('.payment_module a').length && typeof(PS_MRData) != 'undefined'){
+ return true;
+ }
+ return false;
+}
+
+function setProtectRelaySelected(){
+ if(isOnePageCheckout()){
+ $('.payment_module a').each(function(){
+ if(typeof($(this).attr('onclick'))!='undefined'){
+ $(this).data('onclick', $(this).attr('onclick'));
+ $(this).attr('onclick', '');
+ }
+ });
+
+ //OPC Validation - Warn user to select a relay point
+ $('.payment_module').click(function(event) {
+ if(!checkMrSelection()){
+ event.stopPropagation();
+ return false;
+ }
+ else{
+ var lien= $('a', $(this));
+ if( lien.is("[onclick]") && lien.attr('onclick') == '' ){
+ lien.attr('onclick', lien.data('onclick'));
+ lien.trigger('click');
+ }
+ }
+ });
+
+ $('form').submit(function(event) {
+
+ if(checkMrSelection()){
+ $(this).off('submit').submit();
+
+ }
+ event.stopPropagation();
+ return false;
+ });
+
+ }
+
+ $('#form button[name="processCarrier"], #form input[name="processCarrier"]').click(function(event) {
+ if(!checkMrSelection()){
+ event.stopPropagation();
+ return false;
+ }
+ });
+
+}
+
+(function($) {
+
+ $(function(){
+ $('#cgv').click(function(){
+ if($(this).attr('checked')){
+ $("body").bind("ajaxComplete", function(e, xhr, settings){
+ setProtectRelaySelected();
+
+ });
+
+ }
+ });
+
+
+
+
+ });
+})(jQuery);
+
diff --git a/js/index.php b/js/index.php
index fc4110f..087b026 100644
--- a/js/index.php
+++ b/js/index.php
@@ -27,10 +27,10 @@
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
+
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
-
+
header("Location: ../");
exit;
\ No newline at end of file
diff --git a/js/mondialrelay.js b/js/mondialrelay.js
index 504d0b7..bb8a0f3 100644
--- a/js/mondialrelay.js
+++ b/js/mondialrelay.js
@@ -537,7 +537,6 @@ var PS_MRObject = (function($, undefined) {
function PS_MRAddSelectedCarrierInDB(id_carrier)
{
PS_MRHideLastRelayPointList();
-
// Make the request
$.ajax({
type: 'POST',
@@ -567,8 +566,10 @@ var PS_MRObject = (function($, undefined) {
// Reset for any carrier changement
if (MRLivraisonType != 'LD1' && MRLivraisonType != 'LDS' && MRLivraisonType != 'HOM')
{
+ if(PS_MRSelectedRelayPoint['relayPointNum'] == -1)
+ PS_MRSelectedRelayPoint['relayPointNum'] = 0;
// Seek Relay point if it doesn't a home delivery mode
- PS_MRGetRelayPoint(carrierSelected);
+ PS_MRGetRelayPoint(carrierSelected, MRLivraisonType);
}
else
{
@@ -594,7 +595,6 @@ var PS_MRObject = (function($, undefined) {
function PS_MRCheckSelectedRelayPoint()
{
var input;
-
// Check if the input is linked to the module and look into
// a temporary variable if a relay point has been selected
if ((input = $('input[name=id_carrier]:checked')).length &&
@@ -663,7 +663,10 @@ var PS_MRObject = (function($, undefined) {
for (relayPoint in json.success)
{
// Check if the the content wasn't already displayed
- contentBlockid = 'relayPoint_' + json.success[relayPoint].Num + '_' + carrier_id;
+
+ if (json.success[relayPoint].Num != '') {
+ contentBlockid = 'relayPoint_' + json.success[relayPoint].Num + '_' + carrier_id;
+ }
if (!$('#' + contentBlockid).size())
{
// Set translation if a preselection exist
@@ -726,7 +729,7 @@ var PS_MRObject = (function($, undefined) {
*
* @param carrierSelected
*/
- function PS_MRFetchRelayPoint(carrierSelected)
+ function PS_MRFetchRelayPoint(carrierSelected, MRLivraisonType)
{
carrier_id = carrierSelected.val().replace(',', '');
// Block is an input, we need the 'tr' element
@@ -748,6 +751,7 @@ var PS_MRObject = (function($, undefined) {
'id_carrier' : carrier_id,
'ajax' : true,
'step' : 2,
+ 'mode_liv' : MRLivraisonType,
'mrtoken' : mrtoken},
dataType: 'json',
success: function(json)
@@ -770,10 +774,9 @@ var PS_MRObject = (function($, undefined) {
*
* @param carrierSelected
*/
- function PS_MRGetRelayPoint(carrierSelected)
+ function PS_MRGetRelayPoint(carrierSelected, MRLivraisonType)
{
carrier_id = carrierSelected.val().replace(',','');
-
// Init back the inital view, hide existing element, (keep cached)
element = 0;
totalElement = $('.PS_MRSelectedCarrier').size();
@@ -792,12 +795,12 @@ var PS_MRObject = (function($, undefined) {
return ;
}
// If the element isn't cached, we fetch it
- PS_MRFetchRelayPoint(carrierSelected);
+ PS_MRFetchRelayPoint(carrierSelected, MRLivraisonType);
}
++element;
});
else
- PS_MRFetchRelayPoint(carrierSelected);
+ PS_MRFetchRelayPoint(carrierSelected, MRLivraisonType);
}
/**
@@ -1155,6 +1158,7 @@ var PS_MRObject = (function($, undefined) {
var carrier_selected = $('input.delivery_option_radio:checked').val();
var parent_element = $(e).parents('.delivery_option');
var new_element = 'MR_PR_list_'+MR_idcarrier;
+
if($('#'+new_element).length > 0) {
$('#'+new_element).remove();
if( isMRCarrier(MR_idcarrier)!=false && typeof(MR_carrier) != "undefined" && (MR_carrier.dlv_mode!='LD1' && MR_carrier.dlv_mode!='LDS' && MR_carrier.dlv_mode!='HOM')) {
@@ -1176,7 +1180,6 @@ var PS_MRObject = (function($, undefined) {
// Hide MR input if one of them is not selected
if($(e).val() == carrier_selected)
{
- console.log(carrier_selected);
if(MR_carrier != false) {
PS_MRCarrierMethodList[MR_idcarrier] = MR_carrier.id_mr_method;
PS_MRSelectedRelayPoint['carrier_id'] = MR_idcarrier;
@@ -1197,6 +1200,7 @@ var PS_MRObject = (function($, undefined) {
}
});
}
+
}
}
@@ -1281,20 +1285,7 @@ var PS_MRObject = (function($, undefined) {
$('#MR_config_menu').children('ul').css('margin-left', width + 'px');
}
- // 1.5 OPC Validation - Warn user to select a relay point
- $('.payment_module a').live('click', function() {
- if (typeof PS_MRData != 'undefined')
- {
- if (PS_MRData.PS_VERSION >= '1.5' && PS_MRData.carrier)
- {
- var _return = !(!PS_MRSelectedRelayPoint['carrier_id'] || !PS_MRSelectedRelayPoint['relayPointNum']);
- if (!_return)
- alert(PS_MRTranslationList['errorSelection']);
- return _return;
- }
- }
- });
-
+/*
// If MR carrier selected, check MR relay point is selected too
$('input[name=processCarrier], button[name=processCarrier]').click(function(){
var _return = !(PS_MRSelectedRelayPoint['carrier_id'] && !PS_MRSelectedRelayPoint['relayPointNum']);
@@ -1303,15 +1294,14 @@ var PS_MRObject = (function($, undefined) {
return _return;
});
-
- if (typeof PS_MRData != 'undefined')
+*/
+ // En OPC, si l'utilisateur est d�connecter, PS_MRData n'existe pas au d�but
+ $('input[name="id_carrier"]').live('click', function(){
+ if (typeof PS_MRData != 'undefined' && PS_MRData.PS_VERSION < '1.5')
{
- if (PS_MRData.PS_VERSION < '1.5') {
- $('input[name="id_carrier"]').click(function(){
- checkToDisplayRelayList();
- });
- }
+ checkToDisplayRelayList();
}
+ });
// Handle input click of the other input to hide the previous relay point list displayed
});
@@ -1320,6 +1310,7 @@ var PS_MRObject = (function($, undefined) {
return {
initFront : function() {
checkToDisplayRelayList();
+ setProtectRelaySelected();
},
uninstall : function(url)
{
@@ -1358,4 +1349,6 @@ function mr_checkConnexion() {
}
}
});
-}
\ No newline at end of file
+}
+
+
diff --git a/js/mondialrelay_widget.js b/js/mondialrelay_widget.js
index 332427f..755d763 100644
--- a/js/mondialrelay_widget.js
+++ b/js/mondialrelay_widget.js
@@ -1,258 +1,235 @@
/*
-* 2007-2015 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-2015 PrestaShop SA
-* @version Release: $Revision: 16986 $
-* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
-* International Registered Trademark & Property of PrestaShop SA
-*/
- function getNumeric(val) {
- var reg=new RegExp("[0-9]+","g");
- var res = reg.exec(val);
- if(isNaN(res))
- return 0;
- else
- return res;
- }
-
- function checkToDisplayRelayList()
- {
- if (typeof PS_MRData != 'undefined')
- {
- //============================================================
- // auto display fancybox if radio already check
- //============================================================
- PS_MRSelectedRelayPoint['relayPointNum'] = PS_MRData.pre_selected_relay;
- // PS_VERSION < '1.5'
- if (PS_MRData.PS_VERSION < '1.5')
- {
- // Bind id_carrierX to an ajax call
- $.each(PS_MRData.carrier_list, function(i, carrier) {
- PS_MRCarrierMethodList[carrier.id_carrier] = carrier.id_mr_method;
- if ($('#id_carrier' + carrier.id_carrier).attr('checked')) {
- PS_MRSelectedRelayPoint['carrier_id'] = carrier.id_carrier;
- PS_MRDisplayWidget(carrier.id_carrier);
- }
- });
-
- }
- else if (PS_MRData.PS_VERSION >= '1.5'
- && typeof PS_MRData.carrier != 'undefined'
- )
- { // 1.5 way
- var carrier_selected = $('input[class=delivery_option_radio]:checked').val();
- $.each(PS_MRData.carrier_list, function(i, carrier) {
- PS_MRCarrierMethodList[carrier.id_carrier] = carrier.id_mr_method;
- if (carrier.id_carrier+',' == carrier_selected || carrier.id_carrier == carrier_selected) {
- overrideUpdateExtraCarrier(carrier_selected, id_address);
- PS_MRSelectedRelayPoint['carrier_id'] = carrier.id_carrier;
- PS_MRDisplayWidget(carrier.id_carrier);
- }
- });
- }
- //============================================================
- // Handle input click of the other input to hide the previous relay point list displayed
- $('input[name=id_carrier], input.delivery_option_radio').click(function(e){
- displayPickupPlace(0);
- });
- }
- //return false;
- }
-
- function isMRCarrier(id_carrier){
- var carrier_list = PS_MRData.carrier_list;
- for(i in carrier_list){
- var MR_carrier = carrier_list[i];
- if(MR_carrier.id_carrier == id_carrier) {
- return MR_carrier;
- }
- }
- return false;
- }
-
- function hideRelaySelectedBox(_this){
- // Hide MR input if one of them is not selected
- if (PS_MRCarrierMethodList[_this.val()] == undefined){
- // 1.5 way
- var id = getNumeric(_this.val());
- if(PS_MRCarrierMethodList[id] == undefined) {
- displayPickupPlace(0);
- PS_MRSelectedRelayPoint['carrier_id'] = 0;
- PS_MRDisplayWidget(0);
- PS_MRSelectedRelayPoint['relayPointNum'] = 0;
- }
- else {
- PS_MRSelectedRelayPoint['carrier_id'] = id;
- PS_MRDisplayWidget(id);
- }
- }
- else {
- PS_MRSelectedRelayPoint['carrier_id'] = _this.val();
- PS_MRDisplayWidget(_this.val());
- }
- return false;
- }
-
- function PS_MRDisplayWidget(carrier_id) {
- var dlv_mode = '';
- $.each(PS_MRData.carrier_list, function(i, carrier) {
- if (carrier.id_carrier == carrier_id)
- dlv_mode = carrier.dlv_mode;
- PS_MRSelectedRelayPoint['relayPointNum'] = -1;
- PS_MRAddSelectedCarrierInDB(carrier_id);
- }
- );
- if(carrier_id) {
- if(dlv_mode!='LD1' && dlv_mode!='LDS' && dlv_mode!='HOM') {
- loadMR_Map("#Zone_Widget", dlv_mode);
- $("#link_zone_widget").click();
- if(PS_MRSelectedRelayPoint['relayPointNum'] == -1)
- PS_MRSelectedRelayPoint['relayPointNum'] = 0;
- }
- else
- displayPickupPlace(0);
- }
- return false;
- }
-
-
- function overrideUpdateExtraCarrier(id_delivery_option, id_address)
- {
- if(PS_MRData.PS_VERSION < '1.5')
- return false;
-
- var url = "";
- var method = 'updateExtraCarrier';
- var params = '';
- if(typeof(orderOpcUrl) !== 'undefined') {
- method = 'updateCarrierAndGetPayments';
- params += '&recyclable='+(($('#recyclable:checked').val() != undefined)? 1:0);
- params += '&gift='+(($('#gift:checked').val() != undefined)? 1:0);
- params += '&gift_message='+$('#gift_message').val();
- params += '&delivery_option['+id_address+']='+id_delivery_option;
- url = orderOpcUrl;
- }
- else
- url = orderUrl;
-
- $.ajax({
- type: 'POST',
- headers: { "cache-control": "no-cache" },
- url: url + '?rand=' + new Date().getTime(),
- async: false,
- cache: false,
- dataType : "json",
- data: 'ajax=true'
- +'&method='+method
- +params
- +'&id_address='+id_address
- +'&id_delivery_option='+id_delivery_option
- +'&token='+static_token
- +'&allow_refresh=1',
- success: function(jsonData)
- {
- //$('#HOOK_EXTRACARRIER_'+id_address).html(jsonData['content']);
- return false;
- }
- });
- return false;
- }
-
- function displayPickupPlace(info) {
- var id = "relay_point_selected_box";
-
- if(!info) {
- $('#'+id).hide();
- $('#'+id).remove();
- return false;
- }
-
- if (PS_MRData.PS_VERSION < '1.5')
- {
- var block_carrier = $('#carrierTable');
- }
- else {
- var block_carrier = $('.delivery_options_address');
- }
- if($('#'+id).length !== 0) {
- $('#'+id).html(''+relay_point_selected_box_label+' '+info);
- $('#'+id).show();
- }
- else {
- $('
'+relay_point_selected_box_label+' '+info+'').insertAfter(block_carrier);
- }
- return false;
- }
-
- function PS_MRAddSelectedCarrierInDB(id_carrier)
- {
- // Make the request
- $.ajax({
- type: 'POST',
- url: _PS_MR_MODULE_DIR_ + 'ajax.php',
- data: {'method' : 'addSelectedCarrierToDB',
- 'id_carrier' : id_carrier,
- 'id_mr_method' : PS_MRCarrierMethodList[id_carrier],
- 'mrtoken' : mrtoken},
- success: function(json)
- {
- return false;
- }
- });
- return false;
- }
-
- $(document).ready(function()
- {
- // 1.5 OPC Validation - Warn user to select a relay point
- $('.payment_module a').live('click', function() {
- if (typeof PS_MRData != 'undefined')
- {
- if (PS_MRData.PS_VERSION >= '1.5' && PS_MRData.carrier && PS_MRSelectedRelayPoint['carrier_id']!=0)
- {
- var _return = !(!PS_MRSelectedRelayPoint['carrier_id'] || !PS_MRSelectedRelayPoint['relayPointNum']);
- if (!_return)
- alert(PS_MRTranslationList['errorSelection']);
- return _return;
- }
- }
- });
-
- // If MR carrier selected, check MR relay point is selected too
- $('input[name=processCarrier], button[name=processCarrier]').click(function(){
- var carrier_selected = $('input[class=delivery_option_radio]:checked').val();
- if (PS_MRSelectedRelayPoint['carrier_id']+',' == carrier_selected || PS_MRSelectedRelayPoint['carrier_id'] == carrier_selected)
- {
- var _return = !(PS_MRSelectedRelayPoint['carrier_id'] && !PS_MRSelectedRelayPoint['relayPointNum']);
- if (!_return)
- alert(PS_MRTranslationList['errorSelection']);
- return _return;
- }
- });
-
- if (typeof PS_MRData != 'undefined')
- {
- if (PS_MRData.PS_VERSION < '1.5') {
- $('input[name="id_carrier"]').click(function(){
- checkToDisplayRelayList();
- });
- }
- }
- });
+ * 2007-2015 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-2015 PrestaShop SA
+ * @version Release: $Revision: 16986 $
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ */
+function getNumeric(val) {
+ var reg = new RegExp("[0-9]+", "g");
+ var res = reg.exec(val);
+ if (isNaN(res))
+ return 0;
+ else
+ return res;
+}
+
+function checkToDisplayRelayList()
+{
+ if (typeof PS_MRData != 'undefined')
+ {
+ //============================================================
+ // auto display fancybox if radio already check
+ //============================================================
+ PS_MRSelectedRelayPoint['relayPointNum'] = PS_MRData.pre_selected_relay;
+ // PS_VERSION < '1.5'
+ if (PS_MRData.PS_VERSION < '1.5')
+ {
+ // Bind id_carrierX to an ajax call
+ $.each(PS_MRData.carrier_list, function (i, carrier) {
+ PS_MRCarrierMethodList[carrier.id_carrier] = carrier.id_mr_method;
+ if ($('#id_carrier' + carrier.id_carrier).attr('checked')) {
+ PS_MRSelectedRelayPoint['carrier_id'] = carrier.id_carrier;
+ PS_MRDisplayWidget(carrier.id_carrier);
+ setProtectRelaySelected();
+ }
+ });
+
+ }
+ else if (PS_MRData.PS_VERSION >= '1.5'
+ && typeof PS_MRData.carrier != 'undefined'
+ )
+ { // 1.5 way
+ var carrier_selected = $('input[class=delivery_option_radio]:checked').val();
+ $.each(PS_MRData.carrier_list, function (i, carrier) {
+ PS_MRCarrierMethodList[carrier.id_carrier] = carrier.id_mr_method;
+ if (carrier.id_carrier + ',' == carrier_selected || carrier.id_carrier == carrier_selected) {
+ overrideUpdateExtraCarrier(carrier_selected, id_address);
+ PS_MRSelectedRelayPoint['carrier_id'] = carrier.id_carrier;
+ PS_MRDisplayWidget(carrier.id_carrier);
+ }
+ });
+ }
+ //============================================================
+ // Handle input click of the other input to hide the previous relay point list displayed
+ $('input[name=id_carrier], input.delivery_option_radio').click(function (e) {
+ displayPickupPlace(0);
+ });
+ }
+ //return false;
+}
+
+function isMRCarrier(id_carrier) {
+ var carrier_list = PS_MRData.carrier_list;
+ for (i in carrier_list) {
+ var MR_carrier = carrier_list[i];
+ if (MR_carrier.id_carrier == id_carrier) {
+ return MR_carrier;
+ }
+ }
+ return false;
+}
+
+function hideRelaySelectedBox(_this) {
+ // Hide MR input if one of them is not selected
+ if (PS_MRCarrierMethodList[_this.val()] == undefined) {
+ // 1.5 way
+ var id = getNumeric(_this.val());
+ if (PS_MRCarrierMethodList[id] == undefined) {
+ displayPickupPlace(0);
+ PS_MRSelectedRelayPoint['carrier_id'] = 0;
+ PS_MRDisplayWidget(0);
+ PS_MRSelectedRelayPoint['relayPointNum'] = 0;
+ }
+ else {
+ PS_MRSelectedRelayPoint['carrier_id'] = id;
+ PS_MRDisplayWidget(id);
+ }
+ }
+ else {
+ PS_MRSelectedRelayPoint['carrier_id'] = _this.val();
+ PS_MRDisplayWidget(_this.val());
+ }
+ return false;
+}
+
+function PS_MRDisplayWidget(carrier_id) {
+ var dlv_mode = '';
+ $.each(PS_MRData.carrier_list, function (i, carrier) {
+ if (carrier.id_carrier == carrier_id)
+ dlv_mode = carrier.dlv_mode;
+ PS_MRSelectedRelayPoint['relayPointNum'] = -1;
+ PS_MRAddSelectedCarrierInDB(carrier_id);
+ }
+ );
+ if (carrier_id) {
+ if (dlv_mode != 'LD1' && dlv_mode != 'LDS' && dlv_mode != 'HOM') {
+ loadMR_Map("#Zone_Widget", dlv_mode);
+ $("#link_zone_widget").click();
+ if (PS_MRSelectedRelayPoint['relayPointNum'] == -1)
+ PS_MRSelectedRelayPoint['relayPointNum'] = 0;
+ }
+ else
+ displayPickupPlace(0);
+ }
+ return false;
+}
+
+
+function overrideUpdateExtraCarrier(id_delivery_option, id_address)
+{
+ if (PS_MRData.PS_VERSION < '1.5')
+ return false;
+
+ var url = "";
+ var method = 'updateExtraCarrier';
+ var params = '';
+ if (typeof (orderOpcUrl) !== 'undefined') {
+ method = 'updateCarrierAndGetPayments';
+ params += '&recyclable=' + (($('#recyclable:checked').val() != undefined) ? 1 : 0);
+ params += '&gift=' + (($('#gift:checked').val() != undefined) ? 1 : 0);
+ params += '&gift_message=' + $('#gift_message').val();
+ params += '&delivery_option[' + id_address + ']=' + id_delivery_option;
+ url = orderOpcUrl;
+ }
+ else
+ url = orderUrl;
+
+ $.ajax({
+ type: 'POST',
+ headers: {"cache-control": "no-cache"},
+ url: url + '?rand=' + new Date().getTime(),
+ async: false,
+ cache: false,
+ dataType: "json",
+ data: 'ajax=true'
+ + '&method=' + method
+ + params
+ + '&id_address=' + id_address
+ + '&id_delivery_option=' + id_delivery_option
+ + '&token=' + static_token
+ + '&allow_refresh=1',
+ success: function (jsonData)
+ {
+ //$('#HOOK_EXTRACARRIER_'+id_address).html(jsonData['content']);
+ setProtectRelaySelected();
+ return false;
+ }
+ });
+ return false;
+}
+
+function displayPickupPlace(info) {
+ var id = "relay_point_selected_box";
+
+ if (!info) {
+ $('#' + id).hide();
+ $('#' + id).remove();
+ return false;
+ }
+
+ if (PS_MRData.PS_VERSION < '1.5')
+ {
+ var block_carrier = $('#carrierTable');
+ }
+ else {
+ var block_carrier = $('.delivery_options_address');
+ }
+ if ($('#' + id).length !== 0) {
+ $('#' + id).html('' + relay_point_selected_box_label + ' ' + info);
+ $('#' + id).show();
+ }
+ else {
+ $('
' + relay_point_selected_box_label + ' ' + info + '').insertAfter(block_carrier);
+ }
+ return false;
+}
+
+function PS_MRAddSelectedCarrierInDB(id_carrier)
+{
+ // Make the request
+ $.ajax({
+ type: 'POST',
+ url: _PS_MR_MODULE_DIR_ + 'ajax.php',
+ data: {'method': 'addSelectedCarrierToDB',
+ 'id_carrier': id_carrier,
+ 'id_mr_method': PS_MRCarrierMethodList[id_carrier],
+ 'mrtoken': mrtoken},
+ success: function (json)
+ {
+ return false;
+ }
+ });
+ return false;
+}
+
+$(document).ready(function ()
+{
+
+ if (typeof PS_MRData != 'undefined')
+ {
+ if (PS_MRData.PS_VERSION < '1.5') {
+ $('input[name="id_carrier"]').click(function () {
+ checkToDisplayRelayList();
+ });
+ }
+ }
+});
diff --git a/logo.gif b/logo.gif
index e1e406a..06f8471 100644
Binary files a/logo.gif and b/logo.gif differ
diff --git a/logo.png b/logo.png
index 3129774..56a3ec7 100644
Binary files a/logo.png and b/logo.png differ
diff --git a/mails/en/index.php b/mails/en/index.php
index 4deda52..9cf60e3 100644
--- a/mails/en/index.php
+++ b/mails/en/index.php
@@ -27,10 +27,10 @@
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
+
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
-
+
header("Location: ../");
exit;
\ No newline at end of file
diff --git a/mails/fr/index.php b/mails/fr/index.php
index 4deda52..9cf60e3 100644
--- a/mails/fr/index.php
+++ b/mails/fr/index.php
@@ -27,10 +27,10 @@
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
+
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
-
+
header("Location: ../");
exit;
\ No newline at end of file
diff --git a/mails/index.php b/mails/index.php
index 4deda52..9cf60e3 100644
--- a/mails/index.php
+++ b/mails/index.php
@@ -27,10 +27,10 @@
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
+
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
-
+
header("Location: ../");
exit;
\ No newline at end of file
diff --git a/mondialrelay.php b/mondialrelay.php
index c1e54ae..dc7552a 100644
--- a/mondialrelay.php
+++ b/mondialrelay.php
@@ -25,1225 +25,1234 @@
*/
if (!defined('_PS_VERSION_'))
- exit;
+ exit;
require_once(_PS_MODULE_DIR_.'mondialrelay/classes/MRTools.php');
class MondialRelay extends Module
{
- const INSTALL_SQL_FILE = 'sql/mrInstall.sql';
-
- private $_postErrors;
-
- public static $modulePath = '';
- public static $moduleURL = '';
- static public $MRFrontToken = '';
- static public $MRBackToken = '';
-
- /* Added for 1.3 compatibility */
- const ONLY_PRODUCTS = 1;
- const ONLY_DISCOUNTS = 2;
- const BOTH = 3;
- const BOTH_WITHOUT_SHIPPING = 4;
- const ONLY_SHIPPING = 5;
- const ONLY_WRAPPING = 6;
- const ONLY_PRODUCTS_WITHOUT_SHIPPING = 7;
-
- /* SQL FILTER ORDER */
- const NO_FILTER = 0;
- const WITHOUT_HOME_DELIVERY = 1;
-
- const MR_URL = 'http://www.mondialrelay.fr/';
-
- /* Contains the details of the current shop used */
- public $account_shop = array(
- 'MR_ENSEIGNE_WEBSERVICE' => '',
- 'MR_CODE_MARQUE' => '',
- 'MR_KEY_WEBSERVICE' => '',
- 'MR_LANGUAGE' => '',
- 'MR_WEIGHT_COEFFICIENT' => '',
- 'MR_ORDER_STATE' => 3,
- 'id_shop' => 1
- );
-
- public $upgrade_detail = array();
-
- public function __construct()
- {
- $this->name = 'mondialrelay';
- $this->tab = 'shipping_logistics';
- $this->version = '2.1.6';
- $this->installed_version = '';
- $this->module_key = '366584e511d311cfaa899fc2d9ec1bd0';
- $this->author = 'PrestaShop';
-
- parent::__construct();
-
- $this->displayName = $this->l('Mondial Relay');
- $this->description = $this->l('Deliver in Relay points');
-
- /** Backward compatibility */
- require(_PS_MODULE_DIR_.'/mondialrelay/backward_compatibility/backward.php');
-
- self::initModuleAccess();
-
- /* Call everytime to prevent the change of the module by a recent one */
- $this->_updateProcess();
- $this->initAccount();
-
- /* Check if it's a mondialrelay ajax query */
- $this->checkAJAX();
- }
-
- public function install()
- {
- if (!function_exists('curl_version') || !extension_loaded('soap'))
- {
- $this->_errors[] = $this->l('Mondial Relay needs SOAP & cURL to be installed on your server.');
- return false;
- }
-
- if (!parent::install())
- return false;
-
- if (!$this->registerHookByVersion())
- return false;
-
- if ((!file_exists(MondialRelay::$modulePath.MondialRelay::INSTALL_SQL_FILE)) ||
- (!$sql = Tools::file_get_contents(MondialRelay::$modulePath.MondialRelay::INSTALL_SQL_FILE)))
- return false;
-
- $sql = str_replace('PREFIX_', _DB_PREFIX_, $sql);
- $sql = preg_split("/;\s*[\r\n]+/", $sql);
- foreach ($sql as $query)
- if (!empty($query))
- Db::getInstance()->execute(trim($query));
-
- $result = Db::getInstance()->getRow('
- SELECT id_tab
- FROM `'._DB_PREFIX_.'tab`
- WHERE class_name="AdminMondialRelay"');
-
- if (!$result)
- {
- $tab = new Tab();
- $languages = Language::getLanguages(false);
- foreach ($languages as $language)
- $tab->name[$language['id_lang']] = 'Mondial Relay';
- $tab->class_name = 'AdminMondialRelay';
- $tab->module = 'mondialrelay';
- $tab->id_parent = Tab::getIdFromClassName('AdminOrders');
-
- if (!$tab->add())
- return false;
-
- if (is_dir(_PS_MODULE_DIR_.'mondialrelay/'))
- @copy(_PS_MODULE_DIR_.'mondialrelay/img/AdminMondialRelay.gif', _PS_IMG_DIR_.'/AdminMondialRelay.gif');
- }
-
- /* If module isn't installed, set default value */
- if (!Configuration::get('MONDIAL_RELAY'))
- {
- Configuration::updateValue('MONDIAL_RELAY', $this->version);
- Configuration::updateValue('MONDIAL_RELAY_SECURE_KEY', md5( _COOKIE_KEY_.time()));
- Configuration::updateValue('MONDIAL_RELAY_MODE', 'widget');
- }
- else
- {
- $query = 'UPDATE `'._DB_PREFIX_.'carrier` c, `'._DB_PREFIX_.'mr_method` m
- SET c.`deleted` = 0
- WHERE c.`id_carrier` = m.`id_carrier`
- AND m.`is_deleted` = 0';
-
- /* Reactive transport if database wasn't remove at the last uninstall */
- Db::getInstance()->execute($query);
- }
- return true;
- }
-
- /*
- ** Return the token depend of the type
- */
- public static function getToken($type = 'front')
- {
- return ($type == 'front') ? MondialRelay::$MRFrontToken : (($type == 'back') ?
- MondialRelay::$MRBackToken : null);
- }
-
- /*
- ** Register hook depending of the Prestashop version used
- */
- private function registerHookByVersion()
- {
- if (version_compare(_PS_VERSION_, '1.3', '>=') && (!$this->registerHook('extraCarrier') || !$this->registerHook('updateCarrier') || !$this->registerHook('newOrder') || !$this->registerHook('BackOfficeHeader') || !$this->registerHook('header')))
- return false;
- if (version_compare(_PS_VERSION_, '1.4', '>=') && (!$this->registerHook('processCarrier') || !$this->registerHook('orderDetailDisplayed')))
- return false;
- if (version_compare(_PS_VERSION_, '1.6', '>=') && (!$this->registerHook('displayBackOfficeHeader')))
- return false;
- return true;
- }
-
- public function uninstallCommonData()
- {
- /* Tab uninstall */
- if (($id_tab = Tab::getIdFromClassName('AdminMondialRelay')))
- {
- $tab = new Tab($id_tab);
- $tab->delete();
- }
-
- if (!Db::getInstance()->execute('
- UPDATE '._DB_PREFIX_.'carrier c, '._DB_PREFIX_.'mr_method m
- SET c.`deleted` = 1
- WHERE c.`id_carrier` = m.`id_carrier`'))
- return false;
-
- return true;
- }
-
- public function uninstall()
- {
- if (!parent::uninstall())
- return false;
-
- /* Uninstall data that doesn't need to be keep */
- if (!$this->uninstallCommonData())
- return false;
-
- if (Tools::getValue('keepDatabase'))
- return true;
-
- Configuration::deleteByName('MR_ACCOUNT_DETAIL');
-
- /* Drop databases */
- if (!Db::getInstance()->execute('
- DROP TABLE
- '._DB_PREFIX_.'mr_history,
- '._DB_PREFIX_.'mr_method,
- '._DB_PREFIX_.'mr_selected,
- '._DB_PREFIX_.'mr_method_shop'))
- {
- /* If drop failed, try to turn off the carriers */
- Db::getInstance()->execute('
- UPDATE '._DB_PREFIX_.'carrier c, '._DB_PREFIX_.'mr_method m
- SET c.`deleted` = 1
- WHERE c.`id_carrier` = m.`id_carrier`');
- return false;
- }
- return true;
- }
-
- /**
- * Launch upgrade process for 1.3 and 1.4
- */
- public function runUpgrade()
- {
- /* List of upgraded version existing */
- $files_version = array('1.8.0', '1.8.3', '2.0.6');
-
- $upgrade_path = dirname(__FILE__).'/upgrade/';
-
- if (version_compare(_PS_VERSION_, '1.5', '<'))
- {
- foreach ($files_version as $version)
- {
- $file = $upgrade_path.'install-'.$version.'.php';
- if ($this->installed_version < $version && file_exists($file))
- {
- include_once($file);
- call_user_func('upgrade_module_'.str_replace('.', '_', $version), $this);
- }
- }
- }
- }
-
- /*
- ** UpdateProcess if merchant update the module without a
- ** normal installation
- */
- private function _updateProcess()
- {
- if (Module::isInstalled('mondialrelay') &&
- (($this->installed_version = Configuration::get('MONDIAL_RELAY')) ||
- $this->installed_version = Configuration::get('MONDIAL_RELAY_1_4'))
- && $this->installed_version < $this->version)
- $this->runUpgrade();
- }
-
- /*
- ** Get the content to ask for a backup of the database
- */
- private function askForBackup($href)
- {
- return 'return PS_MRObject.uninstall(\''.$href.'\');';
- }
-
- /*
- ** OnClick for input fields under the module list fields action
- */
- public function onclickOption($type, $href = false)
- {
- $content = '';
-
- switch ($type)
- {
- case 'desactive':
- break;
- case 'reset':
- break;
- case 'delete':
- break;
- case 'uninstall':
- $content = $this->askForBackup($href);
- break;
- default:
- }
- return $content;
- }
-
- /**
- * Init the account_shop variable with the account detail for this shop
- */
- public function initAccount()
- {
- /* Get default value */
- $id_order_state = $this->account_shop['MR_ORDER_STATE'];
-
- if (($account_shop_stored = MondialRelay::getAccountDetail()))
- $this->account_shop = $account_shop_stored;
-
- /* Normally, this can't happen... */
- if (empty($this->account_shop['MR_ORDER_STATE']))
- $this->account_shop['MR_ORDER_STATE'] = $id_order_state;
- }
-
- /*
- ** Init the access directory module for URL and file system
- ** Allow a compatibility for Presta < 1.4
- */
- public static function initModuleAccess()
- {
- MondialRelay::$modulePath = _PS_MODULE_DIR_.'mondialrelay/';
- MondialRelay::$MRFrontToken = sha1('mr'._COOKIE_KEY_.'Front');
- MondialRelay::$MRBackToken = sha1('mr'._COOKIE_KEY_.'Back');
- MondialRelay::$moduleURL = __PS_BASE_URI__.'modules/mondialrelay/';
- }
-
- public function fetchTemplate($path, $name)
- {
- if (version_compare(_PS_VERSION_, '1.4', '<'))
- $this->context->smarty->currentTemplate = $name;
-
- return $this->context->smarty->fetch(dirname(__FILE__).$path.$name.'.tpl');
- }
-
- public function hookNewOrder($params)
- {
- if (!MondialRelay::isMondialRelayCarrier($params['cart']->id_carrier))
- return;
-
- $order = $params['order'];
- $currency = $params['currency'];
- $id_lang = (int)$order->id_lang;
- $customer = new Customer($order->id_customer);
- $carrier = new Carrier($order->id_carrier);
- $invoice = new Address((int)($order->id_address_invoice));
- $invoice_state = $invoice->id_state ? new State($invoice->id_state) : false;
- if (version_compare(_PS_VERSION_, '1.5', '<'))
- $order_date_text = Tools::displayDate($order->date_add, (int)($id_lang));
- else
- $order_date_text = Tools::displayDate($order->date_add, null);
-
- DB::getInstance()->execute('
- UPDATE `'._DB_PREFIX_.'mr_selected`
- SET `id_order` = '.(int)$order->id.'
- WHERE `id_cart` = '.(int)$params['cart']->id);
-
- /*============================================
- // GET MR INFOS
- //============================================*/
- $sql = 'SELECT * FROM `'._DB_PREFIX_.'mr_selected` WHERE `id_cart` = '.(int)$params['cart']->id.' AND `id_order` = '.(int)$order->id.'';
- $mr_point = DB::getInstance()->getRow($sql);
-
- if (!$mr_point['MR_Selected_Num']) return false;
-
- /*============================================
- // SEND MAIL
- //============================================*/
- $template = 'mr_new_order';
- $subject = $this->l('New order', false, (int)$id_lang).' - '.sprintf('%06d', $order->id);
-
- $mr_address = '';
- if ($mr_point['MR_Selected_LgAdr2'])
- $mr_address .= $mr_point['MR_Selected_LgAdr2'].'';
- if ($mr_point['MR_Selected_LgAdr3'])
- $mr_address .= $mr_point['MR_Selected_LgAdr3'].'';
- if ($mr_point['MR_Selected_LgAdr4'])
- $mr_address .= $mr_point['MR_Selected_LgAdr4'].'';
-
- $templateVars = array(
- '{firstname}' => $customer->firstname,
- '{lastname}' => $customer->lastname,
- '{email}' => $customer->email,
- '{delivery_company}' => $mr_point['MR_Selected_LgAdr1'],
- '{delivery_address1}' => $mr_address,
- '{delivery_city}' => $mr_point['MR_Selected_Ville'],
- '{delivery_postal_code}' => $mr_point['MR_Selected_CP'],
- '{delivery_country}' => $mr_point['MR_Selected_Pays'],
- '{invoice_company}' => $invoice->company,
- '{invoice_firstname}' => $invoice->firstname,
- '{invoice_lastname}' => $invoice->lastname,
- '{invoice_address2}' => $invoice->address2,
- '{invoice_address1}' => $invoice->address1,
- '{invoice_city}' => $invoice->city,
- '{invoice_postal_code}' => $invoice->postcode,
- '{invoice_country}' => $invoice->country,
- '{invoice_state}' => $invoice->id_state ? $invoice_state->name : '',
- '{invoice_phone}' => $invoice->phone,
- '{invoice_other}' => $invoice->other,
- '{order_name}' => sprintf('%06d', $order->id),
- '{shop_name}' => Configuration::get('PS_SHOP_NAME'),
- '{date}' => $order_date_text,
- '{carrier}' => (($carrier->name == '0') ? Configuration::get('PS_SHOP_NAME') : $carrier->name),
- '{payment}' => Tools::substr($order->payment, 0, 32),
- '{currency}' => $currency->sign,
- );
-
- $iso = Language::getIsoById((int)$id_lang);
- if (file_exists(dirname(__FILE__).'/mails/'.$iso.'/'.$template.'.txt') && file_exists(dirname(__FILE__).'/mails/'.$iso.'/'.$template.'.html'))
- Mail::Send((int)$id_lang, $template, $subject, $templateVars, $customer->email, $customer->firstname.' '.$customer->lastname, Configuration::get('PS_SHOP_EMAIL'), Configuration::get('PS_SHOP_NAME'), null, null, dirname(__FILE__).'/mails/');
- }
-
- public function hookBackOfficeHeader()
- {
- if (Tools::getValue('tab') == 'AdminMondialRelay' || Tools::getValue('module_name') == 'mondialrelay' || Tools::strtolower(Tools::getValue('controller')) == 'adminmondialrelay' || Tools::getValue('configure') == 'mondialrelay')
- {
- $this->context->smarty->assign(array(
- 'MR_token' => MondialRelay::$MRBackToken, 'MR_local_path' => MondialRelay::$modulePath,
- 'MR_account_set' => MondialRelay::isAccountSet(), 'new_base_dir' => MondialRelay::$moduleURL));
-
- return $this->fetchTemplate('/views/templates/admin/', 'bo-header');
- }
- }
-
- public function hookOrderDetailDisplayed($params)
- {
- if (!Mondialrelay::isMondialRelayCarrier($params['order']->id_carrier))
- return;
-
- $sql = '
- SELECT s.`MR_Selected_LgAdr1`, s.`MR_Selected_LgAdr2`, s.`MR_Selected_LgAdr3`, s.`MR_Selected_LgAdr4`,
- s.`MR_Selected_CP`, s.`MR_Selected_Ville`, s.`MR_Selected_Pays`, s.`MR_Selected_Num`, s.`url_suivi`, s.`exp_number`, m.dlv_mode
- FROM `'._DB_PREFIX_.'mr_selected` s
- INNER JOIN '._DB_PREFIX_.'mr_method m ON m.id_mr_method = s.id_method
- WHERE s.`id_cart` = '.(int)$params['order']->id_cart;
- $res = Db::getInstance()->getRow($sql);
-
- if (!$res)
- return;
-
- $point_relais = $res['MR_Selected_LgAdr1'].
- ($res['MR_Selected_LgAdr1'] ? ' ';
- $simpleresul = Db::getInstance()->executeS('
- SELECT * FROM '._DB_PREFIX_.'mr_selected
- WHERE id_cart='.(int)($id_cart));
-
- if (isset($simpleresul[0]))
- {
- if (trim($simpleresul[0]['exp_number']) != '')
- $html .= $this->l('Nb expedition:').$simpleresul[0]['exp_number'].''.$this->l('Label URL').' '.$this->l('Follow-up URL').'
';
- return $html;
- }
-
- /**
- * Set necessaries values to the created carrier
- *
- * @param $id_carrier
- * @param $dlv_mode
- * @return bool
- */
- private function addDefaultCarrierValue($id_carrier, $dlv_mode)
- {
- $weight_coef = $this->account_shop['MR_WEIGHT_COEFFICIENT'];
-
- /* Default Range value depending of the delivery mode */
- $range_weight = array(
- '24R' => array(0, 30000 / $weight_coef),
- 'DRI' => array(30000 / $weight_coef, 130000 / $weight_coef),
- 'LD1' => array(0, 60000 / $weight_coef),
- 'HOM' => array(0, 60000 / $weight_coef),
- 'LDS' => array(30000 / $weight_coef, 130000 / $weight_coef)
- );
-
- /* Set range weight for a dlv_mode */
- if (!Db::getInstance()->execute(
- 'INSERT INTO `'._DB_PREFIX_.'range_weight`
- (`id_carrier`, `delimiter1`, `delimiter2`)
- VALUES ('.(int)$id_carrier.', '.$range_weight[$dlv_mode][0].', '.$range_weight[$dlv_mode][1].')'))
- {
- $this->_postErrors[] = $this->l('Range weight can\'t be added');
- return false;
- }
-
- $range_weight_id = Db::getInstance()->Insert_ID();
-
- /* Set a range price */
- if (!Db::getInstance()->execute(
- 'INSERT INTO `'._DB_PREFIX_.'range_price`
- (`id_carrier`, `delimiter1`, `delimiter2`)
- VALUES ('.(int)$id_carrier.', 0.000000, 10000.000000)'))
- {
- $this->_postErrors[] = $this->l('Range price can\'t be added');
- return false;
- }
-
- $range_price_id = Db::getInstance()->Insert_ID();
-
- $groups = Group::getGroups(Configuration::get('PS_LANG_DEFAULT'));
- foreach ($groups as $group)
- if (!Db::getInstance()->execute(
- 'INSERT INTO `'._DB_PREFIX_.'carrier_group`
- (id_carrier, id_group)
- VALUES('.(int)$id_carrier.', '.(int)($group['id_group']).')'))
- {
- $this->_postErrors[] = $this->l('Default zone can\'t be added');
- return false;
- }
-
- /* Set default zone */
- $zones = Zone::getZones();
- foreach ($zones as $zone)
- {
- if (!Db::getInstance()->execute(
- 'INSERT INTO `'._DB_PREFIX_.'carrier_zone`
- (id_carrier, id_zone)
- VALUES('.(int)$id_carrier.', '.(int)($zone['id_zone']).')') ||
- !Db::getInstance()->execute(
- 'INSERT INTO `'._DB_PREFIX_.'delivery`
- (id_carrier, id_range_price, id_range_weight, id_zone, price)
- VALUES('.(int)$id_carrier.', '.(int)($range_price_id).', NULL,'.(int)($zone['id_zone']).', 0.00)') ||
- !Db::getInstance()->execute(
- 'INSERT INTO `'._DB_PREFIX_.'delivery`
- (id_carrier, id_range_price, id_range_weight, id_zone, price)
- VALUES('.(int)$id_carrier.', NULL, '.(int)($range_weight_id).','.(int)($zone['id_zone']).', 0.00)'))
- {
- $this->_postErrors[] = $this->l('Carrier zone or delivery data can\'t be added');
- return false;
- }
- }
- return true;
- }
-
- /**
- * Add new shipping method
- *
- * @return bool
- */
- private function addShippingMethod()
- {
- /* Insert new carrier for under Prestashop */
- if (!($id_carrier = $this->addCarrier(Tools::getValue('MR_name'), Tools::getValue('MR_delay'))))
- {
- $this->_postErrors[] = $this->l('Carrier can\'t be created in PrestaShop');
- return false;
- }
-
- $fields = $_POST;
-
- unset($fields['submit_add_shipping'], $fields['MR_tab_name'], $fields['tab'], $fields['MR_delay']);
-
- /* Force col mod to CCC */
- $fields['col_mode'] = 'CCC';
- $fields['id_carrier'] = $id_carrier;
-
- $query = 'INSERT INTO `'._DB_PREFIX_.'mr_method` (%s) VALUES(%s)';
-
- $keys = array();
- $values = array();
- foreach ($fields as $key => $value)
- {
- $keys[] = '`'.str_replace('MR_', '', $key).'`';
- $values[] = '\''.(is_array($value) ? pSQL(implode(',', $value)) : pSQL($value)).'\'';
- }
- $query = sprintf($query, implode(',', $keys), implode(',', $values));
-
- if (!Db::getInstance()->execute($query) || !Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'mr_method_shop`
- (id_mr_method, id_shop) VALUES('.(int)Db::getInstance()->INSERT_ID().', '.(int)$this->account_shop['id_shop'].')'))
- {
- $this->l('Carrier method can\'t be added for the module');
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'carrier` WHERE id_carrier='.(int)$id_carrier);
- return false;
- }
- return $this->addDefaultCarrierValue($id_carrier, $fields['MR_dlv_mode']);
- }
-
- /**
- * Disable carrier instead of delete to keep history
- *
- * @param $id_mr_method
- */
- public function disableCarrier($id_mr_method)
- {
- if (($id_carrier = Db::getInstance()->getValue(
- 'SELECT `id_carrier`
- FROM `'._DB_PREFIX_.'mr_method`
- WHERE `id_mr_method` = '.(int)($id_mr_method))) &&
- Db::getInstance()->execute(
- 'UPDATE `'._DB_PREFIX_.'carrier` c, `'._DB_PREFIX_.'mr_method` m
- SET c.`active` = 0, c.`deleted` = 1, m.`is_deleted` = 1
- WHERE
- c.`id_carrier` = m.`id_carrier`
- AND c.`id_carrier` = '.(int)$id_carrier))
- return true;
-
- $this->_postErrors = $this->l('Carrier can\'t be deleted yet');
- return false;
- }
-
- /**
- * Get the followup url
- *
- * @param $exp_number
- * @return mixed
- */
- public function get_followup($exp_number)
- {
- $query = '
- SELECT url_suivi
- FROM '._DB_PREFIX_.'mr_selected
- WHERE exp_number='.(int)$exp_number;
-
- return Db::getInstance()->getValue($query);
- }
-
- /**
- * Get the SQL query to fetch order with mr carrier
- *
- * @static
- * @param $id_order_state
- * @param $weight_coefficient
- * @return string
- */
- public static function getBaseOrdersSQLQuery($id_order_state, $weight_coefficient = 0)
- {
- return 'SELECT o.`id_address_delivery` as id_address_delivery,
- o.`id_order` as id_order,
- o.`id_customer` as id_customer,
- o.`id_cart` as id_cart,
- o.`id_lang` as id_lang,
- mrs.`id_mr_selected` as id_mr_selected,
- CONCAT(c.`firstname`, " ", c.`lastname`) AS `customer`,
- o.`total_paid_real` as total, o.`total_shipping` as shipping,
- o.`date_add` as date, o.`id_currency` as id_currency, o.`id_lang` as id_lang,
- mrs.`MR_poids` as mr_weight,
- mrs.`MR_insurance` as mr_insurance,
- mr.`name` as mr_Name, mrs.`MR_Selected_Num` as MR_Selected_Num,
- mrs.`MR_Selected_Pays` as MR_Selected_Pays, mrs.`exp_number` as exp_number,
- mr.`col_mode` as mr_ModeCol, mr.`dlv_mode` as mr_ModeLiv, mr.`insurance` as mr_ModeAss,
- ROUND(SUM(odt.`product_weight` * odt.`product_quantity`) * '.(int)$weight_coefficient.') AS "order_weight"
- FROM
- `'._DB_PREFIX_.'orders` o
- LEFT JOIN
- `'._DB_PREFIX_.'carrier` ca
- ON (ca.`id_carrier` = o.`id_carrier`)
- LEFT JOIN
- `'._DB_PREFIX_.'mr_selected` mrs
- ON (mrs.`id_cart` = o.`id_cart`)
- LEFT JOIN
- `'._DB_PREFIX_.'mr_method` mr
- ON (mr.`id_carrier` = ca.`id_carrier`)
- LEFT JOIN
- `'._DB_PREFIX_.'customer` c
- ON (c.`id_customer` = o.`id_customer`)
- LEFT JOIN
- `'._DB_PREFIX_.'order_detail` odt
- ON odt.`id_order` = o.`id_order`
- WHERE (
- SELECT moh.`id_order_state`
- FROM `'._DB_PREFIX_.'order_history` moh
- WHERE moh.`id_order` = o.`id_order`
- ORDER BY moh.`date_add` DESC LIMIT 1) = '.(int)($id_order_state).'
- AND o.`id_order` = mrs.`id_order`';
- }
-
- /**
- * Get orders details to create Tickets
- *
- * @static
- * @param array $orderIdList
- * @param int $filterEntries
- * @param int $weight_coefficient
- * @return array
- */
- public static function getOrders($orderIdList = array(), $filterEntries = MondialRelay::NO_FILTER, $weight_coefficient = 0)
- {
- $account_shop = MondialRelay::getAccountDetail();
- $id_order_state = $account_shop['MR_ORDER_STATE'];
- $sql = MondialRelay::getBaseOrdersSQLQuery($id_order_state, $weight_coefficient);
-
- if (count($orderIdList))
- {
- $sql .= ' AND o.id_order IN (';
- foreach ($orderIdList as $id_order)
- $sql .= (int)$id_order.', ';
- $sql = rtrim($sql, ', ').')';
- }
- switch ($filterEntries)
- {
- case MondialRelay::WITHOUT_HOME_DELIVERY:
- $sql .= 'AND mr.mr_ModeLiv != "LD1" AND mr.mr_ModeLiv != "LDS" AND mr.mr_ModeLiv != "HOM"';
- break;
- }
- $sql .= '
- GROUP BY o.`id_order`
- ORDER BY o.`date_add` ASC';
- return Db::getInstance()->executeS($sql);
- }
-
- /**
- * Get Mondialrelay error code
- *
- * @param $code
- * @return string
- */
- public function getErrorCodeDetail($code)
- {
- include(dirname(__FILE__).'/errorCode.php');
- if (isset($statCode[$code]))
- return $statCode[$code];
- return $this->l('This error isn\'t referred : ').$code;
- }
-
- /**
- * @param $id_cart
- * @return mixed
- */
- public function getRelayPointSelected($id_cart)
- {
- return Db::getInstance()->getRow('
- SELECT s.`MR_selected_num`
- FROM `'._DB_PREFIX_.'mr_selected` s
- WHERE s.`id_cart` = '.(int)$id_cart);
- }
-
- /**
- * @param $id_carrier
- * @return mixed
- */
- public function isMondialRelayCarrier($id_carrier)
- {
- return Db::getInstance()->getRow('
- SELECT m.`id_mr_method`
- FROM `'._DB_PREFIX_.'mr_method` m
- WHERE `id_carrier` = '.(int)$id_carrier);
- }
-
- public function getMethodValueByIdCarier($id_carrier, $key)
- {
- $content = Db::getInstance()->executeS(
- 'SELECT *
- FROM `'._DB_PREFIX_.'mr_method` m
- WHERE `id_carrier` = '.(int)$id_carrier);
-
- return isset($content[$key]) ? $content[$key] : '';
- }
-
- public function checkAJAX()
- {
- /* Avoid loop inclusion */
- static $is_included = false;
-
- /* TODO : Find a way to use it on front */
- if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && Tools::strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')
- if (Tools::getValue('mrtoken') && !$is_included)
- {
- $is_included = true;
- include(dirname(__FILE__).'/ajax.php');
- exit(0);
- }
- }
+ const INSTALL_SQL_FILE = 'sql/mrInstall.sql';
+
+ private $_postErrors;
+
+ public static $modulePath = '';
+ public static $moduleURL = '';
+ static public $MRFrontToken = '';
+ static public $MRBackToken = '';
+
+ /* Added for 1.3 compatibility */
+ const ONLY_PRODUCTS = 1;
+ const ONLY_DISCOUNTS = 2;
+ const BOTH = 3;
+ const BOTH_WITHOUT_SHIPPING = 4;
+ const ONLY_SHIPPING = 5;
+ const ONLY_WRAPPING = 6;
+ const ONLY_PRODUCTS_WITHOUT_SHIPPING = 7;
+
+ /* SQL FILTER ORDER */
+ const NO_FILTER = 0;
+ const WITHOUT_HOME_DELIVERY = 1;
+
+ const MR_URL = 'http://www.mondialrelay.fr/';
+
+ /* Contains the details of the current shop used */
+ public $account_shop = array(
+ 'MR_ENSEIGNE_WEBSERVICE' => '',
+ 'MR_CODE_MARQUE' => '',
+ 'MR_KEY_WEBSERVICE' => '',
+ 'MR_LANGUAGE' => '',
+ 'MR_WEIGHT_COEFFICIENT' => '',
+ 'MR_ORDER_STATE' => 3,
+ 'id_shop' => 1
+ );
+
+ public $upgrade_detail = array();
+
+ public function __construct()
+ {
+ $this->name = 'mondialrelay';
+ $this->tab = 'shipping_logistics';
+ $this->version = '2.1.7';
+ $this->installed_version = '';
+ $this->module_key = '366584e511d311cfaa899fc2d9ec1bd0';
+ $this->author = 'PrestaShop';
+
+ parent::__construct();
+
+ $this->displayName = $this->l('Mondial Relay');
+ $this->description = $this->l('Deliver in Relay points');
+
+ /** Backward compatibility */
+ require(_PS_MODULE_DIR_.'/mondialrelay/backward_compatibility/backward.php');
+
+ self::initModuleAccess();
+
+ /* Call everytime to prevent the change of the module by a recent one */
+ $this->_updateProcess();
+ $this->initAccount();
+
+ /* Check if it's a mondialrelay ajax query */
+ $this->checkAJAX();
+ }
+
+ public function install()
+ {
+ if (!function_exists('curl_version') || !extension_loaded('soap'))
+ {
+ $this->_errors[] = $this->l('Mondial Relay needs SOAP & cURL to be installed on your server.');
+ return false;
+ }
+
+ if (!parent::install())
+ return false;
+
+ if (!$this->registerHookByVersion())
+ return false;
+
+ if ((!file_exists(MondialRelay::$modulePath.MondialRelay::INSTALL_SQL_FILE)) ||
+ (!$sql = Tools::file_get_contents(MondialRelay::$modulePath.MondialRelay::INSTALL_SQL_FILE)))
+ return false;
+
+ $sql = str_replace('PREFIX_', _DB_PREFIX_, $sql);
+ $sql = preg_split("/;\s*[\r\n]+/", $sql);
+ foreach ($sql as $query)
+ if (!empty($query))
+ Db::getInstance()->execute(trim($query));
+
+ $result = Db::getInstance()->getRow('
+ SELECT id_tab
+ FROM `'._DB_PREFIX_.'tab`
+ WHERE class_name="AdminMondialRelay"');
+
+ if (!$result)
+ {
+ $tab = new Tab();
+ $languages = Language::getLanguages(false);
+ foreach ($languages as $language)
+ $tab->name[$language['id_lang']] = 'Mondial Relay';
+ $tab->class_name = 'AdminMondialRelay';
+ $tab->module = 'mondialrelay';
+ $tab->id_parent = Tab::getIdFromClassName('AdminOrders');
+
+ if (!$tab->add())
+ return false;
+
+ if (is_dir(_PS_MODULE_DIR_.'mondialrelay/'))
+ @copy(_PS_MODULE_DIR_.'mondialrelay/img/AdminMondialRelay.gif', _PS_IMG_DIR_.'/AdminMondialRelay.gif');
+ }
+
+ /* If module isn't installed, set default value */
+ if (!Configuration::get('MONDIAL_RELAY'))
+ {
+ Configuration::updateValue('MONDIAL_RELAY', $this->version);
+ Configuration::updateValue('MONDIAL_RELAY_SECURE_KEY', md5( _COOKIE_KEY_.time()));
+ Configuration::updateValue('MONDIAL_RELAY_MODE', 'widget');
+ }
+ else
+ {
+ $query = 'UPDATE `'._DB_PREFIX_.'carrier` c, `'._DB_PREFIX_.'mr_method` m
+ SET c.`deleted` = 0
+ WHERE c.`id_carrier` = m.`id_carrier`
+ AND m.`is_deleted` = 0';
+
+ /* Reactive transport if database wasn't remove at the last uninstall */
+ Db::getInstance()->execute($query);
+ }
+ return true;
+ }
+
+ /*
+ ** Return the token depend of the type
+ */
+ public static function getToken($type = 'front')
+ {
+ return ($type == 'front') ? MondialRelay::$MRFrontToken : (($type == 'back') ?
+ MondialRelay::$MRBackToken : null);
+ }
+
+ /*
+ ** Register hook depending of the Prestashop version used
+ */
+ private function registerHookByVersion()
+ {
+ if (version_compare(_PS_VERSION_, '1.3', '>=') && (!$this->registerHook('extraCarrier') || !$this->registerHook('updateCarrier') || !$this->registerHook('newOrder') || !$this->registerHook('BackOfficeHeader') || !$this->registerHook('header')))
+ return false;
+ if (version_compare(_PS_VERSION_, '1.4', '>=') && (!$this->registerHook('processCarrier') || !$this->registerHook('orderDetailDisplayed')))
+ return false;
+ if (version_compare(_PS_VERSION_, '1.6', '>=') && (!$this->registerHook('displayBackOfficeHeader')))
+ return false;
+ return true;
+ }
+
+ public function uninstallCommonData()
+ {
+ /* Tab uninstall */
+ if (($id_tab = Tab::getIdFromClassName('AdminMondialRelay')))
+ {
+ $tab = new Tab($id_tab);
+ $tab->delete();
+ }
+
+ if (!Db::getInstance()->execute('
+ UPDATE '._DB_PREFIX_.'carrier c, '._DB_PREFIX_.'mr_method m
+ SET c.`deleted` = 1
+ WHERE c.`id_carrier` = m.`id_carrier`'))
+ return false;
+
+ return true;
+ }
+
+ public function uninstall()
+ {
+ if (!parent::uninstall())
+ return false;
+
+ /* Uninstall data that doesn't need to be keep */
+ if (!$this->uninstallCommonData())
+ return false;
+
+ if (Tools::getValue('keepDatabase'))
+ return true;
+
+ Configuration::deleteByName('MR_ACCOUNT_DETAIL');
+
+ /* Drop databases */
+ if (!Db::getInstance()->execute('
+ DROP TABLE
+ '._DB_PREFIX_.'mr_history,
+ '._DB_PREFIX_.'mr_method,
+ '._DB_PREFIX_.'mr_selected,
+ '._DB_PREFIX_.'mr_method_shop'))
+ {
+ /* If drop failed, try to turn off the carriers */
+ Db::getInstance()->execute('
+ UPDATE '._DB_PREFIX_.'carrier c, '._DB_PREFIX_.'mr_method m
+ SET c.`deleted` = 1
+ WHERE c.`id_carrier` = m.`id_carrier`');
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Launch upgrade process for 1.3 and 1.4
+ */
+ public function runUpgrade()
+ {
+ /* List of upgraded version existing */
+ $files_version = array('1.8.0', '1.8.3', '2.0.6');
+
+ $upgrade_path = dirname(__FILE__).'/upgrade/';
+
+ if (version_compare(_PS_VERSION_, '1.5', '<'))
+ {
+ foreach ($files_version as $version)
+ {
+ $file = $upgrade_path.'install-'.$version.'.php';
+ if ($this->installed_version < $version && file_exists($file))
+ {
+ include_once($file);
+ call_user_func('upgrade_module_'.str_replace('.', '_', $version), $this);
+ }
+ }
+ }
+ }
+
+ /*
+ ** UpdateProcess if merchant update the module without a
+ ** normal installation
+ */
+ private function _updateProcess()
+ {
+ if (Module::isInstalled('mondialrelay') &&
+ (($this->installed_version = Configuration::get('MONDIAL_RELAY')) ||
+ $this->installed_version = Configuration::get('MONDIAL_RELAY_1_4'))
+ && $this->installed_version < $this->version)
+ $this->runUpgrade();
+ }
+
+ /*
+ ** Get the content to ask for a backup of the database
+ */
+ private function askForBackup($href)
+ {
+ return 'return PS_MRObject.uninstall(\''.$href.'\');';
+ }
+
+ /*
+ ** OnClick for input fields under the module list fields action
+ */
+ public function onclickOption($type, $href = false)
+ {
+ $content = '';
+
+ switch ($type)
+ {
+ case 'desactive':
+ break;
+ case 'reset':
+ break;
+ case 'delete':
+ break;
+ case 'uninstall':
+ $content = $this->askForBackup($href);
+ break;
+ default:
+ }
+ return $content;
+ }
+
+ /**
+ * Init the account_shop variable with the account detail for this shop
+ */
+ public function initAccount()
+ {
+ /* Get default value */
+ $id_order_state = $this->account_shop['MR_ORDER_STATE'];
+
+ if (($account_shop_stored = MondialRelay::getAccountDetail()))
+ $this->account_shop = $account_shop_stored;
+
+ /* Normally, this can't happen... */
+ if (empty($this->account_shop['MR_ORDER_STATE']))
+ $this->account_shop['MR_ORDER_STATE'] = $id_order_state;
+ }
+
+ /*
+ ** Init the access directory module for URL and file system
+ ** Allow a compatibility for Presta < 1.4
+ */
+ public static function initModuleAccess()
+ {
+ MondialRelay::$modulePath = _PS_MODULE_DIR_.'mondialrelay/';
+ MondialRelay::$MRFrontToken = sha1('mr'._COOKIE_KEY_.'Front');
+ MondialRelay::$MRBackToken = sha1('mr'._COOKIE_KEY_.'Back');
+ MondialRelay::$moduleURL = __PS_BASE_URI__.'modules/mondialrelay/';
+ }
+
+ public function fetchTemplate($path, $name)
+ {
+ if (version_compare(_PS_VERSION_, '1.4', '<'))
+ $this->context->smarty->currentTemplate = $name;
+
+ return $this->context->smarty->fetch(dirname(__FILE__).$path.$name.'.tpl');
+ }
+
+ public function hookNewOrder($params)
+ {
+ if (!MondialRelay::isMondialRelayCarrier($params['cart']->id_carrier))
+ return;
+
+ $order = $params['order'];
+ $currency = $params['currency'];
+ $id_lang = (int)$order->id_lang;
+ $customer = new Customer($order->id_customer);
+ $carrier = new Carrier($order->id_carrier);
+ $invoice = new Address((int)($order->id_address_invoice));
+ $invoice_state = $invoice->id_state ? new State($invoice->id_state) : false;
+ if (version_compare(_PS_VERSION_, '1.5', '<'))
+ $order_date_text = Tools::displayDate($order->date_add, (int)($id_lang));
+ else
+ $order_date_text = Tools::displayDate($order->date_add, null);
+
+ DB::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'mr_selected`
+ SET `id_order` = '.(int)$order->id.'
+ WHERE `id_cart` = '.(int)$params['cart']->id);
+
+ /*============================================
+ // GET MR INFOS
+ //============================================*/
+ $sql = 'SELECT * FROM `'._DB_PREFIX_.'mr_selected` WHERE `id_cart` = '.(int)$params['cart']->id.' AND `id_order` = '.(int)$order->id.'';
+ $mr_point = DB::getInstance()->getRow($sql);
+
+ if (!$mr_point['MR_Selected_Num']) return false;
+
+ /*============================================
+ // SEND MAIL
+ //============================================*/
+ $template = 'mr_new_order';
+ $subject = $this->l('New order', false, (int)$id_lang).' - '.sprintf('%06d', $order->id);
+
+ $mr_address = '';
+ if ($mr_point['MR_Selected_LgAdr2'])
+ $mr_address .= $mr_point['MR_Selected_LgAdr2'].'';
+ if ($mr_point['MR_Selected_LgAdr3'])
+ $mr_address .= $mr_point['MR_Selected_LgAdr3'].'';
+ if ($mr_point['MR_Selected_LgAdr4'])
+ $mr_address .= $mr_point['MR_Selected_LgAdr4'].'';
+
+ $templateVars = array(
+ '{firstname}' => $customer->firstname,
+ '{lastname}' => $customer->lastname,
+ '{email}' => $customer->email,
+ '{delivery_company}' => $mr_point['MR_Selected_LgAdr1'],
+ '{delivery_address1}' => $mr_address,
+ '{delivery_city}' => $mr_point['MR_Selected_Ville'],
+ '{delivery_postal_code}' => $mr_point['MR_Selected_CP'],
+ '{delivery_country}' => $mr_point['MR_Selected_Pays'],
+ '{invoice_company}' => $invoice->company,
+ '{invoice_firstname}' => $invoice->firstname,
+ '{invoice_lastname}' => $invoice->lastname,
+ '{invoice_address2}' => $invoice->address2,
+ '{invoice_address1}' => $invoice->address1,
+ '{invoice_city}' => $invoice->city,
+ '{invoice_postal_code}' => $invoice->postcode,
+ '{invoice_country}' => $invoice->country,
+ '{invoice_state}' => $invoice->id_state ? $invoice_state->name : '',
+ '{invoice_phone}' => $invoice->phone,
+ '{invoice_other}' => $invoice->other,
+ '{order_name}' => sprintf('%06d', $order->id),
+ '{shop_name}' => Configuration::get('PS_SHOP_NAME'),
+ '{date}' => $order_date_text,
+ '{carrier}' => (($carrier->name == '0') ? Configuration::get('PS_SHOP_NAME') : $carrier->name),
+ '{payment}' => Tools::substr($order->payment, 0, 32),
+ '{currency}' => $currency->sign,
+ );
+
+ $iso = Language::getIsoById((int)$id_lang);
+ if (file_exists(dirname(__FILE__).'/mails/'.$iso.'/'.$template.'.txt') && file_exists(dirname(__FILE__).'/mails/'.$iso.'/'.$template.'.html'))
+ Mail::Send((int)$id_lang, $template, $subject, $templateVars, $customer->email, $customer->firstname.' '.$customer->lastname, Configuration::get('PS_SHOP_EMAIL'), Configuration::get('PS_SHOP_NAME'), null, null, dirname(__FILE__).'/mails/');
+ }
+
+ public function hookBackOfficeHeader()
+ {
+ if (Tools::getValue('tab') == 'AdminMondialRelay' || Tools::getValue('module_name') == 'mondialrelay' || Tools::strtolower(Tools::getValue('controller')) == 'adminmondialrelay' || Tools::getValue('configure') == 'mondialrelay')
+ {
+ $this->context->smarty->assign(array(
+ 'MR_token' => MondialRelay::$MRBackToken, 'MR_local_path' => MondialRelay::$modulePath,
+ 'MR_account_set' => MondialRelay::isAccountSet(), 'new_base_dir' => MondialRelay::$moduleURL));
+
+ return $this->fetchTemplate('/views/templates/admin/', 'bo-header');
+ }
+ }
+
+ public function hookOrderDetailDisplayed($params)
+ {
+ if (!Mondialrelay::isMondialRelayCarrier($params['order']->id_carrier))
+ return;
+
+ $sql = '
+ SELECT s.`MR_Selected_LgAdr1`, s.`MR_Selected_LgAdr2`, s.`MR_Selected_LgAdr3`, s.`MR_Selected_LgAdr4`,
+ s.`MR_Selected_CP`, s.`MR_Selected_Ville`, s.`MR_Selected_Pays`, s.`MR_Selected_Num`, s.`url_suivi`, s.`exp_number`, m.dlv_mode
+ FROM `'._DB_PREFIX_.'mr_selected` s
+ INNER JOIN '._DB_PREFIX_.'mr_method m ON m.id_mr_method = s.id_method
+ WHERE s.`id_cart` = '.(int)$params['order']->id_cart;
+ $res = Db::getInstance()->getRow($sql);
+
+ if (!$res)
+ return;
+
+ $point_relais = $res['MR_Selected_LgAdr1'].
+ ($res['MR_Selected_LgAdr1'] ? ' ';
+ $simpleresul = Db::getInstance()->executeS('
+ SELECT * FROM '._DB_PREFIX_.'mr_selected
+ WHERE id_cart='.(int)($id_cart));
+
+ if (isset($simpleresul[0]))
+ {
+ if (trim($simpleresul[0]['exp_number']) != '')
+ $html .= $this->l('Nb expedition:').$simpleresul[0]['exp_number'].''.$this->l('Label URL').' '.$this->l('Follow-up URL').'
';
+ return $html;
+ }
+
+ /**
+ * Set necessaries values to the created carrier
+ *
+ * @param $id_carrier
+ * @param $dlv_mode
+ * @return bool
+ */
+ private function addDefaultCarrierValue($id_carrier, $dlv_mode)
+ {
+ $weight_coef = $this->account_shop['MR_WEIGHT_COEFFICIENT'];
+
+ /* Default Range value depending of the delivery mode */
+ $range_weight = array(
+ '24R' => array(0, 30000 / $weight_coef),
+ 'DRI' => array(30000 / $weight_coef, 130000 / $weight_coef),
+ 'LD1' => array(0, 60000 / $weight_coef),
+ 'HOM' => array(0, 60000 / $weight_coef),
+ 'LDS' => array(30000 / $weight_coef, 130000 / $weight_coef)
+ );
+
+ /* Set range weight for a dlv_mode */
+ if (!Db::getInstance()->execute(
+ 'INSERT INTO `'._DB_PREFIX_.'range_weight`
+ (`id_carrier`, `delimiter1`, `delimiter2`)
+ VALUES ('.(int)$id_carrier.', '.$range_weight[$dlv_mode][0].', '.$range_weight[$dlv_mode][1].')'))
+ {
+ $this->_postErrors[] = $this->l('Range weight can\'t be added');
+ return false;
+ }
+
+ $range_weight_id = Db::getInstance()->Insert_ID();
+
+ /* Set a range price */
+ if (!Db::getInstance()->execute(
+ 'INSERT INTO `'._DB_PREFIX_.'range_price`
+ (`id_carrier`, `delimiter1`, `delimiter2`)
+ VALUES ('.(int)$id_carrier.', 0.000000, 10000.000000)'))
+ {
+ $this->_postErrors[] = $this->l('Range price can\'t be added');
+ return false;
+ }
+
+ $range_price_id = Db::getInstance()->Insert_ID();
+
+ $groups = Group::getGroups(Configuration::get('PS_LANG_DEFAULT'));
+ foreach ($groups as $group)
+ if (!Db::getInstance()->execute(
+ 'INSERT INTO `'._DB_PREFIX_.'carrier_group`
+ (id_carrier, id_group)
+ VALUES('.(int)$id_carrier.', '.(int)($group['id_group']).')'))
+ {
+ $this->_postErrors[] = $this->l('Default zone can\'t be added');
+ return false;
+ }
+
+ /* Set default zone */
+ $zones = Zone::getZones();
+ foreach ($zones as $zone)
+ {
+ if (!Db::getInstance()->execute(
+ 'INSERT INTO `'._DB_PREFIX_.'carrier_zone`
+ (id_carrier, id_zone)
+ VALUES('.(int)$id_carrier.', '.(int)($zone['id_zone']).')') ||
+ !Db::getInstance()->execute(
+ 'INSERT INTO `'._DB_PREFIX_.'delivery`
+ (id_carrier, id_range_price, id_range_weight, id_zone, price)
+ VALUES('.(int)$id_carrier.', '.(int)($range_price_id).', NULL,'.(int)($zone['id_zone']).', 0.00)') ||
+ !Db::getInstance()->execute(
+ 'INSERT INTO `'._DB_PREFIX_.'delivery`
+ (id_carrier, id_range_price, id_range_weight, id_zone, price)
+ VALUES('.(int)$id_carrier.', NULL, '.(int)($range_weight_id).','.(int)($zone['id_zone']).', 0.00)'))
+ {
+ $this->_postErrors[] = $this->l('Carrier zone or delivery data can\'t be added');
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Add new shipping method
+ *
+ * @return bool
+ */
+ private function addShippingMethod()
+ {
+ /* Insert new carrier for under Prestashop */
+ if (!($id_carrier = $this->addCarrier(Tools::getValue('MR_name'), Tools::getValue('MR_delay'))))
+ {
+ $this->_postErrors[] = $this->l('Carrier can\'t be created in PrestaShop');
+ return false;
+ }
+
+ $fields = $_POST;
+
+ unset($fields['submit_add_shipping'], $fields['MR_tab_name'], $fields['tab'], $fields['MR_delay']);
+
+ /* Force col mod to CCC */
+ $fields['col_mode'] = 'CCC';
+ $fields['id_carrier'] = $id_carrier;
+ $fields['is_deleted'] = 0;
+
+ $query = 'INSERT INTO `'._DB_PREFIX_.'mr_method` (%s) VALUES(%s)';
+
+ $keys = array();
+ $values = array();
+ foreach ($fields as $key => $value)
+ {
+ $keys[] = '`'.str_replace('MR_', '', $key).'`';
+ $values[] = '\''.(is_array($value) ? pSQL(implode(',', $value)) : pSQL($value)).'\'';
+ }
+ $query = sprintf($query, implode(',', $keys), implode(',', $values));
+
+ if (!Db::getInstance()->execute($query) || !Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'mr_method_shop`
+ (id_mr_method, id_shop) VALUES('.(int)Db::getInstance()->INSERT_ID().', '.(int)$this->account_shop['id_shop'].')'))
+ {
+ $this->l('Carrier method can\'t be added for the module');
+ Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'carrier` WHERE id_carrier='.(int)$id_carrier);
+ return false;
+ }
+ return $this->addDefaultCarrierValue($id_carrier, $fields['MR_dlv_mode']);
+ }
+
+ /**
+ * Disable carrier instead of delete to keep history
+ *
+ * @param $id_mr_method
+ */
+ public function disableCarrier($id_mr_method)
+ {
+ if (($id_carrier = Db::getInstance()->getValue(
+ 'SELECT `id_carrier`
+ FROM `'._DB_PREFIX_.'mr_method`
+ WHERE `id_mr_method` = '.(int)($id_mr_method))) &&
+ Db::getInstance()->execute(
+ 'UPDATE `'._DB_PREFIX_.'carrier` c, `'._DB_PREFIX_.'mr_method` m
+ SET c.`active` = 0, c.`deleted` = 1, m.`is_deleted` = 1
+ WHERE
+ c.`id_carrier` = m.`id_carrier`
+ AND c.`id_carrier` = '.(int)$id_carrier))
+ return true;
+
+ $this->_postErrors = $this->l('Carrier can\'t be deleted yet');
+ return false;
+ }
+
+ /**
+ * Get the followup url
+ *
+ * @param $exp_number
+ * @return mixed
+ */
+ public function get_followup($exp_number)
+ {
+ $query = '
+ SELECT url_suivi
+ FROM '._DB_PREFIX_.'mr_selected
+ WHERE exp_number='.(int)$exp_number;
+
+ return Db::getInstance()->getValue($query);
+ }
+
+ /**
+ * Get the SQL query to fetch order with mr carrier
+ *
+ * @static
+ * @param $id_order_state
+ * @param $weight_coefficient
+ * @return string
+ */
+ public static function getBaseOrdersSQLQuery($id_order_state, $weight_coefficient = 0)
+ {
+ return 'SELECT o.`id_address_delivery` as id_address_delivery,
+ o.`id_order` as id_order,
+ o.`id_customer` as id_customer,
+ o.`id_cart` as id_cart,
+ o.`id_lang` as id_lang,
+ mrs.`id_mr_selected` as id_mr_selected,
+ CONCAT(c.`firstname`, " ", c.`lastname`) AS `customer`,
+ o.`total_paid_real` as total, o.`total_shipping` as shipping,
+ o.`date_add` as date, o.`id_currency` as id_currency, o.`id_lang` as id_lang,
+ mrs.`MR_poids` as mr_weight,
+ mrs.`MR_insurance` as mr_insurance,
+ mr.`name` as mr_Name, mrs.`MR_Selected_Num` as MR_Selected_Num,
+ mrs.`MR_Selected_Pays` as MR_Selected_Pays, mrs.`exp_number` as exp_number,
+ mr.`col_mode` as mr_ModeCol, mr.`dlv_mode` as mr_ModeLiv, mr.`insurance` as mr_ModeAss,
+ ROUND(SUM(odt.`product_weight` * odt.`product_quantity`) * '.(int)$weight_coefficient.') AS "order_weight"
+ FROM
+ `'._DB_PREFIX_.'orders` o
+ LEFT JOIN
+ `'._DB_PREFIX_.'carrier` ca
+ ON (ca.`id_carrier` = o.`id_carrier`)
+ LEFT JOIN
+ `'._DB_PREFIX_.'mr_selected` mrs
+ ON (mrs.`id_cart` = o.`id_cart`)
+ LEFT JOIN
+ `'._DB_PREFIX_.'mr_method` mr
+ ON (mr.`id_carrier` = ca.`id_carrier`)
+ LEFT JOIN
+ `'._DB_PREFIX_.'customer` c
+ ON (c.`id_customer` = o.`id_customer`)
+ LEFT JOIN
+ `'._DB_PREFIX_.'order_detail` odt
+ ON odt.`id_order` = o.`id_order`
+ WHERE (
+ SELECT moh.`id_order_state`
+ FROM `'._DB_PREFIX_.'order_history` moh
+ WHERE moh.`id_order` = o.`id_order`
+ ORDER BY moh.`date_add` DESC LIMIT 1) = '.(int)($id_order_state).'
+ AND o.`id_order` = mrs.`id_order`';
+ }
+
+ /**
+ * Get orders details to create Tickets
+ *
+ * @static
+ * @param array $orderIdList
+ * @param int $filterEntries
+ * @param int $weight_coefficient
+ * @return array
+ */
+ public static function getOrders($orderIdList = array(), $filterEntries = MondialRelay::NO_FILTER, $weight_coefficient = 0)
+ {
+ $account_shop = MondialRelay::getAccountDetail();
+ $id_order_state = $account_shop['MR_ORDER_STATE'];
+ $sql = MondialRelay::getBaseOrdersSQLQuery($id_order_state, $weight_coefficient);
+
+ if (count($orderIdList))
+ {
+ $sql .= ' AND o.id_order IN (';
+ foreach ($orderIdList as $id_order)
+ $sql .= (int)$id_order.', ';
+ $sql = rtrim($sql, ', ').')';
+ }
+ switch ($filterEntries)
+ {
+ case MondialRelay::WITHOUT_HOME_DELIVERY:
+ $sql .= 'AND mr.mr_ModeLiv != "LD1" AND mr.mr_ModeLiv != "LDS" AND mr.mr_ModeLiv != "HOM"';
+ break;
+ }
+ $sql .= '
+ GROUP BY o.`id_order`
+ ORDER BY o.`date_add` ASC';
+ return Db::getInstance()->executeS($sql);
+ }
+
+ /**
+ * Get Mondialrelay error code
+ *
+ * @param $code
+ * @return string
+ */
+ public function getErrorCodeDetail($code)
+ {
+ include(dirname(__FILE__).'/errorCode.php');
+ if (isset($statCode[$code]))
+ return $statCode[$code];
+ return $this->l('This error isn\'t referred : ').$code;
+ }
+
+ /**
+ * @param $id_cart
+ * @return mixed
+ */
+ public function getRelayPointSelected($id_cart)
+ {
+ return Db::getInstance()->getRow('
+ SELECT s.`MR_selected_num`
+ FROM `'._DB_PREFIX_.'mr_selected` s
+ WHERE s.`id_cart` = '.(int)$id_cart);
+ }
+
+ /**
+ * @param $id_carrier
+ * @return mixed
+ */
+ public function isMondialRelayCarrier($id_carrier)
+ {
+ return Db::getInstance()->getRow('
+ SELECT m.`id_mr_method`
+ FROM `'._DB_PREFIX_.'mr_method` m
+ WHERE `id_carrier` = '.(int)$id_carrier);
+ }
+
+ public function getMethodValueByIdCarier($id_carrier, $key)
+ {
+ $content = Db::getInstance()->executeS(
+ 'SELECT *
+ FROM `'._DB_PREFIX_.'mr_method` m
+ WHERE `id_carrier` = '.(int)$id_carrier);
+
+ return isset($content[$key]) ? $content[$key] : '';
+ }
+
+ public function checkAJAX()
+ {
+ /* Avoid loop inclusion */
+ static $is_included = false;
+
+ /* TODO : Find a way to use it on front */
+ if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && Tools::strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')
+ if (Tools::getValue('mrtoken') && !$is_included)
+ {
+ $is_included = true;
+ include(dirname(__FILE__).'/ajax.php');
+ exit(0);
+ }
+ }
}
diff --git a/sql/index.php b/sql/index.php
index fc4110f..087b026 100644
--- a/sql/index.php
+++ b/sql/index.php
@@ -27,10 +27,10 @@
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
+
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
-
+
header("Location: ../");
exit;
\ No newline at end of file
diff --git a/sql/mrInstall.sql b/sql/mrInstall.sql
index 0d3cb5b..b63ebe0 100644
--- a/sql/mrInstall.sql
+++ b/sql/mrInstall.sql
@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `PREFIX_mr_method` (
`dlv_mode` varchar(3) NOT NULL,
`insurance` varchar(3) NOT NULL DEFAULT '0',
`id_carrier` int(10) NOT NULL,
- `is_deleted` int(10) NOT NULL,
+ `is_deleted` int(10) NOT NULL DEFAULT '0',
PRIMARY KEY (`id_mr_method`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
diff --git a/upgrade/index.php b/upgrade/index.php
index fc4110f..087b026 100644
--- a/upgrade/index.php
+++ b/upgrade/index.php
@@ -27,10 +27,10 @@
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
+
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
-
+
header("Location: ../");
exit;
\ No newline at end of file
diff --git a/upgrade/install-1.8.0.php b/upgrade/install-1.8.0.php
index 7d99093..3d16016 100644
--- a/upgrade/install-1.8.0.php
+++ b/upgrade/install-1.8.0.php
@@ -28,103 +28,103 @@
/* File Example for upgrade */
if (!defined('_PS_VERSION_'))
- exit;
+ exit;
/* object module ($this) available */
function upgrade_module_1_8_0($object)
{
- $upgrade_version = '1.8.0';
-
- $object->upgrade_detail[$upgrade_version] = array();
-
- /* Add new table to handle multi-shop for a carrier */
- $query = '
- CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'mr_method_shop` (
- `id_mr_method_shop` int(10) unsigned NOT NULL auto_increment,
- `id_mr_method` int(10) unsigned NOT NULL,
- `id_shop` int(10) unsigned NOT NULL,
- PRIMARY KEY (`id_mr_method_shop`)
- ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;';
-
- if (!Db::getInstance()->execute($query))
- $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t create method shop table');
-
- /* Refacto name */
- $query = '
- ALTER TABLE `'._DB_PREFIX_.'mr_method` CHANGE `id_mr_method` `id_mr_method` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
- CHANGE `mr_Name` `name` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,
- CHANGE `mr_Pays_list` `country_list` VARCHAR( 1000 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,
- CHANGE `mr_ModeCol` `col_mode` VARCHAR( 3 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,
- CHANGE `mr_ModeLiv` `dlv_mode` VARCHAR( 3 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,
- CHANGE `mr_ModeAss` `insurance` VARCHAR( 3 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT \'0\',
- CHANGE `id_carrier` `id_carrier` INT( 10 ) NOT NULL';
-
- if (!Db::getInstance()->execute($query))
- $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t change name of the method table');
-
- $query = 'RENAME TABLE `'._DB_PREFIX_.'mr_historique` TO `'._DB_PREFIX_.'mr_history`';
-
- if (!Db::getInstance()->execute($query))
- $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t rename the history table');
-
- $object->account_shop['MR_ENSEIGNE_WEBSERVICE'] = Configuration::get('MR_ENSEIGNE_WEBSERVICE');
- $object->account_shop['MR_CODE_MARQUE'] = Configuration::get('MR_CODE_MARQUE');
- $object->account_shop['MR_KEY_WEBSERVICE'] = Configuration::get('MR_KEY_WEBSERVICE');
- $object->account_shop['MR_LANGUAGE'] = Configuration::get('MR_LANGUAGE');
- $object->account_shop['MR_WEIGHT_COEFFICIENT'] = Configuration::get('MR_WEIGHT_COEF');
- $object->account_shop['MR_ORDER_STATE'] = Configuration::get('MONDIAL_RELAY_ORDER_STATE');
- $object->updateAccountShop();
-
- Configuration::deleteByName('MONDIAL_RELAY_INSTALL_UPDATE');
- Configuration::deleteByName('MONDIAL_RELAY_ORDER_STATE');
- Configuration::deleteByName('MR_ENSEIGNE_WEBSERVICE');
- Configuration::deleteByName('MR_CODE_MARQUE');
- Configuration::deleteByName('MR_KEY_WEBSERVICE');
- Configuration::deleteByName('MR_WEIGHT_COEF');
- Configuration::deleteByName('MR_LANGUAGE');
- Configuration::deleteByName('MONDIAL_RELAY_1_4');
- Configuration::deleteByName('MONDIAL_RELAY_INSTALL_UPDATE_1');
-
- Configuration::updateValue('MONDIAL_RELAY', $upgrade_version);
-
- $methods = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'mr_method`');
- if (count($methods))
- {
- $query = '
- INSERT INTO `'._DB_PREFIX_.'mr_method_shop`
- (id_mr_method, id_shop) VALUES ';
-
- foreach ($methods as $method)
- $query .= '('.(int)$method['id_mr_method'].', '.(int)$object->account_shop['id_shop'].'),';
- $query = trim($query, ',');
- if (!Db::getInstance()->execute($query))
- $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t update table mr_method_shop');
-
- }
-
- if (!empty($object->installed_version))
- {
- if ($object->installed_version < '1.4')
- Db::getInstance()->execute('
- UPDATE `'._DB_PREFIX_.'carrier`
- SET
- `shipping_external` = 0,
- `need_range` = 1,
- `external_module_name` = "mondialrelay",
- `shipping_method` = 1
- WHERE `id_carrier`
- IN (SELECT `id_carrier`
- FROM `'._DB_PREFIX_.'mr_method`)');
- }
-
- /* Try to register the new hook since 1.7 */
- if (!$object->isRegisteredInHook('newOrder'))
- $object->registerHook('newOrder');
- if (!$object->isRegisteredInHook('BackOfficeHeader'))
- $object->registerHook('BackOfficeHeader');
-
- if (!$object->isRegisteredInHook('header'))
- $object->registerHook('header');
-
- return (bool)count($object->upgrade_detail[$upgrade_version]);
+ $upgrade_version = '1.8.0';
+
+ $object->upgrade_detail[$upgrade_version] = array();
+
+ /* Add new table to handle multi-shop for a carrier */
+ $query = '
+ CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'mr_method_shop` (
+ `id_mr_method_shop` int(10) unsigned NOT NULL auto_increment,
+ `id_mr_method` int(10) unsigned NOT NULL,
+ `id_shop` int(10) unsigned NOT NULL,
+ PRIMARY KEY (`id_mr_method_shop`)
+ ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;';
+
+ if (!Db::getInstance()->execute($query))
+ $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t create method shop table');
+
+ /* Refacto name */
+ $query = '
+ ALTER TABLE `'._DB_PREFIX_.'mr_method` CHANGE `id_mr_method` `id_mr_method` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
+ CHANGE `mr_Name` `name` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,
+ CHANGE `mr_Pays_list` `country_list` VARCHAR( 1000 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,
+ CHANGE `mr_ModeCol` `col_mode` VARCHAR( 3 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,
+ CHANGE `mr_ModeLiv` `dlv_mode` VARCHAR( 3 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,
+ CHANGE `mr_ModeAss` `insurance` VARCHAR( 3 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT \'0\',
+ CHANGE `id_carrier` `id_carrier` INT( 10 ) NOT NULL';
+
+ if (!Db::getInstance()->execute($query))
+ $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t change name of the method table');
+
+ $query = 'RENAME TABLE `'._DB_PREFIX_.'mr_historique` TO `'._DB_PREFIX_.'mr_history`';
+
+ if (!Db::getInstance()->execute($query))
+ $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t rename the history table');
+
+ $object->account_shop['MR_ENSEIGNE_WEBSERVICE'] = Configuration::get('MR_ENSEIGNE_WEBSERVICE');
+ $object->account_shop['MR_CODE_MARQUE'] = Configuration::get('MR_CODE_MARQUE');
+ $object->account_shop['MR_KEY_WEBSERVICE'] = Configuration::get('MR_KEY_WEBSERVICE');
+ $object->account_shop['MR_LANGUAGE'] = Configuration::get('MR_LANGUAGE');
+ $object->account_shop['MR_WEIGHT_COEFFICIENT'] = Configuration::get('MR_WEIGHT_COEF');
+ $object->account_shop['MR_ORDER_STATE'] = Configuration::get('MONDIAL_RELAY_ORDER_STATE');
+ $object->updateAccountShop();
+
+ Configuration::deleteByName('MONDIAL_RELAY_INSTALL_UPDATE');
+ Configuration::deleteByName('MONDIAL_RELAY_ORDER_STATE');
+ Configuration::deleteByName('MR_ENSEIGNE_WEBSERVICE');
+ Configuration::deleteByName('MR_CODE_MARQUE');
+ Configuration::deleteByName('MR_KEY_WEBSERVICE');
+ Configuration::deleteByName('MR_WEIGHT_COEF');
+ Configuration::deleteByName('MR_LANGUAGE');
+ Configuration::deleteByName('MONDIAL_RELAY_1_4');
+ Configuration::deleteByName('MONDIAL_RELAY_INSTALL_UPDATE_1');
+
+ Configuration::updateValue('MONDIAL_RELAY', $upgrade_version);
+
+ $methods = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'mr_method`');
+ if (count($methods))
+ {
+ $query = '
+ INSERT INTO `'._DB_PREFIX_.'mr_method_shop`
+ (id_mr_method, id_shop) VALUES ';
+
+ foreach ($methods as $method)
+ $query .= '('.(int)$method['id_mr_method'].', '.(int)$object->account_shop['id_shop'].'),';
+ $query = trim($query, ',');
+ if (!Db::getInstance()->execute($query))
+ $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t update table mr_method_shop');
+
+ }
+
+ if (!empty($object->installed_version))
+ {
+ if ($object->installed_version < '1.4')
+ Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'carrier`
+ SET
+ `shipping_external` = 0,
+ `need_range` = 1,
+ `external_module_name` = "mondialrelay",
+ `shipping_method` = 1
+ WHERE `id_carrier`
+ IN (SELECT `id_carrier`
+ FROM `'._DB_PREFIX_.'mr_method`)');
+ }
+
+ /* Try to register the new hook since 1.7 */
+ if (!$object->isRegisteredInHook('newOrder'))
+ $object->registerHook('newOrder');
+ if (!$object->isRegisteredInHook('BackOfficeHeader'))
+ $object->registerHook('BackOfficeHeader');
+
+ if (!$object->isRegisteredInHook('header'))
+ $object->registerHook('header');
+
+ return (bool)count($object->upgrade_detail[$upgrade_version]);
}
\ No newline at end of file
diff --git a/upgrade/install-1.8.3.php b/upgrade/install-1.8.3.php
index d416e1c..6d500a6 100644
--- a/upgrade/install-1.8.3.php
+++ b/upgrade/install-1.8.3.php
@@ -26,20 +26,20 @@
*/
if (!defined('_PS_VERSION_'))
- exit;
+ exit;
/**
* object module available
*/
function upgrade_module_1_8_3($object)
{
- $upgrade_version = '1.8.3';
+ $upgrade_version = '1.8.3';
- $object->upgrade_detail[$upgrade_version] = array();
+ $object->upgrade_detail[$upgrade_version] = array();
- if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'mr_method` ADD `is_deleted` INT NOT NULL'))
- $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t add new field in methodtable');
+ if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'mr_method` ADD `is_deleted` INT NOT NULL'))
+ $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t add new field in methodtable');
- Configuration::updateValue('MONDIAL_RELAY', $upgrade_version);
- return (bool)count($object->upgrade_detail[$upgrade_version]);
+ Configuration::updateValue('MONDIAL_RELAY', $upgrade_version);
+ return (bool)count($object->upgrade_detail[$upgrade_version]);
}
\ No newline at end of file
diff --git a/upgrade/install-2.0.6.php b/upgrade/install-2.0.6.php
index ff4f9fd..cb4050a 100644
--- a/upgrade/install-2.0.6.php
+++ b/upgrade/install-2.0.6.php
@@ -26,23 +26,23 @@
*/
if (!defined('_PS_VERSION_'))
- exit;
+ exit;
/**
* object module available
*/
function upgrade_module_2_0_6($object)
{
- $upgrade_version = '2.0.6';
+ $upgrade_version = '2.0.6';
- $object->upgrade_detail[$upgrade_version] = array();
+ $object->upgrade_detail[$upgrade_version] = array();
- try {
- if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'mr_selected` ADD `MR_insurance` INT( 11 ) NOT NULL AFTER `MR_poids`'))
- $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t add new field in methodtable');
- }
- catch (Exception $e) { }
-
- Configuration::updateValue('MONDIAL_RELAY', $upgrade_version);
- return (bool)count($object->upgrade_detail[$upgrade_version]);
+ try {
+ if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'mr_selected` ADD `MR_insurance` INT( 11 ) NOT NULL AFTER `MR_poids`'))
+ $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t add new field in methodtable');
+ }
+ catch (Exception $e) { }
+
+ Configuration::updateValue('MONDIAL_RELAY', $upgrade_version);
+ return (bool)count($object->upgrade_detail[$upgrade_version]);
}
\ No newline at end of file
diff --git a/upgrade/install-2.1.7.php b/upgrade/install-2.1.7.php
new file mode 100644
index 0000000..99e7099
--- /dev/null
+++ b/upgrade/install-2.1.7.php
@@ -0,0 +1,31 @@
+upgrade_detail[$upgrade_version] = array();
+
+ try {
+ // return false si erreur
+ if (!Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'mr_method` ALTER `is_deleted` SET DEFAULT "0"'))
+ $object->upgrade_detail[$upgrade_version][] = $object->l('Can\'t add new field in methodtable');
+
+ return Configuration::updateValue('MONDIAL_RELAY', $upgrade_version);
+ }
+ catch (Exception $e) {
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/views/index.php b/views/index.php
index 0bfbc8e..fa0395b 100644
--- a/views/index.php
+++ b/views/index.php
@@ -27,10 +27,10 @@
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
+
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
-
+
header("Location: ../");
exit;
\ No newline at end of file
diff --git a/views/templates/admin/index.php b/views/templates/admin/index.php
index 4deda52..9cf60e3 100644
--- a/views/templates/admin/index.php
+++ b/views/templates/admin/index.php
@@ -27,10 +27,10 @@
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
+
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
-
+
header("Location: ../");
exit;
\ No newline at end of file
diff --git a/views/templates/front/checkout_process.tpl b/views/templates/front/checkout_process.tpl
index e221b9e..384c326 100644
--- a/views/templates/front/checkout_process.tpl
+++ b/views/templates/front/checkout_process.tpl
@@ -24,15 +24,22 @@
* International Registered Trademark & Property of PrestaShop SA
*}
+
+ {l s='JavaScript is disabled on your browser, please enable it in order to select a Point Relais®.' mod='mondialrelay'}
+
+
{*if $MR_Data.PS_VERSION >= '1.5' && !$MR_Data.carrier}
{l s='Mondial relay can\'t fetch any replay point due to prestashop error' mod='mondialrelay'}
-{/if*}
\ No newline at end of file
+{/if*}
diff --git a/views/templates/front/checkout_process_widget.tpl b/views/templates/front/checkout_process_widget.tpl
index 7eaee98..ef98f71 100644
--- a/views/templates/front/checkout_process_widget.tpl
+++ b/views/templates/front/checkout_process_widget.tpl
@@ -23,12 +23,17 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
+
+
+ {l s='JavaScript is disabled on your browser, please enable it in order to select a Point Relais®.' mod='mondialrelay'}
+
+
@@ -49,5 +49,6 @@
+
diff --git a/views/templates/front/header_widget.tpl b/views/templates/front/header_widget.tpl
index 040c1bd..95f8ecc 100644
--- a/views/templates/front/header_widget.tpl
+++ b/views/templates/front/header_widget.tpl
@@ -29,6 +29,7 @@
{/if}
+
@@ -48,4 +49,4 @@
PS_MRTranslationList['errorSelection'] = "{l s='Please choose a relay point' mod='mondialrelay' js=1}";
PS_MRTranslationList['openingRelay'] = "{l s='Opening hours' mod='mondialrelay' js=1}";
PS_MRTranslationList['moreDetails'] = "{l s='More details' mod='mondialrelay' js=1}";
-
\ No newline at end of file
+
diff --git a/views/templates/front/index.php b/views/templates/front/index.php
index 7752dc5..21075f4 100644
--- a/views/templates/front/index.php
+++ b/views/templates/front/index.php
@@ -26,10 +26,10 @@
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
+
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
-
+
header("Location: ../");
exit;
\ No newline at end of file
diff --git a/views/templates/index.php b/views/templates/index.php
index fc4110f..087b026 100644
--- a/views/templates/index.php
+++ b/views/templates/index.php
@@ -27,10 +27,10 @@
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
+
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
-
+
header("Location: ../");
exit;
\ No newline at end of file