dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Merge -> revision 9221

Browse Source
This commit is contained in:
rMalie
2011-10-11 12:45:12 +00:00
parent b0cc80ad01
commit eeb5b16112
77 changed files with 1987 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/authorizeaim/authorizeaim.php
+14 -5
View File
@@ -34,7 +34,7 @@ class authorizeAIM extends PaymentModule
{
$this->name = 'authorizeaim';
$this->tab = 'payments_gateways';
$this->version = '1.2.1';
$this->version = '1.2.2';
$this->author = 'PrestaShop';
$this->limited_countries = array('us');
$this->need_instance = 0;
@@ -45,11 +45,20 @@ class authorizeAIM extends PaymentModule
$this->description = $this->l('Receive payment with Authorize.net');
/* For 1.4.3 and less compatibility */
$updateConfig = array('PS_OS_CHEQUE', 'PS_OS_PAYMENT', 'PS_OS_PREPARATION', 'PS_OS_SHIPPING', 'PS_OS_CANCELED', 'PS_OS_REFUND', 'PS_OS_ERROR', 'PS_OS_OUTOFSTOCK', 'PS_OS_BANKWIRE', 'PS_OS_PAYPAL', 'PS_OS_WS_PAYMENT');
if (!Configuration::get('PS_OS_PAYMENT'))
foreach ($updateConfig as $u)
if (!Configuration::get($u) && defined('_'.$u.'_'))
$updateConfig = array('PS_OS_CHEQUE' => 1, 'PS_OS_PAYMENT' => 2, 'PS_OS_PREPARATION' => 3, 'PS_OS_SHIPPING' => 4, 'PS_OS_DELIVERED' => 5, 'PS_OS_CANCELED' => 6,
'PS_OS_REFUND' => 7, 'PS_OS_ERROR' => 8, 'PS_OS_OUTOFSTOCK' => 9, 'PS_OS_BANKWIRE' => 10, 'PS_OS_PAYPAL' => 11, 'PS_OS_WS_PAYMENT' => 12);
foreach ($updateConfig as $u => $v)
if (!Configuration::get($u) || (int)Configuration::get($u) < 1)
{
if (defined('_'.$u.'_') && (int)constant('_'.$u.'_') > 0)
Configuration::updateValue($u, constant('_'.$u.'_'));
else
Configuration::updateValue($u, $v);
}
/* Check if cURL is enabled */
if (!is_callable('curl_exec'))
$this->warning = $this->l('cURL extension must be enabled on your server to use this module.');
}
public function install()
modules/authorizeaim/config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>authorizeaim</name>
<displayName><![CDATA[Authorize.net AIM (Advanced Integration Method)]]></displayName>
<version><![CDATA[1.2.1]]></version>
<version><![CDATA[1.2.2]]></version>
<description><![CDATA[Receive payment with Authorize.net]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[payments_gateways]]></tab>
modules/authorizeaim/fr.php
+1
View File
@@ -3,6 +3,7 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{authorizeaim}prestashop>authorizeaim_cb313e911b15b21b57f4fc7b53058e4f'] = 'Recevoir des paiments avec Authorize.net';
$_MODULE['<{authorizeaim}prestashop>authorizeaim_9d5b40ff49295ac0b4a5a13a88ccd285'] = 'L\'extension cURL doit être activé sur votre serveur pour utiliser ce module.';
$_MODULE['<{authorizeaim}prestashop>authorizeaim_20015706a8cbd457cbb6ea3e7d5dc9b3'] = 'Configuration mise a jour';
$_MODULE['<{authorizeaim}prestashop>authorizeaim_6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Aide';
$_MODULE['<{authorizeaim}prestashop>authorizeaim_11a4b229c0e206b831f729572618553f'] = 'Dans votre panneau d\'aministration PrestaShop';
modules/autoupgrade/AdminPreferences.php
+4
View File
@@ -25,6 +25,10 @@
* International Registered Trademark & Property of PrestaShop SA
*/
// @since 1.4.5.0
// add the following comment in a module file to skip it in translations
// IGNORE_THIS_FILE_FOR_TRANSLATION
class AdminPreferences extends AdminTab
{
public function __construct()
modules/autoupgrade/AdminSelfTab.php
+3
View File
@@ -25,6 +25,9 @@
* International Registered Trademark & Property of PrestaShop SA
*/
// @since 1.4.5.0
// add the following comment in a module file to skip it in translations
// IGNORE_THIS_FILE_FOR_TRANSLATION
abstract class AdminSelfTab
{
/** @var integer Tab id */
modules/autoupgrade/AdminSelfUpgrade.php
+126 -82
View File
@@ -25,6 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA
*/
if(!defined('_PS_ADMIN_DIR_'))
define('_PS_ADMIN_DIR_', _PS_ADMIN_DIR_);
if(!defined('_PS_USE_SQL_SLAVE_'))
@@ -473,6 +474,13 @@ $this->standalone = true;
}
$changedFileList = $this->upgrader->getChangedFilesList();
if (!isset($changedFileList['core']))
$changedFileList['core'] = array();
if (!isset($changedFileList['translation']))
$changedFileList['translation'] = array();
if (!isset($changedFileList['mail']))
$changedFileList['mail'] = array();
if ($changedFileList === false)
{
$changedFileList = array();
@@ -794,11 +802,6 @@ $this->standalone = true;
switch ($this->currentParams['upgradeDbStep'])
{
default:
$this->next = 'upgradeComplete';
$this->nextResponseType = 'json';
return true;
// $this->_model('checkConfig');
break;
// 1) confirm version is correct(DB)
// install/model.php?method=getVersionFromDb&language=0
case '1':
@@ -825,7 +828,7 @@ $this->standalone = true;
case '4':
$this->next = 'upgradeComplete';
$this->nextResponseType = 'json';
$this->nextDesc = $this->l('Way to go ! Upgrade complete.');
$this->nextDesc = $this->l('Way to go ! Upgrade complete. You can now reactivate your shop.');
break;
}
@@ -1352,10 +1355,18 @@ $this->standalone = true;
{
$res = $this->upgrader->downloadLast($this->autoupgradePath,$this->destDownloadFilename);
if ($res){
if (md5_file(realpath($this->autoupgradePath).DIRECTORY_SEPARATOR.$this->destDownloadFilename) == $this->upgrader->md5 )
{
$this->next = 'unzip';
$this->nextDesc = $this->l('Download complete. Now extracting');
}
else
{
$this->next = 'error';
$this->nextDesc = $this->l('Download complete but md5sum does not match. Operation aborted.');
}
}
else
{
$this->next = 'error';
$this->nextDesc = $this->l('Error during download');
@@ -1376,12 +1387,15 @@ $this->standalone = true;
$return['next'] = $this->next;
$return['status'] = $this->next == 'error' ? 'error' : 'ok';
$return['nextDesc'] = $this->nextDesc;
$return['upgradeDbStep'] = 0;
foreach($this->ajaxParams as $v)
if(property_exists($this,$v))
$this->nextParams[$v] = $this->$v;
$return['nextParams'] = $this->nextParams;
if (!isset($return['nextParams']['upgradeDbStep']))
$return['nextParams']['upgradeDbStep'] = 0;
$return['nextParams']['typeResult'] = $this->nextResponseType;
@@ -1428,7 +1442,7 @@ $this->standalone = true;
}
}
if (Tools::apacheModExists('evasive'))
if (!method_exists('Tools', 'apacheModExists') || Tools::apacheModExists('evasive'))
sleep(1);
}
@@ -1501,6 +1515,10 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
{
echo '<fieldset><legend>'.$this->l('Rollback').'</legend>
<div id="rollbackForm">';
echo '<p>'
.$this->l('After upgrading your shop, you can rollback to the previously database and files. Use this function if your theme or an essential module is not working correctly.')
.'</p><br/>';
if (empty($this->backupFilesFilename) AND empty($this->backupDbFilename))
echo $this->l('No rollback available');
else if (!empty($this->backupFilesFilename) OR !empty($this->backupDbFilename))
@@ -1515,20 +1533,22 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
echo '</div></fieldset>';
}
private function _displayUpgraderForm()
/** this returns fieldset containing the configuration points you need to use autoupgrade
* @return string
*/
private function getCurrentConfiguration()
{
global $cookie;
$pleaseUpdate = $this->upgrader->checkPSVersion();
echo '<fieldset class="width autoupgrade " >';
echo '<legend>'.$this->l('Your current configuration').'</legend>';
echo '<b>'.$this->l('Root directory').' : </b>'.$this->prodRootDir.'<br/><br/>';
$content = '<fieldset class="width autoupgrade " >';
$content .= '<legend><a href="#" id="currentConfigurationToggle">'.$this->l('Your current configuration').'</a></legend>';
$content .= '<div id="currentConfiguration">
<p>'.$this->l('All the following points must be ok in order to allow the upgrade.').'</p>
<b>'.$this->l('Root directory').' : </b>'.$this->prodRootDir.'<br/><br/>';
if ($this->rootWritable)
$srcRootWritable = '../img/admin/enabled.gif';
else
$srcRootWritable = '../img/admin/disabled.gif';
echo '<b>'.$this->l('Root directory status').' : </b>'.'<img src="'.$srcRootWritable.'" /> '.($this->rootWritable?$this->l('fully writable'):$this->l('not writable recursively')).'<br/><br/>';
$content .= '<b>'.$this->l('Root directory status').' : </b>'.'<img src="'.$srcRootWritable.'" /> '.($this->rootWritable?$this->l('fully writable'):$this->l('not writable recursively')).'<br/><br/>';
if ($this->upgrader->need_upgrade)
{
@@ -1536,12 +1556,13 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
$srcAutoupgrade = '../img/admin/enabled.gif';
else
$srcAutoupgrade = '../img/admin/disabled.gif';
echo '<b>'.$this->l('Autoupgrade allowed').' : </b>'.'<img src="'.$srcAutoupgrade.'" /> '.($this->upgrader->autoupgrade?$this->l('This release allow autoupgrade.'):$this->l('This release does not allow autoupgrade')).'. <br/><br/>';
$content .= '<b>'.$this->l('Upgrade available').' : </b>'.'<img src="'.$srcAutoupgrade.'" /> '.($this->upgrader->autoupgrade?$this->l('This release allows autoupgrade.'):$this->l('This release does not allow autoupgrade')).' <br/><br/>';
}
else
{
$srcAutoupgrade = '../img/admin/disabled.gif';
echo '<b>'.$this->l('Autoupgrade allowed').' : </b>'.'<img src="../img/admin/disabled.gif" /> . <br/><br/>';
$content .= '<b>'.$this->l('Upgrade available').' : </b>'.'<img src="../img/admin/disabled.gif" />'.$this->l('You already have the last version.').'<br/><br/>';
}
@@ -1555,110 +1576,129 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
$srcShopStatus = '../img/admin/enabled.gif';
$label = $this->l('Yes');
}
echo '<b>'.$this->l('Shop desactivated').' : </b>'.'<img src="'.$srcShopStatus.'" />'.$label.'<br/><br/>';
$content .= '<b>'.$this->l('Shop desactivated').' : </b>'.'<img src="'.$srcShopStatus.'" /><a href="index.php?tab=AdminPreferences&token='.Tools::getAdminTokenLite('AdminPreferences').'" class="button">'.$label.'</a><br/><br/>';
$max_exec_time = ini_get('max_execution_time');
if ($max_exec_time == 0)
$srcExecTime = '../img/admin/enabled.gif';
else
$srcExecTime = '../img/admin/warning.gif';
echo '<b>'.$this->l('PHP time limit').' : </b>'.'<img src="'.$srcExecTime.'" />'.($max_exec_time == 0?$this->l('disabled'):$max_exec_time.' '.$this->l('seconds')).' <br/><br/>';
$content .= '<b>'.$this->l('PHP time limit').' : </b>'.'<img src="'.$srcExecTime.'" />'.($max_exec_time == 0?$this->l('disabled'):$max_exec_time.' '.$this->l('seconds')).' <br/><br/>';
if (($testConfigDone = Configuration::get('PS_AUTOUP_DONT_SAVE_IMAGES')) !== false)
$configurationDone = '../img/admin/enabled.gif';
else
$configurationDone = '../img/admin/disabled.gif';
echo '<b>'.$this->l('Options chosen').' : </b>'.'<img src="'.$configurationDone.'" /> '.($testConfigDone?$this->l('autoupgrade configuration ok'):$this->l('Please configure autoupgrade options')).'<br/><br/>';
$content .= '<b>'.$this->l('Options chosen').' : </b>'.'<img src="'.$configurationDone.'" /> '.($testConfigDone?$this->l('autoupgrade configuration ok'):$this->l('Please configure autoupgrade options')).'<br/><br/>';
echo '<b>'.$this->l('PrestaShop Original version').' : </b>'.'<span id="checkPrestaShopFilesVersion">
$content .= '<b>'.$this->l('PrestaShop Original version').' : </b>'.'<span id="checkPrestaShopFilesVersion">
<img id="pleaseWait" src="'.__PS_BASE_URI__.'img/loader.gif"/>
</span>';
echo '<p> <a class="button" id="scrollToOptions" href="#options">'.$this->l('Modify your options').'</a></p>';
echo '</fieldset>';
$content .= '<p> <a class="button" id="scrollToOptions" href="#options">'.$this->l('Modify your options').'</a></p>
</div>';
$content .= '</fieldset>';
echo '<br/>';
$content .= '<script type="text/javascript">
$("#currentConfigurationToggle").click(function(e){e.preventDefault();$("#currentConfiguration").toggle()});'
echo '<fieldset class=""><legend>'.$this->l('Update').'</legend>';
.($this->configOk()?'$("#currentConfiguration").hide();$("#currentConfigurationToggle").after("<img src=\"../img/admin/enabled.gif\" />");':'').'</script>';
echo '<div style="float:left">
return $content;
}
private function _displayUpgraderForm()
{
global $cookie;
$content = '';
$pleaseUpdate = $this->upgrader->checkPSVersion();
$content .= $this->getCurrentConfiguration();
$content .= '<br/>';
$content .= '<fieldset class=""><legend>'.$this->l('Update').'</legend>';
$content .= '<div style="float:left">
<h1>'.sprintf($this->l('Your current prestashop version : %s '),_PS_VERSION_).'</h1>';
echo '<p>'.sprintf($this->l('Last version is %1$s (%2$s) '), $this->upgrader->version_name, $this->upgrader->version_num).'</p>';
$content .= '<p>'.sprintf($this->l('Last version is %1$s (%2$s) '), $this->upgrader->version_name, $this->upgrader->version_num).'</p>';
// @TODO : this should be checked when init()
if ($this->isUpgradeAllowed()) {
if ($pleaseUpdate) {
echo '<li><img src="'._PS_ADMIN_IMG_.'information.png" alt="information"/> '.$this->l('Latest Prestashop version available is:').' <b>'.$pleaseUpdate['name'].'</b></li>';
$content .= '<li><img src="'._PS_ADMIN_IMG_.'information.png" alt="information"/> '.$this->l('Latest Prestashop version available is:').' <b>'.$pleaseUpdate['name'].'</b></li>';
}
// echo '<input class="button" type="submit" name="sumbitUpdateVersion" value="'.$this->l('Backup Database, backup files and update right now and in one click !').'"/>';
// echo '<input class="button" type="submit" id="refreshCurrent" value="'.$this->l("refresh update dir / current").'"/>';
echo '<br/>';
$content .= '<br/>';
if ($this->upgrader->need_upgrade)
{
if($this->configOk())
{
echo '<p><a href="" id="upgradeNow" class="button-autoupgrade upgradestep">'.$this->l('Upgrade PrestaShop now !').'</a></p>';
echo '<small>'.sprintf($this->l('PrestaShop will be downloaded from %s'), $this->upgrader->link).'</small><br/>';
echo '<small><a href="'.$this->upgrader->changelog.'">'.$this->l('see CHANGELOG').'</a></small>';
$content .= '<p><a href="" id="upgradeNow" class="button-autoupgrade upgradestep">'.$this->l('Upgrade PrestaShop now !').'</a></p>';
info($this->upgrader->link);
$content .= '<small>'.sprintf($this->l('PrestaShop will be downloaded from %s'), $this->upgrader->link).'</small><br/>';
$content .= '<small><a href="'.$this->upgrader->changelog.'">'.$this->l('see CHANGELOG').'</a></small>';
}
else
echo $this->displayWarning('Your current configuration does not allow upgrade.');
$content .= $this->displayWarning('Your current configuration does not allow upgrade.');
}
else
{
echo '<span class="button-autoupgrade upgradestep" >'.$this->l('Your shop is already up to date.').'</span> ';
$content .= '<span class="button-autoupgrade upgradestep" >'.$this->l('Your shop is already up to date.').'</span> ';
}
echo '<br/><br/><small>'.sprintf($this->l('last datetime check : %s '),date('Y-m-d H:i:s',Configuration::get('PS_LAST_VERSION_CHECK'))).'</span>
$content .= '<br/><br/><small>'.sprintf($this->l('last datetime check : %s '),date('Y-m-d H:i:s',Configuration::get('PS_LAST_VERSION_CHECK'))).'</span>
<a class="button" href="index.php?tab=AdminSelfUpgrade&token='.Tools::getAdminToken('AdminSelfUpgrade'.(int)(Tab::getIdFromClassName(get_class($this))).(int)$cookie->id_employee).'&refreshCurrentVersion=1">'.$this->l('Please click to refresh').'</a>
</small>';
echo'</div>
$content .='</div>
<div id="currentlyProcessing" style="display:none;float:right"><h4>Currently processing <img id="pleaseWait" src="'.__PS_BASE_URI__.'img/loader.gif"/></h4>
<div id="infoStep" class="processing" style=height:50px;width:400px;" >'.$this->l('I\'m waiting for your command, sir').'</div>';
echo '</div>';
$content .= '</div>';
echo '</fieldset>';
$content .= '</fieldset>';
if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_ AND $this->manualMode)
{
echo '<br class="clear"/>';
echo '<fieldset class="autoupgradeSteps"><legend>'.$this->l('Step').'</legend>';
echo '<h4>'.$this->l('Upgrade steps').'</h4>';
echo '<div>';
echo '<a href="" id="download" class="button upgradestep" >download</a>';
echo '<a href="" id="unzip" class="button upgradestep" >unzip</a>'; // unzip in autoupgrade/latest
echo '<a href="" id="removeSamples" class="button upgradestep" >removeSamples</a>'; // remove samples (iWheel images)
echo '<a href="" id="backupFiles" class="button upgradestep" >backupFiles</a>'; // backup files
echo '<a href="" id="backupDb" class="button upgradestep" >backupDb</a>';
echo '<a href="" id="upgradeFiles" class="button upgradestep" >upgradeFiles</a>';
echo '<a href="" id="upgradeDb" class="button upgradestep" >upgradeDb</a>';
echo '</div>';
$content .= '<br class="clear"/>';
$content .= '<fieldset class="autoupgradeSteps"><legend>'.$this->l('Step').'</legend>';
$content .= '<h4>'.$this->l('Upgrade steps').'</h4>';
$content .= '<div>';
$content .= '<a href="" id="download" class="button upgradestep" >download</a>';
$content .= '<a href="" id="unzip" class="button upgradestep" >unzip</a>'; // unzip in autoupgrade/latest
$content .= '<a href="" id="removeSamples" class="button upgradestep" >removeSamples</a>'; // remove samples (iWheel images)
$content .= '<a href="" id="backupFiles" class="button upgradestep" >backupFiles</a>'; // backup files
$content .= '<a href="" id="backupDb" class="button upgradestep" >backupDb</a>';
$content .= '<a href="" id="upgradeFiles" class="button upgradestep" >upgradeFiles</a>';
$content .= '<a href="" id="upgradeDb" class="button upgradestep" >upgradeDb</a>';
$content .= '</div>';
if (defined('_PS_ALLOW_UPGRADE_UNSTABLE_') AND _PS_ALLOW_UPGRADE_UNSTABLE_ )
{
echo '<h4>Development tools </h4><div>';
echo '<a href="" name="action" id="svnCheckout" class="button upgradestep" type="submit" >svnCheckout</a>';
echo '<a href="" name="action" id="svnUpdate" class="button upgradestep" type="submit" >svnUpdate</a>';
echo '<a href="" name="action" id="svnExport" class="button upgradestep" type="submit" >svnExport</a>';
echo '<br class="clear"/>';
echo '</div>';
$content .= '<h4>Development tools </h4><div>';
$content .= '<a href="" name="action" id="svnCheckout" class="button upgradestep" type="submit" >svnCheckout</a>';
$content .= '<a href="" name="action" id="svnUpdate" class="button upgradestep" type="submit" >svnUpdate</a>';
$content .= '<a href="" name="action" id="svnExport" class="button upgradestep" type="submit" >svnExport</a>';
$content .= '<br class="clear"/>';
$content .= '</div>';
}
}
echo' <div id="quickInfo" class="processing" style="height:100px;">&nbsp;</div>';
$content .=' <div id="quickInfo" class="processing" style="height:100px;">&nbsp;</div>';
// for upgradeDb
echo '<p id="dbResultCheck"></p>';
echo '<p id="dbCreateResultCheck"></p>';
$content .= '<p id="dbResultCheck"></p>';
$content .= '<p id="dbCreateResultCheck"></p>';
}
else
echo '<p>'.$this->l('Your current configuration does not allow upgrade.').'</p>';
$content .= '<p>'.$this->l('Your current configuration does not allow upgrade.').'</p>';
echo '</fieldset>';
/* echo '<fieldset class="right">
$content .= '</fieldset>';
/* $content .= '<fieldset class="right">
<legend>Error</legend>
<div id="errorWindow" > no error yet</div>
</fieldset>';
@@ -1666,13 +1706,14 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
*/
// information to keep will be in #infoStep
// temporary infoUpdate will be in #tmpInformation
echo '<script type="text/javascript">';
$content .= '<script type="text/javascript">';
// _PS_MODE_DEV_ is available in js
if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_)
echo 'var _PS_MODE_DEV_ = true;';
echo $this->_getJsErrorMsgs();
$content .= 'var _PS_MODE_DEV_ = true;';
$content .= $this->_getJsErrorMsgs();
echo '</script>';
$content .= '</script>';
echo $content;
}
public function display()
@@ -1694,7 +1735,7 @@ echo '</script>';
#checkPrestaShopFilesVersion{margin-bottom:20px;}
#changedList ul{list-style-type:circle}
.changedFileList {margin-left:20px; padding-left:5px;}
.changedNotice li{color:lightgrey;}
.changedNotice li{color:grey;}
.changedImportant li{color:red;font-weight:bold}
</style>';
$this->displayWarning($this->l('This function is experimental. It\'s highly recommended to make a backup of your files and database before starting the upgrade process.'));
@@ -1718,13 +1759,11 @@ echo '</script>';
echo '<br/>';
$this->_displayForm('autoUpgradeOptions',$this->_fieldsAutoUpgrade,'<a href="" name="options" id="options">'.$this->l('Options').'</a>', '','prefs');
if ($this->standalone)
{
// We need jquery 1.6 for json
echo '<script type="text/javascript">
jq13 = jQuery.noConflict(true);
</script>
<script type="text/javascript" src="'.__PS_BASE_URI__.'modules/autoupgrade/jquery-1.6.2.min.js"></script>';
}
echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'modules/autoupgrade/jquery.xml2json.js"></script>';
echo '<script type="text/javascript">'.$this->_getJsInit().'</script>';
@@ -1767,8 +1806,8 @@ function addQuickInfo(arrQuickInfo){
$("#quickInfo").show();
for(i=0;i<arrQuickInfo.length;i++)
$("#quickInfo").append(arrQuickInfo[i]+"<br/>");
$("#quickInfo").attr({ scrollTop: $("#quickInfo").attr("scrollHeight") });
// Note : jquery 1.6 make uses of prop() instead of attr()
$("#quickInfo").prop({ scrollTop: $("#quickInfo").prop("scrollHeight") },1);
}
}';
@@ -1835,7 +1874,7 @@ function handleXMLResult(xmlRet, previousParams)
// use xml2json and put the result in the global var
// this will be used in after** javascript functions
resGlobal = $.xml2json(xmlRet);
result = "ok";
switch(previousParams.upgradeDbStep)
{
case 0: // getVersionFromDb
@@ -1858,7 +1897,7 @@ function handleXMLResult(xmlRet, previousParams)
if (result == "ok")
{
nextParams = previousParams;
nextParams.upgradeDbStep = previousParams.upgradeDbStep+1;
nextParams.upgradeDbStep = parseInt(previousParams.upgradeDbStep)+1;
if(nextParams.upgradeDbStep >= 4)
{
resGlobal.next = "upgradeComplete";
@@ -1899,12 +1938,14 @@ function afterUpgradeComplete()
$("#dbResultCheck")
.addClass("ok")
.removeClass("fail")
.html("<p>'.$this->l('upgrade complete. Please check your front-office (try to make an order, check theme)').'</p>")
.show("slow");
.html("<p>'.$this->l('upgrade complete. Please check your front-office theme is functionnal (try to make an order, check theme)').'</p>")
.show("slow")
.append("<a href=\"index.php?tab=AdminPreferences&token='.Tools::getAdminTokenLite('AdminPreferences').'\" class=\"button\">'.$this->l('activate your shop here').'</a>");
$("#dbCreateResultCheck")
.hide("slow");
$("#infoStep").html("<h3>'.$this->l('Upgrade Complete ! ').'</h3>");
}
/**
* afterBackupDb display the button
*
@@ -2110,7 +2151,7 @@ function handleError(res)
$(fileList).each(function(k,v){
$(subList).append("<li>"+v+"</li>");
});
$("#changedList").append("<h3><a class=\"toggleSublist\">"+title+"</a></h3>");
$("#changedList").append("<h3><a class=\"toggleSublist\">"+title+"</a> (" + fileList.length + ")</h3>");
$("#changedList").append(subList);
$("#cchangedList").append("<br/>");
@@ -2119,7 +2160,7 @@ function handleError(res)
$js.= '$(document).ready(function(){
$.ajax({
type:"POST",
url : "'.($this->standalone? __PS_BASE_URI__ . trim($this->adminDir,DIRECTORY_SEPARATOR).'/autoupgrade/ajax-upgradetab.php' : str_replace('index','ajax-tab',$currentIndex)).'",
url : "'. __PS_BASE_URI__ . trim($this->adminDir,DIRECTORY_SEPARATOR).'/autoupgrade/ajax-upgradetab.php",
async: true,
data : {
dir:"'.trim($this->adminDir,DIRECTORY_SEPARATOR).'",
@@ -2140,9 +2181,12 @@ $js.= '$(document).ready(function(){
$("#checkPrestaShopFilesVersion").prepend("<img src=\"../img/admin/warning.gif\" /> ");
$("#checkPrestaShopFilesVersion").append("<a id=\"toggleChangedList\" class=\"button\" href=\"\">'.$this->l('See or hide the list').'</a><br/>");
$("#checkPrestaShopFilesVersion").append("<div id=\"changedList\" style=\"display:none \"><br/>");
addModifiedFileList("'.$this->l('Core files').'", answer.result.core, "changedImportant");
addModifiedFileList("'.$this->l('Mail files').'", answer.result.mail, "changedNotice");
addModifiedFileList("'.$this->l('Translation files').'", answer.result.translation, "changedNotice");
if(answer.result.core.length)
addModifiedFileList("'.$this->l('Core file(s)').'", answer.result.core, "changedImportant");
if(answer.result.mail.length)
addModifiedFileList("'.$this->l('Mail file(s)').'", answer.result.mail, "changedNotice");
if(answer.result.translation.length)
addModifiedFileList("'.$this->l('Translation file(s)').'", answer.result.translation, "changedNotice");
$("#toggleChangedList").bind("click",function(e){e.preventDefault();$("#changedList").toggle();});
$(".toggleSublist").live("click",function(e){e.preventDefault();$(this).parent().next().toggle();});
modules/autoupgrade/ConfigurationTest.php
+1 -1
View File
@@ -55,7 +55,7 @@ class ConfigurationTestCore
static function test_magicquotes()
{
return !ini_get('magic_quotes_gpc');
return !get_magic_quotes_gpc();
}
static function test_upload()
modules/autoupgrade/SelfModule.php
+3
View File
@@ -25,6 +25,9 @@
* International Registered Trademark & Property of PrestaShop SA
*/
// @since 1.4.5.0
// add the following comment in a module file to skip it in translations
// IGNORE_THIS_FILE_FOR_TRANSLATION
abstract class SelfModule
{
/** @var integer Module ID */
modules/autoupgrade/Upgrader.php
+13 -4
View File
@@ -31,9 +31,7 @@ class UpgraderCore
public $rss_version_link = 'http://www.prestashop.com/xml/upgrader.xml';
public $rss_md5file_link_dir = 'http://www.prestashop.com/xml/md5/';
/**
* link contains hte url where to download the file
*
* @var string
* @var boolean contains true if last version is not installed
*/
private $need_upgrade = false;
private $changed_files = array();
@@ -41,6 +39,9 @@ class UpgraderCore
public $version_name;
public $version_num;
/**
* @var string contains hte url where to download the file
*/
public $link;
public $autoupgrade;
public $autoupgrade_module;
@@ -68,7 +69,7 @@ class UpgraderCore
$this->checkPSVersion();
$destPath = realpath($dest).DIRECTORY_SEPARATOR.$filename;
if (@copy($this->link, $destPath) && md5_file($destPath) == $this->md5 )
if (@copy($this->link, $destPath))
return true;
else
return false;
@@ -131,13 +132,21 @@ class UpgraderCore
else
{
$last_version_check = @unserialize(Configuration::get('PS_LAST_VERSION'));
if (isset($last_version_check['name']))
$this->version_name = $last_version_check['name'];
if (isset($last_version_check['num']))
$this->version_num = $last_version_check['num'];
if (isset($last_version_check['link']))
$this->link = $last_version_check['link'];
if (isset($last_version_check['autoupgrade']))
$this->autoupgrade = $last_version_check['autoupgrade'];
if (isset($last_version_check['autoupgrade_module']))
$this->autoupgrade_module = $last_version_check['autoupgrade_module'];
if (isset($last_version_check['md5']))
$this->md5 = $last_version_check['md5'];
if (isset($last_version_check['desc']))
$this->desc = $last_version_check['desc'];
if (isset($last_version_check['changelog']))
$this->changelog = $last_version_check['changelog'];
}
}
modules/autoupgrade/autoupgrade.php
+1 -1
View File
@@ -47,7 +47,7 @@ class Autoupgrade extends Module
parent::__construct();
$this->displayName = $this->l('Autoupgrade module');
$this->description = $this->l('Provides an automated method to upgrade your shop to the last PrestaShop version');
$this->description = $this->l('Provides an automated method to upgrade your shop to the last PrestaShop version. Caution : custom theme are not updated.');
}
modules/autoupgrade/config.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<name>autoupgrade</name>
<displayName><![CDATA[Autoupgrade module]]></displayName>
<version><![CDATA[0.1]]></version>
<description><![CDATA[Provides an automated method to upgrade your shop to the last PrestaShop version]]></description>
<description><![CDATA[Provides an automated method to upgrade your shop to the last PrestaShop version. Caution : custom theme are not updated.]]></description>
<author><![CDATA[]]></author>
<tab><![CDATA[administration]]></tab>
<is_configurable>0</is_configurable>
modules/autoupgrade/fr.php
+45 -4
View File
@@ -2,17 +2,23 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_124ab8cb7dc504e6848f1b7e5c98636f'] = 'Sauver aussi les images';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a8d6c6734da0083021561b23f2fa88cc'] = 'Vous pouvez exclure le dossier image de la sauvegarde si vous l\'avez déjà sauvegardé d\'une autre manière (non recommandé)';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_af98608eaedd4ba7ffd47a0204e84b23'] = 'Conserver le thème \"prestashop\" actuel';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4ea56ca1a757e426911ff20889c0e93c'] = 'Si vous avez personnalisé le thème par défaut de PrestaShop, vous pouvez le protéger de la mise à niveau (non recommandé)';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8413c63a6ef3717a974094785fd0b588'] = 'Garder les traductions';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_51bbcf7afb0f8d35501d0a7b28979b06'] = 'Si \"oui\", vous conserverez toutes vos traductions';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_08f302d660c7dbf20416d6b4225238c2'] = 'Désactiver les modules non natifs';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8c09b80e27810f6697c90824ab8151d6'] = 'Si vous ne désactivez pas ces modules, des problèmes de compatibilité peuvent apparaitre et la page module peut ne pas se charger correctement.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8c8194a465f0163a6724907755ac1b82'] = 'Mode manuel';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_dd9dbd4916653d683244119a067ca467'] = 'Choisissze \"oui\" si vous voulez vous ';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e7b6d601ff4e9069e726927e211274ea'] = 'Utiliser Subversion';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a15b09729294cf7fea1096f970a0fed4'] = 'Choisissez \"oui\" si vous voulez utiliser une version non stable au lieu de l';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_36be1130454bc8c4e0a41d36fa062a8b'] = 'Impossible de créer le répertoire %s';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e21a52b9631b01c3f1821795b8de451c'] = 'Processus de mise à niveau terminé. Félicitations! Vous pouvez maintenant réactive de votre boutique.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4ad974c7f06be7aa3ce318299d3b5dbb'] = 'Impossible de vérifier les fichiers';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8d8e0207549d32c6f864246403034279'] = 'Les fichiers du coeur sont ok';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_c62f82b25de72c3b0bb07225c49fe9d0'] = '%1$s fichier(s) du coeur a été modifié (sur %2$s au total)';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_7b2f224649ef2ad10a2d73595d67a876'] = 'Démarrage mise à niveau ...';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_6b2d0404b7faba0e791e15a52586a149'] = 'Basculer vers svn checkout (useSvn activé)';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f0e38ac0c558a7f216ae98382b9e58f5'] = 'Site désactivé. Téléchargement en cours (peut prendre ';
@@ -23,12 +29,20 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0929f38eaac3ca38801f08b72695
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4f7c02592a962e40a920f32f3a24f2df'] = 'filesToUpgrade n\'est pas un tableau';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3f10faa8b44a7175ae8fc5dcb8dec5de'] = 'Tous les fichiers ont été mis à jour. Mise à jour de la base de données en cours.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_1ad932e3b85eb2907a817cd3e3e6907e'] = 'Erreur pour la mise à jour de %s';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_97507ecafd7ed1843f55071ee48a64d6'] = '%1$s copié. Il reste encore %2$s fichier(s) à mettre à jour';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_078a325fbcc1dbd50bd9f969ce954965'] = 'encore %2$s fichiers à mettre à jour.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_7a92514ea7e0c497f2e37a0ec6e4292d'] = 'erreur lors de la vérification de la configuration';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_97e55f3991353118fbccfb784885b956'] = 'Erreur lors de la mise à jour de la base. Vous pouvez avoir besoin de restaurer votre base de données.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_25b11e6c53fc76612ab7336464f4c95e'] = 'Bravo ! Mise à jour terminée. Vous pouvez maintenant réactiver votre boutique.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_9a2f2cf276ea9f79b31a815897c0e3e6'] = '%s ignoré.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_11978affb3b0dbb16c50d571fd05de6d'] = 'erreur lors de la création du répertoire %s';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0e06ce0972ad338e1d96e8589dc21b9c'] = 'erreur lors de la copie de %1$s vers %2$s';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_6fd2759cb30e7338b91cddedd0b53635'] = 'Restauration des fichiers ...';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_90334cd907dcf0d67fdacc3d767dcdcb'] = 'Restauration de la base de données ...';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a4694800695190f158487235352dafc9'] = 'Rien n\'est à restaurer';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5f7f50973696d0a42c1efcc07f7820a0'] = 'Votre site est maintenant restauré.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_28517b8a291c50d80aa53a078407065b'] = 'Répertoire racine nettoyée.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_026d80c0e57be9ea3c086b735f77611d'] = 'Fichiers restaurés. Calcul de l\'étape suivante ...';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_bb71892737d721949538d6e1c4d3d22d'] = 'Fichiers restaurés. Sauvegarde de la base de données non trouvée. Restauration terminée.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8efc36d230f76fbfd9e4d758964e9414'] = 'impossible d\'extraire %1$ s dans%2$s.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d7624db09c15d46cd37d7709ae05e44b'] = 'aucune sauvegarde trouvée. Il n\'y a rien à restaurer.';
@@ -47,9 +61,12 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d82eef1ba081c54686767c555670
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_344c592d141604c614c219fad3fa0dae'] = '%1$s fichiers exemple à supprimer';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0baf8c94d1d03d1621c17cd6eabf7b9f'] = 'Tous les exemples de fichiers supprimés. Sauvegarde des fichiers en cours...';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_84e31682487d5a0937f9184ebcf594ba'] = 'copie de travail déjà %s à jour. exportation vers le répertoire latest';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_762ab46f0b1e4eae1526ca7d637926f3'] = 'Mise à jour SVN fait pour %s copie de travail. maintenant l\'exporter plus tard dans la ...';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_dcefd261c0dea53fdb159b218503009e'] = 'SVN Checkout fait à partir de %s. maintenant l\'exporter plus tard dans la ...';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8f4c8c87daa3bc0311cfb61b7d36e27b'] = 'Erreur d\'extraction du SVN';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0e81132066d433d212e237678e1193a3'] = 'non authorisé à utiliser SVN';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0e81132066d433d212e237678e1193a3'] = 'non autorisé à utiliser SVN';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_b0d51f91a1118b7c39ee1835cc6c926a'] = 'Téléchargement terminé. Extraction ...';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4723092f623f18928fb35e90cea5e736'] = 'Téléchargement terminé, mais md5sum ne correspond pas. Opération annulée.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0c0db54fe8212c1a7215005fef75d7dd'] = 'Erreur pendant le téléchargement';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_93120c07d8c5cee44042627cd493e0e0'] = 'vous avez besoin allow_url_fopen pour le téléchargement automatique. Vous pouvez également placer le fichier manuellement dans %s';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3bb38e7d0bfd5a02f7c06cae446fee86'] = 'l\'action %s ignorée';
@@ -107,20 +124,30 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_229ee8046cafc09ddaf46fb9db71
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e805a556799b7cef40e9760c81d99218'] = 'erreurs SQL sont apparues.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5627353fd6ac678497af3ece05087068'] = 'Le fichier config/defines.inc.php n\'a pas été trouvé. Ou est-il passé ?';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_446c9e952debe114c86bbd9e5eea7d61'] = 'Restaurer';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3e9eb8e431c3fdd52632fb03d961808e'] = 'Après avoir mis à jour votre boutique, vous pouvez restaurer la version précédente. Utilisez cette fonction si votre thème ou un module non natif essentiel ne fonctionne pas correctement.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4879913b16fa23f723f70a5067bda8d4'] = 'Aucune restauration disponible';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_fff66e9b3d962fa319c8068b5c1997cd'] = 'restaurer';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_ebdabc2d40aa563aabbb3ee57915a7a9'] = 'cliquer pour restaurer %s';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e9c57c7fbc335e66282a32617b01b9be'] = 'Votre configuration actuelle';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e3b486e7a2718a902d24829aba6ee4ef'] = 'Tout les points suivants doivent être ';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_2fc4ab825ce2ce9476e8a1c2211ac9b8'] = 'Dossier racine';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8786f48d9cf9618cd2f5c37312ab7e50'] = 'Statut du dossier racine';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d16d80ca66261afba43f5736f6cec7e6'] = 'droits complets en écriture';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_039552aa1d74b68f01a73821f3078158'] = 'pas de droits d\'écriture récursif';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_31a962ffeb06a6cc6d58ef3ba5fae2b7'] = 'Autoupgrade autorisé';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_9c30a74657158984997cca4930d6075b'] = 'Cette version autorise la mise à jour automatique';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_228e8380ee42b3ba5d59cdc502dc154d'] = 'Mise à jour disponible';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_93e970ffc765978f032913e590dd51ef'] = 'Cette version autorise la mise à jour automatique';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_af566be1636d11ecc8ddb728a15520b8'] = 'Cette version n\'autorise pas la mise à jour automatique';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_ea4d3af79ad2392b7c0cca4b8ddd7028'] = 'Vous avez déjà la dernière version disponible.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Non';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_93cba07454f06a4a960172bbd6e2a435'] = 'Oui';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3d9f7f5927158b5a7dac0d65b4537265'] = 'Boutique désactivée';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_94af5df6182efd3591d0ccccaa04bd5c'] = 'Limite de temps PHP';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_075ae3d2fc31640504f814f60e5ef713'] = 'désactivée';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_783e8e29e6a8c3e22baa58a19420eb4f'] = 'secondes';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f5fcc741c0bf329e4afbde40006373b2'] = 'Options choisies';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_ce2df06e42c501c38c0c8861d0325256'] = 'Configuration du module ok';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_97a2a3a1192fbcca33effe8682a1b43a'] = 'Merci de configurer les options du module';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_71aa2b9774b005c47f9cd225766b2045'] = 'version non modifiée de PrestaShop';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_342299aeb786a06533ba00d9a04794dd'] = 'Modifiez vos options';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_06933067aafd48425d67bcb01bba5cb6'] = 'Mettre à jour';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5d8b77b69c92370ec4e175a638019ca7'] = 'La version actuelle de votre boutique est : %s';
@@ -128,6 +155,12 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_80e3d093272bc011b6bc661e408c
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_b47ba7568788e46dbc7fe81e525db863'] = 'La dernière version de prestashop disponible est:';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_c97dcfb0df6daa46292a0def8a567822'] = 'Sauvegardez la base de données, les fichiers de sauvegarde et faire la mise en un clic pardi !';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a60ab62ed99ef0358b2efae592be0cdd'] = 'Mettre à jour PrestaShop Maintenant !';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_7f6336f29afd114798bf8ff3e6f2f9c9'] = 'PrestaShop sera téléchargé à partir de l\'url %s';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_b1e4effc886020d5e8ca2ab71b0572b1'] = 'Voir le CHANGELOG';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_543af4fda7ca1a5e9a3983890708e2c3'] = 'Votre boutique est déjà à jour';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_1e10402bc6b8d7a64ced8408d57aedb5'] = 'Dernière vérification : %s';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d34978dd8a4be0b0b4cee937a8f71f57'] = 'Cliquez pour rafraichir';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d944def835fefea7e5ce45ec6e4b3554'] = 'J\'attend les étapes, monsieur.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_48c7c41b72e1d678923ce3571aa65b2d'] = 'Etape';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_eeb5a49c38d2d8c2baa51ed09beccf88'] = 'Etape de mise à jour';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_c5d769685704e7ddcd70e74a6ebe50b7'] = 'Votre configuration actuelle n\'autorise pas la mise à jour.';
@@ -136,8 +169,16 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3a3a651c9a67bca9ac902da78946
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a22eff458b4f4bce6d3232e367ff0138'] = 'Votre configuration actuelle indique que vous voulez mettre à jour votre système à partir d\'une branche de développement instable, sans numéro de version. Si vous mettez à jour, vous ne pourrez plus appliquer le processus de versions stables officiel.';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_dae8ace18bdcbcc6ae5aece263e14fe8'] = 'Options';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_91195bbbacc2147a736c849c46368ed8'] = 'Voulez vous restaurer votre boutique';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_6b3930a184368a458be6e4429f409877'] = 'Mise à jour terminée. Vérifiez votre boutique (essayez de faire une commande, vérifier le thème)';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3794983e0533ce2499b168f8e9bdca3c'] = 'Mise à jour terminée. Vérifiez le thème de votre ';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_c208c3853a0c9515bbf0d330fdd51386'] = 'Mise à jour terminée !';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a498f9476a893d51ee02b3601678d318'] = 'Cliquez pour restaurer la base de donnée';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f34d5debb2bba76aa3e077937a07e373'] = 'Cliquez pour restaurer les fichiers';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_60283aa37e2063b2ada2f99216e1332a'] = 'Votre serveur ne peut pas télécharger le fichier. S\'il vous plaît le télécharger d\'abord par ftp dans votre répertoire admin/autoupgrade';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_6ef7ebe46f6d16cdbf9e2169e3dd048e'] = 'Allez manuellement au bouton restaurer';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_1607e6098b7b62a2791653b059c975d2'] = 'Afficher / masquer la liste';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_25b91596a896c6cf688104169b4b6a71'] = 'Fichier(s) de la solution';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_65f04958837ddd3643fd5edaee3a0f8d'] = 'fichier(s) des courriels';
$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_54aca96b35b48dd39265175f61b6bdd2'] = 'fichier(s) des traductions';
$_MODULE['<{autoupgrade}prestashop>autoupgrade_e79aed52aa295a8d68ff3ecf777cd42d'] = 'Cette version de PrestaShop ne peut pas être mise à jour : la constante PS_ADMIN_DIR est manquante';
$_MODULE['<{autoupgrade}prestashop>autoupgrade_2a037c3ccd26d087a2a39e6e1f2aa2ac'] = 'Module autoupgrade';
$_MODULE['<{autoupgrade}prestashop>autoupgrade_9f90d42cd3a3297519c04bdac6da96a1'] = 'Fournit une méthode automatique de mise à jour de votre boutique à la dernière version de PrestaShop. Attention : les thèmes personnalisés ne sont pas mis à jour.';
modules/blocklayered/blocklayered.js
+20 -17
View File
@@ -265,7 +265,7 @@ function reloadContent(params_plus)
$('.category-product-count').html(result.categoryCount);
$('#product_list').html(result.productList).html();
$('#product_list').replaceWith(result.productList);
$('#product_list').css('opacity', '1');
$('div#pagination').html(result.pagination);
paginationButton();
@@ -310,35 +310,38 @@ function reloadContent(params_plus)
if (current_friendly_url == '#')
current_friendly_url = '#/';
window.location = current_friendly_url;
lockLocationChecking = true;
}
});
ajaxQueries.push(ajaxQuery);
}
function initLocationChange(func, time) {
function initLocationChange(func, time)
{
if(!time) time = 500;
var currLoc = '';
var current_friendly_url = getUrlParams();
setInterval(function()
{
if(window.location.href != currLoc)
if(getUrlParams() != current_friendly_url && !lockLocationChecking)
{
currLoc = window.location.href;
// Don't reload page if current_friendly_url and real url match
if (window.location.href.split('#').length == 2 && window.location.href.split('#')[1] != '')
current_url = '#'+window.location.href.split('#')[1];
else
current_url = '';
if (current_friendly_url.replace(/^#(\/)?/, '') == current_url.replace(/^#(\/)?/, ''))
if (current_friendly_url.replace(/^#(\/)?/, '') == getUrlParams().replace(/^#(\/)?/, ''))
return;
if (window.location.href.split('#').length == 2 && window.location.href.split('#')[1] != '')
{
var params = window.location.href.split('#')[1];
reloadContent('&selected_filters='+params);
lockLocationChecking = true;
reloadContent('&selected_filters='+getUrlParams().replace(/^#/, ''));
}
else
reloadContent('&selected_filters=#');
else {
lockLocationChecking = false;
current_friendly_url = getUrlParams();
}
}, time);
}
function getUrlParams()
{
var params = current_friendly_url;
if(window.location.href.split('#').length == 2 && window.location.href.split('#')[1] != '')
params = '#'+window.location.href.split('#')[1];
return params;
}
modules/blocklayered/blocklayered.php
+12 -4
View File
@@ -1002,7 +1002,8 @@ class BlockLayered extends Module
$values = array();
foreach ($currencyList as $currency)
$values[] = '('.(int)$idProduct.', '.(int)$currency['id_currency'].', '.(int)$minPrice[$currency['id_currency']].', '.(int)$maxPrice[$currency['id_currency']].')';
$values[] = '('.(int)$idProduct.', '.(int)$currency['id_currency'].',
'.(int)$minPrice[$currency['id_currency']].', '.(int)($maxPrice[$currency['id_currency']] * (100+$maxTaxRate) / 100).')';
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'layered_price_index` (id_product, id_currency, price_min, price_max)
@@ -1633,12 +1634,19 @@ class BlockLayered extends Module
updElements(0, 0);
},
\'onComplete\': function() {
if($(\'#categories-treeview li#1\').attr(\'cleaned\'))
return;
if($(\'#categories-treeview li#1\').attr(\'cleaned\', true))
$(\'#categories-treeview li#1\').removeClass(\'static\');
$(\'#categories-treeview li#1 span\').trigger(\'click\');
$(\'#categories-treeview li#1\').children(\'div\').remove();
$(\'#categories-treeview li#1\').
removeClass(\'collapsable lastCollapsable\').
addClass(\'last static\');
$(\'.hitarea\').click(function(it)
{
$(this).parent().find(\'> .category_label\').click();
});
}
});
@@ -1935,9 +1943,9 @@ class BlockLayered extends Module
$priceFilterQueryOut = 'INNER JOIN `'._DB_PREFIX_.'layered_price_index` psi
ON
((psi.price_min < '.(int)$priceFilter['min'].' AND psi.price_max > '.(int)$priceFilter['min'].')
((psi.price_min <= '.(int)$priceFilter['min'].' AND psi.price_max >= '.(int)$priceFilter['min'].')
OR
(psi.price_max > '.(int)$priceFilter['max'].' AND psi.price_min < '.(int)$priceFilter['max'].'))
(psi.price_max >= '.(int)$priceFilter['max'].' AND psi.price_min <= '.(int)$priceFilter['max'].'))
AND psi.`id_product` = p.`id_product`
AND psi.`id_currency` = '.(int)$idCurrency;
}
@@ -1964,7 +1972,7 @@ class BlockLayered extends Module
while ($product = DB::getInstance()->nextRow($allProductsOut))
if (isset($priceFilter) && $priceFilter)
{
$price = Product::getPriceStatic($product['id_product']);
$price = (int)Product::getPriceStatic($product['id_product']); // Cast to int because we don't care about cents
if ($price < $priceFilter['min'] || $price > $priceFilter['max'])
continue;
$productIdList[] = (int)$product['id_product'];
modules/blocklayered/blocklayered.tpl
+3 -3
View File
@@ -51,7 +51,7 @@ current_friendly_url = '#{$current_friendly_url}';
</li>
{else}
{foreach from=$filter.values key=id_value item=value}
{if $id_value == $filter_key && !is_numeric($filter_value) && ($filter.type eq 'id_attribute_group' || $filter.type eq 'id_feature') || $id_value == $filter_value && $filter.type neq 'id_attribute_group'}
{if $id_value == $filter_key && !is_numeric($filter_value) && ($filter.type eq 'id_attribute_group' || $filter.type eq 'id_feature') || $id_value == $filter_value && $filter.type neq 'id_attribute_group' && $filter.type neq 'id_feature'}
<li>
<a href="#" rel="layered_{$filter.type_lite}_{$id_value}" title="{l s='Cancel' mod='blocklayered'}">x</a>
{$filter.name|escape:html:'UTF-8'}{l s=':'} {$value.name|escape:html:'UTF-8'}
@@ -88,9 +88,9 @@ current_friendly_url = '#{$current_friendly_url}';
{/if}
<label for="layered_{$filter.type_lite}_{$id_value}"{if !$value.nbr} class="disabled"{else}{if isset($filter.is_color_group) && $filter.is_color_group} name="layered_{$filter.type_lite}_{$id_value}" class="layered_color" rel="{$id_value}_{$filter.id_key}"{/if}{/if}>
{if !$value.nbr}
{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> (0)</span></a>{/if}
{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> (0)</span>{/if}</a>
{else}
<a href="{$value.link}" rel="{$value.rel}">{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span></a>{/if}</label>
<a href="{$value.link}" rel="{$value.rel}">{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a></label>
{/if}
</li>
{/foreach}
modules/blockrss/fr.php
+4 -2
View File
@@ -8,13 +8,15 @@ $_MODULE['<{blockrss}prestashop>blockrss_9680162225162baf2a085dfdc2814deb'] = 'F
$_MODULE['<{blockrss}prestashop>blockrss_6706b6d8ba45cc4f0eda0506ba1dc3c8'] = 'URL du flux invalide';
$_MODULE['<{blockrss}prestashop>blockrss_36ed65ce17306e812fd68d9f634c0c57'] = 'Titre invalide';
$_MODULE['<{blockrss}prestashop>blockrss_1b3d34e25aef32a3c8daddfff856577f'] = 'Nombre de flux invalide';
$_MODULE['<{blockrss}prestashop>blockrss_606a95aefd4296583b685aa039f01681'] = 'Vous avez sélectionné une flux RSS de votre propre site, il s\'agit très probablement d\'une erreur ! Choisissez une autre URL (ex : http://news.google.com/?output=rss) sauf si vous êtes sûr de votre action';
$_MODULE['<{blockrss}prestashop>blockrss_e423bd72f5aa1be13216c5abbd3deb45'] = 'Vous avez choisi le flux RSS de votre site. Veuillez choisir une autre URL';
$_MODULE['<{blockrss}prestashop>blockrss_7a82db9ac04c55697040556e5cc9dc7c'] = 'Flux introuvable, vérifez votre URL';
$_MODULE['<{blockrss}prestashop>blockrss_1844ef1bfaa030dc8423c4645a43525c'] = 'Flux invalide :';
$_MODULE['<{blockrss}prestashop>blockrss_c888438d14855d7d96a2724ee9c306bd'] = 'Paramètres mis à jour';
$_MODULE['<{blockrss}prestashop>blockrss_f4f70727dc34561dfde1a3c529b6205c'] = 'Paramètres';
$_MODULE['<{blockrss}prestashop>blockrss_b22c8f9ad7db023c548c3b8e846cb169'] = 'Titre du bloc';
$_MODULE['<{blockrss}prestashop>blockrss_2343a40bdffd8c7a6317b6d98c2b1042'] = 'Créez un titre pour le block (par défaut : \'Flux RSS\')';
$_MODULE['<{blockrss}prestashop>blockrss_402d00ca8e4f0fff26fc24ee9ab8e82b'] = 'Ajouter une URL';
$_MODULE['<{blockrss}prestashop>blockrss_eb26a56cc4c9ae20bc55c887773bddfd'] = 'Ajouter l\'url du flux que vous souhaitez utiliser';
$_MODULE['<{blockrss}prestashop>blockrss_695d0986205c1ce17d03b026feb78c97'] = 'Ajouter l\'URL du flux que vous voulez utiliser (exemple: http://news.google.com/?output=rss)';
$_MODULE['<{blockrss}prestashop>blockrss_ff9aa540e20285875ac8b190a3cb7ccf'] = 'Nombre de messages affichés';
$_MODULE['<{blockrss}prestashop>blockrss_f33725e23a017705ad35897e849a4db4'] = 'Nombre de messages affichés par le bloc (défaut : 5)';
$_MODULE['<{blockrss}prestashop>blockrss_c9cc8cce247e49bae79f15173ce97354'] = 'Sauvegarder';
modules/blockstore/blockstore.php
+8 -8
View File
@@ -1,6 +1,6 @@
<?php
/*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -60,20 +60,20 @@ class BlockStore extends Module
{
return $this->hookRightColumn($params);
}
function hookRightColumn($params)
{
$this->context->smarty->assign('store_img', Configuration::get('BLOCKSTORE_IMG'));
return $this->display(__FILE__, 'blockstore.tpl');
}
function hookHeader($params)
{
$this->context->controller->addCSS($this->_path.'blockstore.css', 'all');
}
public function postProcess()
{
if (Tools::isSubmit('submitStoreConf'))
@@ -98,7 +98,7 @@ class BlockStore extends Module
}
return '';
}
public function getContent()
{
$output = $this->postProcess().'
@@ -112,7 +112,7 @@ class BlockStore extends Module
<div class="margin-form">
<input id="store_img" type="file" name="store_img" /> ( '.$this->l('image will be displayed as 174x115').' )
</div>
<p class="center">
<input class="button" type="submit" name="submitStoreConf" value="'.$this->l('Save').'"/>
</p>
modules/canadapost/fr.php
+97
View File
@@ -0,0 +1,97 @@
<?php
global $_MODULE;
$_MODULE = array();
$_MODULE['<{canadapost}prestashop>canadapost_77946efda9f40f6bbcd0e697de948e65'] = 'Transporteur Canada Post';
$_MODULE['<{canadapost}prestashop>canadapost_a5daea18a1d4214028a538c3bf5a41cc'] = 'Offrez à vos clients différentes méthodes de livraison avec Canada Post';
$_MODULE['<{canadapost}prestashop>canadapost_9d7d8be1feb0bc026fffd29bc536364e'] = 'option cURL';
$_MODULE['<{canadapost}prestashop>canadapost_883fa0069f4b0454e2277dd567ab3991'] = '\'Unité de poids (LB ou KG)\'';
$_MODULE['<{canadapost}prestashop>canadapost_5a3ceec65d417f5d92c26dbf0dccc00d'] = '\'Unité de mesure (CM ou IN)\'';
$_MODULE['<{canadapost}prestashop>canadapost_4d470fde8487e755a50e9235e3dc13ab'] = 'doit être configuré pour que le module fonctionne correctement';
$_MODULE['<{canadapost}prestashop>canadapost_2056ed4f6b76a94035f12c041350aa2f'] = 'compte Canada Post';
$_MODULE['<{canadapost}prestashop>canadapost_20449d3f0b6c6b9265a5cd2a470a6451'] = 'Poids du colis';
$_MODULE['<{canadapost}prestashop>canadapost_bfc00de34bc04366e7fee516adf7dca5'] = 'Frais additionnels';
$_MODULE['<{canadapost}prestashop>canadapost_386aad80d82f8245e9ef80352a2240e8'] = 'Tous les produits dans un colis';
$_MODULE['<{canadapost}prestashop>canadapost_f35eb2a913a3fd6fd8e661012cf0ebd8'] = 'Un produit par colis';
$_MODULE['<{canadapost}prestashop>canadapost_9c536dc938b99309eab40c9a06fc1c00'] = 'Statut du module Canada Post';
$_MODULE['<{canadapost}prestashop>canadapost_428a446c88625404645d482927d90b31'] = 'Le module Canada Post est correctement configuré.';
$_MODULE['<{canadapost}prestashop>canadapost_c31be897c51c899fe1da81c31403e2a4'] = 'Le module Canada Post n\'est pas configuré, vous devez :';
$_MODULE['<{canadapost}prestashop>canadapost_3e203b9a16f360b88d90bba6eb61ce61'] = 'Remplir le formlaire de l\'onglet \"Configuration générale\"';
$_MODULE['<{canadapost}prestashop>canadapost_8c0987b9315003df7dae7f130e3cf58e'] = 'Choississez les services de livraison disponible';
$_MODULE['<{canadapost}prestashop>canadapost_e20f6d6f13fe70e78f6e2ab488493ccf'] = 'Test de connection webservice';
$_MODULE['<{canadapost}prestashop>canadapost_5378f4ad5f6616fda3ef972deba67f8a'] = 'cURL est activé';
$_MODULE['<{canadapost}prestashop>canadapost_52f4393e1b52ba63e27310ca92ba098c'] = 'Configuration Général';
$_MODULE['<{canadapost}prestashop>canadapost_277d63a9b24a09697e3c64092eaf4353'] = 'Configuration des Catégories';
$_MODULE['<{canadapost}prestashop>canadapost_098eec2cabe2c39c6dec3fc522b6571a'] = 'Configuration des Produits';
$_MODULE['<{canadapost}prestashop>canadapost_6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Aide';
$_MODULE['<{canadapost}prestashop>canadapost_d2126da975d5b9a5b846efaf57d3fd53'] = 'Configuration générale';
$_MODULE['<{canadapost}prestashop>canadapost_4af6ad356ba7dd056b265944ef91cb5b'] = 'Votre compte Canada Post';
$_MODULE['<{canadapost}prestashop>canadapost_db06a2900c66a3a2cb78fe3a470f1b85'] = 'Poids du colis';
$_MODULE['<{canadapost}prestashop>canadapost_0274f749472f365e7d48a501e14793e6'] = 'Frais additionnels';
$_MODULE['<{canadapost}prestashop>canadapost_83ad4fdaf06650e6d9d7ca18f82fb975'] = 'Configuration de localisation';
$_MODULE['<{canadapost}prestashop>canadapost_f489118ea95c746d648d36bb50c226f0'] = 'Unité de poids';
$_MODULE['<{canadapost}prestashop>canadapost_659c95668841b7d6602ead454b28d4ba'] = 'L\'unité de poids de votre magasin (ex: KG ou LBS)';
$_MODULE['<{canadapost}prestashop>canadapost_cc13d156306185fd42a860da3049567c'] = 'Unité de dimension';
$_MODULE['<{canadapost}prestashop>canadapost_f804c2bdebc117d9cde3cddad3b49845'] = 'L\'unité de dimension de votre magasin (ex: CM ou IN)';
$_MODULE['<{canadapost}prestashop>canadapost_2481447d04ae756836d32e3ade240ff4'] = 'Configuration de l\'adresse';
$_MODULE['<{canadapost}prestashop>canadapost_5b179e75d464a04d8a04111131b3a3ca'] = 'Votre adresse ligne 1';
$_MODULE['<{canadapost}prestashop>canadapost_281b2def1a9737b33f88013c94fdfeb8'] = 'Votre adresse ligne 2';
$_MODULE['<{canadapost}prestashop>canadapost_d30f507473129e70c4b962ceccf175cf'] = 'Code postal / zip code';
$_MODULE['<{canadapost}prestashop>canadapost_d0585aac6bb77bb49423b2effca0e067'] = 'Votre ville';
$_MODULE['<{canadapost}prestashop>canadapost_59716c97497eb9694541f7c3d37b1a4d'] = 'Pays';
$_MODULE['<{canadapost}prestashop>canadapost_f8f5a972333ee726fbe5bb52409c0ed0'] = 'Choississez votre pays ...';
$_MODULE['<{canadapost}prestashop>canadapost_4e9863cf5326e6714388045321665d07'] = 'Choississez votre pays dans la liste';
$_MODULE['<{canadapost}prestashop>canadapost_46a2a41cc6e552044816a2d04634545d'] = 'Etat';
$_MODULE['<{canadapost}prestashop>canadapost_cf1580798f7aba85d519afadf1ffd886'] = 'Choississez votre état ...';
$_MODULE['<{canadapost}prestashop>canadapost_02546d525ab356bd43c91e6b07447496'] = 'Il n\'y a pas d\'état pour ce pays';
$_MODULE['<{canadapost}prestashop>canadapost_0ddc2a5660f7d095fff34d6b93077c80'] = 'Configuration du service';
$_MODULE['<{canadapost}prestashop>canadapost_8d6bd50f3fe3ee2f4513066c25e5fb4a'] = 'Mode de calcul';
$_MODULE['<{canadapost}prestashop>canadapost_79a7b64f7e16759d93ef3e74f1916815'] = 'Utilisation du mode calcul \"Tous les produits dans un seul colis\" utilisera automatiquement la taille et les services de livraison par défaut. Les configurations spécifiques pour les catégories et les produits ne seront pas utilisées.';
$_MODULE['<{canadapost}prestashop>canadapost_5cdd307ba6e260beb4801c0c10e22a3a'] = 'Service de livraison';
$_MODULE['<{canadapost}prestashop>canadapost_78945de8de090e90045d299651a68a9b'] = 'Disponible';
$_MODULE['<{canadapost}prestashop>canadapost_2d25c72c1b18e562f6654fff8e11711e'] = 'Indisponible';
$_MODULE['<{canadapost}prestashop>canadapost_d63e135774e62574e2a1921267dad142'] = 'Choisissez les services de livraison qui seront disponibles pour vos clients.';
$_MODULE['<{canadapost}prestashop>canadapost_a438cfa1a870740754c9f4b35130cc04'] = 'Votre compte Canada Post n\'est pas spécifié';
$_MODULE['<{canadapost}prestashop>canadapost_805353d2862ea0e658c9ddda871540fa'] = 'Votre code postal / zip code n\'est pas spécifié';
$_MODULE['<{canadapost}prestashop>canadapost_ef9bd955e165dfb0207877e9fe180aeb'] = 'Votre ville n\'est pas spécifié';
$_MODULE['<{canadapost}prestashop>canadapost_5ecc7697a320f93f3ee8fb4048dbd64c'] = 'Votre pays n\'est pas spécifié';
$_MODULE['<{canadapost}prestashop>canadapost_e7bb7d2ee4d79c9b48cfc443781f00b5'] = 'PrestaShop ne peut pas se connecter aux webservices Canada Post';
$_MODULE['<{canadapost}prestashop>canadapost_9d1b485edd50e6fbd288b340b386b07d'] = 'Pas de description d\'erreur trouvé';
$_MODULE['<{canadapost}prestashop>canadapost_c888438d14855d7d96a2724ee9c306bd'] = 'Configuration mise à jour';
$_MODULE['<{canadapost}prestashop>canadapost_b9284bff13acffdd879ef4ac7fca5234'] = 'Configuration non mise à jour';
$_MODULE['<{canadapost}prestashop>canadapost_67e19ffdaa0a11e69349810403a9727e'] = 'Vous devez configurer l\'onglet \"Configuration Générale\"';
$_MODULE['<{canadapost}prestashop>canadapost_a37b48e8684078c0620a997b3baeee9f'] = 'Dans cet onglet, vous pouvez faire une configuration spécifique pour chaque catégorie';
$_MODULE['<{canadapost}prestashop>canadapost_f421827ff72ef9a61fb27aa0de62f1e4'] = 'ID Configuration';
$_MODULE['<{canadapost}prestashop>canadapost_3adbdb3ac060038aa0e6e6c138ef9873'] = 'Catégorie';
$_MODULE['<{canadapost}prestashop>canadapost_20cde117cbc92b9ec1fb4e5bc4a7b9bd'] = 'Frais additionnels';
$_MODULE['<{canadapost}prestashop>canadapost_992a0f0542384f1ee5ef51b7cf4ae6c4'] = 'Services';
$_MODULE['<{canadapost}prestashop>canadapost_06df33001c1d7187fdd81ea1f5b277aa'] = 'Actions';
$_MODULE['<{canadapost}prestashop>canadapost_66001bafca8edd8343802bd20cddc10e'] = 'Il n\'y a pas de configuration spécifique pour les catégories.';
$_MODULE['<{canadapost}prestashop>canadapost_605c5ae9959cfe9cc0b0d630b8d3144f'] = 'Êtes vous sûr de vouloir effacer cette configuration spécifique ?';
$_MODULE['<{canadapost}prestashop>canadapost_3e0cb9fd22b124c0839302fef54762d7'] = 'Mettre à jour une règle';
$_MODULE['<{canadapost}prestashop>canadapost_dd593f8a542ab628cbba98c709255e60'] = 'Ajouter une règle';
$_MODULE['<{canadapost}prestashop>canadapost_7fcafa7c47e984693fcb8a92c0fd1beb'] = 'Choississez une catégorie';
$_MODULE['<{canadapost}prestashop>canadapost_d725c0166e978cc30853996c70440873'] = 'Vous devez choisir une catégorie';
$_MODULE['<{canadapost}prestashop>canadapost_882830cb67e4069370c1be3a1ba4e12a'] = 'Cette catégorie a déjà une configuration spécifique.';
$_MODULE['<{canadapost}prestashop>canadapost_fd0119c2a5fc18aa64887b5b7ab41c19'] = 'Une erreur est survenue, essayez encore.';
$_MODULE['<{canadapost}prestashop>canadapost_20f40087c53c662adfb4e780500eaa15'] = 'Dans cet onglet, vous pouvez faire une configuration spécifique par produit.';
$_MODULE['<{canadapost}prestashop>canadapost_deb10517653c255364175796ace3553f'] = 'Produit';
$_MODULE['<{canadapost}prestashop>canadapost_2119cb0eeb7e202767f9fa56566efc50'] = 'Il n\'y a pas de configuration spécifique pour les produits.';
$_MODULE['<{canadapost}prestashop>canadapost_d53b004866635789a76380f66c87e3df'] = 'Êtes vous sûr de vouloir effacer cette configuration spécifique ?';
$_MODULE['<{canadapost}prestashop>canadapost_3c4d710b56f4318dae775cff80619f84'] = 'Choississez un produit...';
$_MODULE['<{canadapost}prestashop>canadapost_9c07640370e4681bf98638d0c458cd2e'] = 'Vous devez choisir un produit.';
$_MODULE['<{canadapost}prestashop>canadapost_c018b9a37818d15477285eb915590d19'] = 'Ce produit a une configuration spécifique';
$_MODULE['<{canadapost}prestashop>canadapost_73e383f703902e137c2e6d8e2e85cc22'] = 'Bienvenue dans le configateur du module Canada Post';
$_MODULE['<{canadapost}prestashop>canadapost_92640c80a67da1782a18304336405dac'] = 'Cette section vous aidera à comprendre comment configurer votre module correctement.';
$_MODULE['<{canadapost}prestashop>canadapost_ec0e6948e8f34818d80f27c309f46661'] = 'Ci-dessous la description de chaque champs :';
$_MODULE['<{canadapost}prestashop>canadapost_a5f7df92d8088761b0727fb1ce0a013a'] = 'Votre compte Canada Post';
$_MODULE['<{canadapost}prestashop>canadapost_742e9dca63ccb97a592727c4c2c9abc8'] = 'Vous devez vous inscrire au site Web de Canada Post à cette adresse';
$_MODULE['<{canadapost}prestashop>canadapost_35ba940948fa0ea163fd01281de10e2f'] = 'Ce champ doit être le Zip / code postal de votre point de départ de vos colis.';
$_MODULE['<{canadapost}prestashop>canadapost_81822348ace1ceabad5e9f8992ce9ea4'] = 'Ce champ doit être le pays de votre point de départ de vos colis.';
$_MODULE['<{canadapost}prestashop>canadapost_b9bba478eb4348e49e672e944b072b68'] = 'Ces cases correspondent aux services de livraison que vous voulez rendre disponibles (quand il n\'y a pas de configuration spécifique pour les produits ou les catégories de produits).';
$_MODULE['<{canadapost}prestashop>canadapost_b7c1051bdf970e718e2a3664ad3e31ac'] = 'Cette section vous permet de définir une configuration Canada Post spécifique pour chaque catégorie de produits (tels que les frais supplémentaires).';
$_MODULE['<{canadapost}prestashop>canadapost_2911404cfaf6a4c3a6756e157b0edb62'] = 'Cette section vous permet de définir une configuration Canada Post spécifique pour chaque produit (tels que les frais supplémentaires).';
$_MODULE['<{canadapost}prestashop>canadapost_902b0d55fddef6f8d651fe1035b7d4bd'] = 'Erreur';
$_MODULE['<{canadapost}prestashop>canadapost_43c9c583cfcb8523ad269708ddcde8b8'] = 'Les webservices de Canada Post semblent être injoignables, veuillez reessayer ultérieurement.';
$_MODULE['<{canadapost}prestashop>canadapost_f1c83c0ed9e0f992f7f448f7321d9743'] = 'Les webservices de Canada Post ne répondent pas.';
$_MODULE['<{canadapost}prestashop>canadapost_b7f155fe0169108902b447f572639d0b'] = 'N\'a pas pu se connecter à CanadaPost.com';
modules/carriercompare/fr.php
+5 -3
View File
@@ -5,9 +5,10 @@ $_MODULE = array();
$_MODULE['<{carriercompare}prestashop>carriercompare_115484428c82f859100c07ae1170d9e0'] = 'Estimation des livraisons';
$_MODULE['<{carriercompare}prestashop>carriercompare_68e114c207a6820a8f14d0eceacf17d7'] = 'Module permettant de faire une estimation des coûts de livraison avant de rentrer dans le processus de commande';
$_MODULE['<{carriercompare}prestashop>carriercompare_ed70a57a190d596171cf324c16a2277d'] = 'L\'identifiant State est invalide';
$_MODULE['<{carriercompare}prestashop>carriercompare_66e799a222e07b1cf25498465028061d'] = 'L\'identifiant Country est invalide';
$_MODULE['<{carriercompare}prestashop>carriercompare_ff22c3e7b4cd12813e2033774d987e96'] = 'Choissisez un état';
$_MODULE['<{carriercompare}prestashop>carriercompare_fb9e838d470b2c27c2c128d127165f9e'] = 'Choississez un pays';
$_MODULE['<{carriercompare}prestashop>carriercompare_b72dd62d03697b37417288c63e78c8c6'] = 'Veuillez utiliser un code postal valide en fonction du pays choisi';
$_MODULE['<{carriercompare}prestashop>carriercompare_e3f585e306c3cda18369730a6a628f7b'] = 'L\'identifiant du transporteur est invalide';
$_MODULE['<{carriercompare}prestashop>carriercompare_3f63451bbacbb1c3303d99d0309fdfe9'] = 'Choississez un transporteur';
$_MODULE['<{carriercompare}prestashop>carriercompare_efaf5c3827ef576b05de32ad458f196c'] = 'Cet identifiant de transporteur n\'est pas disponible pour cette sélection';
$_MODULE['<{carriercompare}prestashop>carriercompare_edc5cf1b3bab64b1d45ef51c63b53887'] = 'Impossibilité de mettre a jour le panier';
$_MODULE['<{carriercompare}prestashop>carriercompare_e7a6ca4e744870d455a57b644f696457'] = 'Offert !';
@@ -15,8 +16,9 @@ $_MODULE['<{carriercompare}prestashop>carriercompare_fbc1bef527a3a092053a244fd8d
$_MODULE['<{carriercompare}prestashop>carriercompare_59716c97497eb9694541f7c3d37b1a4d'] = 'Pays';
$_MODULE['<{carriercompare}prestashop>carriercompare_46a2a41cc6e552044816a2d04634545d'] = 'Etat';
$_MODULE['<{carriercompare}prestashop>carriercompare_e0ed8e71dbd22a1e91cb570b52443fd5'] = 'Code postal';
$_MODULE['<{carriercompare}prestashop>carriercompare_51e304bfd2872c9f53c99054b8fb8381'] = 'Nécessaires pour certains transporteurs';
$_MODULE['<{carriercompare}prestashop>carriercompare_914419aa32f04011357d3b604a86d7eb'] = 'Transporteur';
$_MODULE['<{carriercompare}prestashop>carriercompare_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Information';
$_MODULE['<{carriercompare}prestashop>carriercompare_3601146c4e948c32b6424d2c0a7f0118'] = 'Prix';
$_MODULE['<{carriercompare}prestashop>carriercompare_f620c0ed0c89129c9dd8953406300061'] = 'Aucun transporteur n\'est disponible pour cette sélection';
$_MODULE['<{carriercompare}prestashop>carriercompare_c6b61ece4cb72c71e84d91a4d22aa449'] = 'Lancer l\'estimation';
$_MODULE['<{carriercompare}prestashop>carriercompare_63a6a88c066880c5ac42394a22803ca6'] = 'Rafraichir';
modules/cashticket/fr.php
+2
View File
@@ -2,6 +2,8 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{cashticket}prestashop>prepaidservices_3e8e30e75887d2f3b02da669ebd5b380'] = 'Un certificat n\'a été trouvé pour cette configuration';
$_MODULE['<{cashticket}prestashop>prepaidservices_515f3d11e66f6fc5f7bb453e6030241a'] = 'Un mot de passe a déjà été enregistré';
$_MODULE['<{cashticket}prestashop>cashticket-accept-payment_330bf06fb43e715e5d03c9fd016df4cd'] = 'Le paiement n\'a pas encore été accepté : ';
$_MODULE['<{cashticket}prestashop>cashticket-accept-payment_486cb12e1ec3c8b28b80a8eb9f2db2c0'] = 'Accepter le paiement';
$_MODULE['<{cashticket}prestashop>cashticket-accept-payment_e9b3579d8e877bcd29ab436f2ef87cc8'] = 'Relacher le paiement';
modules/ebay/ebay.php
+1 -1
View File
@@ -915,7 +915,7 @@ class Ebay extends Module
// Load categories only if necessary
if (Db::getInstance()->getValue('SELECT COUNT(`id_ebay_category_configuration`) FROM `'._DB_PREFIX_.'ebay_category_configuration`') > 4 && Tools::getValue('section') != 'category')
return '<p align="center"><b>'.$this->l('Your categories have already been configured.').'</b></p>
<form action="index.php?tab='.Tools::safeOuput($_GET['tab']).'&configure='.Tools::safeOuput($_GET['configure']).'&token='.Tools::safeOuput($_GET['token']).'&tab_module='.Tools::safeOuput($_GET['tab_module']).'&module_name='.Tools::safeOuput($_GET['module_name']).'&id_tab=2&section=category" method="post" class="form">
<form action="index.php?tab='.Tools::safeOutput($_GET['tab']).'&configure='.Tools::safeOutput($_GET['configure']).'&token='.Tools::safeOutput($_GET['token']).'&tab_module='.Tools::safeOutput($_GET['tab_module']).'&module_name='.Tools::safeOutput($_GET['module_name']).'&id_tab=2&section=category" method="post" class="form">
<p align="center"><input class="button" name="submitSave" type="submit" value="'.$this->l('See Categories').'" /></p></form>';
// Display eBay Categories
modules/fedexcarrier/fr.php
+1
View File
@@ -97,6 +97,7 @@ $_MODULE['<{fedexcarrier}prestashop>fedexcarrier_5cdd307ba6e260beb4801c0c10e22a3
$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_78945de8de090e90045d299651a68a9b'] = 'Disponible';
$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_2d25c72c1b18e562f6654fff8e11711e'] = 'Non disponible';
$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_d63e135774e62574e2a1921267dad142'] = 'Choissisez les services de livraison qui seront disponibles pour vos clients';
$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_f1206f9fadc5ce41694f69129aecac26'] = 'Configurer';
$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_9b8c4a7116e8c44e4ebc955fafd47586'] = 'Votre compte fedex n\'est pas spécifié';
$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_b9cc1a101547b3ece6d946dbbe3469d7'] = 'Votre Fedex meter number n\'est pas spécifié';
$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_5ce0f66588bbbbbb3ef0634e5ea7da69'] = 'Votre mot de passe Fedex n\'est pas spécifié';
modules/importerosc/fr.php
+3 -3
View File
@@ -4,9 +4,9 @@ global $_MODULE;
$_MODULE = array();
$_MODULE['<{importerosc}prestashop>importerosc_e273168c3697c35b8c737d14b1a5fb26'] = 'Import OsCommerce';
$_MODULE['<{importerosc}prestashop>importerosc_f4a344f88bab7b04a73077bafc8a0187'] = 'Ce module permet d\'importer votre boutique OsCommerce dans prestashop';
$_MODULE['<{importerosc}prestashop>importerosc_2737b271f276b90d8a04ea4b9d18b920'] = 'Langue par défaut OsCommerce';
$_MODULE['<{importerosc}prestashop>importerosc_1b473540f20c3e31ead53f84511d6c77'] = 'Devise par défaut OsCommerce';
$_MODULE['<{importerosc}prestashop>importerosc_6c61ebc45acfe2f244e91ac4cd423e81'] = 'Url de la boutique';
$_MODULE['<{importerosc}prestashop>importerosc_a410107bacc21de421c07f0162f40878'] = 'Langue par défaut d\'osCommerce';
$_MODULE['<{importerosc}prestashop>importerosc_6325b420c7e3747295ebc4265ca5ebf5'] = 'Monnaie par défaut d\'osCommerce';
$_MODULE['<{importerosc}prestashop>importerosc_3128e575f57c8bff6950eb946748318a'] = 'Url de votre boutique :';
$_MODULE['<{importerosc}prestashop>importerosc_f106e79e646e4262fae765f77db9ca91'] = 'Indiquez l\'URL racine de votre site oscommerce';
$_MODULE['<{importerosc}prestashop>importerosc_a89a64592edf58aee0fc749735902cea'] = 'Merci de choisir une langue par défaut';
$_MODULE['<{importerosc}prestashop>importerosc_375e6e17d4bd18a5163d3a7d13b80b4b'] = 'Merci de choisir la devise par défaut';
modules/mondialrelay/AdminMondialRelay.php
+38 -20
View File
@@ -1,6 +1,6 @@
<?php
/*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -26,6 +26,7 @@
*/
require_once(dirname(__FILE__).'/classes/MondialRelayClass.php');
require_once(dirname(__FILE__).'/classes/MRCreateTickets.php');
require_once(dirname(__FILE__).'/mondialrelay.php');
class AdminMondialRelay extends AdminTab
@@ -35,10 +36,10 @@ class AdminMondialRelay extends AdminTab
public function __construct()
{
MondialRelay::initModuleAccess();
$this->table = 'mr_selected';
$this->className = 'MondialRelayClass';
parent::__construct();
}
@@ -47,14 +48,31 @@ class AdminMondialRelay extends AdminTab
$mondialrelay = new MondialRelay();
$order_state = new OrderState((int)(Configuration::get('MONDIAL_RELAY_ORDER_STATE')), $this->context->language->id);
$mr_weight_coef = (int)(Configuration::get('MR_WEIGHT_COEF'));
$html = '';
$html .= $this->l('To generate labels, you must register a correct address for your store on').
// Simulate a ticket generation
$MRCreateTicket = new MRCreateTickets(array(
'orderIdList' => NULL,
'totalOrder' => NULL,
'weightList' => NULL));
$errorListTicket = $MRCreateTicket->checkPreValidation();
if (count($errorListTicket))
{
$html .= '<div class="error">'.
$this->l('Thanks to kindly correct the following errors on ').
' <a href="index.php?tab=AdminContact&token='.Tools::getAdminToken('AdminContact'.
(int)(Tab::getIdFromClassName('AdminContact')).(int)$this->context->employee->id).'" class="green">'.
$this->l('The contact page').'</a>';
$html .= '<p>'.$this->l('All orders which have the state').' "<b>'.$order_state->name.'</b>"';
(int)(Tab::getIdFromClassName('AdminContact')).(int)$this->context->id_employee).'" style="color:#f00;">'.
$this->l('the contact page').'</a>:<ul>';
foreach($errorListTicket as $type => $error)
$html .= '<li>'.$type.': '.$error.'</li>';
$html .= '</ul></div>';
}
$html .= '<p>'.$this->l('All orders which have the state').' "<b>'.$order_state->name.'</b>" '.
$this->l('will be available for sticker creation');
$html .= '.&nbsp;<a href="index.php?tab=AdminModules&configure=mondialrelay&token='.
Tools::getAdminToken('AdminModules'.(int)(Tab::getIdFromClassName('AdminModules')).
(int)$this->context->employee->id).'" class="green">' . $this->l('Change configuration') . '</a></p>
@@ -63,7 +81,7 @@ class AdminMondialRelay extends AdminTab
<span></span>
</div>';
$orders = MondialRelay::getOrders(array(), MondialRelay::WITHOUT_HOME_DELIVERY);
$orders = MondialRelay::getOrders(array());
if (empty($orders))
$html.= '<h3 style="color:red;">' . $this->l('No orders with this state.') . '</h3>';
else
@@ -71,22 +89,22 @@ class AdminMondialRelay extends AdminTab
$html.= '<form method="post" action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'">';
$html.= "\n<table class=\"table\" id='orders'>";
$html.= '<tr>';
$html.= '<th><input type="checkbox" id="toggleStatusOrderList" /></th>';
$html.= '<th>'.$this->l('Order ID').'</th>';
$html.= '<th>'.$this->l('Customer').'</th>';
$html.= '<th>'.$this->l('Total price').'</th>';
$html.= '<th>'.$this->l('Total shipping').'</th>';
$html.= '<th>'.$this->l('Date').'</th>';
$html.= '<th>'.$this->l('Put a Weight (grams)').'</th>';
$html.= '<th class="fixed"><a href="javascript:void(0);" id="toggleStatusOrderList">'.$this->l('Toggle selection').'</a><br /></th>';
$html.= '<th>'.$this->l('MR Number').'</th>';
$html.= '<th>'.$this->l('MR Country').'</th>';
$html.= '<th>'.$this->l('Exp Number').'</th>';
$html.= '<th>'.$this->l('Detail').'</th>';
$html.= '</tr>';
foreach ($orders as $order)
{
if ($order['weight'] == 0)
if ($order['weight'] == 0)
{
$result_weight = Db::getInstance()->getRow('
SELECT SUM(product_weight * product_quantity) as weight
@@ -96,13 +114,13 @@ class AdminMondialRelay extends AdminTab
}
$html .= '<tr id="PS_MRLineOrderInformation-'.$order['id_order'].'">';
$html .= '<td><input type="checkbox" class="order_id_list" name="order_id_list[]" id="order_id_list" value="'.$order['id_order'].'" /></td>';
$html .= '<td>'.$order['id_order'].'</td>';
$html .= '<td>'.$order['customer'].'</td>';
$html .= '<td>'.Tools::displayPrice($order['total'], new Currency($order['id_currency'])) . '</td>';
$html .= '<td>'.Tools::displayPrice($order['shipping'], new Currency($order['id_currency'])) . '</td>';
$html .= '<td>'.Tools::displayDate($order['date'], $order['id_lang']).'</td>';
$html .= '<td><input type="text" name="weight_'.$order['id_order'].'" id="weight_' . $order['id_order'] . '" size="7" value="'.$order['weight'].'" /></td>';
$html .= '<td><input type="checkbox" class="order_id_list" name="order_id_list[]" id="order_id_list" value="'.$order['id_order'].'" /></td>';
$html .= '<td>'.$order['MR_Selected_Num'].'</td>';
$html .= '<td>'.$order['MR_Selected_Pays'].'</td>';
$html .= '<td>'.$order['exp_number'].'</td>';
@@ -147,7 +165,7 @@ class AdminMondialRelay extends AdminTab
$_html = '';
$query = "SELECT * FROM `" . _DB_PREFIX_ ."mr_historique` ORDER BY `id` DESC ;";
$query = Db::getInstance()->executeS($query);
$_html.= '
<fieldset>
<legend>' . $this->l('History of labels creation') . '</legend>
@@ -156,13 +174,13 @@ class AdminMondialRelay extends AdminTab
<table class="table" id="PS_MRHistoriqueTableList">
<tbody>
<tr>
<th><a href="javascript:void(0);" id="toggleStatusHistoryList">' . $this->l('Toggle selection') . '</a></th>
<th><input type="checkbox" id="toggleStatusHistoryList" /></th>
<th>' . $this->l('Order ID') . '</th>
<th>' . $this->l('Exp num') . '</th>
<th>' . $this->l('Print stick A4') . '</th>
<th>' . $this->l('Print stick A5') . '</th>
</tr>';
foreach ($query AS $k => $row)
foreach ($query AS $k => $row)
{
$_html.= '
<tr id="detailHistory_'.$row['order'].'">
@@ -194,9 +212,9 @@ class AdminMondialRelay extends AdminTab
}
public function display()
{
{
$html = '';
// Allow to override the older jquery to use a new one :)
// Added for the 1.3 compatibility to keep using the recent code
if (_PS_VERSION_ < '1.4')
@@ -206,7 +224,7 @@ class AdminMondialRelay extends AdminTab
<script type="text/javascript" language="javascript">
var _PS_MR_MODULE_DIR_ = "'.MondialRelay::$moduleURL.'";
</script>';
$html .= $this->displayOrdersTable();
$html .= '<br/><br/>';
$html .= $this->displayhistoriqueForm();
modules/mondialrelay/ajax.php
+8 -7
View File
@@ -1,6 +1,6 @@
<?php
<?php
/*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -31,13 +31,14 @@
* Each Name method allow to instanciate an object containing
* methods to manage correctly the data and name fields
*/
require_once(realpath(dirname(__FILE__).'/../../config/config.inc.php'));
require_once(realpath(dirname(__FILE__).'/../../init.php'));
require(dirname(__FILE__).'/mondialrelay.php');
require(dirname(__FILE__).'/classes/MRCreateTickets.php');
require(dirname(__FILE__).'/classes/MRGetTickets.php');
require(dirname(__FILE__).'/classes/MRGetRelayPoint.php');
require(dirname(__FILE__).'/classes/MRRelayDetail.php');
require(dirname(__FILE__).'/classes/MRManagement.php');
MondialRelay::initModuleAccess();
@@ -64,7 +65,7 @@ $result = array();
if (!isset($accessPageList[$token]) || !in_array($method, $accessPageList[$token]))
exit();
// Method name allow to instanciate his object to properly call the
// Method name allow to instanciate his object to properly call the
// implemented interface method and do his job
switch($method)
{
@@ -98,12 +99,12 @@ switch($method)
}
// Try to instanciate the method object name and call the necessaries method
try
try
{
if (class_exists($method, false))
{
$obj = new $method($params);
// Verify that the class implement correctly the interface
// Else use a Management class to do some ajax stuff
if (($obj instanceof IMondialRelayWSMethod))
@@ -117,7 +118,7 @@ try
else if (($management = new MRManagement($params)) &&
method_exists($management, $method))
$result = $management->{$method}();
else
else
throw new Exception('Method Class : '.$method.' can\'t be found');
unset($management);
}
modules/mondialrelay/classes/MRCreateTickets.php
+56 -3
View File
@@ -49,7 +49,7 @@ class MRCreateTickets implements IMondialRelayWSMethod
'ModeLiv' => array(
'required' => true,
'value' => '',
'regexValidation' => '#^(LCC|LDR|LDS|24R|ESP|DRI)$#'),
'regexValidation' => '#^(LCC|LD1|LDS|24R|ESP|DRI)$#'),
'NDossier' => array(
'required' => false,
'value' => '',
@@ -272,7 +272,6 @@ class MRCreateTickets implements IMondialRelayWSMethod
*/
private function _setRequestDefaultValue()
{
$this->_fields['list']['Enseigne']['value'] = Configuration::get('MR_ENSEIGNE_WEBSERVICE');
$this->_fields['list']['Expe_Langage']['value'] = Configuration::get('MR_LANGUAGE');
$this->_fields['list']['Expe_Ad1']['value'] = Configuration::get('PS_MR_SHOP_NAME');
@@ -422,7 +421,7 @@ class MRCreateTickets implements IMondialRelayWSMethod
$order = new Order($params['NDossier']);
// Update the database for order and orderHistory
$order->shipping_number = $id_mr_selected;
$order->shipping_number = $expeditionNum;
$order->update();
$templateVars = array('{followup}' => $trackingURL);
@@ -507,6 +506,60 @@ class MRCreateTickets implements IMondialRelayWSMethod
throw new Exception($this->_mondialRelay->l('The Mondial Relay webservice isn\'t currently reliable'));
}
/*
** Check if the shop parameter are currently well configured
*/
public function checkPreValidation()
{
$errorList = array();
if (!$this->_mondialRelay)
$this->_mondialRelay = new MondialRelay();
$list = array(
'Expe_Langage' => array(
'value' => Configuration::get('MR_LANGUAGE'),
'error' => $this->_mondialRelay->l('Please check your language configuration')),
'Expe_Ad1' => array(
'value' => Configuration::get('PS_MR_SHOP_NAME'),
'error' => $this->_mondialRelay->l('Please check your shop name configuration')),
'Expe_Ad3' => array(
'value' => Configuration::get('PS_SHOP_ADDR1'),
'error' => $this->_mondialRelay->l('Please check your address 1 configuration')),
'Expe_Ville' => array(
'value' => Configuration::get('PS_SHOP_CITY'),
'error' => $this->_mondialRelay->l('Please check your city configuration')),
'Expe_CP' => array(
'value' => Configuration::get('PS_SHOP_CODE'),
'error' => $this->_mondialRelay->l('Please check your zipcode configuration')),
'Expe_Pays' => array(
'value' => ((_PS_VERSION_ >= '1.4') ?
Country::getIsoById(Configuration::get('PS_SHOP_COUNTRY_ID')) :
substr(Configuration::get('PS_SHOP_COUNTRY'), 0, 2)),
'error' => $this->_mondialRelay->l('Please check your country configuration')),
'Expe_Tel1' => array(
'value' => str_replace(array('.', ' ', '-'), '', Configuration::get('PS_SHOP_PHONE')),
'error' => $this->_mondialRelay->l('Please check your Phone configuration')),
'Expe_Mail' => array(
'value' => Configuration::get('PS_SHOP_EMAIL'),
'error' => $this->_mondialRelay->l('Please check your mail configuration')));
foreach($list as $name => $tab)
{
$tab['value'] = strtoupper($tab['value']);
if ($name == 'Expe_CP')
{
if (!MRTools::checkZipcodeByCountry($tab['value'], array(
'id_country' => Configuration::get('PS_COUNTRY_DEFAULT'))))
$errorList[$name] = $tab['error'];
}
else if (isset($this->_fields['list'][$name]['regexValidation']) &&
(!preg_match($this->_fields['list'][$name]['regexValidation'], $tab['value'], $matches)))
$errorList[$name] = $tab['error'];
}
return $errorList;
}
/*
* Get the values with associated fields name
* @fields : array containing multiple values information
modules/mondialrelay/classes/MRGetRelayPoint.php
+44 -1
View File
@@ -167,6 +167,41 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
return $params;
}
/*
** Get detail information for each relay
*/
private function _getRelayPointDetails($relayPointList)
{
$relayPointNumList = array();
foreach($relayPointList as $num => $relayPoint)
$relayPointNumList[] = $relayPoint['Num'];
$MRRelayDetail = new MRRelayDetail(array(
'relayPointNumList' => $relayPointNumList,
'id_address_delivery' => $this->_id_address_delivery));
$MRRelayDetail->init();
$MRRelayDetail->send();
return $MRRelayDetail->getResult();
}
/*
** Generate a perman link to view relay detail on their website
*/
private function _addLinkHoursDetail(&$relayPointList)
{
$relayPointNumList = array();
foreach($relayPointList as $num => $relayPoint)
$relayPointNumList[] = $relayPoint['Num'];
$permaList = MRRelayDetail::getPermaLink($relayPointNumList, $this->_id_address_delivery);
foreach($relayPointList as $num => &$relayPoint)
{
$relayPoint['permaLinkDetail'] = '';
if (array_key_exists($relayPoint['Num'], $permaList))
$relayPoint['permaLinkDetail'] = $permaList[$relayPoint['Num']];
}
return $relayPointList;
}
/*
* Manage the return value of the webservice, handle the errors or build the
* succeed message
@@ -206,6 +241,14 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
}
if (!count($result))
$errors[] = $this->_mondialRelay->l('MondialRelay can\'t find any relay point near your address. Maybe your address isn\'t properly filled ?');
else
{
$this->_addLinkHoursDetail($result);
// Fetch detail info using webservice (not used anymore)
// $this->_generateLinkHoursDetail($result);
// $result = (count($relayDetail['success'])) ? $relayDetail['success'] : $result;
}
$success = $result;
}
$this->_resultList['error'] = $errors;
@@ -251,4 +294,4 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
{
return $this->_resultList;
}
}
}
modules/mondialrelay/classes/MRManagement.php
+3
View File
@@ -56,6 +56,9 @@ class MRManagement extends MondialRelay
FROM `' . _DB_PREFIX_ . 'mr_selected`
WHERE `id_cart` = '.(int)$this->_params['id_cart'];
// Not exist and needed for database
unset($this->_params['relayPointInfo']['permaLinkDetail']);
// Update if Exist else add a new entry
if (Db::getInstance()->getRow($query))
{
modules/mondialrelay/classes/MRRelayDetail.php
Executable
+274
View File
@@ -0,0 +1,274 @@
<?php
/*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 8783 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
/*
* Interface
*/
require_once(dirname(__FILE__).'/IMondialRelayWSMethod.php');
/*
* Allow to retrieve relay point details - 'WSI2_DetailPointRelais'
*/
class MRRelayDetail implements IMondialRelayWSMethod
{
private $_fields = array(
'list' => array(
'Enseigne' => array(
'required' => true,
'value' => '',
'regexValidation' => '#^[0-9A-Z]{2}[0-9A-Z ]{6}$#'),
'Num' => array(
'required' => true,
'value' => '',
'regexValidation' => '#^[0-9]{6}$#'),
'Pays' => array(
'required' => true,
'value' => '',
'regexValidation' => '#^[A-Z]{2}$#'),
'Security' => array(
'required' => true,
'value' => '',
'regexValidation' => '#^[0-9A-Z]{32}$#')));
private $_relayPointNumList = array();
private $_id_address_delivery = 0;
private $_webServiceKey = '';
private $_mondialRelay = NULL;
private $_markCode = '';
private $_resultList = array(
'error' => array(),
'success' => array());
private $_webserviceURL = 'http://www.mondialrelay.fr/webservice/Web_Services.asmx?WSDL';
public function __construct($params)
{
$this->_relayPointNumList = $params['relayPointNumList'];
$this->_id_address_delivery = (int)($params['id_address_delivery']);
$this->_webServiceKey = Configuration::get('MR_KEY_WEBSERVICE');
$this->_markCode = Configuration::get('MR_CODE_MARQUE');
}
public function __destruct()
{
unset($this->_mondialRelay);
}
public function init()
{
$this->_mondialRelay = new MondialRelay();
$address = new Address($this->_id_address_delivery);
if (!$address)
throw new Exception($this->_mondialrelay->l('Customer address can\'t be found'));
$this->_fields['list']['Enseigne']['value'] = Configuration::get('MR_ENSEIGNE_WEBSERVICE');
$this->_fields['list']['Pays']['value'] = Country::getIsoById($address->id_country);
foreach ($this->_relayPointNumList as $num)
{
// Storage temporary
$base = $this->_fields;
$tmp = &$base['list'];
$tmp['Num']['value'] = $num;
$this->_fieldsList[] = $base;
}
$this->_generateMD5SecurityKey();
unset($address);
}
/*
* Generate the MD5 key for each param list
*/
private function _generateMD5SecurityKey()
{
// RootCase is the array case where the main information are stored
// it's an array containing id_mr_selected and an array with the necessary fields
foreach($this->_fieldsList as &$rootCase)
{
$concatenationValue = '';
foreach($rootCase['list'] as $paramName => &$valueDetailed)
if ($paramName != 'Texte' && $paramName != 'Security')
{
// Mac server make an empty string instead of a cleaned string
// TODO : test on windows and linux server
$cleanedString = MRTools::replaceAccentedCharacters($valueDetailed['value']);
$valueDetailed['value'] = !empty($cleanedString) ? strtoupper($cleanedString) : strtoupper($valueDetailed['value']);
// Call a pointer function if exist to do different test
if (isset($valueDetailed['methodValidation']) &&
method_exists('MRTools', $valueDetailed['methodValidation']) &&
isset($valueDetailed['params']) &&
MRTools::$valueDetailed['methodValidation']($valueDetailed['value'], $valueDetailed['params']))
$concatenationValue .= $valueDetailed['value'];
// Use simple Regex test given by MondialRelay
else if (isset($valueDetailed['regexValidation']) &&
preg_match($valueDetailed['regexValidation'], $valueDetailed['value'], $matches))
$concatenationValue .= $valueDetailed['value'];
// If the key is required, we set an error, else it's skipped
else if ((!strlen($valueDetailed['value']) && $valueDetailed['required']) || strlen($valueDetailed['value']))
{
if (empty($valueDetailed['value']))
$error = $this->_mondialRelay->l('This key').' ['.$paramName.'] '.$this->_mondialRelay->l('is empty and need to be filled');
else
$error = 'This key ['.$paramName.'] hasn\'t a valid value format : '.$valueDetailed['value'];
$this->_resultList['error'][$rootCase['list']['Num']['value']] = $error;
}
}
$concatenationValue .= $this->_webServiceKey;
$rootCase['list']['Security']['value' ] = strtoupper(md5($concatenationValue));
}
}
/*
* Get the values with associated fields name
* @fields : array containing multiple values information
*/
private function _getSimpleParamArray($fields)
{
$params = array();
foreach($fields as $keyName => $valueDetailed)
$params[$keyName] = $valueDetailed['value'];
return $params;
}
/*
* Manage the return value of the webservice, handle the errors or build the
* succeed message
*/
private function _parseResult($client, $result, $params)
{
$errors = array();
if ($client->fault)
$errors[$errorTotal++] = $this->_mondialRelay->l('It seems the request isn\'t valid:').
$result;
$result = $result['WSI2_DetailPointRelaisResult'];
if (($errorNumber = $result['STAT']) != 0)
{
$errors[] = $this->_mondialRelay->l('There is an error number : ').$errorNumber;
$errors[] = $this->_mondialRelay->l('Details : ').
$this->_mondialRelay->getErrorCodeDetail($errorNumber);
}
else
{
$HDayList = array(
'Horaires_Lundi' => $this->_mondialRelay->l('Monday'),
'Horaires_Mardi' => $this->_mondialRelay->l('Tuesday'),
'Horaires_Mercredi' => $this->_mondialRelay->l('Wednesday'),
'Horaires_Jeudi' => $this->_mondialRelay->l('Thursday'),
'Horaires_Vendredi' => $this->_mondialRelay->l('Friday'),
'Horaires_Samedi' => $this->_mondialRelay->l('Saturday'),
'Horaires_Dimanche' => $this->_mondialRelay->l('Sunday'));
$orderedDate = array();
// Format hour properly
$priority = 0;
foreach($HDayList as $day => $tradDayName)
{
foreach($result[$day]['string'] as $num => &$value)
if ($value == '0000')
$value = '';
else
$value = implode('h', str_split($value, 2));
$orderedDate[$priority++] = array('name' => $tradDayName, 'list' => $result[$day]);
unset($result[$day]);
}
$result['orderedDate'] = $orderedDate;
$this->_resultList['success'][$result['Num']] = $result;
}
$this->_resultList['error'][] = $errors;
}
/*
* Send one or multiple request to the webservice
*/
public function send()
{
if ($client = new nusoap_client($this->_webserviceURL, true))
{
$client->soap_defencoding = 'UTF-8';
$client->decode_utf8 = false;
foreach($this->_fieldsList as $rootCase)
{
$params = $this->_getSimpleParamArray($rootCase['list']);
$result = $client->call(
'WSI2_DetailPointRelais',
$params,
'http://www.mondialrelay.fr/webservice/',
'http://www.mondialrelay.fr/webservice/WSI2_GetEtiquettes');
$this->_parseResult($client, $result, $params);
}
unset($client);
}
else
throw new Exception($this->_mondialRelay->l('The Mondial Relay webservice isn\'t currently reliable'));
}
/*
** Generate a list of perma link
*/
static public function getPermaLink($relayList, $id_address_delivery)
{
if (!($address = new Address($id_address_delivery)))
return array();
$permaList = array();
$iso = strtoupper(Country::getIsoById($address->id_country));
$ens = strtoupper(Configuration::get('MR_ENSEIGNE_WEBSERVICE').Configuration::get('MR_CODE_MARQUE'));
$url = 'http://www.mondialrelay.com/public/permanent/details_relais.aspx?ens='.
Configuration::get('MR_ENSEIGNE_WEBSERVICE').Configuration::get('MR_CODE_MARQUE');
foreach($relayList as $num => $relayNum)
{
$crc = strtoupper(MD5('<'.$ens.'>'.$relayNum.$iso.'<'.Configuration::get('MR_KEY_WEBSERVICE').'>'));
$permaList[$relayNum] = $url.'&num='.$relayNum.'&pays='.$iso.'&crc='.$crc;
}
unset($address);
return $permaList;
}
/*
* Get the values with associated fields name
*/
public function getFieldsList()
{
return $this->_fieldsList['list'];
}
/*
* Get the result of one or multiple send request
*/
public function getResult()
{
return $this->_resultList;
}
}
modules/mondialrelay/config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>mondialrelay</name>
<displayName><![CDATA[Mondial Relay]]></displayName>
<version><![CDATA[1.7.5]]></version>
<version><![CDATA[1.7.6]]></version>
<description><![CDATA[Deliver in Relay points]]></description>
<author><![CDATA[]]></author>
<tab><![CDATA[shipping_logistics]]></tab>
modules/mondialrelay/fr.php
+33 -9
View File
@@ -2,18 +2,18 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_a25569b97604bddcfba04d7eb9950eeb'] = 'Pour générer des étiquettes, vous devez inscrire une adresse correcte pour votre boutique sur ';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_3d2da0d2e731d59465a92f13216cf82d'] = 'La page de contact';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_de21dc13e1ea638777fbfad49f88b332'] = 'Toutes les commandes qui auront un status';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_d1908b9b04e81c4b6112e38b608c49af'] = 'Merci de bien vouloir corriger les erreurs suivantes dans';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_ccce63109db30895153094de05c60fa5'] = 'la page de contact';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_de21dc13e1ea638777fbfad49f88b332'] = 'Toutes les commandes qui auront un statut';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_a0bf3c9ac2d785f053d883b8746e91ba'] = 'seront disponibles pour la création d\'ètiquette';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_2345e28c9b93f368968be4781ed70f5c'] = 'Changer la configuration';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_37c85a61df6352af7285c307022c4413'] = 'Aucune commande n\'existe avec ce status';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_37c85a61df6352af7285c307022c4413'] = 'Aucune commande n\'existe avec ce statut';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_d79cf3f429596f77db95c65074663a54'] = 'Identifiant de la commande';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_ce26601dac0dea138b7295f02b7620a7'] = 'Client';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_0eede552438475bdfe820c13f24c9399'] = 'Prix total';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_f4e8b53a114e5a17d051ab84d326cae5'] = 'Total frais d\'expédition';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_44749712dbec183e983dcd78a7736c41'] = 'Date';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_3715c824cbc0f966c61a72254f248a2e'] = 'Mettez un poids (grammes)';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_5635c2608fff4c95a564aea8c6118b8c'] = 'Inverser la sélection';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_6ccc0fdff9995e1a0fce00c99e5b6085'] = 'Numéro MR';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_f9c50cba4de9032d7a6797a2458f8ed9'] = 'Pays MR';
$_MODULE['<{mondialrelay}prestashop>adminmondialrelay_428c091372d840900cf8536519fa0056'] = 'Numéro d\'expedition';
@@ -48,7 +48,7 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_cb5e100e5a9a3e7f6d1fd9751221528
$_MODULE['<{mondialrelay}prestashop>mondialrelay_350c1cc4343826a89f08a33bb49c6d98'] = 'Configuration du Module Mondial Relay';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_d21a9f93917604d5490ad529a7cf1ff9'] = 'Pour créer un transporteur Mondial Relay';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_c6a2e6af5fff47adb3afd780b97d9b4b'] = 'Remplissez et sauvegarder vos paramètres Mondial Relay';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_94fbe32464fcfa902feed9f256439833'] = 'Créer un transporteur utilisant le formulaire \"ajouter un transporteur\" ci-dessous';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_94fbe32464fcfa902feed9f256439833'] = 'Créez un transporteur via le formulaire ‘’ajouter un transporteur’’ ci-dessous';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_b962d8fb95f5a439f50502152f3bad71'] = 'Definissez un prix pour votre transporteur sur';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_faf1247ae6846a9955a466d4f301bbe4'] = 'La page Transporteurs';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_10d78806b84b97ebc774e9f6277af6ac'] = 'Pour générer vos étiquettes, vous devez avoir enregistré une adresse valide de votre boutique sur votre';
@@ -77,9 +77,9 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_0309a6c666a7a803fdb9db95de71cf0
$_MODULE['<{mondialrelay}prestashop>mondialrelay_6c1674d14bf5f95742f572cddb0641a7'] = 'Belgique';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_06630c890abadde9228ea818ce52b621'] = 'Luxembourg';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_907eba32d950bfab68227fd7ea22999b'] = 'Espagne';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_0c24ec05a02c710cedd400e3680d8b81'] = 'Liste des tranporteurs';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_0c24ec05a02c710cedd400e3680d8b81'] = 'Liste des transporteurs';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_14039af96b01e718a9c9d9c1259b6472'] = 'Aucun transporteur créé';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_8596361cec00f8d2438d264827eee737'] = 'Modification de la configuration';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_8596361cec00f8d2438d264827eee737'] = 'Modifier les paramètres de ce transporteur';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_9ffc3ccc968a96d902af963c6d7b4e97'] = 'Paramètres avancés';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_1d1d57f5840e1da871622295ba206b30'] = 'Cliquez pour afficher / cacher les options';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_fcf5b2122da1d5a5f5c7253b96a3f9d9'] = 'URL de la tache CRON à lancer pour la mise à jour des statuts de commandes';
@@ -110,10 +110,12 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_bba366864d25056c941b72f18ef79e7
$_MODULE['<{mondialrelay}prestashop>mondialrelay_e0626222614bdee31951d84c64e5e9ff'] = 'Choisir';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_91b442d385b54e1418d81adc34871053'] = 'Sélectionné';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_ef2a1f426c2c289ed5986c7636a5d696'] = 'Merci de choisir un point relay';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_80a0c205cd57b22fca7f174253870300'] = 'Heures d\'ouvertures';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_2b56b60f878922093facd42284848a0c'] = 'Plus de détails';
$_MODULE['<{mondialrelay}prestashop>orderdetail_81b7b4587a2a3ea7a0d6bb1df3fbba54'] = 'Livraison à';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_a1c3470a944b9625cfb924fd15c8bdbf'] = 'Veuillez choisir au moins une commande';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_dc41aac14af17f1d19fca5e3b9439e74'] = 'Cette clé';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_306b346c19017609403424203ea3d720'] = 'est vide et doit être rensignée';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_306b346c19017609403424203ea3d720'] = 'est vide et doit être renseignée';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_e6940b76f045c8bc0aaaa5b2476cdaf7'] = 'Il semble que la requête ne soit pas valide';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_c9b4de92f371ae545ad6f051c07d58ca'] = 'Erreur numéro :';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_ea5f761be4e4888eabf4e1501d7817d1'] = 'Détails :';
@@ -121,6 +123,14 @@ $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_eabb11bf9623f08409a0a4c9d035
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_b92c3d3319314513c547675924ceecd1'] = 'URL du Ticket :';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_66b793b6b4125e300717e8cf7449f533'] = 'Url de Tracking :';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_2653c23b8c0daac59571e4be5e8fa7d0'] = 'Le webservice Mondial Relay est actuellement innaccessible.';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_26b6b6eaec970108c5e84286159fbf48'] = 'Merci de vérifier la configuration de votre langue';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_557595c2e17c9948a9448eb763ac1a88'] = 'Merci de vérifier la configuration de votre nom de boutique';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_017ca6b770ad53669a4eec82894dfcd3'] = 'Merci de vérifier la configuration de votre adresse 1';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_3f79e1fc66b4f9cca7bd68cab176020d'] = 'Merci de vérifier la configuration de votre ville';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_404665d9b65239985d59b30b3dcb26b5'] = 'Merci de vérifier la configuration de votre code postal';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_0b8a30478b9572b86718989d483fd88d'] = 'Merci de vérifier la configuration de votre pays';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_7ddf2d94bf037b7d1088c0600ea589c3'] = 'Merci de vérifier la configuration de votre téléphone';
$_MODULE['<{mondialrelay}prestashop>mrcreatetickets_9c7ce7be9a2c593b24d448edb4f804e0'] = 'Merci de vérifier la configuration de votre email';
$_MODULE['<{mondialrelay}prestashop>mrgetrelaypoint_14288d48d107056c1acf8aaae1bf282b'] = 'L\'adresse du client ne peut etre trouvé';
$_MODULE['<{mondialrelay}prestashop>mrgetrelaypoint_dc41aac14af17f1d19fca5e3b9439e74'] = 'Cette clé';
$_MODULE['<{mondialrelay}prestashop>mrgetrelaypoint_135a7b9a62531e066a95093d8951b344'] = 'n\'a pas un format valide';
@@ -142,3 +152,17 @@ $_MODULE['<{mondialrelay}prestashop>mrmanagement_0b7f47fce1d82d53244771c64b1535c
$_MODULE['<{mondialrelay}prestashop>mrmanagement_ea4788705e6873b424c65e91c2846b19'] = 'Annuler';
$_MODULE['<{mondialrelay}prestashop>mrmanagement_a42bb0eaa485682166770a54469385f6'] = 'Certaines étiquettes ne peuvent pas être supprimées : veuillez réessayer un peu plus tard.';
$_MODULE['<{mondialrelay}prestashop>mrmanagement_11744bfebb33e52be37a66a530b7045d'] = 'Veuillez choisir au moins un élèment de l\'historique';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_14288d48d107056c1acf8aaae1bf282b'] = 'L\'adresse du client ne peut être trouvé';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_dc41aac14af17f1d19fca5e3b9439e74'] = 'Cette clé';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_306b346c19017609403424203ea3d720'] = 'est vide et doit être renseignée';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_e6940b76f045c8bc0aaaa5b2476cdaf7'] = 'Il semble que la requête ne soit pas valide';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_c9b4de92f371ae545ad6f051c07d58ca'] = 'Erreur numéro :';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_ea5f761be4e4888eabf4e1501d7817d1'] = 'Détails :';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_6f8522e0610541f1ef215a22ffa66ff6'] = 'Lundi';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_5792315f09a5d54fb7e3d066672b507f'] = 'Mardi';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_796c163589f295373e171842f37265d5'] = 'Mercredi';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_78ae6f0cd191d25147e252dc54768238'] = 'Jeudi';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_c33b138a163847cdb6caeeb7c9a126b4'] = 'Vendredi';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_8b7051187b9191cdcdae6ed5a10e5adc'] = 'Samedi';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_9d1a0949c39e66a0cd65240bc0ac9177'] = 'Dimanche';
$_MODULE['<{mondialrelay}prestashop>mrrelaydetail_2653c23b8c0daac59571e4be5e8fa7d0'] = 'Le webservice Mondial Relay est actuellement innaccessible.';
modules/mondialrelay/mondialrelay.js
+76 -5
View File
@@ -1,6 +1,7 @@
var toggle_status_order_list = false;
var toggle_history_order_list = false;
var relay_point_max = 10;
var last_gmap_info_clicked = '';
// /!\ All the following list data could be store into the same variable
// But for a better reading of the code, there are separated
@@ -665,7 +666,7 @@ function PS_MRGmapResizeEvent($map)
** Move the view of the gmap to a marker
** liable to the relay point
*/
function PS_MRGmapPlaceViewOnMarker($map, marker)
function PS_MRGmapPlaceViewOnMarker($map, marker, relayNum)
{
$map.gmap3(
{
@@ -673,6 +674,7 @@ function PS_MRGmapPlaceViewOnMarker($map, marker)
args:[marker.position],
callback: function()
{
PS_MRDisplayClickedGmapWindow(marker, relayNum, $map);
(function(m)
{
setTimeout(function()
@@ -713,7 +715,7 @@ function PS_MRDisplayGmap(contentBlockid, $map)
$('#PS_MRGmap_' + id_carrier).slideDown('fast', function()
{
PS_MRGmapResizeEvent($map);
PS_MRGmapPlaceViewOnMarker($map, markerList[id_carrier][relayPointNumber]);
PS_MRGmapPlaceViewOnMarker($map, markerList[id_carrier][relayPointNumber], relayPointNumber);
});
}
else
@@ -727,13 +729,60 @@ function PS_MRDisplayGmap(contentBlockid, $map)
$('#' + contentBlockid).after($(this));
$('#PS_MRGmap_' + id_carrier).slideDown('fast', function()
{
PS_MRGmapPlaceViewOnMarker($map, markerList[id_carrier][relayPointNumber]);
PS_MRGmapPlaceViewOnMarker($map, markerList[id_carrier][relayPointNumber], relayPointNumber);
});
}
});
}
}
/*
** Generate an html block to display the opening hours details
*/
function PS_MRGetTimeRelayDetail(relayInfo)
{
onClick = 'onClick="PS_MROpenPopupDetail(\'' + relayInfo.permaLinkDetail + '\')"';
var html = ' \
<div class="PS_MRGmapBulbe"> \
<img src="' + _PS_MR_MODULE_DIR_ + 'logo_hd.png" width="10%" style="float:left;" /> \
<p><b>' + relayInfo.LgAdr1 + '</b><br /> ' + relayInfo.LgAdr3
+ ' - ' + relayInfo.CP + ' - ' + relayInfo.Ville
+ ' ' + relayInfo.Pays + '</p> \
<a href="javascript:void(0)" ' + onClick + '>' + PS_MRTranslationList['moreDetails'] + '</a> \
</div>';
return html;
}
/*
** Call a MondialRelay page into a popup
*/
function PS_MROpenPopupDetail(url)
{
window.open(url, 'MondialRelay',
'height=200, width=400, top=100, left=100, toolbar=no, menubar=yes, \
location=no, resizable=yes, scrollbars=no, status=no');
}
/*
** Display the gmap windows selected by the user
*/
function PS_MRDisplayClickedGmapWindow(marker, relayNum, mapObject)
{
if (last_gmap_info_clicked.length)
{
// Close the last opening window in gmap
if ((lastWin = mapObject.gmap3({action:'get', name:'infowindow', tag:last_gmap_info_clicked})))
lastWin.close();
}
// Open the selected detail window
map = mapObject.gmap3('get');
if ((currentWindow = mapObject.gmap3({action:'get', name:'infowindow', tag:relayNum})))
currentWindow.open(map, marker);
last_gmap_info_clicked = relayNum;
}
/*
** Add a new Marker to a Gmap for a carrier using the
** relay point information
@@ -743,20 +792,30 @@ function PS_MRAddGMapMarker(id_carrier, relayPointNumber, contentBlockid)
// Check if the gmap has been properly created
if (GmapList[id_carrier] == undefined)
return ;
relayInfo = relayPointDataContainers[relayPointNumber];
var relayInfo = relayPointDataContainers[relayPointNumber];
var detailContentHtml = PS_MRGetTimeRelayDetail(relayInfo);
// Add Marker to the map
fullFormatedAddress = relayInfo.LgAdr1 + ' ' + relayInfo.LgAdr3 + ' ' +
var fullFormatedAddress = relayInfo.LgAdr1 + ' ' + relayInfo.LgAdr3 + ' ' +
relayInfo.CP + ' ' + relayInfo.Ville + ' ' + relayInfo.Pays;
GmapList[id_carrier].gmap3(
{
action: 'addMarker',
address: fullFormatedAddress,
tag:relayInfo.Num,
map:
{
center: true,
zoom: 14
},
marker: {
events:
{
click:function(marker, event, data)
{
PS_MRDisplayClickedGmapWindow(marker, relayInfo.Num, $(this));
}
},
callback: function(marker)
{
if (marker)
@@ -776,6 +835,18 @@ function PS_MRAddGMapMarker(id_carrier, relayPointNumber, contentBlockid)
return true;
}
}
},
infowindow:
{
options: {content:detailContentHtml},
tag:relayInfo.Num,
callback: function() {
// To avoid any bug, foreach anytime the elements and try to close them
var windowList = $(this).gmap3({action:'get', name:'infowindow', all:true});
for (var x in windowList)
windowList[x].close();
}
}
});
return false;
}
modules/mondialrelay/mondialrelay.php
+232 -219
View File
File diff suppressed because it is too large Load Diff
modules/mondialrelay/mondialrelay.tpl
+2
View File
@@ -40,6 +40,8 @@
PS_MRTranslationList['Select'] = "{l s='Select' mod='mondialrelay'}";
PS_MRTranslationList['Selected'] = "{l s='Selected' mod='mondialrelay'}";
PS_MRTranslationList['errorSelection'] = "{l s='Please choose a relay point' mod='mondialrelay'}";
PS_MRTranslationList['openingRelay'] = "{l s='Opening hours' mod='mondialrelay'}";
PS_MRTranslationList['moreDetails'] = "{l s='More details' mod='mondialrelay'}";
</script>
<script type="text/javascript" src="{$new_base_dir}mondialrelay.js"></script>
modules/mondialrelay/style.css
+16 -2
View File
@@ -96,8 +96,7 @@ div#PS_MRUnRemovedItem
}
.shippingList {
width: 400px;
float: right;
}
.shippingList li {
margin: 5px;
@@ -326,3 +325,18 @@ div#PS_MRPersonalizedFields
}
.clearfix:after {clear: both}
.clearfix {zoom: 1}
.PS_MRGmapBulbe
{
width:405px;
height:66px;
overflow: hidden;
}
.MR_date {width:450px;position:relative;float:right; line-height: 9px;}
.MR_date span.titre {margin-left:50px;font-weight:bold;}
.MR_date span.vacances {margin-left:5px;color:Red; }
.MR_date table {border-spacing:3px;font-size:11pt; border: solid 1px #eee;}
.MR_date tr.p {background-color:#e9e9e9; height:9px;}
.MR_date td.g {font-weight:bold;}
.MR_date td.d {}
modules/socolissimo/ajax.php
+6 -4
View File
@@ -4,14 +4,16 @@ include_once('../../config/config.inc.php');
include_once('../../init.php');
include_once('../../modules/socolissimo/socolissimo.php');
if (!Tools::getValue('ajax'))
die('');
global $cookie;
if (Tools::getValue('token') == sha1('socolissimo'._COOKIE_KEY_.$cookie->id_cart))
die('INVALID TOKEN');
$socolissimo = new Socolissimo();
$result = $socolissimo->getDeliveryInfos(Context::getContext()->cart->id, Context::getContext()->customer->id);
if (!$result)
die('{"result" : false}');
else
die('{"result" : true}');
?>
modules/socolissimo/config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>socolissimo</name>
<displayName><![CDATA[So Colissimo]]></displayName>
<version><![CDATA[2.0]]></version>
<version><![CDATA[2.1]]></version>
<description><![CDATA[Offer your customers, different delivery methods with LaPoste.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[shipping_logistics]]></tab>
modules/socolissimo/redirect.php
+4 -2
View File
@@ -27,13 +27,15 @@
require_once ('../../config/config.inc.php');
$onload_script = 'parent.$.fancybox.close();';
if (Tools::isSubmit('firstcall'))
$onload_script = 'document.getElementById(\'socoForm\').submit();';
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">
<head>
</head>
<body onload="document.getElementById('socoForm').submit();">
<body onload="<?php echo $onload_script; ?>">
<?php
echo '<form id="socoForm" name="form" action="'.Configuration::get('SOCOLISSIMO_URL').'" method="POST">';
foreach($_GET as $key => $val)
modules/socolissimo/socolissimo.php
+42 -9
View File
@@ -57,7 +57,7 @@ class Socolissimo extends CarrierModule
{
$this->name = 'socolissimo';
$this->tab = 'shipping_logistics';
$this->version = '2.0';
$this->version = '2.1';
$this->author = 'PrestaShop';
$this->limited_countries = array('fr');
@@ -109,8 +109,8 @@ class Socolissimo extends CarrierModule
if (!parent::install() OR !Configuration::updateValue('SOCOLISSIMO_ID', NULL) OR !Configuration::updateValue('SOCOLISSIMO_KEY', NULL)
OR !Configuration::updateValue('SOCOLISSIMO_URL', 'https://ws.colissimo.fr/pudo-fo/storeCall.do') OR !Configuration::updateValue('SOCOLISSIMO_PREPARATION_TIME', 1)
OR !Configuration::updateValue('SOCOLISSIMO_OVERCOST', 3.6) OR !$this->registerHook('extraCarrier') OR !$this->registerHook('AdminOrder') OR !$this->registerHook('updateCarrier')
OR !$this->registerHook('newOrder') OR !Configuration::updateValue('SOCOLISSIMO_SUP_URL', 'http://ws.colissimo.fr/supervision-pudo/supervision.jsp')
OR !Configuration::updateValue('SOCOLISSIMO_SUP', true))
OR !$this->registerHook('newOrder') OR !$this->registerHook('paymentTop') OR !Configuration::updateValue('SOCOLISSIMO_SUP_URL', 'http://ws.colissimo.fr/supervision-pudo/supervision.jsp')
OR !Configuration::updateValue('SOCOLISSIMO_SUP', true) OR !Configuration::updateValue('SOCOLISSIMO_USE_FANCYBOX', true))
return false;
@@ -159,7 +159,9 @@ class Socolissimo extends CarrierModule
OR !$this->unregisterHook('AdminOrder')
OR !$this->unregisterHook('newOrder')
OR !$this->unregisterHook('updateCarrier')
OR !$this->unregisterHook('paymentTop')
OR !Configuration::deleteByName('SOCOLISSIMO_ID')
OR !Configuration::deleteByName('SOCOLISSIMO_USE_FANCYBOX')
OR !Configuration::deleteByName('SOCOLISSIMO_KEY')
OR !Configuration::deleteByName('SOCOLISSIMO_URL')
OR !Configuration::deleteByName('SOCOLISSIMO_OVERCOST')
@@ -270,6 +272,15 @@ class Socolissimo extends CarrierModule
<p>' . $this->l('Url of back office SoColissimo.') . '</p>
</div>
<label>'.$this->l('Fancybox').' : </label>
<div class="margin-form">
<input type="radio" name="SOCOLISSIMO_USE_FANCYBOX" id="fancybox_on" value="1" '.(Configuration::get('SOCOLISSIMO_USE_FANCYBOX') ? 'checked="checked" ' : '').'/>
<label class="t" for="fancybox_on"> <img src="../img/admin/enabled.gif" alt="'.$this->l('Enabled').'" title="'.$this->l('Enabled').'" /></label>
<input type="radio" name="SOCOLISSIMO_USE_FANCYBOX" id="fancybox_off" value="0" '.(!Configuration::get('SOCOLISSIMO_USE_FANCYBOX') ? 'checked="checked" ' : '').'/>
<label class="t" for="fancybox_off"> <img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" /></label>
<p>'.$this->l('If you enable this option, the page of socolissimo will displayed in a fancybox').'</p>
</div>
<label>'.$this->l('Supervision').' : </label>
<div class="margin-form">
<input type="radio" name="sup_active" id="active_on" value="1" '.(Configuration::get('SOCOLISSIMO_SUP') ? 'checked="checked" ' : '').'/>
@@ -334,6 +345,7 @@ class Socolissimo extends CarrierModule
AND Configuration::updateValue('SOCOLISSIMO_OVERCOST', (float)(Tools::getValue('overcost')))
AND Configuration::updateValue('SOCOLISSIMO_SUP_URL', Tools::getValue('url_sup'))
AND Configuration::updateValue('SOCOLISSIMO_OVERCOST_TAX', Tools::getValue('id_tax_rules_group'))
AND Configuration::updateValue('SOCOLISSIMO_USE_FANCYBOX', Tools::getValue('SOCOLISSIMO_USE_FANCYBOX'))
AND Configuration::updateValue('SOCOLISSIMO_SUP', (int)(Tools::getValue('sup_active'))))
{
//save old carrier id if change
@@ -378,7 +390,10 @@ class Socolissimo extends CarrierModule
'CETOWN' => substr($this->upper($params['address']->city),0,32),
'DYWEIGHT' => ((float)($params['cart']->getTotalWeight()) * 1000),
'SIGNATURE' => htmlentities($signature,ENT_NOQUOTES, 'UTF-8'),
'TRPARAMPLUS' => (int)($carrierSo->id),
'carrier_id' => (int)($carrierSo->id),
'gift' => '',
'gift_message' => '',
'TRPARAMPLUS' => '',
'DYFORWARDINGCHARGES' => number_format((float)($params['cart']->getOrderShippingCost($carrierSo->id)), 2, ',', ''),
'DYPREPARATIONTIME' => (int)(Configuration::Get('SOCOLISSIMO_PREPARATION_TIME')),
'TRRETURNURLKO' => htmlentities($this->url,ENT_NOQUOTES, 'UTF-8'),
@@ -389,16 +404,25 @@ class Socolissimo extends CarrierModule
$serialsInput .= '&'.$key.'='.$val;
$serialsInput = ltrim($serialsInput, '&');
$row['id_carrier'] = (int)($carrierSo->id);
$this->context->smarty->assign(array('urlSo' => Configuration::get('SOCOLISSIMO_URL').'?trReturnUrlKo='.htmlentities($this->url,ENT_NOQUOTES, 'UTF-8'),'id_carrier' => (int)($row['id_carrier']),
'inputs' => $inputs, 'serialsInput' => $serialsInput, 'finishProcess' => $this->l('To choose SoColissimo, click on a delivery method')));
$this->context->smarty->assign(array(
'select_label' => $this->l('Select delivery mode'),
'edit_label' => $this->l('Edit delivery mode'),
'token' => sha1('socolissimo'._COOKIE_KEY_.$cookie->id_cart),
'urlSo' => Configuration::get('SOCOLISSIMO_URL').'?trReturnUrlKo='.htmlentities($this->url,ENT_NOQUOTES, 'UTF-8'),
'id_carrier' => (int)$row['id_carrier'],
'inputs' => $inputs, 'serialsInput' => $serialsInput, 'finishProcess' => $this->l('To choose SoColissimo, click on a delivery method'),
));
$country = new Country((int)($params['address']->id_country));
$carriers = Carrier::getCarriers($this->context->language->id, true , false,false, NULL, Carrier::ALL_CARRIERS);
$carriers = Carrier::getCarriers($this->context->language->id, true , false, false, null, (defined('ALL_CARRIERS') ? ALL_CARRIERS : Carrier::ALL_CARRIERS));
$ids = array();
foreach($carriers as $carrier)
$ids[] = $carrier['id_carrier'];
if ($this->getDeliveryInfos($this->context->cart->id, $this->context->customer->id))
if ($params['cart']->id_carrier == Configuration::Get('SOCOLISSIMO_CARRIER_ID') && $this->getDeliveryInfos($this->context->cart->id, $this->context->customer->id))
$this->context->smarty->assign('already_select_delivery', true);
else
$this->context->smarty->assign('already_select_delivery', false);
@@ -408,7 +432,10 @@ class Socolissimo extends CarrierModule
AND $this->checkSoCarrierAvailable((int)(Configuration::get('SOCOLISSIMO_CARRIER_ID')))
AND in_array((int)(Configuration::get('SOCOLISSIMO_CARRIER_ID')),$ids))
{
return $this->display(__FILE__, 'socolissimo_carrier.tpl');
if (Configuration::get('PS_ORDER_PROCESS_TYPE') || Configuration::get('SOCOLISSIMO_USE_FANCYBOX'))
return $this->display(__FILE__, 'socolissimo_fancybox.tpl');
else
return $this->display(__FILE__, 'socolissimo_redirect.tpl');
}
else
{
@@ -497,6 +524,12 @@ class Socolissimo extends CarrierModule
}
public function hookpaymentTop($params)
{
if ($params['cart']->id_carrier == Configuration::Get('SOCOLISSIMO_CARRIER_ID') AND !$this->getDeliveryInfos((int)$params['cookie']->id_cart, (int)$params['cookie']->id_customer))
$params['cart']->id_carrier = 0;
}
public function make_key($ceName, $dyPraparationTime, $dyForwardingCharges, $trClientNumber, $orderId)
{
return sha1(Configuration::get('SOCOLISSIMO_ID').$ceName.$dyPraparationTime.$dyForwardingCharges.$trClientNumber.self::formatOrderId($orderId).Configuration::get('SOCOLISSIMO_KEY'));
modules/socolissimo/socolissimo_fancybox.tpl
Executable
+182
View File
@@ -0,0 +1,182 @@
{*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 6735 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="#" class="iframe" style="display:none" id="soLink"></a>
{if isset($opc) && $opc}
<script type="text/javascript">
var opc = true;
</script>
{else}
<script type="text/javascript">
var opc = false;
</script>
{/if}
{if isset($already_select_delivery) && $already_select_delivery}
<script type="text/javascript">
var already_select_delivery = true;
</script>
{else}
<script type="text/javascript">
var already_select_delivery = false;
</script>
{/if}
<script type="text/javascript">
var soInputs = new Object();
{foreach from=$inputs item=input key=name name=myLoop}
soInputs.{$name} = "{$input|strip_tags|addslashes}";
{/foreach}
{literal}
$('#soLink').fancybox({
'width' : 1000,
'height' : 700,
'autoScale' : false,
'centerOnScroll' : true,
'autoDimensions' : false,
'transitionIn' : 'none',
'transitionOut' : 'none',
'hideOnOverlayClick' : false,
'hideOnContentClick' : false,
'showCloseButton' : true,
'showIframeLoading' : true,
'enableEscapeButton' : true,
'type' : 'iframe',
onStart: function () {
$('#soLink').attr('href', 'modules/socolissimo/redirect.php'+serialiseInput(soInputs));
},
onClosed : function() {
$.ajax({
type: 'GET',
url: baseDir+'/modules/socolissimo/ajax.php',
async: false,
cache: false,
dataType : "json",
data: 'token={$token"}',
success: function(jsonData)
{
if (jsonData.result && !opc)
$('#form').submit();
},
error: function(XMLHttpRequest, textStatus, errorThrown)
{
alert('TECHNICAL ERROR\nDetails:\nError thrown: ' + XMLHttpRequest + '\n' + 'Text status: ' + textStatus);
}
});
}
});
$(document).ready(function()
{
var interval;
$('input[name=id_carrier]').change(function() {
so_click();
});
so_click();
});
function so_click()
{
if (opc)
{
if (!already_select_delivery)
interval = setInterval(function()
{
modifyCarrierLine(false);
},10);
else if (!$('#edit_socolissimo').length)
interval = setInterval(function()
{
modifyCarrierLine(true);
},10);
}
else if ($('#id_carrier{/literal}{$id_carrier}{literal}').is(':not(:checked)'))
{
$('[name=processCarrier]').unbind('click').click(function () {
return true;
});
}
else
{
$('[name=processCarrier]').unbind('click').click(function () {
if (acceptCGV())
$("#soLink").trigger("click");
return false;
})
}
}
function modifyCarrierLine(edit)
{
if ($('#button_socolissimo').length != 0)
{
clearInterval(interval);
// delete interval value
interval = null;
}
$('#button_socolissimo').remove();
if (edit && $('input[name=id_carrier]:checked').attr('value') == {/literal}{$id_carrier}{literal})
$('#id_carrier{/literal}{$id_carrier}{literal}').parent().prepend('<a style="margin-left:5px;" class="button" id="button_socolissimo" href="#" onclick="redirect();return;" >{/literal}{$edit_label}{literal}</a>');
else
$('#id_carrier{/literal}{$id_carrier}{literal}').parent().prepend('<a style="margin-left:5px;" class="exclusive" id="button_socolissimo" href="#" onclick="redirect();return;" >{/literal}{$select_label}{literal}</a>');
if (already_select_delivery)
{
$('#id_carrier{/literal}{$id_carrier}{literal}').css('display', 'block');
$('#id_carrier{/literal}{$id_carrier}{literal}').css('margin', 'auto');
$('#id_carrier{/literal}{$id_carrier}{literal}').css('margin-top', '5px');
}
else
$('#id_carrier{/literal}{$id_carrier}{literal}').css('display', 'none');
}
function redirect()
{
document.location.href = '{/literal}{$urlSo}{literal}'+serialiseInput(soInputs);
}
function serialiseInput(inputs)
{
updateGiftData();
soInputs.TRPARAMPLUS = soInputs.carrier_id+'|'+soInputs.gift+'|'+soInputs.gift_message;
str = '?firstcall=1&';
for ( var cle in inputs )
str += cle+'='+inputs[cle]+'&';
return str;
}
function updateGiftData()
{
soInputs.gift = ($('#gift').attr('checked') ? '1' : '0' );
soInputs.gift_message = $('#gift_message').attr('value');
}
{/literal}
</script>
modules/socolissimo/socolissimo_redirect.tpl
Executable
+46
View File
@@ -0,0 +1,46 @@
{*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 6735 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<script type="text/javascript">
{literal}
function change_action_form()
{
if ($('#id_carrier{/literal}{$id_carrier}{literal}').is(':not(:checked)'))
$('#form').attr("action", 'order.php');
else
$('#form').attr("action", '{/literal}{$urlSo}{literal}');
}
$(document).ready(function()
{
$('input[name=id_carrier]').change(function() {
change_action_form();
});
change_action_form();
});
{/literal}
</script>
{foreach from=$inputs item=input key=name name=myLoop}
<input type="hidden" name="{$name|escape:'htmlall':'UTF-8'}" value="{$input|strip_tags|addslashes}"/>
{/foreach}
modules/socolissimo/validation.php
+25 -20
View File
@@ -1,6 +1,6 @@
<?php
/*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -34,8 +34,8 @@ require_once(_PS_MODULE_DIR_ . 'socolissimo/socolissimo.php');
$validReturn = array('PUDOFOID','CECIVILITY','CENAME','CEFIRSTNAME', 'CECOMPANYNAME','CEEMAIL','CEPHONENUMBER', 'DELIVERYMODE','CEADRESS1','CEADRESS2','CEADRESS3','CEADRESS4',
'CEZIPCODE','CEDOORCODE1','CEDOORCODE2','CEENTRYPHONE','DYPREPARATIONTIME','DYFORWARDINGCHARGES','ORDERID', 'SIGNATURE','ERRORCODE','TRPARAMPLUS','TRCLIENTNUMBER','PRID','PRNAME',
'PRCOMPLADRESS','PRADRESS1','PRADRESS2','PRZIPCODE', 'PRTOWN','CETOWN','TRADERCOMPANYNAME', 'CEDELIVERYINFORMATION', 'CEDOORCODE1', 'CEDOORCODE2');
//list of non-blocking error
//list of non-blocking error
$nonBlockingError = array(133, 131, 517, 516, 515, 514, 513, 512, 511, 510, 509, 508, 507, 506, 505, 504, 503, 502, 501);
$so = new Socolissimo();
@@ -44,20 +44,27 @@ $return = array();
foreach ($_POST AS $key => $val)
if (in_array(strtoupper($key),$validReturn))
$return[strtoupper($key)] = utf8_encode(urldecode(stripslashes($val)));
if (isset($return['SIGNATURE']) AND isset($return['CENAME']) AND isset($return['DYPREPARATIONTIME']) AND isset($return['DYFORWARDINGCHARGES']) AND isset($return['TRCLIENTNUMBER']) AND isset($return['ORDERID']) AND isset($return['TRCLIENTNUMBER']))
{
if (!isset($return['ERRORCODE']) OR $return['ERRORCODE'] == NULL OR in_array($return['ERRORCODE'],$nonBlockingError))
{
{
if ($return['SIGNATURE'] === socolissimo::make_key($return['CENAME'],(float)($return['DYPREPARATIONTIME']),$return['DYFORWARDINGCHARGES'],$return['TRCLIENTNUMBER'], $return['ORDERID']))
{
if (Context::getContext()->cart->id)
{
if (saveOrderShippingDetails(Context::getContext()->cart->id,(int)($return['TRCLIENTNUMBER']),$return))
{
Context::getContext()->cart->id_carrier = (int)($_POST['TRPARAMPLUS']);
if (!Context::getContext()->cart->update())
{
$cart = Context::getContext()->cart;
$TRPARAMPLUS = explode('|', Tools::getValue('TRPARAMPLUS'));
$cart->id_carrier = $TRPARAMPLUS[0];
$cart->gift = (int)$TRPARAMPLUS[1];
if ((int)$cart->gift)
if (Validate::isMessage($TRPARAMPLUS[2]))
$cart->gift_message = strip_tags($TRPARAMPLUS[2]);
if (!$cart->update())
Tools::redirect();
else
Tools::redirect('index.php?controller=order&step=3');
@@ -81,7 +88,7 @@ if (isset($return['SIGNATURE']) AND isset($return['CENAME']) AND isset($return['
echo '<div class="alert error"><img src="' . _PS_IMG_ . 'admin/forbbiden.gif" alt="nok" />&nbsp;'.$so->displaySoError('999').': ';
$errors = explode(',', str_replace('+',',', $return['ERRORCODE']));
foreach($errors as $error)
echo $so->displaySoError(rtrim($error));
echo $so->displaySoError(rtrim($error));
echo '<p><br/>
<a href="'.Tools::getProtocol().htmlspecialchars($_SERVER['HTTP_HOST'], ENT_COMPAT, 'UTF-8').__PS_BASE_URI__.'order.php" class="button_small" title="Retour">« Retour
</a></p></div>'; }
@@ -98,15 +105,15 @@ function saveOrderShippingDetails($idCart, $idCustomer, $soParams)
'A2P' => 'Livraison Commerce de proximité', 'MRL' => 'Livraison Commerce de proximité',
'CIT' => 'Livraison en Cityssimo', 'ACP' => 'Agence ColiPoste', 'CDI' => 'Centre de distribution',
'RDV' => 'Livraison sur Rendez-vous');
$db = Db::getInstance();
$db->executeS('SELECT * FROM '._DB_PREFIX_.'socolissimo_delivery_info WHERE id_cart = '.(int)($idCart).' AND id_customer ='.(int)($idCustomer));
$numRows = (int)($db->NumRows());
if ($numRows == 0)
{
{
$sql = 'INSERT INTO '._DB_PREFIX_.'socolissimo_delivery_info
( `id_cart`, `id_customer`, `delivery_mode`, `prid`, `prname`, `prfirstname`, `prcompladress`,
`pradress1`, `pradress2`, `pradress3`, `pradress4`, `przipcode`, `prtown`, `cephonenumber`, `ceemail` , `cecompanyname`, `cedeliveryinformation`, `cedoorcode1`, `cedoorcode2`)
( `id_cart`, `id_customer`, `delivery_mode`, `prid`, `prname`, `prfirstname`, `prcompladress`,
`pradress1`, `pradress2`, `pradress3`, `pradress4`, `przipcode`, `prtown`, `cephonenumber`, `ceemail` , `cecompanyname`, `cedeliveryinformation`, `cedoorcode1`, `cedoorcode2`)
VALUES ('.(int)($idCart).','.(int)($idCustomer).',';
if ($soParams['DELIVERYMODE'] != 'DOM' AND $soParams['DELIVERYMODE'] != 'RDV')
$sql .= '\''.pSQL($soParams['DELIVERYMODE']).'\''.',
@@ -144,11 +151,11 @@ function saveOrderShippingDetails($idCart, $idCustomer, $soParams)
'.(isset($soParams['CEDOORCODE1']) ? '\''.pSQL($soParams['CEDOORCODE1']).'\'' : '\'\'').',
'.(isset($soParams['CEDOORCODE2']) ? '\''.pSQL($soParams['CEDOORCODE2']).'\'' : '\'\'').')';
if (Db::getInstance()->execute($sql))
if (Db::getInstance()->execute($sql))
return true;
}
else
{
{
$table = _DB_PREFIX_.'socolissimo_delivery_info';
$values = array();
$values['delivery_mode'] = pSQL($soParams['DELIVERYMODE']);
@@ -174,6 +181,7 @@ function saveOrderShippingDetails($idCart, $idCustomer, $soParams)
}
else
{
(isset($soParams['PRID']) ? $values['prid'] = pSQL($soParams['PRID']) : $values['prid'] = '');
(isset($soParams['CENAME']) ? $values['prname'] = ucfirst(pSQL($soParams['CENAME'])) : '');
(isset($soParams['CEFIRSTNAME']) ? $values['prfirstname'] = ucfirst(pSQL($soParams['CEFIRSTNAME'])) : '');
(isset($soParams['CECOMPLADRESS']) ? $values['prcompladress'] = pSQL($soParams['CECOMPLADRESS']) : '');
@@ -191,11 +199,8 @@ function saveOrderShippingDetails($idCart, $idCustomer, $soParams)
(isset($soParams['CECOMPANYNAME']) ? $values['cecompanyname'] = pSQL($soParams['CECOMPANYNAME']) : '');
}
$where = ' `id_cart` =\''.(int)($idCart).'\' AND `id_customer` =\''.(int)($idCustomer).'\'';
if (Db::getInstance()->autoExecute($table, $values, 'UPDATE', $where))
return true;
}
}
modules/upscarrier/carrier.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

modules/uspscarrier/fr.php
+36 -35
View File
@@ -2,20 +2,21 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{uspscarrier}prestashop>uspscarrier_ec6bd501021318b872a9eddd897a9cc2'] = 'Calcul des frais U.S.P.S';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_098087ab799def1028233142cafeeafd'] = 'Propose à vos clients le transporteur USPS (US Postal)';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_d7897df448ce113a0205078a9255f7b7'] = 'Transporteur USPS';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_660e7e160b8b390f9d36f6886cbeaa9d'] = 'Calculer les frais de transport pour USPS (United States Postal Service)';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_883fa0069f4b0454e2277dd567ab3991'] = '\'Unité de poids (LB ou KG)\'';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_5a3ceec65d417f5d92c26dbf0dccc00d'] = '\'Unité de mesure (CM ou IN)\'';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_4d470fde8487e755a50e9235e3dc13ab'] = 'doit être configuré pour fonctionner correctement';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_d2d22fe4f85d971b090bcbacec8f0123'] = 'USPS User ID';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_813c2f71e65f4cd51a9c529ee2dd7efe'] = 'Zip code';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_20449d3f0b6c6b9265a5cd2a470a6451'] = 'Poids du colis';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_bfc00de34bc04366e7fee516adf7dca5'] = 'Frais supplémentaire';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_761c02f2b956cac5abe5539c6d908508'] = 'La taille des paquets USPS';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_ca9df8a12e7558c34bcf7b88aab5cba5'] = 'Le type de paquet USPS';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_f347d2e6d32688d9174b7aa1fc0124b1'] = 'Cela peut il être traité par une machine';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_abca8ad9739957246c02470f31f040e0'] = 'Mode de calcul';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_d2203cb1237cb6460cbad94564e39345'] = 'Regular';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_3a69b34ce86dacb205936a8094f6c743'] = 'Large';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_5c5f284bdf0e24e2b65a151660b4aa95'] = 'Oversize';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_47c14840d8e15331fa420b9b2f757cd9'] = 'Variable';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_8c2647c84442d515b68c6fdba7d4fb25'] = 'Flat rate box';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_d3d3b81729b689260abfd1b21de630ea'] = 'MD flat rate box';
@@ -28,12 +29,12 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_f8320b26d30ab433c5a54546d21f414c'
$_MODULE['<{uspscarrier}prestashop>uspscarrier_f827cf462f62848df37c5e1e94a4da74'] = 'True';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_386aad80d82f8245e9ef80352a2240e8'] = 'Tous les articles en un seul paquet';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_f35eb2a913a3fd6fd8e661012cf0ebd8'] = 'Découper un article par paquet';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_5947e2ae63c0a33524cf81c44a1db580'] = 'Transporteur USPS';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_3a3a3ea18546ae6529e6e439a97b040a'] = 'Calculateur de frais de port USPS';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_f57cff5425b6e64843c5f066c5b310d0'] = 'Statut du module USPS';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_09bdd414ce843927aa3dceadc8bce034'] = 'Le transporteur USPS est fonctionnel !';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_ec8b84c83dfee20afa4c2f35245a254b'] = 'Le transporteur USPS n\'est pas encore complètement configuré, vous devez :';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_3e203b9a16f360b88d90bba6eb61ce61'] = 'Remplir le formulaire \"Configuration Générale\"';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_8c0987b9315003df7dae7f130e3cf58e'] = 'Choississez vos services de livraison';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_2923c2caf8d0b17f409e66e798ea94cf'] = 'Le module USPS est configuré et activé :';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_82d36b7a513a66cfdcede4d0b56ba36e'] = 'Le module USPS n\'est pas configuré, vous devez :';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_15507d23c7b911b14ebd95a9a0e12560'] = 'Remplir le champs User ID et zip code d\'origine sur le formulaire \"Configuration Générale\"';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_5ea70d7b669a7e15e6d402bd423aa56e'] = 'Selectionnez vos services de livraison';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_e20f6d6f13fe70e78f6e2ab488493ccf'] = 'Test de connection webservices';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_d5377c8cc8c83b501472660c69f694e8'] = 'cURL extension n\'est pas activée, le module USPS peut fonctionner sans cURL mais il serait préférable de l\'activer.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_52f4393e1b52ba63e27310ca92ba098c'] = 'Configuration générale';
@@ -43,6 +44,18 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_6a26f548831e6a8c26bfbbd9f6ec61e0'
$_MODULE['<{uspscarrier}prestashop>uspscarrier_d2126da975d5b9a5b846efaf57d3fd53'] = 'Configuration générale';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_b150f21f4d216c6c275de3d69dffac68'] = 'Votre Identifiant USPS';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_ebbbab87d3a60b18f370b76f59dab31e'] = 'Cliquez ici pour obtenir votre USPS API Key';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_87b78c2dbb5786947e830f13097aece5'] = 'Zip code d\'origine';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_4412f0268c3b3690de46390018a96d1f'] = 'Services de livraison';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_25365926cec8ff5e8fbf1e518505c3e7'] = 'Commercial';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_b9c1e1209dbba5bb9b802c765d27e8a1'] = 'Regulier';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_78945de8de090e90045d299651a68a9b'] = 'Disponible';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_2d25c72c1b18e562f6654fff8e11711e'] = 'Non disponible';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_04ff9e6bb8238bad1936e3bdf84e8f23'] = 'Choisissez les services de livraison que vous voulez disponible pour vos clients.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_a691732939e7e7ef90cfe0d6e738f3e9'] = 'Pour First-Class, Priority et Express Mail, vous avez la possibilité soit de mettre les taux \"COMMERCIAL RATE\" ou \"REGULAR RATE\".';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_e3cc25ccb469ec7047d9e7c4c13f4e46'] = '- Si vous payez pour l\'affranchissement en ligne ou avec une machine à affranchir, alors choisissez \"COMMERCIAL RATE\".';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_b3e6424dbec51d0cbf5c272eca58e275'] = '- Si vous payez l\'affranchissement au bureau de poste, alors choisissez \"Regular Rate\".';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_55219991df83d7a6e4a0ed60c1a11e40'] = '- Choisissiez soit les taux \"COMMERCIAL RATE\" soit les taux \"REGULAR RATE\". Ne choississez pas les deux';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_319c2c41aa9f6b4d5b70b56651abe6e9'] = 'Pour Parcel Post, Media Mail, et Library Mail ils ne s\'afficheront qu\'en \"REGULAR RATE\" seulement si les prix ne sont différents.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_db06a2900c66a3a2cb78fe3a470f1b85'] = 'Poids du colis';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_0274f749472f365e7d48a501e14793e6'] = 'Frais supplémentaire';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_83ad4fdaf06650e6d9d7ca18f82fb975'] = 'Configuration de localisation';
@@ -50,39 +63,22 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_f489118ea95c746d648d36bb50c226f0'
$_MODULE['<{uspscarrier}prestashop>uspscarrier_659c95668841b7d6602ead454b28d4ba'] = 'L\'unité de poids de votre magasin (ex: kg ou lbs)';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_cc13d156306185fd42a860da3049567c'] = 'Unité de mesure';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_f804c2bdebc117d9cde3cddad3b49845'] = 'L\'unité de mesure de votre magasin (ex: cm ou in)';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_2481447d04ae756836d32e3ade240ff4'] = 'Configuration de l\'adresse';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_e1e854ea29e53169a1301076441805db'] = 'Votre adresse (ligne 1)';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_846a54955f32846032981f8fe48c35ff'] = 'Votre adresse (ligne 2)';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_d30f507473129e70c4b962ceccf175cf'] = 'Code postal';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_57d056ed0984166336b7879c2af3657f'] = 'Votre ville';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_59716c97497eb9694541f7c3d37b1a4d'] = 'Pays';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_f8f5a972333ee726fbe5bb52409c0ed0'] = 'Choisissez un pays ...';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_4e9863cf5326e6714388045321665d07'] = 'Choisissez votre pays dans la liste.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_46a2a41cc6e552044816a2d04634545d'] = 'Etat';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_cf1580798f7aba85d519afadf1ffd886'] = 'Choisissez un état ...';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_02546d525ab356bd43c91e6b07447496'] = 'Il n\'y a pas d\'état pour ce pays';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_0ddc2a5660f7d095fff34d6b93077c80'] = 'Configuration du service';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_aa9265dfaf7bc267a6e606335d942883'] = 'Taille des paquets';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_52c46f87566159d11390162e99ed9f68'] = 'Choisissez une taille de paquet';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_2afc962933ab94b832df8bfaa34ef05b'] = 'Choisissez la taille des paquets par défaut';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_da42caf26ef85de3d7e48e16ca60b891'] = 'Type de paquet';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_8d2ee0603dfce09b57d60db628cde269'] = 'Choisissez un type de paquet...';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_795de10b1bdcb843b3703c63ad577fc6'] = 'Choisissez le type de paquet par défaut';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_93c8645dbbc33cf8d126266a827a5501'] = 'Machinable';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_67cd0f5256c40c16a6cfd6effe3ab06b'] = 'Choisissez si cela peut être traité par une machine ou non par défaut';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_f297d2cb126758a96ae196f1865f74ec'] = 'Mode de calcul';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_fc805e1616e45e041e8bef86a9e3180d'] = 'Utiliser le mode de calcul \"Tous les éléments dans un seul paquet\" utilisera automatiquement la taille des emballages par défaut, le type d\'emballage et de livraison. Les configurations spécifiques pour les catégories ou de produit ne seront pas utilisés.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_5cdd307ba6e260beb4801c0c10e22a3a'] = 'Service de livraison';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_78945de8de090e90045d299651a68a9b'] = 'Disponible';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_2d25c72c1b18e562f6654fff8e11711e'] = 'Non disponible';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_bafff0b69daa3ece3cf792eba6c3ef98'] = 'Choisissez les services de livraison qui seront activés par défaut pour vos clients.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_b9947222399c6199839bb327a6f59d2b'] = 'Votre identifiant USPS n\'est pas spécifié';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_805353d2862ea0e658c9ddda871540fa'] = 'Votre code postal n\'est pas spécifié.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_ef9bd955e165dfb0207877e9fe180aeb'] = 'Votre ville n\'est pas spécifiée';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_5ecc7697a320f93f3ee8fb4048dbd64c'] = 'Votre pays n\'est pas spécifié.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_98045fb188a9c6076e839672a7f94485'] = 'La taille des paquets n\'est pas spécifié';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_e794e452ed4d2cfa13083693a2c8810e'] = 'Le type de paquet n\'est pas spécifié';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_b25a0f3caa6e0047ede272a6e91dac29'] = 'Le champs machinable n\'est pas spécifié';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_6a88783cc26a04f204c844a555af04f9'] = 'Mode de calcul';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_68c2e29510ba1fade36948082c1a460d'] = 'Utilisation du mode de calcul \"Tous les produits dans un seul colis\" utilisera automatiquement la taille de colis, le type de colis et les services de livraison par défaut. Les configurations spécifiques pour les catégories ou les produits ne seront pas pris en compte.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_dd3635ee8f6dbca808391e9e2115114f'] = 'Votre USPS User ID n\'est pas spécifié';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_0304084f81483b19b6ef76799d0dcc98'] = 'Le Zip Code d\'origine n\'est pas spécifié';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_1416b880efa6a1706ec5a3a2e354b38b'] = 'Le Zip Code d\'origine n\'est pas valide';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_89849083c326e9e338193a29b398c8d6'] = 'Le poids du colis doit être \"égal à\" ou \"supérieur à\" 0';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_0a4c0dd36c1c6d407a696ba431661cb4'] = 'Les frais additionnels doivent être \"égal à\" ou \"supérieur à\" 0';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_b0e371d9aaf4dd29dcdf94c8f04a73f8'] = 'Vous devez choisir au moins un service de livraison';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_2c73878daaa3c04dfa31722352c48620'] = 'Vous devez utiliser soit \"COMMERCIAL RATE\" soit \"REGULAR RATE\" pour chaque type de service. Vous ne pouvez pas choisir les deux.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_f858ebce2deafd485f17522ca80bca2b'] = 'Prestashop n\'a pas pu se connecter aux webservices d\'USPS';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_9d1b485edd50e6fbd288b340b386b07d'] = 'Aucune description d\'erreur';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_c888438d14855d7d96a2724ee9c306bd'] = 'Configuration mise à jour';
@@ -100,7 +96,11 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_5406dcacf84176fecac51364e10dcdcf'
$_MODULE['<{uspscarrier}prestashop>uspscarrier_5dd4dce839d0bddf557af415308a9224'] = 'Êtes vous sûr de vouloir effacer cette configuration USPS pour cette catégorie ?';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_3e0cb9fd22b124c0839302fef54762d7'] = 'Mettre à jour une règle';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_dd593f8a542ab628cbba98c709255e60'] = 'Ajouter une règle';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_8d2ee0603dfce09b57d60db628cde269'] = 'Choisissez un type de paquet...';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_52c46f87566159d11390162e99ed9f68'] = 'Choisissez une taille de paquet';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_56ee8a6c40098a28b2e4859d7f36bfc2'] = 'Choississez l\'option';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_5cdd307ba6e260beb4801c0c10e22a3a'] = 'Service de livraison';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_bafff0b69daa3ece3cf792eba6c3ef98'] = 'Choisissez les services de livraison qui seront activés par défaut pour vos clients.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_7fcafa7c47e984693fcb8a92c0fd1beb'] = 'Choississez une catégorie';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_d725c0166e978cc30853996c70440873'] = 'Vous devez choisir une catégorie.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_1ef6b71d233ca3c4d73ec49f18cce6ae'] = 'Cette catégorie a déjà une configuration USPS.';
@@ -116,7 +116,8 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_e41495cddec502278844d90501b8f688'
$_MODULE['<{uspscarrier}prestashop>uspscarrier_04f65a638b5713539804e1f851f11f6f'] = 'Cette section vous aidera à comprendre comment configurer correctement ce module.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_ec0e6948e8f34818d80f27c309f46661'] = 'Ci-dessous les descriptions de chaque champs :';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_2d6a1f95c12c41a1937520809bb3e0b0'] = 'Vous devez vous inscrire sur le site d\'USPS à cette adresse';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_6eef8fc653ad4369da95861ad29ac3ef'] = 'Ce champs doit être le code postal du point de départ de vos colis.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_997eaba18a174723bb35c745d3bcba04'] = 'Ce champ identifie le code postal de votre point de départ des colis.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_59716c97497eb9694541f7c3d37b1a4d'] = 'Pays';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_b79cacaef47c6e646f6afaf139b2863a'] = 'Ce champs doit être le pays du point de départ de vos colis.';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_1d3fce5a25604726c1b3c726f9938858'] = 'Ce champs correspond au type de colis par défaut (lorsqu\'il n\'y a pas de configuration spécifique pour le produit ou pour la catégorie du produit).';
$_MODULE['<{uspscarrier}prestashop>uspscarrier_3223a2c4e378eb07a8e0d21f914389a2'] = 'Ces cases à cocher correspondent aux services de livraisons que vous souhaitez proposer à vos clients (lorsqu\'il n\'y a pas de configuration spécifique pour le produit ou pour la catégorie du produit).';