[-] MO : Bug fix : Mondial Relay, JS compatibility with PS 1.4

PrestaShop · Dec 5, 2012 · 3f7db1f · 3f7db1f
1 parent 701c379
commit 3f7db1f
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 32 deletions.
diff --git a/mondialrelay/config.xml b/mondialrelay/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>mondialrelay</name>
 	<displayName><![CDATA[Mondial Relay]]></displayName>
-	<version><![CDATA[1.8.7]]></version>
+	<version><![CDATA[1.8.8]]></version>
 	<description><![CDATA[Deliver in Relay points]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[shipping_logistics]]></tab>

diff --git a/mondialrelay/fr.php b/mondialrelay/fr.php
@@ -178,6 +178,7 @@
 $_MODULE['<{mondialrelay}prestashop>history_9e50665937cbb2f3c833d3626a9f9abb'] = 'Aucun historique disponible';
 $_MODULE['<{mondialrelay}prestashop>history_fa98e6528c9df7f26978c2beb7de3d99'] = 'Supprimer les historiques sélectionnés';
 $_MODULE['<{mondialrelay}prestashop>settings_0a4ee7474864081af12dba847fafdaa6'] = 'Configuration du panneau d\'administration';
+$_MODULE['<{mondialrelay}prestashop>settings_d02bbc3cb147c272b0445ac5ca7d1a36'] = 'État de la commande';
 $_MODULE['<{mondialrelay}prestashop>settings_ca57625685f058f54d82c6e05876a131'] = 'Choississez le statut pour la génération d\'étiquette.';
 $_MODULE['<{mondialrelay}prestashop>settings_c9cc8cce247e49bae79f15173ce97354'] = 'Sauvegarder';
 $_MODULE['<{mondialrelay}prestashop>settings_f4f70727dc34561dfde1a3c529b6205c'] = 'Paramètres';

diff --git a/mondialrelay/js/mondialrelay.js b/mondialrelay/js/mondialrelay.js
@@ -1110,7 +1110,7 @@ var PS_MRObject = (function($, undifened) {
 			});
 		})
 
-		$('input[name="processCarrier"]').on('click', function() {
+		$('input[name="processCarrier"]').click(function() {
 			if (PS_MRData != 'undefined' && PS_MRData.carrier != null) {
 				var result = false;
 				$.each(PS_MRData.carrier_list, function(key, value) {

diff --git a/mondialrelay/lib/nusoap/class.nusoap_base.php b/mondialrelay/lib/nusoap/class.nusoap_base.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-$Id: class.nusoap_base.php 12890 2012-02-01 11:19:57Z vSchoener $
+$Id$
 
 NuSOAP - Web Services Toolkit for PHP
 
@@ -79,7 +79,7 @@
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: class.nusoap_base.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access   public
 */
 class nusoap_base {
@@ -103,7 +103,7 @@ class nusoap_base {
 	 * @var string
 	 * @access private
 	 */
-	var $revision = '$Revision: 12890 $';
+	var $revision = '$Revision$';
     /**
      * Current error string (manipulated by getError/setError)
 	 *

diff --git a/mondialrelay/lib/nusoap/class.soap_fault.php b/mondialrelay/lib/nusoap/class.soap_fault.php
@@ -8,7 +8,7 @@
 * Mainly used for returning faults from deployed functions
 * in a server instance.
 * @author   Dietrich Ayala <dietrich@ganx4.com>
-* @version  $Id: class.soap_fault.php 6626 2011-05-24 09:44:48Z aFolletete $
+* @version  $Id$
 * @access public
 */
 class nusoap_fault extends nusoap_base {

diff --git a/mondialrelay/lib/nusoap/class.soap_parser.php b/mondialrelay/lib/nusoap/class.soap_parser.php
@@ -9,7 +9,7 @@
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: class.soap_parser.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access   public
 */
 class nusoap_parser extends nusoap_base {

diff --git a/mondialrelay/lib/nusoap/class.soap_server.php b/mondialrelay/lib/nusoap/class.soap_server.php
@@ -10,7 +10,7 @@
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: class.soap_server.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access   public
 */
 class nusoap_server extends nusoap_base {

diff --git a/mondialrelay/lib/nusoap/class.soap_transport_http.php b/mondialrelay/lib/nusoap/class.soap_transport_http.php
@@ -9,7 +9,7 @@
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: class.soap_transport_http.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access public
 */
 class soap_transport_http extends nusoap_base {

diff --git a/mondialrelay/lib/nusoap/class.soap_val.php b/mondialrelay/lib/nusoap/class.soap_val.php
@@ -11,7 +11,7 @@
 * xsd:anyType and user-defined types.
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
-* @version  $Id: class.soap_val.php 6626 2011-05-24 09:44:48Z aFolletete $
+* @version  $Id$
 * @access   public
 */
 class soapval extends nusoap_base {

diff --git a/mondialrelay/lib/nusoap/class.soapclient.php b/mondialrelay/lib/nusoap/class.soapclient.php
@@ -20,7 +20,7 @@
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: class.soapclient.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access   public
 */
 class nusoap_client extends nusoap_base  {

diff --git a/mondialrelay/lib/nusoap/class.wsdl.php b/mondialrelay/lib/nusoap/class.wsdl.php
@@ -9,7 +9,7 @@
 * 
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: class.wsdl.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access public 
 */
 class wsdl extends nusoap_base {

diff --git a/mondialrelay/lib/nusoap/class.wsdlcache.php b/mondialrelay/lib/nusoap/class.wsdlcache.php
@@ -12,7 +12,7 @@
 * 
 * @author   Scott Nichol <snichol@users.sourceforge.net>
 * @author	Ingo Fischer <ingo@apollon.de>
-* @version  $Id: class.wsdlcache.php 6626 2011-05-24 09:44:48Z aFolletete $
+* @version  $Id$
 * @access public 
 */
 class nusoap_wsdlcache {

diff --git a/mondialrelay/lib/nusoap/class.xmlschema.php b/mondialrelay/lib/nusoap/class.xmlschema.php
@@ -9,7 +9,7 @@
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: class.xmlschema.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access   public
 */
 class nusoap_xmlschema extends nusoap_base  {

diff --git a/mondialrelay/lib/nusoap/nusoap.php b/mondialrelay/lib/nusoap/nusoap.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-$Id: nusoap.php 12890 2012-02-01 11:19:57Z vSchoener $
+$Id$
 
 NuSOAP - Web Services Toolkit for PHP
 
@@ -79,7 +79,7 @@
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: nusoap.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access   public
 */
 class nusoap_base {
@@ -103,7 +103,7 @@ class nusoap_base {
 	 * @var string
 	 * @access private
 	 */
-	var $revision = '$Revision: 12890 $';
+	var $revision = '$Revision$';
     /**
      * Current error string (manipulated by getError/setError)
 	 *
@@ -1001,7 +1001,7 @@ function usleepWindows($usec)
 * Mainly used for returning faults from deployed functions
 * in a server instance.
 * @author   Dietrich Ayala <dietrich@ganx4.com>
-* @version  $Id: nusoap.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access public
 */
 class nusoap_fault extends nusoap_base {
@@ -1089,7 +1089,7 @@ class soap_fault extends nusoap_fault {
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: nusoap.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access   public
 */
 class nusoap_xmlschema extends nusoap_base  {
@@ -2061,7 +2061,7 @@ class XMLSchema extends nusoap_xmlschema {
 * xsd:anyType and user-defined types.
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
-* @version  $Id: nusoap.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access   public
 */
 class soapval extends nusoap_base {
@@ -2163,7 +2163,7 @@ function decode(){
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: nusoap.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access public
 */
 class soap_transport_http extends nusoap_base {
@@ -2221,7 +2221,8 @@ function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
 		}
 		$this->use_curl = $use_curl;
 		preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);
-		$this->setHeader('User-Agent', $this->title.'/'.$this->version.' ('.$rev[1].')');
+		$revision = isset($rev[1]) ? ' ('.$rev[1].')' : null;
+		$this->setHeader('User-Agent', $this->title.'/'.$this->version.$revision);
 	}
 
 	/**
@@ -3468,7 +3469,7 @@ function getCookiesForRequest($cookies, $secure=false) {
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: nusoap.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access   public
 */
 class nusoap_server extends nusoap_base {
@@ -4591,7 +4592,7 @@ class soap_server extends nusoap_server {
 * 
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: nusoap.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access public 
 */
 class wsdl extends nusoap_base {
@@ -6526,7 +6527,7 @@ function addOperation($name, $in = false, $out = false, $namespace = false, $soa
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: nusoap.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access   public
 */
 class nusoap_parser extends nusoap_base {
@@ -7177,7 +7178,7 @@ class soap_parser extends nusoap_parser {
 *
 * @author   Dietrich Ayala <dietrich@ganx4.com>
 * @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: nusoap.php 12890 2012-02-01 11:19:57Z vSchoener $
+* @version  $Id$
 * @access   public
 */
 class nusoap_client extends nusoap_base  {

diff --git a/mondialrelay/lib/nusoap/nusoapmime.php b/mondialrelay/lib/nusoap/nusoapmime.php
@@ -1,6 +1,6 @@
 <?php
 /*
-$Id: nusoapmime.php 6626 2011-05-24 09:44:48Z aFolletete $
+$Id$
 
 NuSOAP - Web Services Toolkit for PHP
 
@@ -48,7 +48,7 @@
 *
 * @author   Scott Nichol <snichol@users.sourceforge.net>
 * @author	Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
-* @version  $Id: nusoapmime.php 6626 2011-05-24 09:44:48Z aFolletete $
+* @version  $Id$
 * @access   public
 */
 class nusoap_client_mime extends nusoap_client {
@@ -278,7 +278,7 @@ class soapclientmime extends nusoap_client_mime {
 *
 * @author   Scott Nichol <snichol@users.sourceforge.net>
 * @author	Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
-* @version  $Id: nusoapmime.php 6626 2011-05-24 09:44:48Z aFolletete $
+* @version  $Id$
 * @access   public
 */
 class nusoap_server_mime extends nusoap_server {

diff --git a/mondialrelay/mondialrelay.php b/mondialrelay/mondialrelay.php
@@ -68,9 +68,9 @@ class MondialRelay extends Module
 
 	public function __construct()
 	{
-		$this->name		= 'mondialrelay';
-		$this->tab		= 'shipping_logistics';
-		$this->version	= '1.8.7';
+		$this->name = 'mondialrelay';
+		$this->tab = 'shipping_logistics';
+		$this->version = '1.8.8';
 		$this->installed_version = '';
 		$this->module_key = '366584e511d311cfaa899fc2d9ec1bd0';
 		$this->author = 'PrestaShop';