On rajoute les derniers modules et on modifie les CSS

This commit is contained in:
2020-10-20 16:45:41 +02:00
parent 25cb197711
commit bd1927da6f
334 changed files with 39634 additions and 1825 deletions

View File

@@ -88,6 +88,7 @@
row.find('td.colissimo-delivery-addr').html(data.html_address);
row.find('td.colissimo-service').html(data.html_service);
row.find('td.colissimo-insurance').html(data.html_insurance);
row.find('td.colissimo-ta').html(data.html_ftd);
if (data.order.relais) {
row.find('td.colissimo-d150 input[type="checkbox"]').prop('disabled', true);
} else {

View File

@@ -0,0 +1,29 @@
{*
* 2007-2020 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-2020 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<input {if !$order.ftd}disabled="disabled"{/if}
type="checkbox"
name="colissimo_ta_{$key|intval}"
/>

View File

@@ -89,7 +89,7 @@
{include file="../_partials/td-affranchissement-insurance.tpl"}
</td>
<td class="text-center colissimo-ta">
<input {if !$order.ftd}disabled="disabled"{/if} type="checkbox" name="colissimo_ta_{$key|intval}"/>
{include file="../_partials/td-affranchissement-ftd.tpl"}
</td>
<td class="text-center colissimo-d150">
<input {if $order.relais}disabled="disabled"{/if} type="checkbox" name="colissimo_d150_{$key|intval}"/>

View File

@@ -404,22 +404,14 @@
<span>{l s='Country' mod='colissimo'}</span>
</label>
<div class="col-lg-9">
<select name="sender_country" class="chosen fixed-width-lg" style="display: none;">
<select id="colissimo-country" name="sender_country" class="cls-chosen fixed-width-xl" style="display: none;">
{foreach from=$address_countries key=iso item=name}
<option value="{$iso|escape:'html':'UTF-8'}"
{if $form_data['sender_country'] == $iso }selected{/if}>
{$name|escape:'html':'UTF-8'}
</option>
<option value="{$iso|escape:'html':'UTF-8'}"
{if $form_data['sender_country'] == $iso }selected{/if}>
{$name|escape:'html':'UTF-8'}
</option>
{/foreach}
</select>
<div class="chosen-container chosen-container-single chosen-container-single-nosearch"
style="width: 250px;"
title="">
</div>
</div>
<div class="col-lg-9 col-lg-offset-3"></div>
</div>
@@ -576,7 +568,6 @@
id="return-address2"
name="return_address2"
class="input fixed-width-xxl"
required="required"
value="{$form_data['return_address2']|escape:'htmlall':'UTF-8'}"
data-maxchar="35"
maxlength="35">
@@ -596,7 +587,6 @@
id="return-address3"
name="return_address3"
class="input fixed-width-xxl"
required="required"
value="{$form_data['return_address3']|escape:'htmlall':'UTF-8'}"
data-maxchar="35"
maxlength="35">
@@ -616,7 +606,6 @@
id="return-address4"
name="return_address4"
class="input fixed-width-xxl"
required="required"
value="{$form_data['return_address4']|escape:'htmlall':'UTF-8'}"
data-maxchar="35"
maxlength="35">
@@ -664,7 +653,7 @@
<span>{l s='Country' mod='colissimo'}</span>
</label>
<div class="col-lg-9">
<select name="return_country" class="chosen fixed-width-lg" style="display: none;">
<select name="return_country" class="cls-chosen fixed-width-lg" style="display: none;">
{foreach from=$address_countries key=iso item=name}
<option value="{$iso|escape:'html':'UTF-8'}"
{if $form_data['return_country'] == $iso }selected{/if}>
@@ -672,20 +661,6 @@
</option>
{/foreach}
</select>
<div class="chosen-container chosen-container-single chosen-container-single-nosearch"
style="width: 100%;"
title="">
<a class="chosen-single" tabindex="-1">
<span>France</span>
<div><b></b></div>
</a>
<div class="chosen-drop">
<div class="chosen-search">
<input type="text" autocomplete="off" readonly="">
</div>
<ul class="chosen-results"></ul>
</div>
</div>
</div>
<div class="col-lg-9 col-lg-offset-3"></div>
</div>
@@ -729,7 +704,7 @@
</div>
</div>
<div class="panel-footer">
<button type="submit" class="btn btn-default pull-right" name="submitColissimoreturnAddressConfigForm">
<button type="submit" class="btn btn-default pull-right" name="submitColissimoReturnAddressConfigForm">
<i class="process-icon-save"></i> {l s='Save' mod='colissimo'}
</button>
</div>
@@ -757,5 +732,9 @@
testWSCredentials(colissimoCheckCredentials);
});
});
$('select.cls-chosen').each(function(k, item){
$(item).chosen({disable_search_threshold: 5, search_contains: true, width: '200px', });
});
</script>
{/literal}