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

// Fix PSCFV-3894

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17272 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-09-10 17:18:23 +00:00
parent 37a2bc6ebf
commit d9de1869da
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/form.tpl
+4 -1
View File
@@ -553,7 +553,10 @@
if(res.found) if(res.found)
{ {
$('#products_err').hide(); if (!customization_errors)
$('#products_err').hide();
else
customization_errors = false;
$('#products_found').show(); $('#products_found').show();
products_found += '<label>{l s='Product:'}</label><select id="id_product" onclick="display_product_attributes();display_product_customizations();">'; products_found += '<label>{l s='Product:'}</label><select id="id_product" onclick="display_product_attributes();display_product_customizations();">';
attributes_html += '<label>{l s='Combination:'}</label>'; attributes_html += '<label>{l s='Combination:'}</label>';
admin-dev/themes/default/template/controllers/orders/form_customization_feedback.tpl
+10 -11
View File
@@ -33,20 +33,19 @@
</head> </head>
<body> <body>
<script type="text/javascript"> <script type="text/javascript">
{if $customization_errors|count} {if $customization_errors}
customization_errors = true; parent.customization_errors = true;
var id_selected_product = parent.$('#id_product option:selected').val();
if (parent.searchProducts())
{
parent.$('#products_err', window.parent.document).html('{$customization_errors}');
parent.$('#id_product option[value="'+id_selected_product+'"]').attr('selected', true);
parent.$('#id_product').change();
}
{else} {else}
parent.customization_errors = false;
parent.$('#products_err', window.parent.document).hide(); parent.$('#products_err', window.parent.document).hide();
customization_errors = false;
{/if} {/if}
var id_selected_product = parent.$('#id_product option:selected').val();
if (parent.searchProducts())
{
parent.$('#products_err', window.parent.document).html('{$customization_errors}');
parent.$('#id_product option[value="'+id_selected_product+'"]').attr('selected', true);
parent.$('#id_product').change();
}
</script> </script>
</body> </body>
</html> </html>