[TEP-COMMIT] CVS: catalog/catalog/includes/modules/shipping flat.php,1.40,1.41 item.php,1.39,1.40 table.php,1.27,1.28 ups.php,1.54,1.55 usps.php,1.47,1.48 zones.php,1.20,1.21
Harald Ponce de Leon <[email protected]>
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tep/catalog/catalog/includes/modules/shipping
In directory sc8-pr-cvs1:/tmp/cvs-serv32379/modules/shipping
Modified Files:
flat.php item.php table.php ups.php usps.php zones.php
Log Message:
standards updates
use the new tax class
Index: flat.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/modules/shipping/flat.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- flat.php 5 Feb 2003 22:41:52 -0000 1.40
+++ flat.php 17 Nov 2003 20:36:50 -0000 1.41
@@ -46,16 +46,17 @@
// class methods
function quote($method = '') {
- global $order;
+ global $osC_Tax, $order;
$this->quotes = array('id' => $this->code,
'module' => MODULE_SHIPPING_FLAT_TEXT_TITLE,
'methods' => array(array('id' => $this->code,
'title' => MODULE_SHIPPING_FLAT_TEXT_WAY,
- 'cost' => MODULE_SHIPPING_FLAT_COST)));
+ 'cost' => MODULE_SHIPPING_FLAT_COST)),
+ 'tax' => 0);
if ($this->tax_class > 0) {
- $this->quotes['tax'] = tep_get_tax_rate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
+ $this->quotes['tax'] = $osC_Tax->getTaxRate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
}
if (tep_not_null($this->icon)) $this->quotes['icon'] = tep_image($this->icon, $this->title);
Index: item.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/modules/shipping/item.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- item.php 5 Feb 2003 22:41:52 -0000 1.39
+++ item.php 17 Nov 2003 20:36:50 -0000 1.40
@@ -46,16 +46,17 @@
// class methods
function quote($method = '') {
- global $order, $total_count;
+ global $osC_Tax, $order, $total_count;
$this->quotes = array('id' => $this->code,
'module' => MODULE_SHIPPING_ITEM_TEXT_TITLE,
'methods' => array(array('id' => $this->code,
'title' => MODULE_SHIPPING_ITEM_TEXT_WAY,
- 'cost' => (MODULE_SHIPPING_ITEM_COST * $total_count) + MODULE_SHIPPING_ITEM_HANDLING)));
+ 'cost' => (MODULE_SHIPPING_ITEM_COST * $total_count) + MODULE_SHIPPING_ITEM_HANDLING)),
+ 'tax' => 0);
if ($this->tax_class > 0) {
- $this->quotes['tax'] = tep_get_tax_rate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
+ $this->quotes['tax'] = $osC_Tax->getTaxRate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
}
if (tep_not_null($this->icon)) $this->quotes['icon'] = tep_image($this->icon, $this->title);
Index: table.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/modules/shipping/table.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- table.php 5 Feb 2003 22:41:52 -0000 1.27
+++ table.php 17 Nov 2003 20:36:50 -0000 1.28
@@ -46,7 +46,7 @@
// class methods
function quote($method = '') {
- global $order, $cart, $shipping_weight, $shipping_num_boxes;
+ global $osC_Tax, $order, $cart, $shipping_weight, $shipping_num_boxes;
if (MODULE_SHIPPING_TABLE_MODE == 'price') {
$order_total = $cart->show_total();
@@ -71,10 +71,11 @@
'module' => MODULE_SHIPPING_TABLE_TEXT_TITLE,
'methods' => array(array('id' => $this->code,
'title' => MODULE_SHIPPING_TABLE_TEXT_WAY,
- 'cost' => $shipping + MODULE_SHIPPING_TABLE_HANDLING)));
+ 'cost' => $shipping + MODULE_SHIPPING_TABLE_HANDLING)),
+ 'tax' => 0);
if ($this->tax_class > 0) {
- $this->quotes['tax'] = tep_get_tax_rate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
+ $this->quotes['tax'] = $osC_Tax->getTaxRate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
}
if (tep_not_null($this->icon)) $this->quotes['icon'] = tep_image($this->icon, $this->title);
Index: ups.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/modules/shipping/ups.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- ups.php 8 Apr 2003 23:23:42 -0000 1.54
+++ ups.php 17 Nov 2003 20:36:50 -0000 1.55
@@ -68,9 +68,9 @@
// class methods
function quote($method = '') {
- global $HTTP_POST_VARS, $order, $shipping_weight, $shipping_num_boxes;
+ global $osC_Tax, $order, $shipping_weight, $shipping_num_boxes;
- if ( (tep_not_null($method)) && (isset($this->types[$method])) ) {
+ if (tep_not_null($method) && isset($this->types[$method])) {
$prod = $method;
} else {
$prod = 'GNDRES';
@@ -91,7 +91,8 @@
if ( (is_array($upsQuote)) && (sizeof($upsQuote) > 0) ) {
$this->quotes = array('id' => $this->code,
- 'module' => $this->title . ' (' . $shipping_num_boxes . ' x ' . $shipping_weight . 'lbs)');
+ 'module' => $this->title . ' (' . $shipping_num_boxes . ' x ' . $shipping_weight . 'lbs)',
+ 'tax' => 0);
$methods = array();
$qsize = sizeof($upsQuote);
@@ -105,7 +106,7 @@
$this->quotes['methods'] = $methods;
if ($this->tax_class > 0) {
- $this->quotes['tax'] = tep_get_tax_rate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
+ $this->quotes['tax'] = $osC_Tax->getTaxRate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
}
} else {
$this->quotes = array('module' => $this->title,
Index: usps.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/modules/shipping/usps.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- usps.php 8 Apr 2003 23:23:42 -0000 1.47
+++ usps.php 17 Nov 2003 20:36:50 -0000 1.48
@@ -64,7 +64,7 @@
// class methods
function quote($method = '') {
- global $order, $shipping_weight, $shipping_num_boxes;
+ global $osC_Tax, $order, $shipping_weight, $shipping_num_boxes;
if ( tep_not_null($method) && (isset($this->types[$method]) || in_array($method, $this->intl_types)) ) {
$this->_setService($method);
@@ -88,7 +88,8 @@
'error' => $uspsQuote['error']);
} else {
$this->quotes = array('id' => $this->code,
- 'module' => $this->title . ' (' . $shipping_num_boxes . ' x ' . $shipping_weight . 'lbs)');
+ 'module' => $this->title . ' (' . $shipping_num_boxes . ' x ' . $shipping_weight . 'lbs)',
+ 'tax' => 0);
$methods = array();
$size = sizeof($uspsQuote);
@@ -103,7 +104,7 @@
$this->quotes['methods'] = $methods;
if ($this->tax_class > 0) {
- $this->quotes['tax'] = tep_get_tax_rate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
+ $this->quotes['tax'] = $osC_Tax->getTaxRate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
}
}
} else {
Index: zones.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/modules/shipping/zones.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- zones.php 15 Jun 2003 19:48:09 -0000 1.20
+++ zones.php 17 Nov 2003 20:36:50 -0000 1.21
@@ -113,7 +113,7 @@
// class methods
function quote($method = '') {
- global $order, $shipping_weight, $shipping_num_boxes;
+ global $osC_Tax, $order, $shipping_weight, $shipping_num_boxes;
$dest_country = $order->delivery['country']['iso_code_2'];
$dest_zone = 0;
@@ -156,10 +156,11 @@
'module' => MODULE_SHIPPING_ZONES_TEXT_TITLE,
'methods' => array(array('id' => $this->code,
'title' => $shipping_method,
- 'cost' => $shipping_cost)));
+ 'cost' => $shipping_cost)),
+ 'tax' => 0);
if ($this->tax_class > 0) {
- $this->quotes['tax'] = tep_get_tax_rate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
+ $this->quotes['tax'] = $osC_Tax->getTaxRate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
}
if (tep_not_null($this->icon)) $this->quotes['icon'] = tep_image($this->icon, $this->title);
-------------------------------------------------------
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl