Merge pull request #1 from troydavisson/costfix

Fix for cost calculations losing partial dollars
pull/4/merge v0.2-beta
Jamie Isaacs 10 years ago
commit 6f41a5954b

@ -225,7 +225,7 @@ class Rate extends RateAdapter
$this->rates[] = array( $this->rates[] = array(
'code' => $code, 'code' => $code,
'name' => $name, 'name' => $name,
'cost' => (int) $cost * 100, 'cost' => (int) ($cost * 100),
'delivery_ts' => $delivery_ts, 'delivery_ts' => $delivery_ts,
'transit_time' => $transit_time, 'transit_time' => $transit_time,
); );

@ -238,7 +238,7 @@ class Rate extends RateAdapter
$this->rates[] = array( $this->rates[] = array(
'code' => $code, 'code' => $code,
'name' => $name, 'name' => $name,
'cost' => (int) $cost * 100, 'cost' => (int) ($cost * 100),
); );
} }

@ -173,7 +173,7 @@ class Rate extends RateAdapter
$this->rates[] = array( $this->rates[] = array(
'code' => $code, 'code' => $code,
'name' => $name, 'name' => $name,
'cost' => (int) $cost * 100, 'cost' => (int) ($cost * 100),
); );
} }

@ -124,12 +124,12 @@ class ShipTest extends PHPUnit_Framework_TestCase
1 => [ 1 => [
'code' => '4', 'code' => '4',
'name' => 'Parcel Post', 'name' => 'Parcel Post',
'cost' => 1000, 'cost' => 1001,
], ],
0 => [ 0 => [
'code' => '1', 'code' => '1',
'name' => 'Priority Mail', 'name' => 'Priority Mail',
'cost' => 1200, 'cost' => 1220,
], ],
]), json_encode($usps_rates)); ]), json_encode($usps_rates));
} }
@ -143,22 +143,22 @@ class ShipTest extends PHPUnit_Framework_TestCase
0 => [ 0 => [
'code' => '03', 'code' => '03',
'name' => 'UPS Ground', 'name' => 'UPS Ground',
'cost' => 1900, 'cost' => 1910,
], ],
1 => [ 1 => [
'code' => '02', 'code' => '02',
'name' => 'UPS 2nd Day Air', 'name' => 'UPS 2nd Day Air',
'cost' => 4900, 'cost' => 4923,
], ],
2 => [ 2 => [
'code' => '13', 'code' => '13',
'name' => 'UPS Next Day Air Saver', 'name' => 'UPS Next Day Air Saver',
'cost' => 8900, 'cost' => 8954,
], ],
3 => [ 3 => [
'code' => '01', 'code' => '01',
'name' => 'UPS Next Day Air', 'name' => 'UPS Next Day Air',
'cost' => 9300, 'cost' => 9328,
], ],
]), json_encode($ups_rates)); ]), json_encode($ups_rates));
} }
@ -172,28 +172,28 @@ class ShipTest extends PHPUnit_Framework_TestCase
3 => [ 3 => [
'code' => 'GROUND_HOME_DELIVERY', 'code' => 'GROUND_HOME_DELIVERY',
'name' => 'Ground Home Delivery', 'name' => 'Ground Home Delivery',
'cost' => 1600, 'cost' => 1655,
'delivery_ts' => NULL, 'delivery_ts' => NULL,
'transit_time' => 'THREE_DAYS', 'transit_time' => 'THREE_DAYS',
], ],
2 => [ 2 => [
'code' => 'FEDEX_EXPRESS_SAVER', 'code' => 'FEDEX_EXPRESS_SAVER',
'name' => 'Fedex Express Saver', 'name' => 'Fedex Express Saver',
'cost' => 2900, 'cost' => 2989,
'delivery_ts' => '2014-09-30T20:00:00', 'delivery_ts' => '2014-09-30T20:00:00',
'transit_time' => NULL, 'transit_time' => NULL,
], ],
1 => [ 1 => [
'code' => 'FEDEX_2_DAY', 'code' => 'FEDEX_2_DAY',
'name' => 'Fedex 2 Day', 'name' => 'Fedex 2 Day',
'cost' => 4000, 'cost' => 4072,
'delivery_ts' => '2014-09-29T20:00:00', 'delivery_ts' => '2014-09-29T20:00:00',
'transit_time' => NULL, 'transit_time' => NULL,
], ],
0 => [ 0 => [
'code' => 'STANDARD_OVERNIGHT', 'code' => 'STANDARD_OVERNIGHT',
'name' => 'Standard Overnight', 'name' => 'Standard Overnight',
'cost' => 7800, 'cost' => 7834,
'delivery_ts' => '2014-09-26T20:00:00', 'delivery_ts' => '2014-09-26T20:00:00',
'transit_time' => NULL, 'transit_time' => NULL,
], ],
@ -221,7 +221,7 @@ class ShipTest extends PHPUnit_Framework_TestCase
0 => [ 0 => [
'code' => '4', 'code' => '4',
'name' => 'Parcel Post', 'name' => 'Parcel Post',
'cost' => 1000, 'cost' => 1001,
'carrier' => 'usps', 'carrier' => 'usps',
], ],
], ],
@ -229,7 +229,7 @@ class ShipTest extends PHPUnit_Framework_TestCase
0 => [ 0 => [
'code' => 'FEDEX_2_DAY', 'code' => 'FEDEX_2_DAY',
'name' => 'Fedex 2 Day', 'name' => 'Fedex 2 Day',
'cost' => 4000, 'cost' => 4072,
'delivery_ts' => '2014-09-29T20:00:00', 'delivery_ts' => '2014-09-29T20:00:00',
'transit_time' => NULL, 'transit_time' => NULL,
'carrier' => 'fedex', 'carrier' => 'fedex',
@ -239,7 +239,7 @@ class ShipTest extends PHPUnit_Framework_TestCase
0 => [ 0 => [
'code' => 'STANDARD_OVERNIGHT', 'code' => 'STANDARD_OVERNIGHT',
'name' => 'Standard Overnight', 'name' => 'Standard Overnight',
'cost' => 7800, 'cost' => 7834,
'delivery_ts' => '2014-09-26T20:00:00', 'delivery_ts' => '2014-09-26T20:00:00',
'transit_time' => NULL, 'transit_time' => NULL,
'carrier' => 'fedex', 'carrier' => 'fedex',

Loading…
Cancel
Save