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

// Fixing bugs in admin cart

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11343 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-12-19 09:51:59 +00:00
parent b432570f9d
commit 9688e7741f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/carts/view.tpl
+3 -3
View File
@@ -87,7 +87,7 @@
</a> </a>
</td> </td>
<td align="center">{displayWtPriceWithCurrency price=$product.price_wt currency=$currency}</td> <td align="center">{displayWtPriceWithCurrency price=$product.price_wt currency=$currency}</td>
<td align="center" class="productQuantity">{$product.customizationQuantityTotal}</td> <td align="center" class="productQuantity">{$product.customization_quantity}</td>
<td align="center" class="productQuantity">{$product.qty_in_stock}</td> <td align="center" class="productQuantity">{$product.qty_in_stock}</td>
<td align="right">{displayWtPriceWithCurrency price=$product.total_customization_wt currency=$currency}</td> <td align="right">{displayWtPriceWithCurrency price=$product.total_customization_wt currency=$currency}</td>
</tr> </tr>
@@ -121,7 +121,7 @@
{/foreach} {/foreach}
{/if} {/if}
{if $product.cart_quantity > $product.customizationQuantityTotal} {if $product.cart_quantity > $product.customization_quantity}
<tr> <tr>
<td align="center">{$product.image}</td> <td align="center">{$product.image}</td>
<td> <td>
@@ -132,7 +132,7 @@
</a> </a>
</td> </td>
<td align="center">{displayWtPriceWithCurrency price=$product.product_price currency=$currency}</td> <td align="center">{displayWtPriceWithCurrency price=$product.product_price currency=$currency}</td>
<td align="center" class="productQuantity">{math equation='x - y' x=$product.cart_quantity y=$product.customizationQuantityTotal}</td> <td align="center" class="productQuantity">{math equation='x - y' x=$product.cart_quantity y=$product.customization_quantity}</td>
<td align="center" class="productQuantity">{$product.qty_in_stock}</td> <td align="center" class="productQuantity">{$product.qty_in_stock}</td>
<td align="right">{displayWtPriceWithCurrency price=$product.product_total currency=$currency}</td> <td align="right">{displayWtPriceWithCurrency price=$product.product_total currency=$currency}</td>
</tr> </tr>
classes/Cart.php
+2
View File
@@ -427,6 +427,8 @@ class CartCore extends ObjectModel
$sql->select('cu.`id_customization`, cu.`quantity` AS customization_quantity'); $sql->select('cu.`id_customization`, cu.`quantity` AS customization_quantity');
$sql->leftJoin('customization cu ON p.`id_product` = cu.`id_product`'); $sql->leftJoin('customization cu ON p.`id_product` = cu.`id_product`');
} }
else
$sql->select('0 AS customization_quantity');
if (Combination::isFeatureActive()) if (Combination::isFeatureActive())
{ {