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

// merge trunk r10863

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10935 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2011-12-05 16:09:08 +00:00
parent 4831413af0
commit fc865e4986
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/orders/_customized_data.tpl
+2 -2
View File
@@ -87,7 +87,7 @@
<input type="hidden" name="totalQty" id="totalQty" value="{$customization['quantity']}" /> <input type="hidden" name="totalQty" id="totalQty" value="{$customization['quantity']}" />
<input type="hidden" name="productName" id="productName" value="{$product['product_name']}" /> <input type="hidden" name="productName" id="productName" value="{$product['product_name']}" />
{if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) && (int)(($customization['quantity_returned']) < (int)($customization['quantity'])))} {if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) && (int)(($customization['quantity_returned']) < (int)($customization['quantity'])))}
<input type="checkbox" name="id_customization[{$customizationId}]" id="id_customization[{$customizationId}]" value="{$product['id_order_detail']}" onchange="setCancelQuantity(this, '{$customizationId}', '{$customization['quantity']}')" '.{if (($customization['quantity_returned'] + $customization['quantity_refunded']) >= $customization['quantity'])}disabled="disabled"{/if} /> <input type="checkbox" name="id_customization[{$customizationId}]" id="id_customization[{$customizationId}]" value="{$product['id_order_detail']}" onchange="setCancelQuantity(this, '{$customizationId}', '{$customization['quantity'] - $customization['quantity_refunded']}')" '.{if (($customization['quantity_returned'] + $customization['quantity_refunded']) >= $customization['quantity'])}disabled="disabled"{/if} />
{else} {else}
-- --
{/if} {/if}
@@ -106,4 +106,4 @@
</td> </td>
</tr> </tr>
{/foreach} {/foreach}
{/if} {/if}
classes/Customization.php
+2 -2
View File
@@ -81,8 +81,8 @@ class CustomizationCore
$in_values = ''; $in_values = '';
foreach($ids_customizations as $key => $id_customization) foreach($ids_customizations as $key => $id_customization)
{ {
if ($key > 0) $in_values += ','; if ($key > 0) $in_values .= ',';
$in_values += (int)($id_customization); $in_values .= (int)($id_customization);
} }
if (!empty($in_values)) if (!empty($in_values))