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

[-] BO : fixed bug #PSCSX-25 - carrier wizard summary design and missing infos

Browse Source
This commit is contained in:
Vincent Augagneur
2013-11-20 15:20:44 +01:00
parent e2aa776a64
commit 8148d5696d
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
+19 -17
View File
@@ -37,24 +37,26 @@
<div class="defaultForm"> <div class="defaultForm">
<div class="panel"> <div class="panel">
{l s='Carrier name:'} <strong id="summary_name"></strong> <div class="panel-heading">{l s='Carrier name:'} <strong id="summary_name"></strong></div>
<div id="summary_meta_informations"></div> <div class="panel-body">
<div id="summary_shipping_cost"></div> <p id="summary_meta_informations"></p>
<div id="summary_range"></div> <p id="summary_shipping_cost"></p>
<div> <p id="summary_range"></p>
<div>
{l s='This carrier will be proposed for those delivery zones:'} {l s='This carrier will be proposed for those delivery zones:'}
<ul id="summary_zones"></ul> <ul id="summary_zones"></ul>
</div>
<div>
{l s='And it will be proposed for those client groups:'}
<ul id="summary_groups"></ul>
</div>
{if $is_multishop}
<div>
{l s='Finally, this carrier will be proposed in those shops:'}
<ul id="summary_shops"></ul>
</div>
{/if}
</div> </div>
<div>
{l s='And it will be proposed for those client groups:'}
<ul id="summary_groups"></ul>
</div>
{if $is_multishop}
<div>
{l s='Finally, this carrier will be proposed in those shops:'}
<ul id="summary_shops"></ul>
</div>
{/if}
{$active_form}
</div> </div>
{$active_form}
</div> </div>
js/admin_carrier_wizard.js
+2 -2
View File
@@ -175,14 +175,14 @@ function displaySummary()
$('#summary_zones').html(''); $('#summary_zones').html('');
$('.input_zone').each(function(){ $('.input_zone').each(function(){
if ($(this).attr('checked')) if ($(this).attr('checked'))
$('#summary_zones').html($('#summary_zones').html() + '<li><strong>' + $(this).closest().prev().text() + '</strong></li>'); $('#summary_zones').html($('#summary_zones').html() + '<li><strong>' + $(this).closest('tr').find('label').text() + '</strong></li>');
}); });
// Group restrictions // Group restrictions
$('#summary_groups').html(''); $('#summary_groups').html('');
$('input[name$="groupBox[]"]').each(function(){ $('input[name$="groupBox[]"]').each(function(){
if ($(this).attr('checked')) if ($(this).attr('checked'))
$('#summary_groups').html($('#summary_groups').html() + '<li><strong>' + $(this).closest().next().next().text() + '</strong></li>'); $('#summary_groups').html($('#summary_groups').html() + '<li><strong>' + $(this).closest('tr').find('td:eq(2)').text() + '</strong></li>');
}); });
// shop restrictions // shop restrictions