[TEP-COMMIT] CVS: catalog/catalog/includes/modules/order_total ot_loworderfee.php,1.12,1.13 ot_shipping.php,1.16,1.17 ot_subtotal.php,1.7,1.8 ot_tax.php,1.14,1.15 ot_total.php,1.7,1.8
Harald Ponce de Leon <[email protected]>
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tep/catalog/catalog/includes/modules/order_total
In directory sc8-pr-cvs1:/tmp/cvs-serv10016/catalog/includes/modules/order_total
Modified Files:
ot_loworderfee.php ot_shipping.php ot_subtotal.php ot_tax.php
ot_total.php
Log Message:
update the currencies class
* $currencies -> $osC_Currencies
* $currencies->display_price() -> $osC_Currencies->displayPrice()
+-- now passes the product tax class id as a parameter instead of the
product tax rate value (saves queries when DISPLAY_PRICES_WITH_TAX
is disabled)
* $currencies->is_set()
+-- removed due to $osC_Currencies->exists()
* $currencies->get_decimal_places() -> $osC_Currencies->decimalPlaces()
* $currencies->get_value() -> $osC_Currencies->value()
* $osC_Currencies->format()
+-- removed $calculate_currency_value (second) parameter due to
redundancy - if the number should not be calculated with the currency
rate, a value of '1' should be passed as the currency rate value
Index: ot_loworderfee.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/modules/order_total/ot_loworderfee.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ot_loworderfee.php 17 Nov 2003 20:27:59 -0000 1.12
+++ ot_loworderfee.php 18 Dec 2003 23:52:15 -0000 1.13
@@ -24,7 +24,7 @@
}
function process() {
- global $osC_Tax, $order, $currencies;
+ global $osC_Tax, $order, $osC_Currencies;
if (MODULE_ORDER_TOTAL_LOWORDERFEE_LOW_ORDER_FEE == 'true') {
switch (MODULE_ORDER_TOTAL_LOWORDERFEE_DESTINATION) {
@@ -47,7 +47,7 @@
$order->info['total'] += MODULE_ORDER_TOTAL_LOWORDERFEE_FEE + tep_calculate_tax(MODULE_ORDER_TOTAL_LOWORDERFEE_FEE, $tax);
$this->output[] = array('title' => $this->title . ':',
- 'text' => $currencies->format(tep_add_tax(MODULE_ORDER_TOTAL_LOWORDERFEE_FEE, $tax), true, $order->info['currency'], $order->info['currency_value']),
+ 'text' => $osC_Currencies->format(tep_add_tax(MODULE_ORDER_TOTAL_LOWORDERFEE_FEE, $tax), $order->info['currency'], $order->info['currency_value']),
'value' => tep_add_tax(MODULE_ORDER_TOTAL_LOWORDERFEE_FEE, $tax));
}
}
Index: ot_shipping.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/modules/order_total/ot_shipping.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ot_shipping.php 17 Nov 2003 20:27:59 -0000 1.16
+++ ot_shipping.php 18 Dec 2003 23:52:15 -0000 1.17
@@ -24,7 +24,7 @@
}
function process() {
- global $osC_Session, $osC_Tax, $order, $currencies;
+ global $osC_Session, $osC_Tax, $order, $osC_Currencies;
if (MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING == 'true') {
switch (MODULE_ORDER_TOTAL_SHIPPING_DESTINATION) {
@@ -62,7 +62,7 @@
}
$this->output[] = array('title' => $order->info['shipping_method'] . ':',
- 'text' => $currencies->format($order->info['shipping_cost'], true, $order->info['currency'], $order->info['currency_value']),
+ 'text' => $osC_Currencies->format($order->info['shipping_cost'], $order->info['currency'], $order->info['currency_value']),
'value' => $order->info['shipping_cost']);
}
}
Index: ot_subtotal.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/modules/order_total/ot_subtotal.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ot_subtotal.php 13 Feb 2003 00:12:04 -0000 1.7
+++ ot_subtotal.php 18 Dec 2003 23:52:15 -0000 1.8
@@ -24,10 +24,10 @@
}
function process() {
- global $order, $currencies;
+ global $order, $osC_Currencies;
$this->output[] = array('title' => $this->title . ':',
- 'text' => $currencies->format($order->info['subtotal'], true, $order->info['currency'], $order->info['currency_value']),
+ 'text' => $osC_Currencies->format($order->info['subtotal'], $order->info['currency'], $order->info['currency_value']),
'value' => $order->info['subtotal']);
}
Index: ot_tax.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/modules/order_total/ot_tax.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ot_tax.php 14 Feb 2003 05:58:35 -0000 1.14
+++ ot_tax.php 18 Dec 2003 23:52:15 -0000 1.15
@@ -24,13 +24,13 @@
}
function process() {
- global $order, $currencies;
+ global $order, $osC_Currencies;
reset($order->info['tax_groups']);
while (list($key, $value) = each($order->info['tax_groups'])) {
if ($value > 0) {
$this->output[] = array('title' => $key . ':',
- 'text' => $currencies->format($value, true, $order->info['currency'], $order->info['currency_value']),
+ 'text' => $osC_Currencies->format($value, $order->info['currency'], $order->info['currency_value']),
'value' => $value);
}
}
Index: ot_total.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/modules/order_total/ot_total.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ot_total.php 13 Feb 2003 00:12:04 -0000 1.7
+++ ot_total.php 18 Dec 2003 23:52:15 -0000 1.8
@@ -24,10 +24,10 @@
}
function process() {
- global $order, $currencies;
+ global $order, $osC_Currencies;
$this->output[] = array('title' => $this->title . ':',
- 'text' => '<b>' . $currencies->format($order->info['total'], true, $order->info['currency'], $order->info['currency_value']) . '</b>',
+ 'text' => '<b>' . $osC_Currencies->format($order->info['total'], $order->info['currency'], $order->info['currency_value']) . '</b>',
'value' => $order->info['total']);
}
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click