Merge pull request #21 from meanbee/20-upate-library-files-match-exte…

…nsion

20: Update Library files to match Extension

README.md

@@ -6,7 +6,7 @@ This repository contains the source code for the Meanbee Royal Mail PHP Library.
 
 ## Using the Library
 
-To use the library, call the **getMethods** method with your country code ([in the ISO 3166 format](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)), package value, and package weight. 
+To use the library, call the **getMethods** method with your country code ([in the ISO 3166 format](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)), package value, and package weight.
 
 #### Example Usage
 ```PHP
@@ -23,7 +23,7 @@ This program is automatically unit tested with phpunit and travis.
 
 ## CSV data format
 
-This library uses six CSV files to determine which shipping methods are available: 
+This library uses six CSV files to determine which shipping methods are available:
 
 1. [1_countryCodeToZone.csv](https://github.com/meanbee/royalmail/blob/develop/lib/Meanbee/RoyalmailPHPLibrary/data/1_countryToZone.csv)
     * Country code
@@ -32,41 +32,39 @@ This library uses six CSV files to determine which shipping methods are availabl
         * WORLD_ZONE_EU
         * WORLD_ZONE_ONE
         * WORLD_ZONE_TWO
-        
+
 2. [2_zoneToDeliveryMethod.csv](https://github.com/meanbee/royalmail/blob/develop/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv)
     * World zone
-    * Shipping zone. 
+    * Shipping zone.
+
+    Each shipping method's name starts with the world zone it links to as prices differ between zones.
 
-    Each shipping method's name starts with the world zone it links to as prices differ between zones. 
-
-3. [3_deliveryMethodMeta.csv](https://github.com/meanbee/royalmail/blob/develop/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv) 
+3. [3_deliveryMethodMeta.csv](https://github.com/meanbee/royalmail/blob/develop/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv)
     * Delivery method
     * Minimum price of method
     * Maximum price available to the method (the maximum price of shipping cart this method applies to)
     * Max insurance available on method
     * Clean method name. The clean method name represents the name of the method group, and is also represented in the 5 and 6 csvs. The clean method name is used to match multiple methods of the same type to the correct group.
-    
+
 4. [4_deliveryToPrice.csv](https://github.com/meanbee/royalmail/blob/develop/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv)
     * Method name
     * Minimum weight
     * Maximum weight
-    * Max insurance value available to the method
     * Price of method
     * Max insurance value
     * In the case of small or medium parcel up to 2kg in weight "SMALL" or "MEDIUM" else blank
-     
-5. [5_cleanNameToMethod.csv](https://github.com/meanbee/royalmail/blob/develop/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv) 
+
+5. [5_cleanNameToMethod.csv](https://github.com/meanbee/royalmail/blob/develop/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv)
     * Method group name
     * Clean method name
     * Dirty method name
 
     Each method group name is a all lowercase name that represents the group of method names overall. One method name represnts multipel method names.
-     
+
 6. [6_cleanNameToMethodGroup](https://github.com/meanbee/royalmail/blob/develop/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv)
     * Method group name
     * Clean method name
 
-    This csv is used to form list of just the clean method names if necessasary. 
+    This csv is used to form list of just the clean method names if necessasary.
 
 Method names are constructed in the WORLDZONE_NAME_WITH_UNDERSCORES format with a separate method being added for each separate foramt. Examples of these can be seen in multiple of the csvs. In the case of extra insurance available on the item, another method must be created. An example can be seen in the 3_deliveryMethodMeta.csv.   
-

data/3_deliveryMethodMeta.csv

@@ -67,30 +67,42 @@ 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_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_1PM_500,0,500,500,"Special Delivery: Guaranteed by 1pm"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_1000,501,1000,1000,"Special Delivery: Guaranteed by 1pm"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_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_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_500,0,500,500,"Special Delivery: Guaranteed by 1pm Saturday"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_1000,501,1000,1000,"Special Delivery: Guaranteed by 1pm Saturday"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500,1001,2500,2500,"Special Delivery: Guaranteed by 1pm Saturday"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_50,0,50,50,"Special Delivery: Guaranteed by 9am Saturday"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_1000,51,1000,1000,"Special Delivery: Guaranteed by 9am Saturday"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_2500,1001,2500,2500,"Special Delivery: Guaranteed by 9am Saturday"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_500,0,500,500,"Special Delivery: Guaranteed by 1pm"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_1000,501,1000,1000,"Special Delivery: Guaranteed by 1pm"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_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_DELIVERY_1PM_SATURDAY_500,0,500,500,"Special Delivery: Guaranteed by 1pm Saturday"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_1000,501,1000,1000,"Special Delivery: Guaranteed by 1pm Saturday"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500,1001,2500,2500,"Special Delivery: Guaranteed by 1pm Saturday"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_50,0,50,50,"Special Delivery: Guaranteed by 9am Saturday"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_1000,51,1000,1000,"Special Delivery: Guaranteed by 9am Saturday"
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_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"
-UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50,"Signed For: First Medium Parcel"
+UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0,50,50,"Signed For: First Class Small Parcel"
+UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50,"Signed For: First Class Medium Parcel"
 UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LETTER,0,50,50,"Signed For: Second Class Class Letter"
 UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LARGE_LETTER,0,50,50,"Signed For: Second Class Class Large Letter"
 UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_SMALL_PARCEL,0,50,50,"Signed For: Second Class Small Parcel"
 UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_MEDIUM_PARCEL,0,50,50,"Signed For: Second Class Medium Parcel"
-UK_STANDARD_FIRST_CLASS_LETTER,0,20,20,"First Class: Letter"
-UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0,20,20,"First Class: Large Letter"
-UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,0,20,20,"First Class: Small Parcel"
-UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20,"First Class: Medium Parcel"
+UK_STANDARD_FIRST_CLASS_LETTER,0,20,20,"Standard First Class Letter"
+UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0,20,20,"Standard First Class Large Letter"
+UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,0,20,20,"Standard First Class Small Parcel"
+UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20,"Standard First Class Medium Parcel"
 UK_STANDARD_SECOND_CLASS_LETTER,0,20,20,"Second Class: Letter"
 UK_STANDARD_SECOND_CLASS_LARGE_LETTER,0,20,20,"Second Class: Large Letter"
 UK_STANDARD_SECOND_CLASS_SMALL_PARCEL,0,20,20,"Second Class: Small Parcel"

data/4_deliveryToPrice.csv

@@ -1,6 +1,6 @@
 WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LETTER,0.001,0.010,1.00,20,
-WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LETTER,0.001,0.010,1.00,20,
-WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LETTER,0.001,0.010,1.52,20,
+WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LETTER,0.011,0.020,1.00,20,
+WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LETTER,0.021,0.100,1.52,20,
 WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LARGE_LETTER,0.001,0.100,2.45,20,
 WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LARGE_LETTER,0.101,0.250,3.70,20,
 WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LARGE_LETTER,0.251,0.500,5.15,20,
@@ -111,8 +111,8 @@ WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.251,1.500,17.7
 WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.501,1.750,18.31,250,
 WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.751,2.000,19.46,250,
 WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LETTER,0.001,0.010,1.00,20,
-WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LETTER,0.001,0.010,1.33,20,
-WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LETTER,0.001,0.010,2.25,20,
+WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LETTER,0.011,0.020,1.33,20,
+WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LETTER,0.021,0.100,2.25,20,
 WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LARGE_LETTER,0.001,0.100,3.15,20,
 WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LARGE_LETTER,0.101,0.250,4.75,20,
 WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LARGE_LETTER,0.251,0.500,7.45,20,
@@ -239,8 +239,8 @@ WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL,1.251,1.500,10.76,20,
 WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL,1.501,1.750,12.11,20,
 WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL,1.751,2.000,13.26,20,
 WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LETTER,0.001,0.010,1.00,20,
-WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LETTER,0.001,0.010,1.33,20,
-WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LETTER,0.001,0.010,2.25,20,
+WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LETTER,0.011,0.020,1.33,20,
+WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LETTER,0.021,0.100,2.25,20,
 WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LARGE_LETTER,0.001,0.100,3.30,20,
 WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LARGE_LETTER,0.101,0.250,5.05,20,
 WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LARGE_LETTER,0.251,0.500,7.90,20,
@@ -396,6 +396,36 @@ 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_DELIVERY_1PM_SATURDAY_500,0.001,0.100,10.74,500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_500,0.101,0.500,11.70,500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_500,0.501,1.000,13.26,500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_500,1.001,2.000,16.20,500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_500,2.001,10.000,34.92,500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_500,10.001,20.000,52.44,500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_1000,0.001,0.100,11.94,1000,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_1000,0.101,0.500,12.90,1000,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_1000,0.501,1.000,14.46,1000,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_1000,1.001,2.000,17.40,1000,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_1000,2.001,10.000,36.12,1000,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_1000,10.001,20.000,53.64,1000,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500,0.001,0.100,14.34,2500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500,0.101,0.500,15.30,2500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500,0.501,1.000,16.86,2500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500,1.001,2.000,19.80,2500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500,2.001,10.000,38.52,2500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_1PM_SATURDAY_2500,10.001,20.000,56.04,2500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_50,0.001,0.100,21.36,50,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_50,0.101,0.500,23.76,50,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_50,0.501,1.000,25.50,50,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_50,1.001,2.000,29.94,50,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_1000,0.001,0.100,23.56,1000,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_1000,0.101,0.500,25.96,1000,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_1000,0.501,1.000,27.70,1000,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_1000,1.001,2.000,32.14,1000,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_2500,0.001,0.100,27.06,2500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_2500,0.101,0.500,29.46,2500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_2500,0.501,1.000,31.20,2500,
+UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVERY_9AM_SATURDAY_2500,1.001,2.000,35.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,
@@ -435,7 +465,7 @@ UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0.001,1.000,4.40,50,
 UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,1.001,2.000,6.55,50,SMALL
 UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0.001,1.000,6.75,50,MEDIUM
 UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,1.001,2.000,10.00,50,MEDIUM
-UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,2.001,5.00016.95,50,
+UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,2.001,5.000,16.95,50,
 UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,5.001,10.000,23.00,50,
 UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,10.001,20.000,34.50,
 UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LETTER,0.001,0.100,1.64,50,
@@ -461,7 +491,7 @@ UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0.001,1.000,5.65,20,MEDIUM
 UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,1.001,2.000,8.90,20,MEDIUM
 UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,2.001,5.000,15.85,20,
 UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,5.001,10.000,21.90,20,
-UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,10.001,20.000,33.40,
+UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,10.001,20.000,33.40,20,
 UK_STANDARD_SECOND_CLASS_LETTER,0.001,0.100,0.54,20,
 UK_STANDARD_SECOND_CLASS_LARGE_LETTER,0.001,0.100,0.74,20,
 UK_STANDARD_SECOND_CLASS_LARGE_LETTER,0.101,0.250,1.19,20,
@@ -543,4 +573,4 @@ PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,5.001,10.000,25.40,100,
 PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,10.001,15.000,32.14,100,
 PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,15.001,20.000,37.51,100,
 PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,20.001,25.000,38.68,100,
-PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,25.001,30.000,52.78,100,
+PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,25.001,30.000,52.78,100,