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

[*] CO : Order amount informations (tax_excl & tax_incl)

Browse Source
This commit is contained in:
fBrignoli committed 2011-11-07 10:16:12 +00:00
1 parent c30ce93ac0
commit bffacb4fa9
2 files changed
+20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/PaymentModule.php
+12
View File
@@ -146,13 +146,25 @@ abstract class PaymentModuleCore extends Module
$order->total_paid_real = $amountPaid; $order->total_paid_real = $amountPaid;
$order->total_products = (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS); $order->total_products = (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS);
$order->total_products_wt = (float)$cart->getOrderTotal(true, Cart::ONLY_PRODUCTS); $order->total_products_wt = (float)$cart->getOrderTotal(true, Cart::ONLY_PRODUCTS);
$order->total_discounts = (float)abs($cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS)); $order->total_discounts = (float)abs($cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS));
$order->total_discounts_tax_excl = (float)abs($cart->getOrderTotal(false, Cart::ONLY_DISCOUNTS));
$order->total_discounts_tax_incl = (float)abs($cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS));
$order->total_shipping = (float)$cart->getOrderShippingCost(); $order->total_shipping = (float)$cart->getOrderShippingCost();
$order->total_shipping_tax_excl = (float)$cart->getOrderShippingCost(NULL, false);
$order->total_shipping_tax_incl = (float)$cart->getOrderShippingCost();
if (Validate::isLoadedObject($carrier)) if (Validate::isLoadedObject($carrier))
$order->carrier_tax_rate = $carrier->getTaxesRate(new Address($cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')})); $order->carrier_tax_rate = $carrier->getTaxesRate(new Address($cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')}));
$order->total_wrapping = (float)abs($cart->getOrderTotal(true, Cart::ONLY_WRAPPING)); $order->total_wrapping = (float)abs($cart->getOrderTotal(true, Cart::ONLY_WRAPPING));
$order->total_wrapping_tax_excl = (float)abs($cart->getOrderTotal(false, Cart::ONLY_WRAPPING));
$order->total_wrapping_tax_incl = (float)abs($cart->getOrderTotal(true, Cart::ONLY_WRAPPING));
$order->total_paid = (float)Tools::ps_round((float)($cart->getOrderTotal(true, Cart::BOTH)), 2); $order->total_paid = (float)Tools::ps_round((float)($cart->getOrderTotal(true, Cart::BOTH)), 2);
$order->total_paid_tax_excl = (float)Tools::ps_round((float)($cart->getOrderTotal(false, Cart::BOTH)), 2);
$order->total_paid_tax_incl = (float)Tools::ps_round((float)($cart->getOrderTotal(true, Cart::BOTH)), 2);
$order->invoice_date = '0000-00-00 00:00:00'; $order->invoice_date = '0000-00-00 00:00:00';
$order->delivery_date = '0000-00-00 00:00:00'; $order->delivery_date = '0000-00-00 00:00:00';
install-dev/sql/db.sql
+8
View File
@@ -989,13 +989,21 @@ CREATE TABLE `PREFIX_orders` (
`gift_message` text, `gift_message` text,
`shipping_number` varchar(32) default NULL, `shipping_number` varchar(32) default NULL,
`total_discounts` decimal(17,2) NOT NULL default '0.00', `total_discounts` decimal(17,2) NOT NULL default '0.00',
`total_discounts_tax_incl` decimal(17,2) NOT NULL default '0.00',
`total_discounts_tax_excl` decimal(17,2) NOT NULL default '0.00',
`total_paid` decimal(17,2) NOT NULL default '0.00', `total_paid` decimal(17,2) NOT NULL default '0.00',
`total_paid_tax_incl` decimal(17,2) NOT NULL default '0.00',
`total_paid_tax_excl` decimal(17,2) NOT NULL default '0.00',
`total_paid_real` decimal(17,2) NOT NULL default '0.00', `total_paid_real` decimal(17,2) NOT NULL default '0.00',
`total_products` decimal(17,2) NOT NULL default '0.00', `total_products` decimal(17,2) NOT NULL default '0.00',
`total_products_wt` DECIMAL(17, 2) NOT NULL default '0.00', `total_products_wt` DECIMAL(17, 2) NOT NULL default '0.00',
`total_shipping` decimal(17,2) NOT NULL default '0.00', `total_shipping` decimal(17,2) NOT NULL default '0.00',
`total_shipping_tax_incl` decimal(17,2) NOT NULL default '0.00',
`total_shipping_tax_excl` decimal(17,2) NOT NULL default '0.00',
`carrier_tax_rate` DECIMAL(10, 3) NOT NULL default '0.00', `carrier_tax_rate` DECIMAL(10, 3) NOT NULL default '0.00',
`total_wrapping` decimal(17,2) NOT NULL default '0.00', `total_wrapping` decimal(17,2) NOT NULL default '0.00',
`total_wrapping_tax_incl` decimal(17,2) NOT NULL default '0.00',
`total_wrapping_tax_excl` decimal(17,2) NOT NULL default '0.00',
`invoice_number` int(10) unsigned NOT NULL default '0', `invoice_number` int(10) unsigned NOT NULL default '0',
`delivery_number` int(10) unsigned NOT NULL default '0', `delivery_number` int(10) unsigned NOT NULL default '0',
`invoice_date` datetime NOT NULL, `invoice_date` datetime NOT NULL,