Merge branch 'release/2.7.4'

meanbee · Feb 10, 2016 · ecf1de5 · ecf1de5
2 parents 9393001 + 3592ccd
commit ecf1de5
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 27 deletions.
diff --git a/app/code/community/Meanbee/Royalmail/etc/config.xml b/app/code/community/Meanbee/Royalmail/etc/config.xml
@@ -22,7 +22,7 @@
 <config>
     <modules>
         <Meanbee_Royalmail>
-            <version>2.7.2</version>
+            <version>2.7.4</version>
             <depends>
                 <Mage_Shipping />
             </depends>

diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv
@@ -87,10 +87,10 @@ UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LETTER,0,50,50,"Signed For: Seco
 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"

diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv b/lib/Meanbee/RoyalmailPHPLibrary/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,
@@ -461,7 +461,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,

diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv
@@ -36,8 +36,8 @@
 "internationalstandardsmallparcel","International Standard Small Parcel",WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL,0,20,20
 "internationalstandardsmallparcel","International Standard Small Parcel",WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL,0,20,20
 "internationallettertrackedsigned","International Tracked and Signed Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50
-"internationallettertrackedsigned","International Tracked and Signed Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50
-"internationallettertrackedsigned","International Tracked and Signed Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50
+"internationallettertrackedsigned","International Tracked and Signed Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50
+"internationallettertrackedsigned","International Tracked and Signed Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50
 "internationallettertrackedsigned","International Tracked and Signed Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250
 "internationallettertrackedsigned","International Tracked and Signed Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250
 "internationallettertrackedsigned","International Tracked and Signed Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250
@@ -71,9 +71,9 @@
 "internationaltrackedsmallparcel","International Tracked Small Parcel",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250
 "internationaltrackedsmallparcel","International Tracked Small Parcel",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250
 "internationaltrackedsmallparcel","International Tracked Small Parcel",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250
-"internationallettersigned","International Signed Letter",WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0,50,20
-"internationallettersigned","International Signed Letter",WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0,50,20
-"internationallettersigned","International Signed Letter",WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0,50,20
+"internationallettersigned","International Signed Letter",WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0,50,50
+"internationallettersigned","International Signed Letter",WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0,50,50
+"internationallettersigned","International Signed Letter",WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0,50,50
 "internationallettersigned","International Signed Letter",WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250
 "internationallettersigned","International Signed Letter",WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250
 "internationallettersigned","International Signed Letter",WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250

diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv
@@ -31,8 +31,6 @@
 "internationalsignedlargeletter","International Signed Large Letter"
 "internationalsignedsmallparcel","International Signed Small Parcel"
 "internationaleconomyletter","International Economy Letter"
-"internationaleconomyletter","International Economy Letter"
-"internationaleconomylargeletter","International Economy Large Letter"
 "internationaleconomylargeletter","International Economy Large Letter"
 "internationaleconomysmallparcel","International Economy Small Parcel"
 "parcelforceworldwideexpress9","Parcelforce Worldwide: Express 9"

diff --git a/package.xml b/package.xml
@@ -1,5 +1,5 @@
 <_>
-   <form_key>y0ShjLGrOcqkOAlh</form_key>
+   <form_key>ximzgIICM80Sj0lq</form_key>
    <name>Meanbee_Royalmail</name>
    <channel>community</channel>
    <version_ids>
@@ -9,9 +9,9 @@
    <description>Automatically calculated Royal Mail delivery methods.</description>
    <license>Open Software License v3.0 (OSL-3.0)</license>
    <license_uri>http://www.opensource.org/licenses/osl-3.0.php</license_uri>
-   <version>2.7.2</version>
+   <version>2.7.4</version>
    <stability>stable</stability>
-   <notes>* Fixed PHP 5.3 error</notes>
+   <notes>* Fixed spelling mistake in csv files preventing all shipping method from being shown.</notes>
    <authors>
       <name>
          <name>Meanbee</name>
@@ -40,7 +40,7 @@
             <max/>
          </max>
          <files>
-            <files>                       </files>
+            <files>                         </files>
          </files>
       </package>
       <extension>
@@ -87,8 +87,4 @@
          <ignore/>
       </ignore>
    </contents>
-   <page>1</page>
-   <limit>200</limit>
-   <folder/>
-   <package/>
 </_>