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

[-] BO : #PSTEST-1105 : fix bug mail virtual product

Browse Source
This commit is contained in:
lLefevre
2012-04-04 13:55:35 +00:00
parent 9947572e67
commit 9ff8d71b02
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/PaymentModule.php
+7 -1
View File
@@ -254,6 +254,7 @@ abstract class PaymentModuleCore extends Module
// Construct order detail table for the email // Construct order detail table for the email
$products_list = ''; $products_list = '';
$virtual_product = true;
$products = $cart->getProducts(); $products = $cart->getProducts();
foreach ($products as $key => $product) foreach ($products as $key => $product)
{ {
@@ -298,6 +299,11 @@ abstract class PaymentModuleCore extends Module
<td style="padding: 0.6em 0.4em; text-align: center;">'.((int)$product['cart_quantity'] - $customization_quantity).'</td> <td style="padding: 0.6em 0.4em; text-align: center;">'.((int)$product['cart_quantity'] - $customization_quantity).'</td>
<td style="padding: 0.6em 0.4em; text-align: right;">'.Tools::displayPrice(((int)$product['cart_quantity'] - $customization_quantity) * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? $price : $price_wt), $currency, false).'</td> <td style="padding: 0.6em 0.4em; text-align: right;">'.Tools::displayPrice(((int)$product['cart_quantity'] - $customization_quantity) * (Product::getTaxCalculationMethod() == PS_TAX_EXC ? $price : $price_wt), $currency, false).'</td>
</tr>'; </tr>';
// Check if is not a virutal product for the displaying of shipping
if (!$product['is_virtual'])
$virtual_product &= false;
} // end foreach ($products) } // end foreach ($products)
$cart_rules_list = ''; $cart_rules_list = '';
@@ -509,7 +515,7 @@ abstract class PaymentModuleCore extends Module
'{invoice_other}' => $invoice->other, '{invoice_other}' => $invoice->other,
'{order_name}' => sprintf('#%06d', (int)$order->id), '{order_name}' => sprintf('#%06d', (int)$order->id),
'{date}' => Tools::displayDate(date('Y-m-d H:i:s'), (int)$order->id_lang, 1), '{date}' => Tools::displayDate(date('Y-m-d H:i:s'), (int)$order->id_lang, 1),
'{carrier}' => $carrier->name, '{carrier}' => $virtual_product ? $this->l('No carrier') : $carrier->name,
'{payment}' => Tools::substr($order->payment, 0, 32), '{payment}' => Tools::substr($order->payment, 0, 32),
'{products}' => $products_list, '{products}' => $products_list,
'{discounts}' => $cart_rules_list, '{discounts}' => $cart_rules_list,