diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail.php index 2899897..afe80c2 100644 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail.php +++ b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail.php @@ -40,8 +40,8 @@ class Meanbee_Royalmail_Model_Shipping_Carrier_Royalmail */ public function __construct() { - require_once(Mage::getBaseDir('lib') . '/Meanbee/RoyalMailPHPLibrary/src/CalculateMethod.php'); - require_once(Mage::getBaseDir('lib') . '/Meanbee/RoyalMailPHPLibrary/src/Data.php'); + require_once(Mage::getBaseDir('lib') . '/Meanbee/RoyalmailPHPLibrary/src/CalculateMethod.php'); + require_once(Mage::getBaseDir('lib') . '/Meanbee/RoyalmailPHPLibrary/src/Data.php'); $this->calculateMethodClass = new Meanbee_RoyalmailPHPLibrary_CalculateMethod(); $this->dataClass = new Meanbee_RoyalmailPHPLibrary_Data( @@ -147,7 +147,7 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request) } } - if (empty($result->getAllRates()) == true) { + if (count($result->getAllRates()) == 0) { $error = Mage::getModel('shipping/rate_result_error'); $error->setCarrier($this->_code); $error->setCarrierTitle($this->getConfigData('title')); diff --git a/lib/Meanbee/RoyalmailPHPLibrary/composer.json b/lib/Meanbee/RoyalmailPHPLibrary/composer.json index ae66c33..e0bdb3d 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/composer.json +++ b/lib/Meanbee/RoyalmailPHPLibrary/composer.json @@ -9,6 +9,6 @@ }, "autoload": { - "psr-4": { "Meanbee\\RoyalMail\\": ["src/", "tests/"] } + "psr-4": { "Meanbee\\Royalmail\\": ["src/", "tests/"] } } } diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv index 31174bf..ffcd980 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv @@ -67,10 +67,18 @@ WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE -WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM -WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM -WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY -WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_500 +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_1000 +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_2500 +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_50 +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_500 +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_2500 +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_500 +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_1000 +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500 +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_50 +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_1000 +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_2500 WORLD_ZONE_GB,UK_STANDARD_FIRST_CLASS_LETTER WORLD_ZONE_GB,UK_STANDARD_FIRST_CLASS_LARGE_LETTER WORLD_ZONE_GB,UK_STANDARD_FIRST_CLASS_SMALL_PARCEL diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv index 24b17ac..8555132 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv @@ -67,18 +67,18 @@ WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250," WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LETTER,0,20,20,"International Economy Letter" WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LARGE_LETTER,0,20,20,"International Economy Large Letter" WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0,20,20,"International Economy Small Parcel" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM,0,500,500,"Special Delivery: Guaranteed by 1pm" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM,501,1000,1000,"Special Delivery: Guaranteed by 1pm" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM,1001,2500,2500,"Special Delivery: Guaranteed by 1pm" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,0,50,50,"Special Delivery: Guaranteed by 9am" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,51,1000,1000,"Special Delivery: Guaranteed by 9am" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,1001,2500,2500,"Special Delivery: Guaranteed by 9am" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,0,500,500,"Special Delivery: Guaranteed by 1pm Saturday" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,501,1000,1000,"Special Delivery: Guaranteed by 1pm Saturday" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,1001,2500,2500,"Special Delivery: Guaranteed by 1pm Saturday" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,0,500,500,"Special Delivery: Guaranteed by 9am Saturday" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,501,1000,1000,"Special Delivery: Guaranteed by 9am Saturday" -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,1001,2500,2500,"Special Delivery: Guaranteed by 9am Saturday" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_500,0,500,500,"Special Delivery: Guaranteed by 1pm" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_1000,501,1000,1000,"Special Delivery: Guaranteed by 1pm" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_2500,1001,2500,2500,"Special Delivery: Guaranteed by 1pm" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_50,0,50,50,"Special Delivery: Guaranteed by 9am" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_1000,51,1000,1000,"Special Delivery: Guaranteed by 9am" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_2500,1001,2500,2500,"Special Delivery: Guaranteed by 9am" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_500,0,500,500,"Special Delivery: Guaranteed by 1pm Saturday" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_1000,501,1000,1000,"Special Delivery: Guaranteed by 1pm Saturday" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_2500,1001,2500,2500,"Special Delivery: Guaranteed by 1pm Saturday" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_50,0,50,50,"Special Delivery: Guaranteed by 9am Saturday" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_1000,51,1000,1000,"Special Delivery: Guaranteed by 9am Saturday" +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_2500,1001,2500,2500,"Special Delivery: Guaranteed by 9am Saturday" UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LETTER,0,50,50,"Signed For: First Class Letter" UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LARGE_LETTER,0,50,50,"Signed For: First Class Large Letter" UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0,50,50,"Signed For: First Small Parcel" @@ -100,8 +100,8 @@ PARCELFORCE_WORLDWIDE_EXPRESS_10,0,200,200,"Parcelforce Worldwide: Express 10" PARCELFORCE_WORLDWIDE_EXPRESS_AM,0,200,200,"Parcelforce Worldwide: Express AM" PARCELFORCE_WORLDWIDE_EXPRESS_24,0,100,100,"Parcelforce Worldwide: Express 24" PARCELFORCE_WORLDWIDE_EXPRESS_48,0,100,100,"Parcelforce Worldwide: Express 48" -PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY,0,200,200,"Parcelforce Worldwide: Express 9" -PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY,0,200,200,"Parcelforce Worldwide: Express 10" -PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY,0,200,200,"Parcelforce Worldwide: Express AM" -PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY,0,100,100,"Parcelforce Worldwide: Express 24" -PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,0,100,100,"Parcelforce Worldwide: Express 48" \ No newline at end of file +PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY,0,200,200,"Parcelforce Worldwide: Express 9 Saturday" +PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY,0,200,200,"Parcelforce Worldwide: Express 10 Saturday" +PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY,0,200,200,"Parcelforce Worldwide: Express AM Saturday" +PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY,0,100,100,"Parcelforce Worldwide: Express 24 Saturday" +PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,0,100,100,"Parcelforce Worldwide: Express 48 Saturday" \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv index af06966..9b8d73f 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv @@ -366,66 +366,66 @@ WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL,1.001,1.250,9.41,20, WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL,1.251,1.500,10.76,20, WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL,1.501,1.750,12.11,20, WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL,1.751,2.000,13.26,20, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,0.001,0.100,6.45,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,0.101,0.500,7.25,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,0.501,1.000,8.55,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,1.001,2.000,11.00,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,2.001,10.000,26.60,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,10.001,20.000,41.20,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,0.001,0.100,7.45,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,0.101,0.500,8.25,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,0.501,1.000,9.55,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,1.001,2.000,12.00,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,2.001,10.000,27.60,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,10.001,20.000,42.20,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,0.001,0.100,9.45,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,0.101,0.500,10.25,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,0.501,1.000,11.55,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,1.001,2.000,14.00,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,2.001,10.000,29.60,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,10.001,20.000,44.20,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,0.001,0.100,18.36,50, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,0.101,0.500,20.76,50, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,0.501,1.000,22.50,50, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,1.001,2.000,26.94,50, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,0.001,0.100,20.56,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,0.101,0.500,22.96,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,0.501,1.000,24.70,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,1.001,2.000,29.14,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,0.001,0.100,24.06,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,0.101,0.500,26.46,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,0.501,1.000,28.20,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,1.001,2.000,32.64,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,0.001,0.100,10.74,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,0.101,0.500,11.70,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,0.501,1.000,13.26,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,1.001,2.000,16.20,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,2.001,10.000,34.92,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,10.001,20.000,52.44,500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,0.001,0.100,11.94,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,0.101,0.500,12.90,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,0.501,1.000,14.46,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,1.001,2.000,17.40,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,2.001,10.000,36.12,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,10.001,20.000,53.64,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,0.001,0.100,14.34,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,0.101,0.500,15.30,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,0.501,1.000,16.86,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,1.001,2.000,19.80,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,2.001,10.000,38.52,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,10.001,20.000,56.04,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,0.001,0.100,21.36,50, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,0.101,0.500,23.76,50, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,0.501,1.000,25.50,50, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,1.001,2.000,29.94,50, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,0.001,0.100,23.56,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,0.101,0.500,25.96,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,0.501,1.000,27.70,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,1.001,2.000,32.14,1000, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,0.001,0.100,27.06,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,0.101,0.500,29.46,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,0.501,1.000,31.20,2500, -UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,1.001,2.000,35.64,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_500,0.001,0.100,6.45,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_500,0.101,0.500,7.25,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_500,0.501,1.000,8.55,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_500,1.001,2.000,11.00,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_500,2.001,10.000,26.60,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_500,10.001,20.000,41.20,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_1000,0.001,0.100,7.45,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_1000,0.101,0.500,8.25,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_1000,0.501,1.000,9.55,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_1000,1.001,2.000,12.00,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_1000,2.001,10.000,27.60,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_1000,10.001,20.000,42.20,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_2500,0.001,0.100,9.45,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_2500,0.101,0.500,10.25,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_2500,0.501,1.000,11.55,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_2500,1.001,2.000,14.00,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_2500,2.001,10.000,29.60,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_2500,10.001,20.000,44.20,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_50,0.001,0.100,18.36,50, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_50,0.101,0.500,20.76,50, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_50,0.501,1.000,22.50,50, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_50,1.001,2.000,26.94,50, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_1000,0.001,0.100,20.56,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_1000,0.101,0.500,22.96,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_1000,0.501,1.000,24.70,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_1000,1.001,2.000,29.14,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_2500,0.001,0.100,24.06,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_2500,0.101,0.500,26.46,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_2500,0.501,1.000,28.20,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_2500,1.001,2.000,32.64,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_500,0.001,0.100,10.74,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_500,0.101,0.500,11.70,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_500,0.501,1.000,13.26,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_500,1.001,2.000,16.20,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_500,2.001,10.000,34.92,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_500,10.001,20.000,52.44,500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_1000,0.001,0.100,11.94,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_1000,0.101,0.500,12.90,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_1000,0.501,1.000,14.46,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_1000,1.001,2.000,17.40,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_1000,2.001,10.000,36.12,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_1000,10.001,20.000,53.64,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_2500,0.001,0.100,14.34,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_2500,0.101,0.500,15.30,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_2500,0.501,1.000,16.86,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_2500,1.001,2.000,19.80,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_2500,2.001,10.000,38.52,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY_2500,10.001,20.000,56.04,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_50,0.001,0.100,21.36,50, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_50,0.101,0.500,23.76,50, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_50,0.501,1.000,25.50,50, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_50,1.001,2.000,29.94,50, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_1000,0.001,0.100,23.56,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_1000,0.101,0.500,25.96,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_1000,0.501,1.000,27.70,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_1000,1.001,2.000,32.14,1000, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_2500,0.001,0.100,27.06,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_2500,0.101,0.500,29.46,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_2500,0.501,1.000,31.20,2500, +UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY_2500,1.001,2.000,35.64,2500, UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LETTER,0.001,0.100,1.73,50, UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LARGE_LETTER,0.001,0.100,2.05,50, UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LARGE_LETTER,0.101,0.250,2.36,50, diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv index 07696c6..123aee2 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv @@ -1,15 +1,15 @@ -"specialdelivery9am","Special Delivery: Guaranteed by 9am",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,0,50,50 -"specialdelivery9am","Special Delivery: Guaranteed by 9am",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,51,1000,1000 -"specialdelivery9am","Special Delivery: Guaranteed by 9am",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM,1001,2500,2500 -"specialdelivery1pm","Special Delivery: Guaranteed by 1pm",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,0,500,500 -"specialdelivery1pm","Special Delivery: Guaranteed by 1pm",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,501,1000,1000 -"specialdelivery1pm","Special Delivery: Guaranteed by 1pm",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM,1001,2500,2500 -"specialdelivery1pmsaturday","Special Delivery: Guaranteed by 1pm Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY,0,500,500 -"specialdelivery1pmsaturday","Special Delivery: Guaranteed by 1pm Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY,501,1000,1000 -"specialdelivery1pmsaturday","Special Delivery: Guaranteed by 1pm Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY,1001,2500,2500 -"specialdelivery9amsaturday","Special Delivery: Guaranteed by 9am Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY,0,500,500 -"specialdelivery9amsaturday","Special Delivery: Guaranteed by 9am Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY,501,1000,1000 -"specialdelivery9amsaturday","Special Delivery: Guaranteed by 9am Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY,1001,2500,2500 +"specialdelivery9am","Special Delivery: Guaranteed by 9am",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_50,0,50,50 +"specialdelivery9am","Special Delivery: Guaranteed by 9am",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_1000,51,1000,1000 +"specialdelivery9am","Special Delivery: Guaranteed by 9am",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_2500,1001,2500,2500 +"specialdelivery1pm","Special Delivery: Guaranteed by 1pm",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_500,0,500,500 +"specialdelivery1pm","Special Delivery: Guaranteed by 1pm",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_1000,501,1000,1000 +"specialdelivery1pm","Special Delivery: Guaranteed by 1pm",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_2500,1001,2500,2500 +"specialdelivery1pmsaturday","Special Delivery: Guaranteed by 1pm Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_500,0,500,500 +"specialdelivery1pmsaturday","Special Delivery: Guaranteed by 1pm Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_1000,501,1000,1000 +"specialdelivery1pmsaturday","Special Delivery: Guaranteed by 1pm Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500,1001,2500,2500 +"specialdelivery9amsaturday","Special Delivery: Guaranteed by 9am Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_50,0,50,50 +"specialdelivery9amsaturday","Special Delivery: Guaranteed by 9am Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_1000,51,1000,1000 +"specialdelivery9amsaturday","Special Delivery: Guaranteed by 9am Saturday",UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_2500,1001,2500,2500 "firstclasslettersignedfor","Signed For: First Class Letter",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LETTER,0,50,50 "firstclasslargelettersignedfor","Signed For: First Class Large Letter",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LARGE_LETTER,0,50,50 "firstclasssignedforsmall","Signed For: First Small Parcel",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0,50,50 @@ -100,8 +100,8 @@ "parcelforceworldwideexpressAM","Parcelforce Worldwide: Express AM",PARCELFORCE_WORLDWIDE_EXPRESS_AM,0,200,200 "parcelforceworldwideexpress24","Parcelforce Worldwide: Express 24",PARCELFORCE_WORLDWIDE_EXPRESS_24,0,100,100 "parcelforceworldwideexpress48","Parcelforce Worldwide: Express 48",PARCELFORCE_WORLDWIDE_EXPRESS_48,0,100,100 -"parcelforceworldwideexpress9saturday","Parcelforce Worldwide: Express 9",PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY,0,200,200 -"parcelforceworldwideexpress10saturday","Parcelforce Worldwide: Express 10",PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY,0,200,200 -"parcelforceworldwideexpressAMsaturday","Parcelforce Worldwide: Express AM",PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY,0,200,200 -"parcelforceworldwideexpress24saturday","Parcelforce Worldwide: Express 24",PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY,0,100,100 -"parcelforceworldwideexpress48saturday","Parcelforce Worldwide: Express 48",PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,0,100,100 \ No newline at end of file +"parcelforceworldwideexpress9saturday","Parcelforce Worldwide: Express 9 Saturday",PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY,0,200,200 +"parcelforceworldwideexpress10saturday","Parcelforce Worldwide: Express 10 Saturday",PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY,0,200,200 +"parcelforceworldwideexpressAMsaturday","Parcelforce Worldwide: Express AM Saturday",PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY,0,200,200 +"parcelforceworldwideexpress24saturday","Parcelforce Worldwide: Express 24 Saturday",PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY,0,100,100 +"parcelforceworldwideexpress48saturday","Parcelforce Worldwide: Express 48 Saturday",PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,0,100,100 \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv index 0adea46..6b57f41 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv @@ -40,8 +40,8 @@ "parcelforceworldwideexpressAM","Parcelforce Worldwide: Express AM" "parcelforceworldwideexpress24","Parcelforce Worldwide: Express 24" "parcelforceworldwideexpress48","Parcelforce Worldwide: Express 48" -"parcelforceworldwideexpress9saturday","Parcelforce Worldwide: Express 9" -"parcelforceworldwideexpress10saturday","Parcelforce Worldwide: Express 10" -"parcelforceworldwideexpressAMsaturday","Parcelforce Worldwide: Express AM" -"parcelforceworldwideexpress24saturday","Parcelforce Worldwide: Express 24" -"parcelforceworldwideexpress48saturday","Parcelforce Worldwide: Express 48" \ No newline at end of file +"parcelforceworldwideexpress9saturday","Parcelforce Worldwide: Express 9 Saturday" +"parcelforceworldwideexpress10saturday","Parcelforce Worldwide: Express 10 Saturday" +"parcelforceworldwideexpressAMsaturday","Parcelforce Worldwide: Express AM Saturday" +"parcelforceworldwideexpress24saturday","Parcelforce Worldwide: Express 24 Saturday" +"parcelforceworldwideexpress48saturday","Parcelforce Worldwide: Express 48 Saturday" \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/src/CalculateMethod.php b/lib/Meanbee/RoyalmailPHPLibrary/src/CalculateMethod.php index 0b0c592..d4522b7 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/src/CalculateMethod.php +++ b/lib/Meanbee/RoyalmailPHPLibrary/src/CalculateMethod.php @@ -56,7 +56,7 @@ public function getMethods($country_code, $package_value, $package_weight) foreach ($sortedDeliveryMethods as $shippingMethod) { foreach ($shippingMethod as $item) { - $method = new Meanbee_RoyalMailPHPLibrary_src_Method(); + $method = new Meanbee_RoyalmailPHPLibrary_src_Method(); $method->countryCode = $country_code; $method->shippingMethodName = $item['shippingMethodName']; $method->minimumWeight = $item['minimumWeight']; diff --git a/lib/Meanbee/RoyalmailPHPLibrary/src/Method.php b/lib/Meanbee/RoyalmailPHPLibrary/src/Method.php index d5151f4..ebb9581 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/src/Method.php +++ b/lib/Meanbee/RoyalmailPHPLibrary/src/Method.php @@ -1,6 +1,6 @@ assertNotEmpty($this->calculateMethodClass->getMethods('GB', 20, 0.050)); } @@ -113,7 +113,7 @@ public function testRoyalMailClassRealValues() /** * Test to compare the returned data from the Data class to expected values */ - public function testRoyalMailMethodRealValues() + public function testRoyalmailMethodRealValues() { $this->assertEquals($this->testDataClassArray, $this->dataClass->calculateMethods('GB', 19.99, 0.050)); } @@ -121,7 +121,7 @@ public function testRoyalMailMethodRealValues() /** * Test to ensure the only the expected empty array is returned from incorrect data to the data class */ - public function testRoyalMailMethodFake() + public function testRoyalmailMethodFake() { $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods('GASD', "aSDASD", "ASDASD")); $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods(123123123, "asdasd", "asdadasd")); @@ -135,7 +135,7 @@ public function testRoyalMailMethodFake() * Test to ensure that only the expected empty array is returned from null and incorrect data * from the Data class */ - public function testRoyalMailMethodNull() + public function testRoyalmailMethodNull() { $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods(null, 123123123123, 0.100)); $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods(null, null, 0.100)); @@ -149,7 +149,7 @@ public function testRoyalMailMethodNull() * Test to ensure that only the expected empty array is returned from incorrect * data from the CalculateMethod class */ - public function testRoyalMailClassFake() + public function testRoyalmailClassFake() { $this->assertEquals( $this->emptyArray, @@ -175,7 +175,7 @@ public function testRoyalMailClassFake() * Test to ensure that only the expected empty array is returned from null * and incorrect data from the CalculateMethod class */ - public function testRoyalMailClassNull() + public function testRoyalmailClassNull() { $this->assertEquals($this->emptyArray, $this->calculateMethodClass->getMethods(null, 123123123123, 0.100)); $this->assertEquals($this->emptyArray, $this->calculateMethodClass->getMethods(null, null, 0.100)); diff --git a/package.xml b/package.xml index 915e266..50ad583 100644 --- a/package.xml +++ b/package.xml @@ -1,5 +1,5 @@ <_> - gKO33Xg2wx6wdQza + QwJX3XS3dAhahdvS Meanbee_Royalmail community @@ -9,12 +9,13 @@ Automatically calculated Royal Mail delivery methods. Open Software License v3.0 (OSL-3.0) http://www.opensource.org/licenses/osl-3.0.php - 2.7.0 + 2.7.1 stable - *Update to 2015 prices + *Added additional Royalmail shipping methods -*Migrate to using a library format to allow for easier future updates - +*Fixed incorrect name error + +*Fixed PHP 5.4 and lower error Meanbee @@ -43,7 +44,7 @@ - + @@ -90,4 +91,8 @@ + 1 + 200 + +