From cd29cf4144a49abf894a3177b0657d06aad224cc Mon Sep 17 00:00:00 2001 From: Nathan McBride Date: Tue, 26 May 2015 08:49:14 +0100 Subject: [PATCH 01/15] MB-87: Update RoyalMail Worldzones Royalmail now don't support Non EU countries what so ever. This update will mean our module replicates the current delivery methods Royalmail do. I also removed the Non EU zone from the tests and a few models. I updated the getWorldZone() method within the Helper to use a switch statement as it's a bit more legible and thats what the rest of the module uses. --- .../Meanbee/Royalmail/Helper/Data.php | 46 ++++++++----------- .../Royalmail/Internationallettersigned.php | 3 +- .../Royalmail/Internationallettertracked.php | 15 +----- .../Royalmail/Internationaltracked.php | 15 +----- .../Shipping/Carrier/Royalmail/Rules.php | 3 +- .../Royalmail/Rules/providers/runTests.yaml | 6 --- .../Carrier/Royalmail/Source/Method.php | 1 + .../data/internationallettertracked_noneu.csv | 3 -- .../data/internationaltracked_noneu.csv | 9 ---- 9 files changed, 25 insertions(+), 76 deletions(-) delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationallettertracked_noneu.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationaltracked_noneu.csv diff --git a/app/code/community/Meanbee/Royalmail/Helper/Data.php b/app/code/community/Meanbee/Royalmail/Helper/Data.php index dbb6fcc..62749d7 100644 --- a/app/code/community/Meanbee/Royalmail/Helper/Data.php +++ b/app/code/community/Meanbee/Royalmail/Helper/Data.php @@ -21,7 +21,6 @@ class Meanbee_Royalmail_Helper_Data extends Mage_Core_Helper_Abstract { const WORLD_ZONE_GB = 'gb'; const WORLD_ZONE_EU = 'eu'; - const WORLD_ZONE_NONEU = 'noneu'; const WORLD_ZONE_ONE = 'wz1'; const WORLD_ZONE_TWO = 'wz2'; const INTERNATIONAL_SIGNED = 'international_signed'; @@ -32,19 +31,16 @@ class Meanbee_Royalmail_Helper_Data extends Mage_Core_Helper_Abstract { 'GB', 'IM', 'JE', 'GG'); protected $_worldZoneEu = array( - 'DK', 'EE', 'LV', 'AT', 'FI', - 'LT', 'SK', 'FR', 'LU', 'SI', - 'ES', 'DE', 'SE', 'GI', 'MT', - 'BE', 'GR', 'MC', 'BG', 'HU', - 'NL', 'IE', 'HR', 'IT', 'PL', - 'CY', 'PT', 'CZ', 'RO'); - protected $_worldZoneNonEu = array( - 'SM', 'AM', 'FO', 'LI', 'RS', - 'XK', 'KZ', 'VA', 'NO', 'UZ', - 'UA', 'ME', 'TM', 'IS', 'TR', - 'MD', 'TJ', 'BA', 'GL', 'CH', - 'BY', 'GE', 'MK', 'AZ', 'KG', - 'RU', 'AD', 'AL'); + 'AL', 'AM', 'AT', 'AZ', 'BY', + 'BE', 'BA', 'BG', 'HR', 'CY', + 'CZ', 'DK', 'EE', 'FO', 'FI', + 'FR', 'GE', 'DE', 'GI', 'GR', + 'GL', 'HU', 'IS', 'NO', 'PL', + 'PT', 'RO', 'RU', 'SM', 'RS', + 'SK', 'SI', 'ES', 'SE', 'CH', + 'TJ', 'TR', 'TM', 'UA', 'UZ', + 'VA'); + protected $_worldZone2 = array( 'AU', 'PW', 'IO', 'CX', 'CC', 'CK', 'FJ', 'PF', 'TF', 'KI', @@ -328,18 +324,16 @@ public function addInsuranceCharges($rates, $charge, $cartTotal, $valueOver = 50 * @return null|string */ public function getWorldZone($countryCode) { - $country = strtoupper($countryCode); - if (in_array($country, $this->_worldZoneGb)) { - return self::WORLD_ZONE_GB; - } else if (in_array($country, $this->_worldZoneEu)) { - return self::WORLD_ZONE_EU; - } else if (in_array($country, $this->_worldZoneNonEu)) { - return self::WORLD_ZONE_NONEU; - } else if (in_array($country, $this->_worldZone2)) { - return self::WORLD_ZONE_TWO; - } else { - return self::WORLD_ZONE_ONE; + switch(strtoupper($countryCode)) { + case in_array($countryCode, $this->_worldZoneGb): + return self::WORLD_ZONE_GB; + case in_array($countryCode, $this->_worldZoneEu): + return self::WORLD_ZONE_EU; + case (in_array($countryCode, $this->_worldZone2)): + return self::WORLD_ZONE_TWO; + default: + return self::WORLD_ZONE_ONE; } - return null; + } } diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettersigned.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettersigned.php index 2be4354..34c950f 100644 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettersigned.php +++ b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettersigned.php @@ -22,7 +22,6 @@ class Meanbee_Royalmail_Model_Shipping_Carrier_Royalmail_Internationallettersign protected $insureOver = 50; protected $additionalInsuranceChargeEu = 2.50; - protected $additionalInsuranceChargeNonEu = 2.50; protected $additionalInsuranceChargeWz1 = 2.50; protected $additionalInsuranceChargeWz2 = 2.50; @@ -78,4 +77,4 @@ protected function _getWzRates() { return $this->_loadCsv('internationallettersigned_wz'); } -} \ No newline at end of file +} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertracked.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertracked.php index b6c9f1b..d0c5b7a 100644 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertracked.php +++ b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertracked.php @@ -22,7 +22,6 @@ class Meanbee_Royalmail_Model_Shipping_Carrier_Royalmail_Internationallettertrac protected $insureOver = 50; protected $additionalInsuranceChargeEu = 3.00; - protected $additionalInsuranceChargeNonEu = 2.50; protected $additionalInsuranceChargeWz = 2.50; public function getRates() { @@ -47,14 +46,6 @@ public function getRates() { $this->insureOver ); break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_NONEU: - $rates = $_helper->addInsuranceCharges( - $this->_getNonEuRates(), - $this->additionalInsuranceChargeNonEu, - $this->getCartTotal(), - $this->insureOver - ); - break; case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE: case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_TWO: $rates = $_helper->addInsuranceCharges( @@ -74,12 +65,8 @@ protected function _getEuRates() { return $this->_loadCsv('internationallettertracked_eu'); } - protected function _getNonEuRates() { - return $this->_loadCsv('internationallettertracked_noneu'); - } - protected function _getWzRates() { return $this->_loadCsv('internationallettertracked_wz'); } -} \ No newline at end of file +} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltracked.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltracked.php index 1020c96..213788c 100644 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltracked.php +++ b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltracked.php @@ -22,7 +22,6 @@ class Meanbee_Royalmail_Model_Shipping_Carrier_Royalmail_Internationaltracked protected $insureOver = 50; protected $additionalInsuranceChargeEu = 3; - protected $additionalInsuranceChargeNonEu = 2.50; protected $additionalInsuranceChargeWz1 = 2.50; protected $additionalInsuranceChargeWz2 = 2.50; @@ -47,14 +46,6 @@ public function getRates() { $this->insureOver ); break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_NONEU: - $rates = $_helper->addInsuranceCharges( - $this->_getNonEuRates(), - $this->additionalInsuranceChargeNonEu, - $this->getCartTotal(), - $this->insureOver - ); - break; case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE: $rates = $_helper->addInsuranceCharges( $this->_getWz1Rates(), @@ -81,10 +72,6 @@ protected function _getEuRates() { return $this->_loadCsv('internationaltracked_eu'); } - protected function _getNonEuRates() { - return $this->_loadCsv('internationaltracked_noneu'); - } - protected function _getWz1Rates() { return $this->_loadCsv('internationaltracked_wz1'); } @@ -92,4 +79,4 @@ protected function _getWz1Rates() { protected function _getWz2Rates() { return $this->_loadCsv('internationaltracked_wz2'); } -} \ No newline at end of file +} diff --git a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules.php b/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules.php index 00bea1d..60c15b3 100644 --- a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules.php +++ b/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules.php @@ -6,7 +6,6 @@ class Meanbee_Royalmail_Test_Model_Shipping_Carrier_Royalmail_Rules extends Mean protected $_model = null; protected $_countryCodes = array( Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB => 'GB', - Meanbee_Royalmail_Helper_Data::WORLD_ZONE_NONEU => 'RS', Meanbee_Royalmail_Helper_Data::WORLD_ZONE_EU => 'FR', Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE => 'US', Meanbee_Royalmail_Helper_Data::WORLD_ZONE_TWO => 'AU', @@ -159,7 +158,7 @@ protected function getNotAllowedCountryCode($data, $key = null) } $code = $this->getCountryCode($data, $key); if($code == 'GB') { - return $this->_countryCodes[Meanbee_Royalmail_Helper_Data::WORLD_ZONE_NONEU]; + return $this->_countryCodes[Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE]; } else { return $this->_countryCodes[Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB]; } diff --git a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules/providers/runTests.yaml b/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules/providers/runTests.yaml index 2414ba4..77b7c39 100644 --- a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules/providers/runTests.yaml +++ b/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules/providers/runTests.yaml @@ -79,9 +79,6 @@ - model_alias: internationaltracked data: { csv: internationaltracked_eu, weights: { lowest: { weight: '250', price: '10.44' }, highest: { weight: '2000', price: '20.36' } }, zones: eu } -- - model_alias: internationaltracked - data: { csv: internationaltracked_noneu, weights: { lowest: { weight: '250', price: '8.70' }, highest: { weight: '2000', price: '16.96' } }, zones: noneu, country_code: LI } - model_alias: internationaltracked data: { csv: internationaltracked_wz1, weights: { lowest: { weight: '250', price: '9.75' }, highest: { weight: '2000', price: '23.55' } }, zones: wz1 } @@ -103,9 +100,6 @@ - model_alias: internationallettertracked data: { csv: internationallettertracked_eu, weights: { lowest: { weight: '20', price: '7.20' }, highest: { weight: '100', price: '7.83' } }, zones: eu } -- - model_alias: internationallettertracked - data: { csv: internationallettertracked_noneu, weights: { lowest: { weight: '20', price: null }, highest: { weight: '100', price: null } }, zones: noneu } - model_alias: internationallettertracked data: { csv: internationallettertracked_wz, weights: { lowest: { weight: '20', price: '6.33' }, highest: { weight: '100', price: '7.25' } }, zones: [wz1, wz2] } diff --git a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Source/Method.php b/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Source/Method.php index 010c7a8..cd5ae02 100644 --- a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Source/Method.php +++ b/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Source/Method.php @@ -11,3 +11,4 @@ public function tearDown() { $this->_model = null; } } + diff --git a/app/code/community/Meanbee/Royalmail/data/internationallettertracked_noneu.csv b/app/code/community/Meanbee/Royalmail/data/internationallettertracked_noneu.csv deleted file mode 100644 index b29ebe5..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationallettertracked_noneu.csv +++ /dev/null @@ -1,3 +0,0 @@ -10,6.00 -20,6.00 -100,6.52 diff --git a/app/code/community/Meanbee/Royalmail/data/internationaltracked_noneu.csv b/app/code/community/Meanbee/Royalmail/data/internationaltracked_noneu.csv deleted file mode 100644 index 43e9031..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationaltracked_noneu.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,8.20 -250,8.70 -500,10.15 -750,11.10 -1000,12.51 -1250,13.86 -1500,15.21 -1750,15.81 -2000,16.96 From ee8f89d8a2a2f04fbbb5b44976959ed9789063f2 Mon Sep 17 00:00:00 2001 From: Peter Hough Date: Tue, 29 Sep 2015 19:11:04 +0100 Subject: [PATCH 02/15] Added composer.json --- composer.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 composer.json diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..3433fe6 --- /dev/null +++ b/composer.json @@ -0,0 +1,6 @@ +{ + "name": "meanbee/royalmail", + "type": "magento-module", + "description": "A Magento shipping extension to add Royal Mail shipping methods.", + "homepage": "https://www.meanbee.com/magento-extensions/magento-royal-mail.html" +} From b217efb124a8bcbc0f4e6498495fd8734009e9d5 Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Mon, 21 Dec 2015 10:27:49 +0000 Subject: [PATCH 03/15] #32: Add the new library to the repository Adds the new library to the repository which originates from the meanbee royal mail php library. --- lib/Meanbee/RoyalmailPHPLibrary/.gitignore | 3 + lib/Meanbee/RoyalmailPHPLibrary/.travis.yml | 15 + lib/Meanbee/RoyalmailPHPLibrary/LICENSE.txt | 47 +++ lib/Meanbee/RoyalmailPHPLibrary/README.md | 33 ++ lib/Meanbee/RoyalmailPHPLibrary/composer.json | 14 + .../data/1_countryToZone.csv | 7 + .../data/2_zoneToDeliveryMethod.csv | 4 + .../data/3_deliveryMethodMeta.csv | 33 ++ .../data/4_deliveryToPrice.csv | 97 ++++++ .../data/5_cleanNameToMethod.csv | 43 +++ .../data/6_cleanNameMethodGroup.csv | 12 + lib/Meanbee/RoyalmailPHPLibrary/phpunit.xml | 17 + .../src/CalculateMethod.php | 85 +++++ lib/Meanbee/RoyalmailPHPLibrary/src/Data.php | 291 ++++++++++++++++++ .../RoyalmailPHPLibrary/src/Method.php | 28 ++ .../tests/RoyalmailTest.php | 188 +++++++++++ 16 files changed, 917 insertions(+) create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/.gitignore create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/.travis.yml create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/LICENSE.txt create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/README.md create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/composer.json create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/data/1_countryToZone.csv create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/phpunit.xml create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/src/CalculateMethod.php create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/src/Data.php create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/src/Method.php create mode 100644 lib/Meanbee/RoyalmailPHPLibrary/tests/RoyalmailTest.php diff --git a/lib/Meanbee/RoyalmailPHPLibrary/.gitignore b/lib/Meanbee/RoyalmailPHPLibrary/.gitignore new file mode 100644 index 0000000..4f38912 --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/.gitignore @@ -0,0 +1,3 @@ +.idea +vendor +composer.lock diff --git a/lib/Meanbee/RoyalmailPHPLibrary/.travis.yml b/lib/Meanbee/RoyalmailPHPLibrary/.travis.yml new file mode 100644 index 0000000..27cc3d2 --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/.travis.yml @@ -0,0 +1,15 @@ +language: php + +php: + - 5.4 + - 5.5 + - 5.6 + - 7.0 + - hhvm + +before_script: + - composer self-update + - composer install --prefer-source --no-interaction --dev + +script: phpunit + diff --git a/lib/Meanbee/RoyalmailPHPLibrary/LICENSE.txt b/lib/Meanbee/RoyalmailPHPLibrary/LICENSE.txt new file mode 100644 index 0000000..94166bb --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/LICENSE.txt @@ -0,0 +1,47 @@ +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/lib/Meanbee/RoyalmailPHPLibrary/README.md b/lib/Meanbee/RoyalmailPHPLibrary/README.md new file mode 100644 index 0000000..d5ea100 --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/README.md @@ -0,0 +1,33 @@ +# Royal Mail PHP Shipping Method Library + +![image](http://up.nicksays.co.uk/200k1j35411o2i0Y0N3S/RoyalMail.png) + +This repository contains the source code for the Meanbee Royal Mail PHP Library. It takes the country code, package value, and package weight and then outputs an array of objects containing the available shipping methods. + +## 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. + +#### Example Usage +```PHP +$calculateMethodClass = new CalculateMethodClass(); + +$calculateMethodClass->getMethods('GB', 20, 0.050); +``` + +This will return an array of objects where each object contains the shipping method name, minimum weight, maximum weight, price of the method, maximum insurance value, and proper name of the shipping method. + +## Unit Testing + +This program is automatically unit tested with phpunit and travis. + +## CSV data format + +This library uses four CSV files to determine which shipping methods are available: + +1. 1_countryCodeToZone.csv - maps country code to world zone +2. 2_zoneToDeliveryMethod.csv - maps world zone to all possible shipping methods in that world zone +3. 3_deliveryMethodMeta.csv - maps delivery method to minimum and maximum price available to the method, max insurance available on method, and the clean method name +4. 4_deliveryToPrice.csv - maps method name to minimum and maximum weight, max insurance value, price of method, and max insurance value + +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. \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/composer.json b/lib/Meanbee/RoyalmailPHPLibrary/composer.json new file mode 100644 index 0000000..ae66c33 --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/composer.json @@ -0,0 +1,14 @@ +{ + "name": "meanbee/Royalmail-PHP-Library", + "type": "Library", + "description": "PHP library for Royal Mail shipping shipping methods", + "homepage": "https://github.com/meanbee/Royalmail-PHP-Library", + + "require-dev": { + "phpunit/phpunit": "4.*" + }, + + "autoload": { + "psr-4": { "Meanbee\\RoyalMail\\": ["src/", "tests/"] } + } +} diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/1_countryToZone.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/1_countryToZone.csv new file mode 100644 index 0000000..c63ff62 --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/1_countryToZone.csv @@ -0,0 +1,7 @@ +GB,WORLD_ZONE_EU +GB,WORLD_ZONE_GB +FA,WORLD_ZONE_EU +IM,WORLD_ZONE_ONE +JE,WORLD_ZONE_TWO +GG,WORLD_ZONE_GB +GG,WORLD_ZONE_EU \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv new file mode 100644 index 0000000..d1a6cd4 --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv @@ -0,0 +1,4 @@ +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,UK_STANDARD_FIRST_CLASS_LETTER,UK_STANDARD_FIRST_CLASS_LARGE_LETTER,UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv new file mode 100644 index 0000000..b76f2ea --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv @@ -0,0 +1,33 @@ +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0,50,20,"International Signed Letter" +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Letter" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50,"International Tracked and Signed Letter" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50,"International Tracked and Signed Large Letter" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Letter" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Large Letter" +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0,50,20,"International Signed Letter" +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50,"International Tracked and Signed Letter" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50,"International Tracked and Signed Large Letter" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Letter" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Large Letter" +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0,50,20,"International Signed Letter" +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50,"International Tracked and Signed Letter" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50,"International Tracked and Signed Large Letter" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Letter" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Large Letter" +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_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_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,50,50,"Standard First Class Small Parcel" +UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,50,50,"Standard First Class Medium Parcel" +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0,50,50,"First Class Parcel Small - Signed For" +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50,"First Class Parcel Medium - Signed For" \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv new file mode 100644 index 0000000..896c355 --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv @@ -0,0 +1,97 @@ +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50 +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.00,50 +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,6.52,50 +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,6.00,250 +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,6.00,250 +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,6.52,250 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.00,50 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,6.52,50 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,08.10,50 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,08.60,50 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,10.05,50 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,11.00,50 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.50,250 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.02,250 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,10.60,250 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,11.10,250 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,12.55,250 +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,13.50,250 +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50 +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50 +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50 +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250 +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250 +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.70,50 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.65,50 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.35,50 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,14.45,50 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.20,250 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.05,250 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,14.85,250 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,16.95,250 +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50 +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50 +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50 +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250 +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250 +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.90,50 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.95,50 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.80,50 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,15.30,50 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.40,250 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.45,250 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,15.30,250 +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,17.80,250 +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_STANDARD_FIRST_CLASS_LETTER,0.001,0.100,.63,20 +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.001,0.100,.95,20 +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.101,0.250,1.26,20 +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.251,0.500,1.68,20 +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.501,0.750,2.42,20 +UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,0.001,1.000,3.30,20,SMALL +UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,1.001,2.000,5.45,20,SMALL +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,20 +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0.001,1.000,4.40,20,SMALL +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,1.001,2.000,6.55,20,SMALL +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0.001,1.000,6.75,20,MEDIUM +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,1.001,2.000,10.00,20,MEDIUM +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,2.001,5.000,16.95,20 +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,5.001,10.000,23.00,20 +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,10.001,20.000,34.50,20 \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv new file mode 100644 index 0000000..fe79937 --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv @@ -0,0 +1,43 @@ +"internationallettersigned","International Signed Letter",WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0,50,20 +"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,0,50,20 +"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,0,50,20 +"internationallettersigned","International Signed Letter",WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250 +"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_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 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"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 +"letter","Standard First Class Letter",UK_STANDARD_FIRST_CLASS_LETTER,0,20,20 +"largeletter","Standard First Class Large Letter",UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0,20,20 +"firstclasssmall","Standard First Class Small Parcel",UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,0,20,20 +"firstclasssmall","Standard First Class Small Parcel",UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,0,20,20 +"firstclassmedium","Standard First Class Medium Parcel",UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20 +"firstclassmedium","Standard First Class Medium Parcel",UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20 +"firstclassmedium","Standard First Class Medium Parcel",UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20 +"firstclassmedium","Standard First Class Medium Parcel",UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20 +"firstclassmedium","Standard First Class Medium Parcel",UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20 +"firstclassrecordedsignedforsmall","First Class Parcel Small - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0,50,50 +"firstclassrecordedsignedforsmall","First Class Parcel Small - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0,50,50 +"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50 +"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50 +"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50 +"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50 +"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50 \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv new file mode 100644 index 0000000..48d685b --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv @@ -0,0 +1,12 @@ +"internationallettersigned","International Signed Letter" +"internationallettertrackedsigned","International Tracked and Signed Letter" +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter" +"specialdelivery1pm","Special Delivery: Guaranteed by 1pm" +"specialdelivery1pmsaturday","Special Delivery: Guaranteed by 1pm Saturday" +"specialdelivery9amsaturday","Special Delivery: Guaranteed by 9am Saturday" +"letter","Standard First Class Letter" +"largeletter","Standard First Class Large Letter" +"firstclasssmall","Standard First Class Small Parcel" +"firstclassmedium","Standard First Class Medium Parcel" +"firstclassrecordedsignedforsmall","First Class Parcel Small - Signed For" +"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For" \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/phpunit.xml b/lib/Meanbee/RoyalmailPHPLibrary/phpunit.xml new file mode 100644 index 0000000..c76fcd1 --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/phpunit.xml @@ -0,0 +1,17 @@ + + + + + ./tests/ + + + \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/src/CalculateMethod.php b/lib/Meanbee/RoyalmailPHPLibrary/src/CalculateMethod.php new file mode 100644 index 0000000..0b0c592 --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/src/CalculateMethod.php @@ -0,0 +1,85 @@ +getDocumentRoot(); + + // Set the default csv values + $this->_csvCountryCode = $this->documentRoot . '../data/1_countryToZone.csv'; + $this->_csvZoneToDeliverMethod = $this->documentRoot . '../data/2_zoneToDeliveryMethod.csv'; + $this->_csvDeliveryMethodMeta = $this->documentRoot . '../data/3_deliveryMethodMeta.csv'; + $this->_csvDeliveryToPrice = $this->documentRoot . '../data/4_deliveryToPrice.csv'; + $this->_csvCleanNameToMethod = $this->documentRoot . '../data/5_cleanNameToMethod.csv'; + $this->_csvCleanNameMethodGroup = $this->documentRoot . '../data/6_cleanNameMethodGroup.csv'; + } + + /** + * Method to run the appropriate sorting methods + * in the correct order based on the country code, + * package value, and package weight. Returns the + * sorted values to the RoyalMailMethod class to be + * converted into objects. + * + * @param $country_code + * @param $package_value + * @param $package_weight + * + * @return array + */ + public function getMethods($country_code, $package_value, $package_weight) + { + $data = new Meanbee_RoyalmailPHPLibrary_Data( + $this->_csvCountryCode, + $this->_csvZoneToDeliverMethod, + $this->_csvDeliveryMethodMeta, + $this->_csvDeliveryToPrice, + $this->_csvCleanNameToMethod, + $this->_csvCleanNameMethodGroup + ); + + $sortedDeliveryMethods = array($data->calculateMethods($country_code, $package_value, $package_weight)); + + $results = []; + + foreach ($sortedDeliveryMethods as $shippingMethod) { + foreach ($shippingMethod as $item) { + $method = new Meanbee_RoyalMailPHPLibrary_src_Method(); + $method->countryCode = $country_code; + $method->shippingMethodName = $item['shippingMethodName']; + $method->minimumWeight = $item['minimumWeight']; + $method->maximumWeight = $item['maximumWeight']; + $method->methodPrice = $item['methodPrice']; + $method->insuranceValue = $item['insuranceValue']; + $method->shippingMethodNameClean = $item['shippingMethodNameClean']; + + if(isset($item['size'])){ + $method->size = $item['size']; + } + + $results[] = $method; + } + } + return $results; + } + + /** + * Helper function to get the document root for csv files + */ + public function getDocumentRoot() + { + $this->documentRoot = dirname(realpath(__FILE__)) . '/'; + } +} diff --git a/lib/Meanbee/RoyalmailPHPLibrary/src/Data.php b/lib/Meanbee/RoyalmailPHPLibrary/src/Data.php new file mode 100644 index 0000000..b69a46a --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/src/Data.php @@ -0,0 +1,291 @@ +mappingCountryToZone = $this->csvToArray($_csvCountryCode); + $this->mappingZoneToMethod = $this->csvToArray($_csvZoneToDeliverMethod); + $this->mappingMethodToMeta = $this->csvToArray($_csvDeliveryMethodMeta); + $this->mappingDeliveryToPrice = $this->csvToArray($_csvDeliveryToPrice); + $this->mappingCleanNameToMethod = $this->csvToArray($_csvCleanNameToMethod); + $this->mappingCleanNameMethodGroup = $this->csvToArray($_csvCleanNameMethodGroup); + } + + /** + * Method to run the appropriate sorting methods + * in the correct order based on the country code, + * package value, and package weight. Returns the + * sorted values to the RoyalMailMethod class to be + * converted into objects. + * + * @param $country_code + * @param $package_value + * @param $package_weight + * + * @return array + */ + public function calculateMethods($country_code, $package_value, $package_weight) + { + $this->sortedCountryCodeMethods = array( + $this->getCountryCodeData( + $country_code, + $this->mappingCountryToZone + ) + ); + + $this->sortedZoneToMethods = array( + $this->getZoneToMethod( + $this->sortedCountryCodeMethods, + $this->mappingZoneToMethod + ) + ); + + $this->sortedMethodToMeta = array( + $this->getMethodToMeta( + $package_value, + $this->sortedZoneToMethods, + $this->mappingMethodToMeta + ) + ); + + $this->sortedDeliveryToPrices = + $this->getMethodToPrice( + $package_weight, + $this->sortedMethodToMeta, + $this->mappingDeliveryToPrice + + ); + + return $this->sortedDeliveryToPrices; + } + + /** + * + * Method to return a 2d array of world zones a country + * (by its country code) is located in. + * + * @param $country_code + * @param $mappingCountryToZone + * + * @return array + */ + private function getCountryCodeData($country_code, $mappingCountryToZone) + { + // Get All array items that match the country code + $countryCodeData = array(); + foreach ($mappingCountryToZone as $item) { + if (isset($item[0]) && $item[0] == $country_code) { + foreach ($item as $keys) { + $countryCodeData[] = $keys; + } + } + } + + // Clean up the array removing excess values + foreach ($countryCodeData as $key => $value) { + if ($value == $country_code) { + unset($countryCodeData[$key]); + } + } + + $countryCodeData = array_values($countryCodeData); + + return $countryCodeData; + } + + /** + * Method to return a 2d array of possible delivery methods based + * on the given world zones a country is in. + * + * @param $sortedCountryCodeMethods + * @param $mappingZoneToMethod + * + * @return array + */ + private function getZoneToMethod($sortedCountryCodeMethods, $mappingZoneToMethod) + { + $mappingZoneData = array(); + foreach ($sortedCountryCodeMethods as $key => $value) { + foreach ($value as $zone) { + foreach ($mappingZoneToMethod as $item) { + if (isset($item[0]) && $item[0] == $zone) { + foreach ($item as $keys) { + $mappingZoneData[] = $keys; + } + + } + } + } + } + + // Clean up the array removing excess values + foreach ($sortedCountryCodeMethods as $item => $itemValue) { + foreach ($itemValue as $zone) { + foreach ($mappingZoneData as $key => $value) { + if ($value == $zone) { + unset($mappingZoneData[$key]); + } + } + } + + } + + $mappingZoneData = array_values($mappingZoneData); + + return $mappingZoneData; + } + + /** + * Method to return a 2d array of the meta data for each + * given allowed shipping method and the given package + * value. + * + * @param $packageValue + * @param $sortedZoneToMethods + * @param $mappingMethodToMeta + * + * @return array + */ + private function getMethodToMeta($packageValue, $sortedZoneToMethods, $mappingMethodToMeta) + { + $mappingZoneMethodData = array(); + foreach ($sortedZoneToMethods as $key => $value) { + foreach ($value as $method) { + foreach ($mappingMethodToMeta as $item) { + if (isset($item[0]) && $item[0] == $method) { + if ($packageValue >= $item[1] && $packageValue <= $item[2]) { + $mappingZoneMethodData[] = array($item); + } + + } + } + } + } + + $mappingZoneMethodData = array_values($mappingZoneMethodData); + + return $mappingZoneMethodData; + } + + /** + * Method to return a 2d array of sorted shipping methods based on + * the weight of the item and the allowed shipping methods. Returns + * a 2d array to be converting into objects by the RoyalMailMethod + * class. Also adds the pretty text from the meta table to the + * correct shipping method, to allow for less text in the delivery + * to price csv. + * + * @param $package_weight + * @param $sortedMethodToMeta + * @param $mappingDeliveryToPrice + * + * @return array + */ + private function getMethodToPrice($package_weight, $sortedMethodToMeta, $mappingDeliveryToPrice) + { + $mappingDeliveryToPriceData = array(); + foreach ($sortedMethodToMeta as $method) { + foreach ($method as $thing) { + foreach ($thing as $key => $value) { + foreach ($value as $methodData) { + foreach ($mappingDeliveryToPrice as $item) { + if (isset($item[0]) && $item[0] == $methodData) { + if ($package_weight >= $item[1] && $package_weight <= $item[2]) { + $objectArray = array( + 'shippingMethodName' => $item[0], + 'minimumWeight' => $item[1], + 'maximumWeight' => $item[2], + 'methodPrice' => $item[3], + 'insuranceValue' => $item[4], + 'shippingMethodNameClean' => $value[4] + ); + + if (isset($item[5])) { + $objectArray['size'] = $item[5]; + } + + $mappingDeliveryToPriceData[] = $objectArray; + + } + } + } + } + } + } + } + + $mappingDeliveryToPriceData = array_values($mappingDeliveryToPriceData); + + return $mappingDeliveryToPriceData; + } + + /** + * Reads the given csv in to a 2d array + * + * @param string $filename + * @param string $delimiter + * + * @return array + * @throws \Exception + */ + private function csvToArray($filename = '', $delimiter = ',') + { + if (!file_exists($filename) || !is_readable($filename)) { + throw new \Exception("Unable to load the Royal Mail price data csv for '$filename'. + Ensure that the data folder contains all the necessary csvs."); + } + + $header = null; + $data = array(); + if (($handle = fopen($filename, 'r')) !== false) { + while (($row = fgetcsv($handle, 1000, $delimiter)) !== false) { + $data[] = $row; + } + fclose($handle); + } + return $data; + } +} \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/src/Method.php b/lib/Meanbee/RoyalmailPHPLibrary/src/Method.php new file mode 100644 index 0000000..d5151f4 --- /dev/null +++ b/lib/Meanbee/RoyalmailPHPLibrary/src/Method.php @@ -0,0 +1,28 @@ +calculateMethodClass = new CalculateMethod(); + $this->dataClass = new Data( + $this->calculateMethodClass->_csvCountryCode, + $this->calculateMethodClass->_csvZoneToDeliverMethod, + $this->calculateMethodClass->_csvDeliveryMethodMeta, + $this->calculateMethodClass->_csvDeliveryToPrice, + $this->calculateMethodClass->_csvCleanNameToMethod, + $this->calculateMethodClass->_csvCleanNameMethodGroup + ); + + $this->emptyArray = array(); + $this->testDataClassArray = Array + ( + 0 => Array + ( + 'shippingMethodName' => 'WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER', + 'minimumWeight' => 0.021, + 'maximumWeight' => 0.100, + 'methodPrice' => 6.52, + 'insuranceValue' => 50, + 'shippingMethodNameClean' => 'Royal Mail International Tracked and Signed Letter' + ), + 1 => Array + ( + 'shippingMethodName' => 'WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER', + 'minimumWeight' => 0.001, + 'maximumWeight' => 0.100, + 'methodPrice' => 08.10, + 'insuranceValue' => 50, + 'shippingMethodNameClean' => 'Royal Mail International Tracked and Signed Large Letter' + ), + 2 => Array + ( + 'shippingMethodName' => 'WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER', + 'minimumWeight' => 0.020, + 'maximumWeight' => 0.100, + 'methodPrice' => 6.52, + 'insuranceValue' => 50, + 'shippingMethodNameClean' => 'Royal Mail International Signed' + ), + 3 => Array + ( + 'shippingMethodName' => 'UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM', + 'minimumWeight' => 0.001, + 'maximumWeight' => 0.100, + 'methodPrice' => 6.45, + 'insuranceValue' => 500, + 'shippingMethodNameClean' => 'Royal Mail Special Delivery: Guaranteed by 1pm' + ), + 4 => Array + ( + 'shippingMethodName' => 'UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM', + 'minimumWeight' => 0.001, + 'maximumWeight' => 0.100, + 'methodPrice' => 7.45, + 'insuranceValue' => 1000, + 'shippingMethodNameClean' => 'Royal Mail Special Delivery: Guaranteed by 1pm' + ), + 5 => Array + ( + 'shippingMethodName' => 'UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM', + 'minimumWeight' => 0.001, + 'maximumWeight' => 0.100, + 'methodPrice' => 9.45, + 'insuranceValue' => 2500, + 'shippingMethodNameClean' => 'Royal Mail Special Delivery: Guaranteed by 1pm' + ), + 6 => Array + ( + 'shippingMethodName' => 'UK_STANDARD_FIRST_CLASS_LETTER', + 'minimumWeight' => 0.001, + 'maximumWeight' => 0.100, + 'methodPrice' => 0.63, + 'insuranceValue' => 20, + 'shippingMethodNameClean' => 'Royal Mail Standard First Class Letter' + ) + + ); + } + + /** + * Cleans up the used classes + */ + public function tearDown() + { + $this->calculateMethodClass = null; + $this->dataClass = null; + } + + /** + * Test to ensure that the calculate method class is returning + */ + public function testRoyalMailClassRealValues() + { + $this->assertNotEmpty($this->calculateMethodClass->getMethods('GB', 20, 0.050)); + } + + /** + * Test to compare the returned data from the Data class to expected values + */ + public function testRoyalMailMethodRealValues() + { + $this->assertEquals($this->testDataClassArray, $this->dataClass->calculateMethods('GB', 19.99, 0.050)); + } + + /** + * Test to ensure the only the expected empty array is returned from incorrect data to the data class + */ + public function testRoyalMailMethodFake() + { + $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods('GASD', "aSDASD", "ASDASD")); + $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods(123123123, "asdasd", "asdadasd")); + $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods(123123, 123123, "ASDASD")); + $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods(123123123, 123123123, 123123123)); + $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods('GB', "aSD!!ASD", 0.100)); + $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods('GB', 123123123123, 0.100)); + } + + /** + * Test to ensure that only the expected empty array is returned from null and incorrect data + * from the Data class + */ + 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)); + $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods('GB', null, 0.100)); + $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods('GB', null, null)); + $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods('GB', 123123123123, null)); + $this->assertEquals($this->emptyArray, $this->dataClass->calculateMethods(null, null, null)); + } + + /** + * Test to ensure that only the expected empty array is returned from incorrect + * data from the CalculateMethod class + */ + public function testRoyalMailClassFake() + { + $this->assertEquals( + $this->emptyArray, + $this->calculateMethodClass->getMethods('GASD', "aSDASD", "ASDASD")); + $this->assertEquals( + $this->emptyArray, + $this->calculateMethodClass->getMethods(123123123, "asdasd", "asdadasd")); + $this->assertEquals( + $this->emptyArray, + $this->calculateMethodClass->getMethods(123123, 123123, "ASDASD")); + $this->assertEquals( + $this->emptyArray, + $this->calculateMethodClass->getMethods(123123123, 123123123, 123123123)); + $this->assertEquals( + $this->emptyArray, + $this->calculateMethodClass->getMethods('GB', "aSD!!ASD", 0.100)); + $this->assertEquals( + $this->emptyArray, + $this->calculateMethodClass->getMethods('GB', 123123123123, 0.100)); + } + + /** + * Test to ensure that only the expected empty array is returned from null + * and incorrect data from the CalculateMethod class + */ + 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)); + $this->assertEquals($this->emptyArray, $this->calculateMethodClass->getMethods('GB', null, 0.100)); + $this->assertEquals($this->emptyArray, $this->calculateMethodClass->getMethods('GB', null, null)); + $this->assertEquals($this->emptyArray, $this->calculateMethodClass->getMethods('GB', 123123123123, null)); + $this->assertEquals($this->emptyArray, $this->calculateMethodClass->getMethods(null, null, null)); + } + +} \ No newline at end of file From 86d3a5dbee04dcc990999138694e5ce5826f2137 Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Mon, 21 Dec 2015 10:31:22 +0000 Subject: [PATCH 04/15] #31: Add usage of the new Royal Mail PHP library, removing old unused code Adds in the new logic based on the data received from the new royalmail php library, which removes some of the old logic based around multiple CSV files --- .gitignore | 2643 +++++++++++++++++ LICENSE.txt | 95 +- .../Meanbee/Royalmail/Helper/Data.php | 373 +-- .../Meanbee/Royalmail/Model/Parcelsize.php | 18 +- .../Meanbee/Royalmail/Model/Roundingrule.php | 13 +- .../Model/Shipping/Carrier/Royalmail.php | 227 +- .../Carrier/Royalmail/Source/Method.php | 14 +- .../Meanbee/Royalmail/Model/Weightunit.php | 13 +- composer.json | 55 +- modman | 8 + 10 files changed, 3005 insertions(+), 454 deletions(-) diff --git a/.gitignore b/.gitignore index aad0e32..4b4b8b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2646 @@ .DS_Store coverage .idea +composer.lock +/vendor + +/app/etc/modules/EcomDev_PHPUnit.xml +/app/etc/modules/EcomDev_PHPUnitTest.xml +/app/code/community/EcomDev/PHPUnit +/app/code/community/EcomDev/PHPUnitTest +/lib/EcomDev/PHPUnit +/lib/EcomDev/Utils +/lib/Spyc +/lib/vfsStream +/shell/ecomdev-phpunit.php +/app/code/core/Mage +/app/code/core/Zend +/app/code/core/Enterprise +/dev +/lib/Zend +/lib/Varien +/lib/Magento +/lib/PEAR +/lib/Mage +/lib/phpseclib +/lib/flex +/lib/LinLibertineFont +/downloader +/js/extjs +/js/prototype +/js/calendar +/js/mage +/js/varien +/js/tiny_mce +/lib/Apache +/app/code/community/Phoenix/Moneybookers +/app/design/adminhtml/default/default/template/bundle +/app/design/adminhtml/default/default/template/catalog +/app/design/adminhtml/default/default/template/customer +/app/design/adminhtml/default/default/template/downloadable +/app/design/adminhtml/default/default/template/newsletter +/app/design/adminhtml/default/default/template/payment +/app/design/adminhtml/default/default/template/sales +/app/design/adminhtml/default/default/template/system +/app/design/adminhtml/default/default/template/widget +/app/design/adminhtml/default/default/template/xmlconnect +/app/design/frontend/base/default/template/bundle +/app/design/frontend/base/default/template/catalog +/app/design/frontend/base/default/template/checkout +/app/design/frontend/base/default/template/customer +/app/design/frontend/base/default/template/downloadable +/app/design/frontend/base/default/template/page +/app/design/frontend/base/default/template/payment +/app/design/frontend/base/default/template/paypal +/app/design/frontend/base/default/template/reports +/app/design/frontend/base/default/template/sales +/app/design/frontend/base/default/template/wishlist +/app/design/frontend/default/iphone/template/catalog +/app/design/frontend/default/iphone/template/checkout +/app/design/frontend/default/iphone/template/page +/app/design/frontend/default/iphone/template/sales +/app/design/frontend/default/iphone/template/wishlist +/app/design/frontend/rwd/default/template/bundle +/app/design/frontend/rwd/default/template/catalog +/app/design/frontend/rwd/default/template/checkout +/app/design/frontend/rwd/default/template/customer +/app/design/frontend/rwd/default/template/downloadable +/app/design/frontend/base/default/template/cataloginventory +/app/design/frontend/base/default/template/catalogsearch +/app/design/frontend/base/default/template/pagecache +/app/design/frontend/default/iphone/template/catalogsearch +/app/design/frontend/rwd/default/template/cataloginventory +/app/design/frontend/rwd/default/template/catalogsearch +/app/design/frontend/rwd/default/template/configurableswatches +/app/design/frontend/rwd/default/template/email +/app/design/frontend/rwd/default/template/page +/app/design/frontend/rwd/default/template/paypal +/app/design/frontend/rwd/default/template/persistent +/app/design/frontend/rwd/default/template/reports +/app/design/frontend/rwd/default/template/sales +/app/design/frontend/rwd/default/template/wishlist +/app/design/install/default/default/template/install +/skin/adminhtml/default/default/images/xmlconnect +/skin/frontend/base/default/images/moneybookers +/skin/frontend/rwd/default/scss +/app/design/adminhtml/default/default/template/paypal +/app/design/adminhtml/default/default/template/permissions +/app/design/adminhtml/default/default/template/report +/app/design/adminhtml/default/default/template/tax +/app/design/frontend/base/default/template/cms +/app/design/frontend/base/default/template/email +/app/design/frontend/base/default/template/moneybookers +/app/design/frontend/base/default/template/oauth +/app/design/frontend/base/default/template/review +/app/design/frontend/default/modern/template/catalog +/skin/adminhtml/default/default/xmlconnect +/skin/frontend/base/default/images/cookies +/skin/frontend/base/default/images/xmlconnect +/app/design/frontend/default/modern/template/catalogsearch +/.htaccess +/.htaccess.sample +/api.php +/app/.htaccess +/app/bootstrap.php +/app/code/community/Cm/RedisSession/etc/config.xml +/app/code/community/Cm/RedisSession/Model/Session.php +/app/code/community/OnTap/Merchandiser/Block/Adminhtml/Catalog/Category/Tab/Smartmerch.php +/app/code/community/OnTap/Merchandiser/Block/Adminhtml/Catalog/Product/List.php +/app/code/community/OnTap/Merchandiser/Block/Adminhtml/Merchandiser.php +/app/code/community/OnTap/Merchandiser/Block/Adminhtml/System/Config/Fieldset/Rebuild.php +/app/code/community/OnTap/Merchandiser/Block/Adminhtml/System/Config/Form/Field/Attributes.php +/app/code/community/OnTap/Merchandiser/Block/Adminhtml/System/Config/Form/Renderer/Select.php +/app/code/community/OnTap/Merchandiser/Block/Category/List.php +/app/code/community/OnTap/Merchandiser/Block/Search/Result.php +/app/code/community/OnTap/Merchandiser/controllers/Adminhtml/MerchandiserController.php +/app/code/community/OnTap/Merchandiser/controllers/AdminhtmlController.php +/app/code/community/OnTap/Merchandiser/etc/adminhtml.xml +/app/code/community/OnTap/Merchandiser/etc/config.xml +/app/code/community/OnTap/Merchandiser/etc/system.xml +/app/code/community/OnTap/Merchandiser/Helper/Data.php +/app/code/community/OnTap/Merchandiser/Model/Adminhtml/Config/Source/Months.php +/app/code/community/OnTap/Merchandiser/Model/Adminhtml/Config/Source/Newproductshandler.php +/app/code/community/OnTap/Merchandiser/Model/Adminhtml/Observer.php +/app/code/community/OnTap/Merchandiser/Model/Merchandiser.php +/app/code/community/OnTap/Merchandiser/Model/Resource/Merchandiser.php +/app/code/community/OnTap/Merchandiser/Model/Resource/Mysql4/Product/Collection.php +/app/code/community/OnTap/Merchandiser/Model/Search.php +/app/code/community/OnTap/Merchandiser/sql/ontap_merchandiser_setup/mysql4-install-2.2.0.php +/app/code/community/OnTap/Merchandiser/sql/ontap_merchandiser_setup/mysql4-upgrade-2.1.8.1-2.2.0.php +/app/code/community/OnTap/Merchandiser/sql/ontap_merchandiser_setup/mysql4-upgrade-2.2.0-2.2.1.php +/app/code/community/OnTap/Merchandiser/sql/ontap_merchandiser_setup/mysql4-upgrade-2.2.3-2.2.4.php +/app/design/adminhtml/default/default/etc/theme.xml +/app/design/adminhtml/default/default/layout/admin.xml +/app/design/adminhtml/default/default/layout/adminnotification.xml +/app/design/adminhtml/default/default/layout/api2.xml +/app/design/adminhtml/default/default/layout/authorizenet.xml +/app/design/adminhtml/default/default/layout/bundle.xml +/app/design/adminhtml/default/default/layout/captcha.xml +/app/design/adminhtml/default/default/layout/catalog.xml +/app/design/adminhtml/default/default/layout/centinel.xml +/app/design/adminhtml/default/default/layout/cms.xml +/app/design/adminhtml/default/default/layout/compiler.xml +/app/design/adminhtml/default/default/layout/connect.xml +/app/design/adminhtml/default/default/layout/currencysymbol.xml +/app/design/adminhtml/default/default/layout/customer.xml +/app/design/adminhtml/default/default/layout/dataflow.xml +/app/design/adminhtml/default/default/layout/downloadable.xml +/app/design/adminhtml/default/default/layout/enterprise/admingws.xml +/app/design/adminhtml/default/default/layout/enterprise/adminhtml.xml +/app/design/adminhtml/default/default/layout/enterprise/banner.xml +/app/design/adminhtml/default/default/layout/enterprise/catalog.xml +/app/design/adminhtml/default/default/layout/enterprise/catalogevent.xml +/app/design/adminhtml/default/default/layout/enterprise/catalogpermissions.xml +/app/design/adminhtml/default/default/layout/enterprise/checkout.xml +/app/design/adminhtml/default/default/layout/enterprise/cms.xml +/app/design/adminhtml/default/default/layout/enterprise/customer.xml +/app/design/adminhtml/default/default/layout/enterprise/customerbalance.xml +/app/design/adminhtml/default/default/layout/enterprise/customersegment.xml +/app/design/adminhtml/default/default/layout/enterprise/giftcard.xml +/app/design/adminhtml/default/default/layout/enterprise/giftcardaccount.xml +/app/design/adminhtml/default/default/layout/enterprise/giftregistry.xml +/app/design/adminhtml/default/default/layout/enterprise/giftwrapping.xml +/app/design/adminhtml/default/default/layout/enterprise/importexport.xml +/app/design/adminhtml/default/default/layout/enterprise/index.xml +/app/design/adminhtml/default/default/layout/enterprise/invitation.xml +/app/design/adminhtml/default/default/layout/enterprise/license.xml +/app/design/adminhtml/default/default/layout/enterprise/logging.xml +/app/design/adminhtml/default/default/layout/enterprise/pbridge.xml +/app/design/adminhtml/default/default/layout/enterprise/pci.xml +/app/design/adminhtml/default/default/layout/enterprise/reminder.xml +/app/design/adminhtml/default/default/layout/enterprise/reward.xml +/app/design/adminhtml/default/default/layout/enterprise/rma.xml +/app/design/adminhtml/default/default/layout/enterprise/salesarchive.xml +/app/design/adminhtml/default/default/layout/enterprise/search.xml +/app/design/adminhtml/default/default/layout/enterprise/staging.xml +/app/design/adminhtml/default/default/layout/enterprise/support.xml +/app/design/adminhtml/default/default/layout/enterprise/targetrule.xml +/app/design/adminhtml/default/default/layout/enterprise/urlrewrite.xml +/app/design/adminhtml/default/default/layout/enterprise/wishlist.xml +/app/design/adminhtml/default/default/layout/giftmessage.xml +/app/design/adminhtml/default/default/layout/googleanalyticsuniversal.xml +/app/design/adminhtml/default/default/layout/importexport.xml +/app/design/adminhtml/default/default/layout/index.xml +/app/design/adminhtml/default/default/layout/main.xml +/app/design/adminhtml/default/default/layout/merchandiser.xml +/app/design/adminhtml/default/default/layout/moneybookers.xml +/app/design/adminhtml/default/default/layout/newsletter.xml +/app/design/adminhtml/default/default/layout/oauth.xml +/app/design/adminhtml/default/default/layout/promo.xml +/app/design/adminhtml/default/default/layout/report.xml +/app/design/adminhtml/default/default/layout/rss.xml +/app/design/adminhtml/default/default/layout/sales.xml +/app/design/adminhtml/default/default/layout/search.xml +/app/design/adminhtml/default/default/layout/tag.xml +/app/design/adminhtml/default/default/layout/tax.xml +/app/design/adminhtml/default/default/layout/widget.xml +/app/design/adminhtml/default/default/layout/xmlconnect.xml +/app/design/adminhtml/default/default/locale/en_US/translate.csv +/app/design/adminhtml/default/default/template/access_denied.phtml +/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml +/app/design/adminhtml/default/default/template/api/roleinfo.phtml +/app/design/adminhtml/default/default/template/api/roles.phtml +/app/design/adminhtml/default/default/template/api/rolesedit.phtml +/app/design/adminhtml/default/default/template/api/rolesusers.phtml +/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml +/app/design/adminhtml/default/default/template/api/userinfo.phtml +/app/design/adminhtml/default/default/template/api/usernroles.phtml +/app/design/adminhtml/default/default/template/api/userroles.phtml +/app/design/adminhtml/default/default/template/api/users.phtml +/app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml +/app/design/adminhtml/default/default/template/api2/attribute/resource.phtml +/app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml +/app/design/adminhtml/default/default/template/api2/role/buttons.phtml +/app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml +/app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml +/app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml +/app/design/adminhtml/default/default/template/backup/dialogs.phtml +/app/design/adminhtml/default/default/template/backup/left.phtml +/app/design/adminhtml/default/default/template/backup/list.phtml +/app/design/adminhtml/default/default/template/captcha/zend.phtml +/app/design/adminhtml/default/default/template/centinel/authentication/complete.phtml +/app/design/adminhtml/default/default/template/centinel/authentication/start.phtml +/app/design/adminhtml/default/default/template/centinel/validation/form.phtml +/app/design/adminhtml/default/default/template/cms/browser/content/files.phtml +/app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml +/app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml +/app/design/adminhtml/default/default/template/cms/browser/content.phtml +/app/design/adminhtml/default/default/template/cms/browser/js.phtml +/app/design/adminhtml/default/default/template/cms/browser/tree.phtml +/app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml +/app/design/adminhtml/default/default/template/coming.phtml +/app/design/adminhtml/default/default/template/compiler/process.phtml +/app/design/adminhtml/default/default/template/connect/extension/custom/authors.phtml +/app/design/adminhtml/default/default/template/connect/extension/custom/contents.phtml +/app/design/adminhtml/default/default/template/connect/extension/custom/depends.phtml +/app/design/adminhtml/default/default/template/connect/extension/custom/load.phtml +/app/design/adminhtml/default/default/template/connect/extension/custom/package.phtml +/app/design/adminhtml/default/default/template/connect/extension/custom/release.phtml +/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml +/app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml +/app/design/adminhtml/default/default/template/dashboard/graph.phtml +/app/design/adminhtml/default/default/template/dashboard/grid.phtml +/app/design/adminhtml/default/default/template/dashboard/index.phtml +/app/design/adminhtml/default/default/template/dashboard/salebar.phtml +/app/design/adminhtml/default/default/template/dashboard/searches.phtml +/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml +/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml +/app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml +/app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml +/app/design/adminhtml/default/default/template/eav/attribute/options.phtml +/app/design/adminhtml/default/default/template/email/order/items.phtml +/app/design/adminhtml/default/default/template/empty.phtml +/app/design/adminhtml/default/default/template/enterprise/admingws/permissions/rolesedit/gws.phtml +/app/design/adminhtml/default/default/template/enterprise/banner/edit/tab/promotions.phtml +/app/design/adminhtml/default/default/template/enterprise/catalog/redirect/categories.phtml +/app/design/adminhtml/default/default/template/enterprise/catalog/redirect/product/grid.phtml +/app/design/adminhtml/default/default/template/enterprise/catalogevent/categories.phtml +/app/design/adminhtml/default/default/template/enterprise/catalogevent/form/renderer/fieldset/element.phtml +/app/design/adminhtml/default/default/template/enterprise/catalogpermissions/catalog/category/tab/permissions/row.phtml +/app/design/adminhtml/default/default/template/enterprise/catalogpermissions/catalog/category/tab/permissions.phtml +/app/design/adminhtml/default/default/template/enterprise/checkout/form/coupon.phtml +/app/design/adminhtml/default/default/template/enterprise/checkout/manage/items.phtml +/app/design/adminhtml/default/default/template/enterprise/checkout/manage.phtml +/app/design/adminhtml/default/default/template/enterprise/checkout/sku/add.phtml +/app/design/adminhtml/default/default/template/enterprise/checkout/sku/errors/grid/description.phtml +/app/design/adminhtml/default/default/template/enterprise/checkout/sku/errors.phtml +/app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/edit.phtml +/app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/manage.phtml +/app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/scope/switcher.phtml +/app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/widget/radio.phtml +/app/design/adminhtml/default/default/template/enterprise/cms/page/edit/form.phtml +/app/design/adminhtml/default/default/template/enterprise/cms/page/preview/revision.phtml +/app/design/adminhtml/default/default/template/enterprise/cms/page/preview/store.phtml +/app/design/adminhtml/default/default/template/enterprise/cms/page/preview.phtml +/app/design/adminhtml/default/default/template/enterprise/cms/page/revision/info.phtml +/app/design/adminhtml/default/default/template/enterprise/cms/page/tab/hierarchy.phtml +/app/design/adminhtml/default/default/template/enterprise/cms/page/version/form.phtml +/app/design/adminhtml/default/default/template/enterprise/customer/attribute/js.phtml +/app/design/adminhtml/default/default/template/enterprise/customer/form/renderer/fieldset/element.phtml +/app/design/adminhtml/default/default/template/enterprise/customer/formtype/edit/tab/tree.phtml +/app/design/adminhtml/default/default/template/enterprise/customer/website/switcher.phtml +/app/design/adminhtml/default/default/template/enterprise/customerbalance/balance/history.phtml +/app/design/adminhtml/default/default/template/enterprise/customerbalance/balance.phtml +/app/design/adminhtml/default/default/template/enterprise/customerbalance/edit/js.phtml +/app/design/adminhtml/default/default/template/enterprise/customerbalance/sales/creditmemo/controls.phtml +/app/design/adminhtml/default/default/template/enterprise/customerbalance/sales/creditmemo/refund.phtml +/app/design/adminhtml/default/default/template/enterprise/customerbalance/sales/creditmemo/totals/customerbalance.phtml +/app/design/adminhtml/default/default/template/enterprise/customerbalance/sales/creditmemo/totals/view.phtml +/app/design/adminhtml/default/default/template/enterprise/customerbalance/sales/order/create/payment.phtml +/app/design/adminhtml/default/default/template/enterprise/customerbalance/sales/order/totals/customerbalance.phtml +/app/design/adminhtml/default/default/template/enterprise/customersegment/report/detail/grid/container.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcard/catalog/product/composite/fieldset/giftcard.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcard/catalog/product/composite/fieldset/qty.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcard/catalog/product/edit/tab/giftcard.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcard/email/generated.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcard/renderer/amount.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcardaccount/config/generate.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcardaccount/edit/tab/info.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcardaccount/sales/creditmemo/controls.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcardaccount/sales/creditmemo/totals/giftcardaccount.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcardaccount/sales/creditmemo/totals/view.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcardaccount/sales/invoice/totals/giftcardaccount.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcardaccount/sales/order/create/items.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcardaccount/sales/order/create/js.phtml +/app/design/adminhtml/default/default/template/enterprise/giftcardaccount/sales/order/totals/giftcardaccount.phtml +/app/design/adminhtml/default/default/template/enterprise/giftregistry/customer/form.phtml +/app/design/adminhtml/default/default/template/enterprise/giftregistry/edit/attributes.phtml +/app/design/adminhtml/default/default/template/enterprise/giftregistry/edit/type/country.phtml +/app/design/adminhtml/default/default/template/enterprise/giftregistry/edit/type/date.phtml +/app/design/adminhtml/default/default/template/enterprise/giftregistry/edit/type/select.phtml +/app/design/adminhtml/default/default/template/enterprise/giftregistry/form/renderer/element.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/form/renderer/element.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/order/create/info/content.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/order/create/info.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/order/create/items.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/order/create/totals.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/order/view/info.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/order/view/items.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/sales/creditmemo/create/renderer.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/sales/creditmemo/view/renderer.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/sales/invoice/create/renderer.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/sales/invoice/view/renderer.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/sales/order/create/renderer.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/sales/order/link.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/sales/order/view/renderer.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/sales/shipment/create/renderer.phtml +/app/design/adminhtml/default/default/template/enterprise/giftwrapping/sales/shipment/view/renderer.phtml +/app/design/adminhtml/default/default/template/enterprise/importexport/scheduled/form/after.phtml +/app/design/adminhtml/default/default/template/enterprise/invitation/view/tab/general.phtml +/app/design/adminhtml/default/default/template/enterprise/invitation/view/tab/history.phtml +/app/design/adminhtml/default/default/template/enterprise/invitation/view.phtml +/app/design/adminhtml/default/default/template/enterprise/license/checker/reminder.phtml +/app/design/adminhtml/default/default/template/enterprise/logging/details.phtml +/app/design/adminhtml/default/default/template/enterprise/logging/system/config/actions.phtml +/app/design/adminhtml/default/default/template/enterprise/pbridge/customer/edit/tab/payment/profile.phtml +/app/design/adminhtml/default/default/template/enterprise/pbridge/iframe.phtml +/app/design/adminhtml/default/default/template/enterprise/pbridge/sales/order/create/iframe.phtml +/app/design/adminhtml/default/default/template/enterprise/pbridge/sales/order/create/js.phtml +/app/design/adminhtml/default/default/template/enterprise/pbridge/sales/order/create/pbridge.phtml +/app/design/adminhtml/default/default/template/enterprise/pbridge/sales/order/create/result.phtml +/app/design/adminhtml/default/default/template/enterprise/reward/customer/edit/history.phtml +/app/design/adminhtml/default/default/template/enterprise/reward/customer/edit/management/balance.phtml +/app/design/adminhtml/default/default/template/enterprise/reward/customer/edit/management.phtml +/app/design/adminhtml/default/default/template/enterprise/reward/customer/reward.phtml +/app/design/adminhtml/default/default/template/enterprise/reward/rate/form/renderer/rate.phtml +/app/design/adminhtml/default/default/template/enterprise/reward/sales/order/create/payment.phtml +/app/design/adminhtml/default/default/template/enterprise/reward/sales/order/creditmemo/reward.phtml +/app/design/adminhtml/default/default/template/enterprise/reward/sales/order/refunded.phtml +/app/design/adminhtml/default/default/template/enterprise/reward/sales/order/total.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/attribute/js.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/create/form.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/create/order.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/bundle/bundle.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/bundle/js.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/details.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/general/details.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/general/history.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/general/returnadress.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/general/shippingaddress.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/general.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/item/renderer/fieldset.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/items.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/js.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/mask.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/reason.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/shipping/grid.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/shipping/information.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/shipping/methods.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/shipping/popup.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/shipping/tracking.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/edit/shippingmethod.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/new/general/confirmation.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/new/general/details.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/new/general/history.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/new/general.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/new/items/renderer/reason.phtml +/app/design/adminhtml/default/default/template/enterprise/rma/new/items.phtml +/app/design/adminhtml/default/default/template/enterprise/search/js.phtml +/app/design/adminhtml/default/default/template/enterprise/search/system/config/testconnection.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/backup/edit.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/backup/rollback.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/log/information/create.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/log/information/default.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/log/information/merge.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/log/information/rollback.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/log/view.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/staging/edit/tabs/entities.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/staging/edit/tabs/website/store.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/staging/edit/tabs/website.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/staging/edit.phtml +/app/design/adminhtml/default/default/template/enterprise/staging/staging/merge/settings/website.phtml +/app/design/adminhtml/default/default/template/enterprise/store/switcher/enhanced.phtml +/app/design/adminhtml/default/default/template/enterprise/store/switcher.phtml +/app/design/adminhtml/default/default/template/enterprise/support/log.phtml +/app/design/adminhtml/default/default/template/enterprise/support/sysreport/export/html.phtml +/app/design/adminhtml/default/default/template/enterprise/support/sysreport/view/tab.phtml +/app/design/adminhtml/default/default/template/enterprise/targetrule/edit/conditions/fieldset.phtml +/app/design/adminhtml/default/default/template/enterprise/targetrule/edit/conditions/newchild.phtml +/app/design/adminhtml/default/default/template/enterprise/targetrule/product.phtml +/app/design/adminhtml/default/default/template/enterprise/urlrewrite/redirect/container.phtml +/app/design/adminhtml/default/default/template/enterprise/urlrewrite/redirect/edit.phtml +/app/design/adminhtml/default/default/template/enterprise/urlrewrite/redirect/select/js.phtml +/app/design/adminhtml/default/default/template/enterprise/urlrewrite/redirect/selector.phtml +/app/design/adminhtml/default/default/template/enterprise/wishlist/sales/order/create/sidebar/items.phtml +/app/design/adminhtml/default/default/template/example.phtml +/app/design/adminhtml/default/default/template/forgotpassword.phtml +/app/design/adminhtml/default/default/template/formkey.phtml +/app/design/adminhtml/default/default/template/giftmessage/form.phtml +/app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml +/app/design/adminhtml/default/default/template/giftmessage/helper.phtml +/app/design/adminhtml/default/default/template/giftmessage/popup.phtml +/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml +/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml +/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml +/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml +/app/design/adminhtml/default/default/template/googleanalyticsuniversal/creditmemo.phtml +/app/design/adminhtml/default/default/template/googleanalyticsuniversal/ga.phtml +/app/design/adminhtml/default/default/template/googlebase/captcha.phtml +/app/design/adminhtml/default/default/template/googlebase/items.phtml +/app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml +/app/design/adminhtml/default/default/template/importexport/busy.phtml +/app/design/adminhtml/default/default/template/importexport/export/form/after.phtml +/app/design/adminhtml/default/default/template/importexport/export/form/before.phtml +/app/design/adminhtml/default/default/template/importexport/import/form/after.phtml +/app/design/adminhtml/default/default/template/importexport/import/form/before.phtml +/app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml +/app/design/adminhtml/default/default/template/index/notifications.phtml +/app/design/adminhtml/default/default/template/login.phtml +/app/design/adminhtml/default/default/template/media/editor.phtml +/app/design/adminhtml/default/default/template/media/uploader.phtml +/app/design/adminhtml/default/default/template/merchandiser/cache/additional.phtml +/app/design/adminhtml/default/default/template/merchandiser/category/open.phtml +/app/design/adminhtml/default/default/template/merchandiser/config/button.phtml +/app/design/adminhtml/default/default/template/merchandiser/empty.phtml +/app/design/adminhtml/default/default/template/merchandiser/init.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/category/ajax.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/category/button.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/category/heroproductbox.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/category/list.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/category/open.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/category/price-configurable.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/category/price-grouped.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/category/price.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/category/productbox.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/category.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/page/html/top-buttons.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/page/merchandiser.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/search/form.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/search/productbox.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/search/result.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/search/search-list.phtml +/app/design/adminhtml/default/default/template/merchandiser/new/search.phtml +/app/design/adminhtml/default/default/template/merchandiser/smartmerch/attributes.phtml +/app/design/adminhtml/default/default/template/merchandiser/smartmerch/tab.phtml +/app/design/adminhtml/default/default/template/moneybookers/info.phtml +/app/design/adminhtml/default/default/template/moneybookers/jsinit.phtml +/app/design/adminhtml/default/default/template/moneybookers/pdf/info.phtml +/app/design/adminhtml/default/default/template/notification/baseurl.phtml +/app/design/adminhtml/default/default/template/notification/security.phtml +/app/design/adminhtml/default/default/template/notification/survey.phtml +/app/design/adminhtml/default/default/template/notification/toolbar.phtml +/app/design/adminhtml/default/default/template/notification/window.phtml +/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml +/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml +/app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml +/app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml +/app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml +/app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml +/app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml +/app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml +/app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml +/app/design/adminhtml/default/default/template/ogone/info.phtml +/app/design/adminhtml/default/default/template/overlay_popup.phtml +/app/design/adminhtml/default/default/template/page/footer.phtml +/app/design/adminhtml/default/default/template/page/head.phtml +/app/design/adminhtml/default/default/template/page/header.phtml +/app/design/adminhtml/default/default/template/page/js/calendar.phtml +/app/design/adminhtml/default/default/template/page/js/translate.phtml +/app/design/adminhtml/default/default/template/page/menu.phtml +/app/design/adminhtml/default/default/template/page/notices.phtml +/app/design/adminhtml/default/default/template/page.phtml +/app/design/adminhtml/default/default/template/paygate/form/cc.phtml +/app/design/adminhtml/default/default/template/paygate/info/cc.phtml +/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml +/app/design/adminhtml/default/default/template/poll/answers/list.phtml +/app/design/adminhtml/default/default/template/popup.phtml +/app/design/adminhtml/default/default/template/promo/fieldset.phtml +/app/design/adminhtml/default/default/template/promo/form.phtml +/app/design/adminhtml/default/default/template/promo/js.phtml +/app/design/adminhtml/default/default/template/promo/salesrulejs.phtml +/app/design/adminhtml/default/default/template/rating/detailed.phtml +/app/design/adminhtml/default/default/template/rating/options.phtml +/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml +/app/design/adminhtml/default/default/template/rating/stars/summary.phtml +/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml +/app/design/adminhtml/default/default/template/review/add.phtml +/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml +/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml +/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml +/app/design/adminhtml/default/default/template/store/switcher.phtml +/app/design/adminhtml/default/default/template/tag/edit/container.phtml +/app/design/adminhtml/default/default/template/tag/index.phtml +/app/design/adminhtml/default/default/template/urlrewrite/categories.phtml +/app/design/adminhtml/default/default/template/urlrewrite/edit.phtml +/app/design/adminhtml/default/default/template/urlrewrite/selector.phtml +/app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml +/app/design/adminhtml/default/default/template/weee/renderer/tax.phtml +/app/design/frontend/base/default/etc/theme.xml +/app/design/frontend/base/default/etc/widget.xml +/app/design/frontend/base/default/layout/authorizenet.xml +/app/design/frontend/base/default/layout/bml.xml +/app/design/frontend/base/default/layout/bundle.xml +/app/design/frontend/base/default/layout/captcha.xml +/app/design/frontend/base/default/layout/catalog.xml +/app/design/frontend/base/default/layout/catalog_msrp.xml +/app/design/frontend/base/default/layout/cataloginventory.xml +/app/design/frontend/base/default/layout/catalogsearch.xml +/app/design/frontend/base/default/layout/centinel.xml +/app/design/frontend/base/default/layout/checkout.xml +/app/design/frontend/base/default/layout/cms.xml +/app/design/frontend/base/default/layout/contacts.xml +/app/design/frontend/base/default/layout/core.xml +/app/design/frontend/base/default/layout/customer.xml +/app/design/frontend/base/default/layout/directory.xml +/app/design/frontend/base/default/layout/downloadable.xml +/app/design/frontend/base/default/layout/googleanalytics.xml +/app/design/frontend/base/default/layout/googleanalyticsuniversal.xml +/app/design/frontend/base/default/layout/moneybookers.xml +/app/design/frontend/base/default/layout/newsletter.xml +/app/design/frontend/base/default/layout/oauth.xml +/app/design/frontend/base/default/layout/ogone.xml +/app/design/frontend/base/default/layout/page.xml +/app/design/frontend/base/default/layout/payment.xml +/app/design/frontend/base/default/layout/paypal.xml +/app/design/frontend/base/default/layout/paypaluk.xml +/app/design/frontend/base/default/layout/persistent.xml +/app/design/frontend/base/default/layout/poll.xml +/app/design/frontend/base/default/layout/productalert.xml +/app/design/frontend/base/default/layout/reports.xml +/app/design/frontend/base/default/layout/review.xml +/app/design/frontend/base/default/layout/rss.xml +/app/design/frontend/base/default/layout/sales/billing_agreement.xml +/app/design/frontend/base/default/layout/sales/recurring_profile.xml +/app/design/frontend/base/default/layout/sales.xml +/app/design/frontend/base/default/layout/sendfriend.xml +/app/design/frontend/base/default/layout/shipping.xml +/app/design/frontend/base/default/layout/tag.xml +/app/design/frontend/base/default/layout/weee.xml +/app/design/frontend/base/default/layout/wishlist.xml +/app/design/frontend/base/default/layout/xmlconnect.xml +/app/design/frontend/base/default/template/authorizenet/directpost/form.phtml +/app/design/frontend/base/default/template/authorizenet/directpost/iframe.phtml +/app/design/frontend/base/default/template/authorizenet/directpost/info.phtml +/app/design/frontend/base/default/template/callouts/left_col.phtml +/app/design/frontend/base/default/template/callouts/right_col.phtml +/app/design/frontend/base/default/template/captcha/zend.phtml +/app/design/frontend/base/default/template/centinel/authentication/complete.phtml +/app/design/frontend/base/default/template/centinel/authentication/start.phtml +/app/design/frontend/base/default/template/centinel/authentication.phtml +/app/design/frontend/base/default/template/centinel/logo.phtml +/app/design/frontend/base/default/template/contacts/form.phtml +/app/design/frontend/base/default/template/core/formkey.phtml +/app/design/frontend/base/default/template/core/link.phtml +/app/design/frontend/base/default/template/core/messages.phtml +/app/design/frontend/base/default/template/directory/currency/switch.phtml +/app/design/frontend/base/default/template/directory/currency.phtml +/app/design/frontend/base/default/template/directory/js/optional_zip_countries.phtml +/app/design/frontend/base/default/template/giftmessage/inline.phtml +/app/design/frontend/base/default/template/googleanalytics/ga.phtml +/app/design/frontend/base/default/template/googleanalyticsuniversal/cart/update.phtml +/app/design/frontend/base/default/template/googleanalyticsuniversal/checkout/mainstep.phtml +/app/design/frontend/base/default/template/googleanalyticsuniversal/checkout/set_checkout_option.phtml +/app/design/frontend/base/default/template/googleanalyticsuniversal/checkout/step.phtml +/app/design/frontend/base/default/template/googleanalyticsuniversal/checkout/update.phtml +/app/design/frontend/base/default/template/googleanalyticsuniversal/detailproduct.phtml +/app/design/frontend/base/default/template/googleanalyticsuniversal/fpc/impression.phtml +/app/design/frontend/base/default/template/googleanalyticsuniversal/ga.phtml +/app/design/frontend/base/default/template/googleanalyticsuniversal/impression.phtml +/app/design/frontend/base/default/template/googleanalyticsuniversal/promotion.phtml +/app/design/frontend/base/default/template/newsletter/subscribe.phtml +/app/design/frontend/base/default/template/ogone/form.phtml +/app/design/frontend/base/default/template/ogone/info.phtml +/app/design/frontend/base/default/template/ogone/paypage.phtml +/app/design/frontend/base/default/template/ogone/placeform.phtml +/app/design/frontend/base/default/template/paygate/form/cc.phtml +/app/design/frontend/base/default/template/paygate/info/cc.phtml +/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml +/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml +/app/design/frontend/base/default/template/persistent/customer/form/login.phtml +/app/design/frontend/base/default/template/persistent/customer/form/register.phtml +/app/design/frontend/base/default/template/persistent/remember_me.phtml +/app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml +/app/design/frontend/base/default/template/poll/active.phtml +/app/design/frontend/base/default/template/poll/result.phtml +/app/design/frontend/base/default/template/productalert/price.phtml +/app/design/frontend/base/default/template/productalert/product/view.phtml +/app/design/frontend/base/default/template/productalert/stock.phtml +/app/design/frontend/base/default/template/rating/detailed.phtml +/app/design/frontend/base/default/template/rating/empty.phtml +/app/design/frontend/base/default/template/rss/list.phtml +/app/design/frontend/base/default/template/rss/nofeed.phtml +/app/design/frontend/base/default/template/rss/order/details.phtml +/app/design/frontend/base/default/template/sendfriend/send.phtml +/app/design/frontend/base/default/template/shipping/tracking/ajax.phtml +/app/design/frontend/base/default/template/shipping/tracking/popup.phtml +/app/design/frontend/base/default/template/tag/cloud.phtml +/app/design/frontend/base/default/template/tag/customer/recent.phtml +/app/design/frontend/base/default/template/tag/customer/tags.phtml +/app/design/frontend/base/default/template/tag/customer/view.phtml +/app/design/frontend/base/default/template/tag/list.phtml +/app/design/frontend/base/default/template/tag/popular.phtml +/app/design/frontend/base/default/template/tax/checkout/discount.phtml +/app/design/frontend/base/default/template/tax/checkout/grandtotal.phtml +/app/design/frontend/base/default/template/tax/checkout/shipping.phtml +/app/design/frontend/base/default/template/tax/checkout/subtotal.phtml +/app/design/frontend/base/default/template/tax/checkout/tax.phtml +/app/design/frontend/base/default/template/tax/order/tax.phtml +/app/design/frontend/base/default/template/xmlconnect/centinel/authentication.phtml +/app/design/frontend/base/default/template/xmlconnect/pbridge/result.phtml +/app/design/frontend/enterprise/default/etc/theme.xml +/app/design/frontend/enterprise/default/etc/widget.xml +/app/design/frontend/enterprise/default/layout/bundle.xml +/app/design/frontend/enterprise/default/layout/catalog.xml +/app/design/frontend/enterprise/default/layout/catalogevent.xml +/app/design/frontend/enterprise/default/layout/catalogpermissions.xml +/app/design/frontend/enterprise/default/layout/catalogsearch.xml +/app/design/frontend/enterprise/default/layout/checkout.xml +/app/design/frontend/enterprise/default/layout/cms.xml +/app/design/frontend/enterprise/default/layout/contacts.xml +/app/design/frontend/enterprise/default/layout/customer.xml +/app/design/frontend/enterprise/default/layout/customerbalance.xml +/app/design/frontend/enterprise/default/layout/directory.xml +/app/design/frontend/enterprise/default/layout/enterprise_wishlist.xml +/app/design/frontend/enterprise/default/layout/giftcard.xml +/app/design/frontend/enterprise/default/layout/giftcardaccount.xml +/app/design/frontend/enterprise/default/layout/giftregistry.xml +/app/design/frontend/enterprise/default/layout/giftwrapping.xml +/app/design/frontend/enterprise/default/layout/invitation.xml +/app/design/frontend/enterprise/default/layout/newsletter.xml +/app/design/frontend/enterprise/default/layout/oauth.xml +/app/design/frontend/enterprise/default/layout/page.xml +/app/design/frontend/enterprise/default/layout/pbridge.xml +/app/design/frontend/enterprise/default/layout/reports.xml +/app/design/frontend/enterprise/default/layout/review.xml +/app/design/frontend/enterprise/default/layout/reward.xml +/app/design/frontend/enterprise/default/layout/rma.xml +/app/design/frontend/enterprise/default/layout/search.xml +/app/design/frontend/enterprise/default/layout/tag.xml +/app/design/frontend/enterprise/default/layout/targetrule.xml +/app/design/frontend/enterprise/default/layout/websiterestriction.xml +/app/design/frontend/enterprise/default/locale/en_US/translate.csv +/app/design/frontend/enterprise/default/template/banner/widget/block.phtml +/app/design/frontend/enterprise/default/template/banner/widget/inline.phtml +/app/design/frontend/enterprise/default/template/bundle/catalog/product/list/partof.phtml +/app/design/frontend/enterprise/default/template/bundle/catalog/product/view/backbutton.phtml +/app/design/frontend/enterprise/default/template/bundle/catalog/product/view/customize.phtml +/app/design/frontend/enterprise/default/template/bundle/catalog/product/view/price.phtml +/app/design/frontend/enterprise/default/template/bundle/catalog/product/view/summary.phtml +/app/design/frontend/enterprise/default/template/bundle/catalog/product/view/type/bundle.phtml +/app/design/frontend/enterprise/default/template/bundle/catalog/product/view.phtml +/app/design/frontend/enterprise/default/template/callouts/callout.phtml +/app/design/frontend/enterprise/default/template/catalog/category/title.phtml +/app/design/frontend/enterprise/default/template/catalog/category/view.phtml +/app/design/frontend/enterprise/default/template/catalog/layer/view.phtml +/app/design/frontend/enterprise/default/template/catalog/product/compare/list.phtml +/app/design/frontend/enterprise/default/template/catalog/product/list/related.phtml +/app/design/frontend/enterprise/default/template/catalog/product/list/toolbar.phtml +/app/design/frontend/enterprise/default/template/catalog/product/list/upsell.phtml +/app/design/frontend/enterprise/default/template/catalog/product/list.phtml +/app/design/frontend/enterprise/default/template/catalog/product/new.phtml +/app/design/frontend/enterprise/default/template/catalog/product/view/attributes.phtml +/app/design/frontend/enterprise/default/template/catalog/product/view/description.phtml +/app/design/frontend/enterprise/default/template/catalog/product/view/media.phtml +/app/design/frontend/enterprise/default/template/catalog/product/view/options/wrapper/bottom.phtml +/app/design/frontend/enterprise/default/template/catalog/product/view/options/wrapper.phtml +/app/design/frontend/enterprise/default/template/catalog/product/view.phtml +/app/design/frontend/enterprise/default/template/catalog/product/widget/new/column/new_default_list.phtml +/app/design/frontend/enterprise/default/template/catalog/product/widget/new/content/new_grid.phtml +/app/design/frontend/enterprise/default/template/catalog/product/widget/new/content/new_list.phtml +/app/design/frontend/enterprise/default/template/catalogevent/catalog/category/event.phtml +/app/design/frontend/enterprise/default/template/catalogevent/catalog/product/event.phtml +/app/design/frontend/enterprise/default/template/catalogevent/lister.phtml +/app/design/frontend/enterprise/default/template/catalogevent/widget/lister.phtml +/app/design/frontend/enterprise/default/template/catalogsearch/advanced/form.phtml +/app/design/frontend/enterprise/default/template/catalogsearch/advanced/result.phtml +/app/design/frontend/enterprise/default/template/catalogsearch/form.mini.phtml +/app/design/frontend/enterprise/default/template/catalogsearch/result.phtml +/app/design/frontend/enterprise/default/template/checkout/cart/cartheader.phtml +/app/design/frontend/enterprise/default/template/checkout/cart/coupon.phtml +/app/design/frontend/enterprise/default/template/checkout/cart/crosssell.phtml +/app/design/frontend/enterprise/default/template/checkout/cart/item/failed.phtml +/app/design/frontend/enterprise/default/template/checkout/cart/shipping.phtml +/app/design/frontend/enterprise/default/template/checkout/cart/sidebar/default.phtml +/app/design/frontend/enterprise/default/template/checkout/cart/sku/failed/info.phtml +/app/design/frontend/enterprise/default/template/checkout/cart/sku/failed.phtml +/app/design/frontend/enterprise/default/template/checkout/cart.phtml +/app/design/frontend/enterprise/default/template/checkout/customer/file.phtml +/app/design/frontend/enterprise/default/template/checkout/customer/sku.phtml +/app/design/frontend/enterprise/default/template/checkout/multishipping/address/select.phtml +/app/design/frontend/enterprise/default/template/checkout/multishipping/addresses.phtml +/app/design/frontend/enterprise/default/template/checkout/multishipping/billing/items.phtml +/app/design/frontend/enterprise/default/template/checkout/multishipping/billing.phtml +/app/design/frontend/enterprise/default/template/checkout/multishipping/item/default.phtml +/app/design/frontend/enterprise/default/template/checkout/multishipping/overview.phtml +/app/design/frontend/enterprise/default/template/checkout/multishipping/shipping.phtml +/app/design/frontend/enterprise/default/template/checkout/onepage/billing.phtml +/app/design/frontend/enterprise/default/template/checkout/onepage/login.phtml +/app/design/frontend/enterprise/default/template/checkout/onepage/payment.phtml +/app/design/frontend/enterprise/default/template/checkout/onepage/shipping.phtml +/app/design/frontend/enterprise/default/template/checkout/onepage.phtml +/app/design/frontend/enterprise/default/template/checkout/widget/sku.phtml +/app/design/frontend/enterprise/default/template/cms/hierarchy/menu.phtml +/app/design/frontend/enterprise/default/template/cms/hierarchy/pagination.phtml +/app/design/frontend/enterprise/default/template/cms/hierarchy/widget/link/link_block.phtml +/app/design/frontend/enterprise/default/template/cms/hierarchy/widget/link/link_inline.phtml +/app/design/frontend/enterprise/default/template/contacts/form.phtml +/app/design/frontend/enterprise/default/template/customer/account/dashboard/address.phtml +/app/design/frontend/enterprise/default/template/customer/account/dashboard/hello.phtml +/app/design/frontend/enterprise/default/template/customer/account/dashboard/info.phtml +/app/design/frontend/enterprise/default/template/customer/account/dashboard/newsletter.phtml +/app/design/frontend/enterprise/default/template/customer/account/dashboard.phtml +/app/design/frontend/enterprise/default/template/customer/address/book.phtml +/app/design/frontend/enterprise/default/template/customer/address/edit.phtml +/app/design/frontend/enterprise/default/template/customer/form/address.phtml +/app/design/frontend/enterprise/default/template/customer/form/changepassword.phtml +/app/design/frontend/enterprise/default/template/customer/form/confirmation.phtml +/app/design/frontend/enterprise/default/template/customer/form/edit.phtml +/app/design/frontend/enterprise/default/template/customer/form/forgotpassword.phtml +/app/design/frontend/enterprise/default/template/customer/form/login.phtml +/app/design/frontend/enterprise/default/template/customer/form/newsletter.phtml +/app/design/frontend/enterprise/default/template/customer/form/register.phtml +/app/design/frontend/enterprise/default/template/customer/form/renderer/boolean.phtml +/app/design/frontend/enterprise/default/template/customer/form/renderer/date.phtml +/app/design/frontend/enterprise/default/template/customer/form/renderer/file.phtml +/app/design/frontend/enterprise/default/template/customer/form/renderer/image.phtml +/app/design/frontend/enterprise/default/template/customer/form/renderer/multiline.phtml +/app/design/frontend/enterprise/default/template/customer/form/renderer/multiselect.phtml +/app/design/frontend/enterprise/default/template/customer/form/renderer/select.phtml +/app/design/frontend/enterprise/default/template/customer/form/renderer/text.phtml +/app/design/frontend/enterprise/default/template/customer/form/renderer/textarea.phtml +/app/design/frontend/enterprise/default/template/customer/form/resetforgottenpassword.phtml +/app/design/frontend/enterprise/default/template/customer/form/userattributes.phtml +/app/design/frontend/enterprise/default/template/customer/widget/dob.phtml +/app/design/frontend/enterprise/default/template/customerbalance/account/balance.phtml +/app/design/frontend/enterprise/default/template/customerbalance/account/history.phtml +/app/design/frontend/enterprise/default/template/customerbalance/account/wrapper.phtml +/app/design/frontend/enterprise/default/template/customerbalance/checkout/multishipping/payment.phtml +/app/design/frontend/enterprise/default/template/customerbalance/checkout/onepage/payment/additional.phtml +/app/design/frontend/enterprise/default/template/customerbalance/checkout/onepage/payment/scripts.phtml +/app/design/frontend/enterprise/default/template/customerbalance/checkout/total.phtml +/app/design/frontend/enterprise/default/template/customerbalance/order/customerbalance.phtml +/app/design/frontend/enterprise/default/template/customerbalance/order/customerbalance_refunded.phtml +/app/design/frontend/enterprise/default/template/directory/currency.phtml +/app/design/frontend/enterprise/default/template/downloadable/catalog/product/type.phtml +/app/design/frontend/enterprise/default/template/giftcard/catalog/product/price.phtml +/app/design/frontend/enterprise/default/template/giftcard/catalog/product/view/type/giftcard/form.phtml +/app/design/frontend/enterprise/default/template/giftcard/catalog/product/view/type/giftcard.phtml +/app/design/frontend/enterprise/default/template/giftcard/email/generated.phtml +/app/design/frontend/enterprise/default/template/giftcard/rss/catalog/product/price.phtml +/app/design/frontend/enterprise/default/template/giftcardaccount/account/redeem.phtml +/app/design/frontend/enterprise/default/template/giftcardaccount/account/redeem_link.phtml +/app/design/frontend/enterprise/default/template/giftcardaccount/cart/block.phtml +/app/design/frontend/enterprise/default/template/giftcardaccount/cart/check.phtml +/app/design/frontend/enterprise/default/template/giftcardaccount/cart/total.phtml +/app/design/frontend/enterprise/default/template/giftcardaccount/check.phtml +/app/design/frontend/enterprise/default/template/giftcardaccount/multishipping/payment.phtml +/app/design/frontend/enterprise/default/template/giftcardaccount/onepage/payment/additional.phtml +/app/design/frontend/enterprise/default/template/giftcardaccount/onepage/payment/scripts.phtml +/app/design/frontend/enterprise/default/template/giftcardaccount/order/giftcards.phtml +/app/design/frontend/enterprise/default/template/giftmessage/inline.phtml +/app/design/frontend/enterprise/default/template/giftregistry/address/edit.phtml +/app/design/frontend/enterprise/default/template/giftregistry/attributes/region.phtml +/app/design/frontend/enterprise/default/template/giftregistry/attributes/text.phtml +/app/design/frontend/enterprise/default/template/giftregistry/cart/link.phtml +/app/design/frontend/enterprise/default/template/giftregistry/cart/product/mark.phtml +/app/design/frontend/enterprise/default/template/giftregistry/customer/checkout/multishipping.phtml +/app/design/frontend/enterprise/default/template/giftregistry/customer/checkout/onepage.phtml +/app/design/frontend/enterprise/default/template/giftregistry/customer/items/default.phtml +/app/design/frontend/enterprise/default/template/giftregistry/customer/items.phtml +/app/design/frontend/enterprise/default/template/giftregistry/customer/list.phtml +/app/design/frontend/enterprise/default/template/giftregistry/customer/share.phtml +/app/design/frontend/enterprise/default/template/giftregistry/edit/addselect.phtml +/app/design/frontend/enterprise/default/template/giftregistry/edit/edit.phtml +/app/design/frontend/enterprise/default/template/giftregistry/edit/registrants.phtml +/app/design/frontend/enterprise/default/template/giftregistry/edit/registry.phtml +/app/design/frontend/enterprise/default/template/giftregistry/email/items.phtml +/app/design/frontend/enterprise/default/template/giftregistry/product/addtocart.phtml +/app/design/frontend/enterprise/default/template/giftregistry/product/customize.phtml +/app/design/frontend/enterprise/default/template/giftregistry/search/advanced.phtml +/app/design/frontend/enterprise/default/template/giftregistry/search/form.phtml +/app/design/frontend/enterprise/default/template/giftregistry/search/quick.phtml +/app/design/frontend/enterprise/default/template/giftregistry/search/results.phtml +/app/design/frontend/enterprise/default/template/giftregistry/search/widget/form.phtml +/app/design/frontend/enterprise/default/template/giftregistry/view/items/default.phtml +/app/design/frontend/enterprise/default/template/giftregistry/view/items.phtml +/app/design/frontend/enterprise/default/template/giftregistry/view.phtml +/app/design/frontend/enterprise/default/template/giftregistry/wishlist/item/column/registry.phtml +/app/design/frontend/enterprise/default/template/giftregistry/wishlist/view.phtml +/app/design/frontend/enterprise/default/template/giftwrapping/checkout/options.phtml +/app/design/frontend/enterprise/default/template/giftwrapping/checkout/totals.phtml +/app/design/frontend/enterprise/default/template/giftwrapping/product/info.phtml +/app/design/frontend/enterprise/default/template/invitation/form.phtml +/app/design/frontend/enterprise/default/template/invitation/list.phtml +/app/design/frontend/enterprise/default/template/newsletter/subscribe.phtml +/app/design/frontend/enterprise/default/template/oauth/authorize/form/login.phtml +/app/design/frontend/enterprise/default/template/page/1column.phtml +/app/design/frontend/enterprise/default/template/page/2columns-left.phtml +/app/design/frontend/enterprise/default/template/page/2columns-right.phtml +/app/design/frontend/enterprise/default/template/page/3columns.phtml +/app/design/frontend/enterprise/default/template/page/html/footer.phtml +/app/design/frontend/enterprise/default/template/page/html/header.phtml +/app/design/frontend/enterprise/default/template/page/switch/languages.phtml +/app/design/frontend/enterprise/default/template/page/switch/stores.phtml +/app/design/frontend/enterprise/default/template/pagecache/blockdebug.phtml +/app/design/frontend/enterprise/default/template/pbridge/checkout/payment/js.phtml +/app/design/frontend/enterprise/default/template/pbridge/checkout/payment/pbridge.phtml +/app/design/frontend/enterprise/default/template/pbridge/checkout/payment/result.phtml +/app/design/frontend/enterprise/default/template/pbridge/checkout/payment/scripts.phtml +/app/design/frontend/enterprise/default/template/pbridge/checkout/review/button.continue.phtml +/app/design/frontend/enterprise/default/template/pbridge/checkout/review/button.phtml +/app/design/frontend/enterprise/default/template/pbridge/checkout/review/cancel.phtml +/app/design/frontend/enterprise/default/template/pbridge/checkout/review/error.phtml +/app/design/frontend/enterprise/default/template/pbridge/checkout/review/iframe.phtml +/app/design/frontend/enterprise/default/template/pbridge/checkout/review/onepage.success.phtml +/app/design/frontend/enterprise/default/template/pbridge/checkout/review/success.phtml +/app/design/frontend/enterprise/default/template/pbridge/iframe.phtml +/app/design/frontend/enterprise/default/template/pbridge/payment/profile.phtml +/app/design/frontend/enterprise/default/template/persistent/checkout/onepage/billing.phtml +/app/design/frontend/enterprise/default/template/persistent/checkout/onepage/login.phtml +/app/design/frontend/enterprise/default/template/persistent/customer/form/login.phtml +/app/design/frontend/enterprise/default/template/persistent/customer/form/register.phtml +/app/design/frontend/enterprise/default/template/persistent/remember_me_tooltip.phtml +/app/design/frontend/enterprise/default/template/rating/detailed.phtml +/app/design/frontend/enterprise/default/template/reports/home_product_compared.phtml +/app/design/frontend/enterprise/default/template/reports/home_product_viewed.phtml +/app/design/frontend/enterprise/default/template/reports/widget/compared/column/compared_default_list.phtml +/app/design/frontend/enterprise/default/template/reports/widget/compared/content/compared_grid.phtml +/app/design/frontend/enterprise/default/template/reports/widget/compared/content/compared_list.phtml +/app/design/frontend/enterprise/default/template/reports/widget/viewed/column/viewed_default_list.phtml +/app/design/frontend/enterprise/default/template/reports/widget/viewed/content/viewed_grid.phtml +/app/design/frontend/enterprise/default/template/reports/widget/viewed/content/viewed_list.phtml +/app/design/frontend/enterprise/default/template/review/customer/list.phtml +/app/design/frontend/enterprise/default/template/review/customer/recent.phtml +/app/design/frontend/enterprise/default/template/review/customer/view.phtml +/app/design/frontend/enterprise/default/template/review/form.phtml +/app/design/frontend/enterprise/default/template/review/product/view/list.phtml +/app/design/frontend/enterprise/default/template/review/view.phtml +/app/design/frontend/enterprise/default/template/reward/checkout/multishipping/payment/additional.phtml +/app/design/frontend/enterprise/default/template/reward/checkout/onepage/payment/additional.phtml +/app/design/frontend/enterprise/default/template/reward/checkout/onepage/payment/scripts.phtml +/app/design/frontend/enterprise/default/template/reward/checkout/total.phtml +/app/design/frontend/enterprise/default/template/reward/customer/reward/history.phtml +/app/design/frontend/enterprise/default/template/reward/customer/reward/info.phtml +/app/design/frontend/enterprise/default/template/reward/customer/reward/subscription.phtml +/app/design/frontend/enterprise/default/template/reward/customer/reward.phtml +/app/design/frontend/enterprise/default/template/reward/tooltip.phtml +/app/design/frontend/enterprise/default/template/rma/email/items.phtml +/app/design/frontend/enterprise/default/template/rma/form/renderer/image.phtml +/app/design/frontend/enterprise/default/template/rma/form/renderer/select.phtml +/app/design/frontend/enterprise/default/template/rma/form/renderer/text.phtml +/app/design/frontend/enterprise/default/template/rma/form/renderer/textarea.phtml +/app/design/frontend/enterprise/default/template/rma/form/view/image.phtml +/app/design/frontend/enterprise/default/template/rma/order/button.phtml +/app/design/frontend/enterprise/default/template/rma/return/create.phtml +/app/design/frontend/enterprise/default/template/rma/return/history.phtml +/app/design/frontend/enterprise/default/template/rma/return/info.phtml +/app/design/frontend/enterprise/default/template/rma/return/popup/package.phtml +/app/design/frontend/enterprise/default/template/rma/return/returns.phtml +/app/design/frontend/enterprise/default/template/rma/return/tracking.phtml +/app/design/frontend/enterprise/default/template/rma/return/view.phtml +/app/design/frontend/enterprise/default/template/sales/order/history.phtml +/app/design/frontend/enterprise/default/template/sales/order/info/buttons.phtml +/app/design/frontend/enterprise/default/template/sales/order/info.phtml +/app/design/frontend/enterprise/default/template/sales/order/recent.phtml +/app/design/frontend/enterprise/default/template/search/recommendations.phtml +/app/design/frontend/enterprise/default/template/search/suggestions.phtml +/app/design/frontend/enterprise/default/template/sendfriend/send.phtml +/app/design/frontend/enterprise/default/template/tag/customer/recent.phtml +/app/design/frontend/enterprise/default/template/tag/list.phtml +/app/design/frontend/enterprise/default/template/targetrule/catalog/product/list/related/item.phtml +/app/design/frontend/enterprise/default/template/targetrule/catalog/product/list/related.phtml +/app/design/frontend/enterprise/default/template/targetrule/catalog/product/list/upsell/item.phtml +/app/design/frontend/enterprise/default/template/targetrule/catalog/product/list/upsell.phtml +/app/design/frontend/enterprise/default/template/targetrule/checkout/cart/crosssell.phtml +/app/design/frontend/enterprise/default/template/wishlist/behaviour.phtml +/app/design/frontend/enterprise/default/template/wishlist/button/delete.phtml +/app/design/frontend/enterprise/default/template/wishlist/info.phtml +/app/design/frontend/enterprise/default/template/wishlist/item/column/comment.phtml +/app/design/frontend/enterprise/default/template/wishlist/item/column/copy.phtml +/app/design/frontend/enterprise/default/template/wishlist/item/column/details.phtml +/app/design/frontend/enterprise/default/template/wishlist/item/column/management.phtml +/app/design/frontend/enterprise/default/template/wishlist/item/column/price.phtml +/app/design/frontend/enterprise/default/template/wishlist/item/column/qty.phtml +/app/design/frontend/enterprise/default/template/wishlist/item/column/qty_input.phtml +/app/design/frontend/enterprise/default/template/wishlist/item/column/selector.phtml +/app/design/frontend/enterprise/default/template/wishlist/search/form.phtml +/app/design/frontend/enterprise/default/template/wishlist/search/results.phtml +/app/design/frontend/enterprise/default/template/wishlist/view/management.phtml +/app/design/frontend/enterprise/default/template/wishlist/widget/search.phtml +/app/design/frontend/enterprise/iphone/etc/theme.xml +/app/design/frontend/enterprise/iphone/etc/widget.xml +/app/design/frontend/enterprise/iphone/layout/bundle.xml +/app/design/frontend/enterprise/iphone/layout/catalog.xml +/app/design/frontend/enterprise/iphone/layout/catalogsearch.xml +/app/design/frontend/enterprise/iphone/layout/checkout.xml +/app/design/frontend/enterprise/iphone/layout/cms.xml +/app/design/frontend/enterprise/iphone/layout/customer.xml +/app/design/frontend/enterprise/iphone/layout/giftregistry.xml +/app/design/frontend/enterprise/iphone/layout/newsletter.xml +/app/design/frontend/enterprise/iphone/layout/page.xml +/app/design/frontend/enterprise/iphone/layout/review.xml +/app/design/frontend/enterprise/iphone/layout/rss.xml +/app/design/frontend/enterprise/iphone/layout/sales/billing_agreement.xml +/app/design/frontend/enterprise/iphone/layout/sales/recurring_profile.xml +/app/design/frontend/enterprise/iphone/layout/sales.xml +/app/design/frontend/enterprise/iphone/layout/search.xml +/app/design/frontend/enterprise/iphone/layout/sendfriend.xml +/app/design/frontend/enterprise/iphone/layout/tag.xml +/app/design/frontend/enterprise/iphone/layout/wishlist.xml +/app/design/frontend/enterprise/iphone/locale/en_US/translate.csv +/app/design/frontend/enterprise/iphone/template/bundle/catalog/product/view/type/bundle.phtml +/app/design/frontend/enterprise/iphone/template/bundle/sales/order/items/renderer.phtml +/app/design/frontend/enterprise/iphone/template/catalog/category/view.phtml +/app/design/frontend/enterprise/iphone/template/catalog/layer/view.phtml +/app/design/frontend/enterprise/iphone/template/catalog/navigation/top.phtml +/app/design/frontend/enterprise/iphone/template/catalog/product/gallery.phtml +/app/design/frontend/enterprise/iphone/template/catalog/product/list/toolbar.phtml +/app/design/frontend/enterprise/iphone/template/catalog/product/list/upsell.phtml +/app/design/frontend/enterprise/iphone/template/catalog/product/list.phtml +/app/design/frontend/enterprise/iphone/template/catalog/product/price.phtml +/app/design/frontend/enterprise/iphone/template/catalog/product/price_msrp.phtml +/app/design/frontend/enterprise/iphone/template/catalog/product/price_msrp_noform.phtml +/app/design/frontend/enterprise/iphone/template/catalog/product/view/addto.phtml +/app/design/frontend/enterprise/iphone/template/catalog/product/view/media.phtml +/app/design/frontend/enterprise/iphone/template/catalog/product/view/options/wrapper.phtml +/app/design/frontend/enterprise/iphone/template/catalog/product/view.phtml +/app/design/frontend/enterprise/iphone/template/catalogsearch/form.mini.phtml +/app/design/frontend/enterprise/iphone/template/catalogsearch/result.phtml +/app/design/frontend/enterprise/iphone/template/checkout/cart/item/default.phtml +/app/design/frontend/enterprise/iphone/template/checkout/cart.phtml +/app/design/frontend/enterprise/iphone/template/checkout/onepage/review/info.phtml +/app/design/frontend/enterprise/iphone/template/checkout/onepage/review/item.phtml +/app/design/frontend/enterprise/iphone/template/checkout/onepage/review/totals.phtml +/app/design/frontend/enterprise/iphone/template/checkout/success.phtml +/app/design/frontend/enterprise/iphone/template/customer/account/dashboard/address.phtml +/app/design/frontend/enterprise/iphone/template/customer/account/navigation.phtml +/app/design/frontend/enterprise/iphone/template/customer/address/book.phtml +/app/design/frontend/enterprise/iphone/template/customerbalance/order/customerbalance.phtml +/app/design/frontend/enterprise/iphone/template/customerbalance/order/customerbalance_refunded.phtml +/app/design/frontend/enterprise/iphone/template/downloadable/checkout/cart/item/default.phtml +/app/design/frontend/enterprise/iphone/template/downloadable/checkout/onepage/review/item.phtml +/app/design/frontend/enterprise/iphone/template/downloadable/customer/products/list.phtml +/app/design/frontend/enterprise/iphone/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +/app/design/frontend/enterprise/iphone/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +/app/design/frontend/enterprise/iphone/template/downloadable/sales/order/items/renderer/downloadable.phtml +/app/design/frontend/enterprise/iphone/template/giftcardaccount/order/giftcards.phtml +/app/design/frontend/enterprise/iphone/template/giftregistry/customer/items/default.phtml +/app/design/frontend/enterprise/iphone/template/giftregistry/customer/items.phtml +/app/design/frontend/enterprise/iphone/template/giftregistry/customer/list.phtml +/app/design/frontend/enterprise/iphone/template/giftregistry/view/items/default.phtml +/app/design/frontend/enterprise/iphone/template/giftregistry/view/items.phtml +/app/design/frontend/enterprise/iphone/template/giftregistry/view.phtml +/app/design/frontend/enterprise/iphone/template/giftregistry/wishlist/view.phtml +/app/design/frontend/enterprise/iphone/template/newsletter/subscribe.phtml +/app/design/frontend/enterprise/iphone/template/page/1column.phtml +/app/design/frontend/enterprise/iphone/template/page/html/footer.phtml +/app/design/frontend/enterprise/iphone/template/page/html/head.phtml +/app/design/frontend/enterprise/iphone/template/page/html/header.phtml +/app/design/frontend/enterprise/iphone/template/page/html/pager.phtml +/app/design/frontend/enterprise/iphone/template/page/switch/languages.phtml +/app/design/frontend/enterprise/iphone/template/page/switch/stores.phtml +/app/design/frontend/enterprise/iphone/template/page/template/links.phtml +/app/design/frontend/enterprise/iphone/template/paypal/express/review/details.phtml +/app/design/frontend/enterprise/iphone/template/paypal/express/review.phtml +/app/design/frontend/enterprise/iphone/template/persistent/remember_me_tooltip.phtml +/app/design/frontend/enterprise/iphone/template/review/customer/list.phtml +/app/design/frontend/enterprise/iphone/template/sales/billing/agreement/view.phtml +/app/design/frontend/enterprise/iphone/template/sales/billing/agreements.phtml +/app/design/frontend/enterprise/iphone/template/sales/order/creditmemo/items/renderer/default.phtml +/app/design/frontend/enterprise/iphone/template/sales/order/creditmemo/items.phtml +/app/design/frontend/enterprise/iphone/template/sales/order/history.phtml +/app/design/frontend/enterprise/iphone/template/sales/order/invoice/items/renderer/default.phtml +/app/design/frontend/enterprise/iphone/template/sales/order/invoice/items.phtml +/app/design/frontend/enterprise/iphone/template/sales/order/items/renderer/default.phtml +/app/design/frontend/enterprise/iphone/template/sales/order/items.phtml +/app/design/frontend/enterprise/iphone/template/sales/order/recent.phtml +/app/design/frontend/enterprise/iphone/template/sales/order/totals.phtml +/app/design/frontend/enterprise/iphone/template/shipping/tracking/ajax.phtml +/app/design/frontend/enterprise/iphone/template/shipping/tracking/popup.phtml +/app/design/frontend/enterprise/iphone/template/tag/list.phtml +/app/design/frontend/enterprise/iphone/template/targetrule/catalog/product/list/upsell/item.phtml +/app/design/frontend/enterprise/iphone/template/targetrule/catalog/product/list/upsell.phtml +/app/design/frontend/enterprise/iphone/template/tax/order/tax.phtml +/app/design/frontend/enterprise/iphone/template/wishlist/item/column/cart.phtml +/app/design/frontend/enterprise/iphone/template/wishlist/item/column/image.phtml +/app/design/frontend/enterprise/iphone/template/wishlist/item/column/info.phtml +/app/design/frontend/enterprise/iphone/template/wishlist/item/list.phtml +/app/design/frontend/enterprise/iphone/template/wishlist/shared.phtml +/app/design/frontend/enterprise/iphone/template/wishlist/view/management.phtml +/app/design/frontend/enterprise/iphone/template/wishlist/view.phtml +/app/design/frontend/rwd/default/etc/theme.xml +/app/design/frontend/rwd/default/etc/widget.xml +/app/design/frontend/rwd/default/layout/bundle.xml +/app/design/frontend/rwd/default/layout/catalog.xml +/app/design/frontend/rwd/default/layout/catalog_msrp.xml +/app/design/frontend/rwd/default/layout/catalogsearch.xml +/app/design/frontend/rwd/default/layout/checkout.xml +/app/design/frontend/rwd/default/layout/cms.xml +/app/design/frontend/rwd/default/layout/configurableswatches.xml +/app/design/frontend/rwd/default/layout/contacts.xml +/app/design/frontend/rwd/default/layout/customer.xml +/app/design/frontend/rwd/default/layout/directory.xml +/app/design/frontend/rwd/default/layout/downloadable.xml +/app/design/frontend/rwd/default/layout/newsletter.xml +/app/design/frontend/rwd/default/layout/oauth.xml +/app/design/frontend/rwd/default/layout/page.xml +/app/design/frontend/rwd/default/layout/paypal.xml +/app/design/frontend/rwd/default/layout/persistent.xml +/app/design/frontend/rwd/default/layout/review.xml +/app/design/frontend/rwd/default/layout/rss.xml +/app/design/frontend/rwd/default/layout/sales.xml +/app/design/frontend/rwd/default/layout/wishlist.xml +/app/design/frontend/rwd/default/template/authorizenet/directpost/form.phtml +/app/design/frontend/rwd/default/template/captcha/zend.phtml +/app/design/frontend/rwd/default/template/centinel/authentication/start.phtml +/app/design/frontend/rwd/default/template/contacts/form.phtml +/app/design/frontend/rwd/default/template/directory/currency.phtml +/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml +/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml +/app/design/frontend/rwd/default/template/payment/form/cc.phtml +/app/design/frontend/rwd/default/template/payment/form/ccsave.phtml +/app/design/frontend/rwd/default/template/payment/info/default.phtml +/app/design/frontend/rwd/default/template/rating/detailed.phtml +/app/design/frontend/rwd/default/template/review/customer/view.phtml +/app/design/frontend/rwd/default/template/review/form.phtml +/app/design/frontend/rwd/default/template/review/product/view/list.phtml +/app/design/frontend/rwd/default/template/review/view.phtml +/app/design/frontend/rwd/default/template/sendfriend/send.phtml +/app/design/frontend/rwd/enterprise/etc/theme.xml +/app/design/frontend/rwd/enterprise/etc/widget.xml +/app/design/frontend/rwd/enterprise/layout/catalogevent.xml +/app/design/frontend/rwd/enterprise/layout/catalogpermissions.xml +/app/design/frontend/rwd/enterprise/layout/customerbalance.xml +/app/design/frontend/rwd/enterprise/layout/enterprise/catalogsearch.xml +/app/design/frontend/rwd/enterprise/layout/enterprise/checkout.xml +/app/design/frontend/rwd/enterprise/layout/enterprise/cms.xml +/app/design/frontend/rwd/enterprise/layout/enterprise/customer.xml +/app/design/frontend/rwd/enterprise/layout/enterprise/newsletter.xml +/app/design/frontend/rwd/enterprise/layout/enterprise/oauth.xml +/app/design/frontend/rwd/enterprise/layout/enterprise/review.xml +/app/design/frontend/rwd/enterprise/layout/enterprise_wishlist.xml +/app/design/frontend/rwd/enterprise/layout/giftcard.xml +/app/design/frontend/rwd/enterprise/layout/giftcardaccount.xml +/app/design/frontend/rwd/enterprise/layout/giftregistry.xml +/app/design/frontend/rwd/enterprise/layout/giftwrapping.xml +/app/design/frontend/rwd/enterprise/layout/invitation.xml +/app/design/frontend/rwd/enterprise/layout/page.xml +/app/design/frontend/rwd/enterprise/layout/pbridge.xml +/app/design/frontend/rwd/enterprise/layout/reward.xml +/app/design/frontend/rwd/enterprise/layout/rma.xml +/app/design/frontend/rwd/enterprise/layout/search.xml +/app/design/frontend/rwd/enterprise/layout/targetrule.xml +/app/design/frontend/rwd/enterprise/layout/websiterestriction.xml +/app/design/frontend/rwd/enterprise/locale/en_US/translate.csv +/app/design/frontend/rwd/enterprise/template/banner/widget/block.phtml +/app/design/frontend/rwd/enterprise/template/banner/widget/inline.phtml +/app/design/frontend/rwd/enterprise/template/callouts/callout.phtml +/app/design/frontend/rwd/enterprise/template/catalog/category/title.phtml +/app/design/frontend/rwd/enterprise/template/catalogevent/catalog/category/event.phtml +/app/design/frontend/rwd/enterprise/template/catalogevent/catalog/product/event.phtml +/app/design/frontend/rwd/enterprise/template/catalogevent/lister.phtml +/app/design/frontend/rwd/enterprise/template/catalogevent/widget/lister.phtml +/app/design/frontend/rwd/enterprise/template/checkout/cart/cartheader.phtml +/app/design/frontend/rwd/enterprise/template/checkout/cart/item/failed.phtml +/app/design/frontend/rwd/enterprise/template/checkout/cart/sku/failed/info.phtml +/app/design/frontend/rwd/enterprise/template/checkout/cart/sku/failed.phtml +/app/design/frontend/rwd/enterprise/template/checkout/customer/file.phtml +/app/design/frontend/rwd/enterprise/template/checkout/customer/sku.phtml +/app/design/frontend/rwd/enterprise/template/checkout/onepage/billing.phtml +/app/design/frontend/rwd/enterprise/template/checkout/onepage/shipping.phtml +/app/design/frontend/rwd/enterprise/template/checkout/widget/sku.phtml +/app/design/frontend/rwd/enterprise/template/cms/hierarchy/menu.phtml +/app/design/frontend/rwd/enterprise/template/cms/hierarchy/pagination.phtml +/app/design/frontend/rwd/enterprise/template/cms/hierarchy/widget/link/link_block.phtml +/app/design/frontend/rwd/enterprise/template/cms/hierarchy/widget/link/link_inline.phtml +/app/design/frontend/rwd/enterprise/template/customer/address/edit.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/edit.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/register.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/renderer/boolean.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/renderer/date.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/renderer/file.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/renderer/image.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/renderer/multiline.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/renderer/multiselect.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/renderer/select.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/renderer/text.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/renderer/textarea.phtml +/app/design/frontend/rwd/enterprise/template/customer/form/userattributes.phtml +/app/design/frontend/rwd/enterprise/template/customerbalance/account/balance.phtml +/app/design/frontend/rwd/enterprise/template/customerbalance/account/history.phtml +/app/design/frontend/rwd/enterprise/template/customerbalance/account/wrapper.phtml +/app/design/frontend/rwd/enterprise/template/customerbalance/checkout/multishipping/payment.phtml +/app/design/frontend/rwd/enterprise/template/customerbalance/checkout/onepage/payment/additional.phtml +/app/design/frontend/rwd/enterprise/template/customerbalance/checkout/onepage/payment/scripts.phtml +/app/design/frontend/rwd/enterprise/template/customerbalance/checkout/total.phtml +/app/design/frontend/rwd/enterprise/template/customerbalance/order/customerbalance.phtml +/app/design/frontend/rwd/enterprise/template/customerbalance/order/customerbalance_refunded.phtml +/app/design/frontend/rwd/enterprise/template/giftcard/catalog/product/price.phtml +/app/design/frontend/rwd/enterprise/template/giftcard/catalog/product/view/type/giftcard/form.phtml +/app/design/frontend/rwd/enterprise/template/giftcard/catalog/product/view/type/giftcard.phtml +/app/design/frontend/rwd/enterprise/template/giftcard/email/generated.phtml +/app/design/frontend/rwd/enterprise/template/giftcard/rss/catalog/product/price.phtml +/app/design/frontend/rwd/enterprise/template/giftcardaccount/account/redeem.phtml +/app/design/frontend/rwd/enterprise/template/giftcardaccount/account/redeem_link.phtml +/app/design/frontend/rwd/enterprise/template/giftcardaccount/cart/block.phtml +/app/design/frontend/rwd/enterprise/template/giftcardaccount/cart/check.phtml +/app/design/frontend/rwd/enterprise/template/giftcardaccount/cart/total.phtml +/app/design/frontend/rwd/enterprise/template/giftcardaccount/check.phtml +/app/design/frontend/rwd/enterprise/template/giftcardaccount/multishipping/payment.phtml +/app/design/frontend/rwd/enterprise/template/giftcardaccount/onepage/payment/additional.phtml +/app/design/frontend/rwd/enterprise/template/giftcardaccount/onepage/payment/scripts.phtml +/app/design/frontend/rwd/enterprise/template/giftcardaccount/order/giftcards.phtml +/app/design/frontend/rwd/enterprise/template/giftmessage/inline.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/address/edit.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/attributes/region.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/attributes/text.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/cart/link.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/cart/product/mark.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/customer/checkout/multishipping.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/customer/checkout/onepage.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/customer/items/default.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/customer/items.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/customer/list.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/customer/share.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/edit/addselect.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/edit/edit.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/edit/registrants.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/edit/registry.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/email/items.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/product/addtocart.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/product/customize.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/search/advanced.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/search/form.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/search/quick.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/search/results.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/search/widget/form.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/view/items/default.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/view/items.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/view.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/wishlist/item/column/registry.phtml +/app/design/frontend/rwd/enterprise/template/giftregistry/wishlist/view.phtml +/app/design/frontend/rwd/enterprise/template/giftwrapping/checkout/options.phtml +/app/design/frontend/rwd/enterprise/template/giftwrapping/checkout/totals.phtml +/app/design/frontend/rwd/enterprise/template/giftwrapping/product/info.phtml +/app/design/frontend/rwd/enterprise/template/invitation/form.phtml +/app/design/frontend/rwd/enterprise/template/invitation/list.phtml +/app/design/frontend/rwd/enterprise/template/pagecache/blockdebug.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/checkout/payment/js.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/checkout/payment/pbridge.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/checkout/payment/result.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/checkout/payment/scripts.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/checkout/review/button.continue.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/checkout/review/button.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/checkout/review/cancel.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/checkout/review/error.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/checkout/review/iframe.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/checkout/review/onepage.success.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/checkout/review/success.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/iframe.phtml +/app/design/frontend/rwd/enterprise/template/pbridge/payment/profile.phtml +/app/design/frontend/rwd/enterprise/template/persistent/checkout/onepage/billing.phtml +/app/design/frontend/rwd/enterprise/template/persistent/customer/form/register.phtml +/app/design/frontend/rwd/enterprise/template/reward/checkout/multishipping/payment/additional.phtml +/app/design/frontend/rwd/enterprise/template/reward/checkout/onepage/payment/additional.phtml +/app/design/frontend/rwd/enterprise/template/reward/checkout/onepage/payment/scripts.phtml +/app/design/frontend/rwd/enterprise/template/reward/checkout/total.phtml +/app/design/frontend/rwd/enterprise/template/reward/customer/reward/history.phtml +/app/design/frontend/rwd/enterprise/template/reward/customer/reward/info.phtml +/app/design/frontend/rwd/enterprise/template/reward/customer/reward/subscription.phtml +/app/design/frontend/rwd/enterprise/template/reward/customer/reward.phtml +/app/design/frontend/rwd/enterprise/template/reward/tooltip.phtml +/app/design/frontend/rwd/enterprise/template/rma/email/items.phtml +/app/design/frontend/rwd/enterprise/template/rma/form/renderer/image.phtml +/app/design/frontend/rwd/enterprise/template/rma/form/renderer/select.phtml +/app/design/frontend/rwd/enterprise/template/rma/form/renderer/text.phtml +/app/design/frontend/rwd/enterprise/template/rma/form/renderer/textarea.phtml +/app/design/frontend/rwd/enterprise/template/rma/form/view/image.phtml +/app/design/frontend/rwd/enterprise/template/rma/order/button.phtml +/app/design/frontend/rwd/enterprise/template/rma/return/create.phtml +/app/design/frontend/rwd/enterprise/template/rma/return/history.phtml +/app/design/frontend/rwd/enterprise/template/rma/return/info.phtml +/app/design/frontend/rwd/enterprise/template/rma/return/popup/package.phtml +/app/design/frontend/rwd/enterprise/template/rma/return/returns.phtml +/app/design/frontend/rwd/enterprise/template/rma/return/tracking.phtml +/app/design/frontend/rwd/enterprise/template/rma/return/view.phtml +/app/design/frontend/rwd/enterprise/template/search/recommendations.phtml +/app/design/frontend/rwd/enterprise/template/search/suggestions.phtml +/app/design/frontend/rwd/enterprise/template/targetrule/catalog/product/list/related/item.phtml +/app/design/frontend/rwd/enterprise/template/targetrule/catalog/product/list/related.phtml +/app/design/frontend/rwd/enterprise/template/targetrule/catalog/product/list/upsell/item.phtml +/app/design/frontend/rwd/enterprise/template/targetrule/catalog/product/list/upsell.phtml +/app/design/frontend/rwd/enterprise/template/targetrule/checkout/cart/crosssell.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/behaviour.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/button/delete.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/catalog/product/wrapper.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/info.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/item/column/comment.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/item/column/copy.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/item/column/details.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/item/column/management.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/item/column/price.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/item/column/qty.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/item/column/qty_input.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/item/column/selector.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/search/form.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/search/results.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/view/management.phtml +/app/design/frontend/rwd/enterprise/template/wishlist/widget/search.phtml +/app/design/install/default/default/etc/theme.xml +/app/design/install/default/default/layout/main.xml +/app/design/install/default/default/template/page.phtml +/app/design/install/default/enterprise/etc/theme.xml +/app/design/install/default/enterprise/template/install/state.phtml +/app/design/install/default/enterprise/template/page.phtml +/app/etc/config.xml +/app/etc/enterprise.xml +/app/etc/local.xml.additional +/app/etc/local.xml.template +/app/etc/modules/Cm_RedisSession.xml +/app/etc/modules/Enterprise_AdminGws.xml +/app/etc/modules/Enterprise_Banner.xml +/app/etc/modules/Enterprise_Bundle.xml +/app/etc/modules/Enterprise_Catalog.xml +/app/etc/modules/Enterprise_CatalogEvent.xml +/app/etc/modules/Enterprise_CatalogInventory.xml +/app/etc/modules/Enterprise_CatalogPermissions.xml +/app/etc/modules/Enterprise_CatalogSearch.xml +/app/etc/modules/Enterprise_Checkout.xml +/app/etc/modules/Enterprise_Cms.xml +/app/etc/modules/Enterprise_Customer.xml +/app/etc/modules/Enterprise_CustomerBalance.xml +/app/etc/modules/Enterprise_CustomerSegment.xml +/app/etc/modules/Enterprise_Eav.xml +/app/etc/modules/Enterprise_Enterprise.xml +/app/etc/modules/Enterprise_GiftCard.xml +/app/etc/modules/Enterprise_GiftCardAccount.xml +/app/etc/modules/Enterprise_GiftRegistry.xml +/app/etc/modules/Enterprise_GiftWrapping.xml +/app/etc/modules/Enterprise_GoogleAnalyticsUniversal.xml +/app/etc/modules/Enterprise_ImportExport.xml +/app/etc/modules/Enterprise_Index.xml +/app/etc/modules/Enterprise_Invitation.xml +/app/etc/modules/Enterprise_License.xml +/app/etc/modules/Enterprise_Log.xml +/app/etc/modules/Enterprise_Logging.xml +/app/etc/modules/Enterprise_Mview.xml +/app/etc/modules/Enterprise_PageCache.xml +/app/etc/modules/Enterprise_Pbridge.xml +/app/etc/modules/Enterprise_Pci.xml +/app/etc/modules/Enterprise_Persistent.xml +/app/etc/modules/Enterprise_PricePermissions.xml +/app/etc/modules/Enterprise_PromotionPermissions.xml +/app/etc/modules/Enterprise_Reminder.xml +/app/etc/modules/Enterprise_Reward.xml +/app/etc/modules/Enterprise_Rma.xml +/app/etc/modules/Enterprise_SalesArchive.xml +/app/etc/modules/Enterprise_Search.xml +/app/etc/modules/Enterprise_Staging.xml +/app/etc/modules/Enterprise_Support.xml +/app/etc/modules/Enterprise_TargetRule.xml +/app/etc/modules/Enterprise_UrlRewrite.xml +/app/etc/modules/Enterprise_WebsiteRestriction.xml +/app/etc/modules/Enterprise_Wishlist.xml +/app/etc/modules/Mage_All.xml +/app/etc/modules/Mage_Api.xml +/app/etc/modules/Mage_Api2.xml +/app/etc/modules/Mage_Authorizenet.xml +/app/etc/modules/Mage_Bundle.xml +/app/etc/modules/Mage_Captcha.xml +/app/etc/modules/Mage_Centinel.xml +/app/etc/modules/Mage_Compiler.xml +/app/etc/modules/Mage_ConfigurableSwatches.xml +/app/etc/modules/Mage_Connect.xml +/app/etc/modules/Mage_CurrencySymbol.xml +/app/etc/modules/Mage_Downloadable.xml +/app/etc/modules/Mage_ImportExport.xml +/app/etc/modules/Mage_Oauth.xml +/app/etc/modules/Mage_Ogone.xml +/app/etc/modules/Mage_Persistent.xml +/app/etc/modules/Mage_Weee.xml +/app/etc/modules/Mage_Widget.xml +/app/etc/modules/Mage_XmlConnect.xml +/app/etc/modules/OnTap_Merchandiser.xml +/app/etc/modules/Phoenix_Moneybookers.xml +/app/locale/en_US/Enterprise_AdminGws.csv +/app/locale/en_US/Enterprise_Banner.csv +/app/locale/en_US/Enterprise_Bundle.csv +/app/locale/en_US/Enterprise_Catalog.csv +/app/locale/en_US/Enterprise_CatalogEvent.csv +/app/locale/en_US/Enterprise_CatalogInventory.csv +/app/locale/en_US/Enterprise_CatalogPermissions.csv +/app/locale/en_US/Enterprise_CatalogSearch.csv +/app/locale/en_US/Enterprise_Checkout.csv +/app/locale/en_US/Enterprise_Cms.csv +/app/locale/en_US/Enterprise_Customer.csv +/app/locale/en_US/Enterprise_CustomerBalance.csv +/app/locale/en_US/Enterprise_CustomerSegment.csv +/app/locale/en_US/Enterprise_Eav.csv +/app/locale/en_US/Enterprise_GiftCard.csv +/app/locale/en_US/Enterprise_GiftCardAccount.csv +/app/locale/en_US/Enterprise_GiftRegistry.csv +/app/locale/en_US/Enterprise_GiftWrapping.csv +/app/locale/en_US/Enterprise_GoogleAnalyticsUniversal.csv +/app/locale/en_US/Enterprise_ImportExport.csv +/app/locale/en_US/Enterprise_Index.csv +/app/locale/en_US/Enterprise_Invitation.csv +/app/locale/en_US/Enterprise_License.csv +/app/locale/en_US/Enterprise_Logging.csv +/app/locale/en_US/Enterprise_PageCache.csv +/app/locale/en_US/Enterprise_Pbridge.csv +/app/locale/en_US/Enterprise_Pci.csv +/app/locale/en_US/Enterprise_Persistent.csv +/app/locale/en_US/Enterprise_PricePermissions.csv +/app/locale/en_US/Enterprise_PromotionPermissions.csv +/app/locale/en_US/Enterprise_Reminder.csv +/app/locale/en_US/Enterprise_Reward.csv +/app/locale/en_US/Enterprise_Rma.csv +/app/locale/en_US/Enterprise_SalesArchive.csv +/app/locale/en_US/Enterprise_Search.csv +/app/locale/en_US/Enterprise_Staging.csv +/app/locale/en_US/Enterprise_Support.csv +/app/locale/en_US/Enterprise_TargetRule.csv +/app/locale/en_US/Enterprise_UrlRewrite.csv +/app/locale/en_US/Enterprise_WebsiteRestriction.csv +/app/locale/en_US/Enterprise_Wishlist.csv +/app/locale/en_US/Mage_Adminhtml.csv +/app/locale/en_US/Mage_AdminNotification.csv +/app/locale/en_US/Mage_AmazonPayments.csv +/app/locale/en_US/Mage_Api.csv +/app/locale/en_US/Mage_Api2.csv +/app/locale/en_US/Mage_Authorizenet.csv +/app/locale/en_US/Mage_Backup.csv +/app/locale/en_US/Mage_Bundle.csv +/app/locale/en_US/Mage_Captcha.csv +/app/locale/en_US/Mage_Catalog.csv +/app/locale/en_US/Mage_CatalogInventory.csv +/app/locale/en_US/Mage_CatalogRule.csv +/app/locale/en_US/Mage_CatalogSearch.csv +/app/locale/en_US/Mage_Centinel.csv +/app/locale/en_US/Mage_Checkout.csv +/app/locale/en_US/Mage_Cms.csv +/app/locale/en_US/Mage_Compiler.csv +/app/locale/en_US/Mage_ConfigurableSwatches.csv +/app/locale/en_US/Mage_Connect.csv +/app/locale/en_US/Mage_Contacts.csv +/app/locale/en_US/Mage_Core.csv +/app/locale/en_US/Mage_Cron.csv +/app/locale/en_US/Mage_CurrencySymbol.csv +/app/locale/en_US/Mage_Customer.csv +/app/locale/en_US/Mage_Dataflow.csv +/app/locale/en_US/Mage_Directory.csv +/app/locale/en_US/Mage_Downloadable.csv +/app/locale/en_US/Mage_Eav.csv +/app/locale/en_US/Mage_GiftMessage.csv +/app/locale/en_US/Mage_GoogleAnalytics.csv +/app/locale/en_US/Mage_GoogleBase.csv +/app/locale/en_US/Mage_GoogleCheckout.csv +/app/locale/en_US/Mage_ImportExport.csv +/app/locale/en_US/Mage_Index.csv +/app/locale/en_US/Mage_Install.csv +/app/locale/en_US/Mage_Log.csv +/app/locale/en_US/Mage_Media.csv +/app/locale/en_US/Mage_Newsletter.csv +/app/locale/en_US/Mage_Oauth.csv +/app/locale/en_US/Mage_Ogone.csv +/app/locale/en_US/Mage_Page.csv +/app/locale/en_US/Mage_PageCache.csv +/app/locale/en_US/Mage_Paygate.csv +/app/locale/en_US/Mage_Payment.csv +/app/locale/en_US/Mage_Paypal.csv +/app/locale/en_US/Mage_PaypalUk.csv +/app/locale/en_US/Mage_Persistent.csv +/app/locale/en_US/Mage_Poll.csv +/app/locale/en_US/Mage_ProductAlert.csv +/app/locale/en_US/Mage_Rating.csv +/app/locale/en_US/Mage_Reports.csv +/app/locale/en_US/Mage_Review.csv +/app/locale/en_US/Mage_Rss.csv +/app/locale/en_US/Mage_Rule.csv +/app/locale/en_US/Mage_Sales.csv +/app/locale/en_US/Mage_SalesRule.csv +/app/locale/en_US/Mage_Sendfriend.csv +/app/locale/en_US/Mage_Shipping.csv +/app/locale/en_US/Mage_Sitemap.csv +/app/locale/en_US/Mage_Tag.csv +/app/locale/en_US/Mage_Tax.csv +/app/locale/en_US/Mage_Usa.csv +/app/locale/en_US/Mage_Weee.csv +/app/locale/en_US/Mage_Widget.csv +/app/locale/en_US/Mage_Wishlist.csv +/app/locale/en_US/Mage_XmlConnect.csv +/app/locale/en_US/OnTap_Merchandiser.csv +/app/locale/en_US/Phoenix_Moneybookers.csv +/app/locale/en_US/template/email/account_new.html +/app/locale/en_US/template/email/account_new_confirmation.html +/app/locale/en_US/template/email/account_new_confirmed.html +/app/locale/en_US/template/email/account_password_reset_confirmation.html +/app/locale/en_US/template/email/admin_password_new.html +/app/locale/en_US/template/email/admin_password_reset_confirmation.html +/app/locale/en_US/template/email/contact_form.html +/app/locale/en_US/template/email/currency_update_warning.html +/app/locale/en_US/template/email/enterprise/customerbalance_update.html +/app/locale/en_US/template/email/enterprise/giftcard_generated.html +/app/locale/en_US/template/email/enterprise/giftcardaccount.html +/app/locale/en_US/template/email/enterprise/giftregistry_owner.html +/app/locale/en_US/template/email/enterprise/giftregistry_sharing.html +/app/locale/en_US/template/email/enterprise/giftregistry_update.html +/app/locale/en_US/template/email/enterprise/invitation.html +/app/locale/en_US/template/email/enterprise/reminder.html +/app/locale/en_US/template/email/enterprise/reward_balance_update.html +/app/locale/en_US/template/email/enterprise/reward_expiry_warning.html +/app/locale/en_US/template/email/enterprise/rma_auth.html +/app/locale/en_US/template/email/enterprise/rma_auth_guest.html +/app/locale/en_US/template/email/enterprise/rma_comment.html +/app/locale/en_US/template/email/enterprise/rma_comment_guest.html +/app/locale/en_US/template/email/enterprise/rma_customer_comment.html +/app/locale/en_US/template/email/enterprise/rma_new.html +/app/locale/en_US/template/email/enterprise/rma_new_guest.html +/app/locale/en_US/template/email/enterprise/scheduled_export_failed.html +/app/locale/en_US/template/email/enterprise/scheduled_import_failed.html +/app/locale/en_US/template/email/enterprise/scheduled_importexport_file_history_clean_failed.html +/app/locale/en_US/template/email/html/footer.html +/app/locale/en_US/template/email/html/header.html +/app/locale/en_US/template/email/log_clean_warning.html +/app/locale/en_US/template/email/moneybookers_activateemail.html +/app/locale/en_US/template/email/newsletter_subscr_confirm.html +/app/locale/en_US/template/email/newsletter_subscr_success.html +/app/locale/en_US/template/email/newsletter_unsub_success.html +/app/locale/en_US/template/email/password_new.html +/app/locale/en_US/template/email/payment_failed.html +/app/locale/en_US/template/email/product_alert_cron_error.html +/app/locale/en_US/template/email/product_price_alert.html +/app/locale/en_US/template/email/product_share.html +/app/locale/en_US/template/email/product_stock_alert.html +/app/locale/en_US/template/email/sales/creditmemo_new.html +/app/locale/en_US/template/email/sales/creditmemo_new_guest.html +/app/locale/en_US/template/email/sales/creditmemo_update.html +/app/locale/en_US/template/email/sales/creditmemo_update_guest.html +/app/locale/en_US/template/email/sales/invoice_new.html +/app/locale/en_US/template/email/sales/invoice_new_guest.html +/app/locale/en_US/template/email/sales/invoice_update.html +/app/locale/en_US/template/email/sales/invoice_update_guest.html +/app/locale/en_US/template/email/sales/order_new.html +/app/locale/en_US/template/email/sales/order_new_guest.html +/app/locale/en_US/template/email/sales/order_update.html +/app/locale/en_US/template/email/sales/order_update_guest.html +/app/locale/en_US/template/email/sales/shipment_new.html +/app/locale/en_US/template/email/sales/shipment_new_guest.html +/app/locale/en_US/template/email/sales/shipment_update.html +/app/locale/en_US/template/email/sales/shipment_update_guest.html +/app/locale/en_US/template/email/sitemap_generate_warning.html +/app/locale/en_US/template/email/token.html +/app/locale/en_US/template/email/wishlist_share.html +/app/Mage.php +/cron.php +/cron.sh +/errors/.htaccess +/errors/404.php +/errors/503.php +/errors/default/404.phtml +/errors/default/503.phtml +/errors/default/css/styles.css +/errors/default/images/bkg_body.gif +/errors/default/images/bkg_header.jpg +/errors/default/images/bkg_main1.gif +/errors/default/images/bkg_main2.gif +/errors/default/images/favicon.ico +/errors/default/images/i_msg-error.gif +/errors/default/images/i_msg-note.gif +/errors/default/images/i_msg-success.gif +/errors/default/images/logo.gif +/errors/default/page.phtml +/errors/default/report.phtml +/errors/design.xml +/errors/enterprise/404.phtml +/errors/enterprise/503.phtml +/errors/enterprise/css/styles.css +/errors/enterprise/images/bkg_btn.gif +/errors/enterprise/images/bkg_cols.gif +/errors/enterprise/images/bkg_input.gif +/errors/enterprise/images/bkg_page-title.gif +/errors/enterprise/images/error_msg_icon.gif +/errors/enterprise/images/favicon.ico +/errors/enterprise/images/logo.gif +/errors/enterprise/images/note_msg_icon.gif +/errors/enterprise/images/success_msg_icon.gif +/errors/enterprise/page.phtml +/errors/enterprise/report.phtml +/errors/local.xml.sample +/errors/processor.php +/errors/report.php +/favicon.ico +/get.php +/includes/.htaccess +/includes/config.php +/index.php +/index.php.sample +/install.php +/js/blank.html +/js/enterprise/adminhtml/addbysku.js +/js/enterprise/adminhtml/catalogpermissions-config.js +/js/enterprise/adminhtml/catalogpermissions.js +/js/enterprise/adminhtml/checkout.js +/js/enterprise/adminhtml/cms.js +/js/enterprise/adminhtml/rma.js +/js/enterprise/adminhtml/staging.js +/js/enterprise/adminhtml/support.js +/js/firebug/errorIcon.png +/js/firebug/firebug.css +/js/firebug/firebug.html +/js/firebug/firebug.js +/js/firebug/firebugx.js +/js/firebug/infoIcon.png +/js/firebug/warningIcon.png +/js/flash/AC_RunActiveContent.js +/js/google/ga.js +/js/index.php +/js/jscolor/arrow.gif +/js/jscolor/cross.gif +/js/jscolor/demo.html +/js/jscolor/hs.png +/js/jscolor/hv.png +/js/jscolor/jscolor.js +/js/lib/boxover.js +/js/lib/ccard.js +/js/lib/dropdown.js +/js/lib/ds-sleight.js +/js/lib/FABridge.js +/js/lib/flex.js +/js/lib/jquery/jquery-1.10.2.js +/js/lib/jquery/jquery-1.10.2.min.js +/js/lib/jquery/jquery-1.10.2.min.map +/js/lib/jquery/noconflict.js +/js/merchandiser/jquery-ui-1.10.4.min.js +/js/merchandiser/jquery.ui.touch-punch.min.js +/js/scriptaculous/builder.js +/js/scriptaculous/controls.js +/js/scriptaculous/dragdrop.js +/js/scriptaculous/effects.js +/js/scriptaculous/scriptaculous.js +/js/scriptaculous/slider.js +/js/scriptaculous/sound.js +/js/scriptaculous/unittest.js +/js/spacer.gif +/lib/.htaccess +/lib/3Dsecure/CentinelClient.php +/lib/3Dsecure/CentinelErrors.php +/lib/3Dsecure/XMLParser.php +/lib/Cm/Cache/Backend/Redis.php +/lib/Credis/Client.php +/lib/Net/IDNA2/Exception/Nameprep.php +/lib/Net/IDNA2/Exception.php +/lib/Net/IDNA2.php +/lib/Pelago/Emogrifier.php +/lib/Support/ref/core_files_checksum_ee_v1.14.2.2.ref +/lib/Support/ref/db_structure_snapshot_ee_v1.14.2.2.ref +/lib/Unserialize/Parser.php +/lib/Unserialize/Reader/Arr.php +/lib/Unserialize/Reader/ArrKey.php +/lib/Unserialize/Reader/ArrValue.php +/lib/Unserialize/Reader/Bool.php +/lib/Unserialize/Reader/Dbl.php +/lib/Unserialize/Reader/Int.php +/lib/Unserialize/Reader/Str.php +/LICENSE.html +/LICENSE.txt +/LICENSE_AFL.txt +/LICENSE_EE.html +/LICENSE_EE.txt +/mage +/media/.htaccess +/media/customer/.htaccess +/media/dhl/logo.jpg +/media/downloadable/.htaccess +/media/xmlconnect/custom/ok.gif +/media/xmlconnect/original/ok.gif +/media/xmlconnect/system/ok.gif +/php.ini.sample +/RELEASE_NOTES.txt +/shell/.htaccess +/shell/abstract.php +/shell/compiler.php +/shell/indexer.php +/shell/lib/Migration.php +/shell/log.php +/shell/support/admin-sysreport.sh +/shell/support/backup.sh +/shell/support/restore.sh +/shell/umt113_conflict.php +/shell/umt113_redirect.php +/shell/url_migration_from_1_13_0_0_to_1_13_0_2.php +/shell/url_migration_to_1_13.php +/skin/adminhtml/default/default/below_ie7.css +/skin/adminhtml/default/default/boxes.css +/skin/adminhtml/default/default/custom.css +/skin/adminhtml/default/default/favicon.ico +/skin/adminhtml/default/default/ie7.css +/skin/adminhtml/default/default/iestyles.css +/skin/adminhtml/default/default/images/accordion_close.gif +/skin/adminhtml/default/default/images/accordion_close.png +/skin/adminhtml/default/default/images/accordion_open.gif +/skin/adminhtml/default/default/images/accordion_open.png +/skin/adminhtml/default/default/images/add_btn_icon-disabled.gif +/skin/adminhtml/default/default/images/add_btn_icon.gif +/skin/adminhtml/default/default/images/address_list_li.gif +/skin/adminhtml/default/default/images/address_list_on_arrow.gif +/skin/adminhtml/default/default/images/address_list_over_arrow.gif +/skin/adminhtml/default/default/images/address_list_over_bg.gif +/skin/adminhtml/default/default/images/ajax-loader-tr.gif +/skin/adminhtml/default/default/images/ajax-loader.gif +/skin/adminhtml/default/default/images/application_view_tile.gif +/skin/adminhtml/default/default/images/arrow_sort_move.gif +/skin/adminhtml/default/default/images/bg_collapse.gif +/skin/adminhtml/default/default/images/bg_create_order_totals.gif +/skin/adminhtml/default/default/images/bg_notifications.gif +/skin/adminhtml/default/default/images/bg_window_mask.png +/skin/adminhtml/default/default/images/bkg_btn-close.gif +/skin/adminhtml/default/default/images/bkg_btn-close2.gif +/skin/adminhtml/default/default/images/bkg_config-advanced.png +/skin/adminhtml/default/default/images/bkg_config-nested.png +/skin/adminhtml/default/default/images/bkg_config-shaddow.png +/skin/adminhtml/default/default/images/bkg_tooltip.png +/skin/adminhtml/default/default/images/blank.gif +/skin/adminhtml/default/default/images/box_bg.gif +/skin/adminhtml/default/default/images/breadcrumb_bg.gif +/skin/adminhtml/default/default/images/btn_add-image_icon.gif +/skin/adminhtml/default/default/images/btn_add-variable_icon.gif +/skin/adminhtml/default/default/images/btn_add-widget_icon.gif +/skin/adminhtml/default/default/images/btn_add-widget_icon2.gif +/skin/adminhtml/default/default/images/btn_back_bg.gif +/skin/adminhtml/default/default/images/btn_bare_bg.gif +/skin/adminhtml/default/default/images/btn_bg-disabled.gif +/skin/adminhtml/default/default/images/btn_bg.gif +/skin/adminhtml/default/default/images/btn_bg.png +/skin/adminhtml/default/default/images/btn_cancel_bg.gif +/skin/adminhtml/default/default/images/btn_delete_bg.gif +/skin/adminhtml/default/default/images/btn_go.gif +/skin/adminhtml/default/default/images/btn_gr_bg.gif +/skin/adminhtml/default/default/images/btn_gr_on.gif +/skin/adminhtml/default/default/images/btn_gr_over.gif +/skin/adminhtml/default/default/images/btn_loading-icon.gif +/skin/adminhtml/default/default/images/btn_login.gif +/skin/adminhtml/default/default/images/btn_on_bg.gif +/skin/adminhtml/default/default/images/btn_over_bg.gif +/skin/adminhtml/default/default/images/btn_show-hide_icon.gif +/skin/adminhtml/default/default/images/btn_task_bg.gif +/skin/adminhtml/default/default/images/button-close.png +/skin/adminhtml/default/default/images/cancel_btn_active_bg.gif +/skin/adminhtml/default/default/images/cancel_btn_bg.gif +/skin/adminhtml/default/default/images/cancel_btn_icon.gif +/skin/adminhtml/default/default/images/cancel_btn_over_bg.gif +/skin/adminhtml/default/default/images/cancel_icon.gif +/skin/adminhtml/default/default/images/config_tab_dt_bg.gif +/skin/adminhtml/default/default/images/dashboard-close.gif +/skin/adminhtml/default/default/images/db-graph-bg.gif +/skin/adminhtml/default/default/images/db-graph-bottom-bg.gif +/skin/adminhtml/default/default/images/db-graph-line-bg.gif +/skin/adminhtml/default/default/images/db-graph-line2-bg.gif +/skin/adminhtml/default/default/images/db-graph-x-bg.png +/skin/adminhtml/default/default/images/db-header-bg.png +/skin/adminhtml/default/default/images/db-menu-bg-hov.gif +/skin/adminhtml/default/default/images/db-menu-bg-up.gif +/skin/adminhtml/default/default/images/db-menu-bg.gif +/skin/adminhtml/default/default/images/db-menu-sep-last.gif +/skin/adminhtml/default/default/images/db-menu-sep.gif +/skin/adminhtml/default/default/images/db-menu-start.gif +/skin/adminhtml/default/default/images/db-scroll-bg.gif +/skin/adminhtml/default/default/images/db-scroll-but-bot-roll.png +/skin/adminhtml/default/default/images/db-scroll-but-bot.png +/skin/adminhtml/default/default/images/db-scroll-but-top-roll.png +/skin/adminhtml/default/default/images/db-scroll-but-top.png +/skin/adminhtml/default/default/images/db-scroll-roller.png +/skin/adminhtml/default/default/images/db-tab-bottom-left-bg.gif +/skin/adminhtml/default/default/images/db-tab-bottom-mid-bg.gif +/skin/adminhtml/default/default/images/db-tab-bottom-right-bg.gif +/skin/adminhtml/default/default/images/db-tab-footer.gif +/skin/adminhtml/default/default/images/db-tab-header-sep.gif +/skin/adminhtml/default/default/images/db-tab-header.gif +/skin/adminhtml/default/default/images/db-tab-left.gif +/skin/adminhtml/default/default/images/db-tab-right.gif +/skin/adminhtml/default/default/images/dotted_divider_dark.gif +/skin/adminhtml/default/default/images/dotted_divider_light.gif +/skin/adminhtml/default/default/images/edit_icon.gif +/skin/adminhtml/default/default/images/entry_edit_head_arrow_down.gif +/skin/adminhtml/default/default/images/entry_edit_head_arrow_down2.gif +/skin/adminhtml/default/default/images/entry_edit_head_arrow_up.gif +/skin/adminhtml/default/default/images/entry_edit_head_bg.gif +/skin/adminhtml/default/default/images/error-msg.png +/skin/adminhtml/default/default/images/error_msg_icon.gif +/skin/adminhtml/default/default/images/fam_account.gif +/skin/adminhtml/default/default/images/fam_application_form_delete.png +/skin/adminhtml/default/default/images/fam_application_view_tile.gif +/skin/adminhtml/default/default/images/fam_asterisk_orange.gif +/skin/adminhtml/default/default/images/fam_bin.gif +/skin/adminhtml/default/default/images/fam_book_open.png +/skin/adminhtml/default/default/images/fam_bullet_disk.gif +/skin/adminhtml/default/default/images/fam_bullet_error.gif +/skin/adminhtml/default/default/images/fam_bullet_success.gif +/skin/adminhtml/default/default/images/fam_calendar.gif +/skin/adminhtml/default/default/images/fam_cart.gif +/skin/adminhtml/default/default/images/fam_comment.gif +/skin/adminhtml/default/default/images/fam_creditcards.gif +/skin/adminhtml/default/default/images/fam_folder_database.gif +/skin/adminhtml/default/default/images/fam_folder_palette.gif +/skin/adminhtml/default/default/images/fam_folder_table.gif +/skin/adminhtml/default/default/images/fam_group.gif +/skin/adminhtml/default/default/images/fam_help.gif +/skin/adminhtml/default/default/images/fam_house.gif +/skin/adminhtml/default/default/images/fam_layout.gif +/skin/adminhtml/default/default/images/fam_leaf.png +/skin/adminhtml/default/default/images/fam_link.gif +/skin/adminhtml/default/default/images/fam_lorry.gif +/skin/adminhtml/default/default/images/fam_money.gif +/skin/adminhtml/default/default/images/fam_money_add.gif +/skin/adminhtml/default/default/images/fam_monitor.gif +/skin/adminhtml/default/default/images/fam_newspaper.gif +/skin/adminhtml/default/default/images/fam_newspaper_delete.gif +/skin/adminhtml/default/default/images/fam_newspaper_error.gif +/skin/adminhtml/default/default/images/fam_newspaper_go.gif +/skin/adminhtml/default/default/images/fam_package.gif +/skin/adminhtml/default/default/images/fam_package_go.gif +/skin/adminhtml/default/default/images/fam_page_white.gif +/skin/adminhtml/default/default/images/fam_page_white_edit.gif +/skin/adminhtml/default/default/images/fam_rainbow.gif +/skin/adminhtml/default/default/images/fam_refresh.gif +/skin/adminhtml/default/default/images/fam_server_database.gif +/skin/adminhtml/default/default/images/fam_status_online.gif +/skin/adminhtml/default/default/images/fam_tag_orange.gif +/skin/adminhtml/default/default/images/fam_user.gif +/skin/adminhtml/default/default/images/fam_user_comment.gif +/skin/adminhtml/default/default/images/fam_user_edit.gif +/skin/adminhtml/default/default/images/filter_row_bg.gif +/skin/adminhtml/default/default/images/footer_bg.gif +/skin/adminhtml/default/default/images/gift-message-collapse.gif +/skin/adminhtml/default/default/images/gift-message-expand.gif +/skin/adminhtml/default/default/images/gift-message-grid-column-bg.gif +/skin/adminhtml/default/default/images/grid-cal.gif +/skin/adminhtml/default/default/images/grid_sort_asc.gif +/skin/adminhtml/default/default/images/grid_sort_desc.gif +/skin/adminhtml/default/default/images/grid_th_bg.gif +/skin/adminhtml/default/default/images/grid_th_onclick_bg.gif +/skin/adminhtml/default/default/images/grouped_to_order_icon.png +/skin/adminhtml/default/default/images/header_bg.gif +/skin/adminhtml/default/default/images/header_top_bg.gif +/skin/adminhtml/default/default/images/horiz_tabs_ul_bg.gif +/skin/adminhtml/default/default/images/i_notice.gif +/skin/adminhtml/default/default/images/i_question-mark.png +/skin/adminhtml/default/default/images/ico_success.gif +/skin/adminhtml/default/default/images/icon-enabled.png +/skin/adminhtml/default/default/images/icon-tooltip.png +/skin/adminhtml/default/default/images/icon_btn_add.gif +/skin/adminhtml/default/default/images/icon_btn_back.gif +/skin/adminhtml/default/default/images/icon_btn_delete.gif +/skin/adminhtml/default/default/images/icon_btn_save.gif +/skin/adminhtml/default/default/images/icon_edit_address.gif +/skin/adminhtml/default/default/images/icon_export.gif +/skin/adminhtml/default/default/images/icon_export.png +/skin/adminhtml/default/default/images/icon_feed.gif +/skin/adminhtml/default/default/images/icon_feed.png +/skin/adminhtml/default/default/images/icon_note_list.gif +/skin/adminhtml/default/default/images/icon_remove_address.gif +/skin/adminhtml/default/default/images/login_box_bg.gif +/skin/adminhtml/default/default/images/login_box_bg.jpg +/skin/adminhtml/default/default/images/login_box_bg_auth.jpg +/skin/adminhtml/default/default/images/login_box_bottom.jpg +/skin/adminhtml/default/default/images/login_box_legal_bg.gif +/skin/adminhtml/default/default/images/login_logo.gif +/skin/adminhtml/default/default/images/logo-large.gif +/skin/adminhtml/default/default/images/logo.gif +/skin/adminhtml/default/default/images/logo_email.gif +/skin/adminhtml/default/default/images/logo_print.gif +/skin/adminhtml/default/default/images/massaction_bg.gif +/skin/adminhtml/default/default/images/massaction_button_bg.gif +/skin/adminhtml/default/default/images/massaction_links_delimiter.gif +/skin/adminhtml/default/default/images/middle_bg.gif +/skin/adminhtml/default/default/images/moneybookers/banner.jpg +/skin/adminhtml/default/default/images/more_arrow.gif +/skin/adminhtml/default/default/images/nav1_active.gif +/skin/adminhtml/default/default/images/nav1_bg.gif +/skin/adminhtml/default/default/images/nav1_off.gif +/skin/adminhtml/default/default/images/nav1_on.gif +/skin/adminhtml/default/default/images/nav1_over.gif +/skin/adminhtml/default/default/images/nav1_sep.gif +/skin/adminhtml/default/default/images/nav2_last_li_bg.png +/skin/adminhtml/default/default/images/nav2_last_li_over_bg.png +/skin/adminhtml/default/default/images/nav2_li_bg.gif +/skin/adminhtml/default/default/images/nav2_li_bg.png +/skin/adminhtml/default/default/images/nav2_li_over_bg.png +/skin/adminhtml/default/default/images/nav2_link_bg.gif +/skin/adminhtml/default/default/images/nav2_parent_arrow.gif +/skin/adminhtml/default/default/images/nav3_bg.png +/skin/adminhtml/default/default/images/nav_bg.gif +/skin/adminhtml/default/default/images/nav_list_bg.gif +/skin/adminhtml/default/default/images/nav_nest_link_bg.gif +/skin/adminhtml/default/default/images/nav_nest_link_over_bg.gif +/skin/adminhtml/default/default/images/nav_on_bg.gif +/skin/adminhtml/default/default/images/nav_parent_arrow.gif +/skin/adminhtml/default/default/images/note_bg.gif +/skin/adminhtml/default/default/images/note_cell_bg.gif +/skin/adminhtml/default/default/images/note_msg_icon.gif +/skin/adminhtml/default/default/images/notice-msg.png +/skin/adminhtml/default/default/images/pager_arrow_left.gif +/skin/adminhtml/default/default/images/pager_arrow_left_off.gif +/skin/adminhtml/default/default/images/pager_arrow_right.gif +/skin/adminhtml/default/default/images/pager_arrow_right_off.gif +/skin/adminhtml/default/default/images/paypal/logo-paypal.png +/skin/adminhtml/default/default/images/paypal/pp-allinone.png +/skin/adminhtml/default/default/images/paypal/pp-alt.png +/skin/adminhtml/default/default/images/paypal/pp-gateways.png +/skin/adminhtml/default/default/images/paypal/pp-uk.png +/skin/adminhtml/default/default/images/paypal_logo.gif +/skin/adminhtml/default/default/images/paypal_section.png +/skin/adminhtml/default/default/images/paypal_tick.gif +/skin/adminhtml/default/default/images/placeholder/thumbnail.jpg +/skin/adminhtml/default/default/images/process_spinner.gif +/skin/adminhtml/default/default/images/product_rating_blank_star.gif +/skin/adminhtml/default/default/images/product_rating_full_star.gif +/skin/adminhtml/default/default/images/reload.png +/skin/adminhtml/default/default/images/rule-ajax-loader.gif +/skin/adminhtml/default/default/images/rule_chooser_trigger.gif +/skin/adminhtml/default/default/images/rule_component_add.gif +/skin/adminhtml/default/default/images/rule_component_apply.gif +/skin/adminhtml/default/default/images/rule_component_remove.gif +/skin/adminhtml/default/default/images/save_btn_icon.gif +/skin/adminhtml/default/default/images/sec_nav_bg.gif +/skin/adminhtml/default/default/images/section_menu_bg.gif +/skin/adminhtml/default/default/images/section_menu_bottom.gif +/skin/adminhtml/default/default/images/section_menu_link_bg.gif +/skin/adminhtml/default/default/images/section_menu_link_over_bg.gif +/skin/adminhtml/default/default/images/section_menu_over_span_bg.gif +/skin/adminhtml/default/default/images/section_menu_span_bg.gif +/skin/adminhtml/default/default/images/section_menu_ul_bg.gif +/skin/adminhtml/default/default/images/side_col_bg.gif +/skin/adminhtml/default/default/images/simple_container_bg.gif +/skin/adminhtml/default/default/images/sort-arrow-down.gif +/skin/adminhtml/default/default/images/sort-arrow-down.png +/skin/adminhtml/default/default/images/sort-arrow-up.gif +/skin/adminhtml/default/default/images/sort-arrow-up.png +/skin/adminhtml/default/default/images/sort_heading_bg.gif +/skin/adminhtml/default/default/images/sort_on_bg.gif +/skin/adminhtml/default/default/images/sort_row_bg.gif +/skin/adminhtml/default/default/images/spacer.gif +/skin/adminhtml/default/default/images/sub_button_bg.gif +/skin/adminhtml/default/default/images/success-msg.png +/skin/adminhtml/default/default/images/success_msg_icon.gif +/skin/adminhtml/default/default/images/tabs_link_bg.gif +/skin/adminhtml/default/default/images/tabs_link_over_bg.gif +/skin/adminhtml/default/default/images/tabs_span_bg.gif +/skin/adminhtml/default/default/images/tag_blue_edit.gif +/skin/adminhtml/default/default/images/tn_cancel_bg.gif +/skin/adminhtml/default/default/images/tooltip_bg.gif +/skin/adminhtml/default/default/images/tooltip_corner.gif +/skin/adminhtml/default/default/images/tooltip_top.gif +/skin/adminhtml/default/default/images/tree_icons/join.gif +/skin/adminhtml/default/default/images/tree_icons/joinbottom.gif +/skin/adminhtml/default/default/images/tree_icons/line.gif +/skin/adminhtml/default/default/images/tree_icons/minus.gif +/skin/adminhtml/default/default/images/tree_icons/minusbottom.gif +/skin/adminhtml/default/default/images/tree_icons/nolines_minus.gif +/skin/adminhtml/default/default/images/tree_icons/nolines_plus.gif +/skin/adminhtml/default/default/images/validation_advice_bg.gif +/skin/adminhtml/default/default/images/varien_logo.gif +/skin/adminhtml/default/default/images/warning_msg_icon.gif +/skin/adminhtml/default/default/images/widget/catalog__category_widget_link.gif +/skin/adminhtml/default/default/images/widget/catalog__product_widget_link.gif +/skin/adminhtml/default/default/images/widget/catalog__product_widget_new.gif +/skin/adminhtml/default/default/images/widget/cms__widget_block.gif +/skin/adminhtml/default/default/images/widget/cms__widget_page_link.gif +/skin/adminhtml/default/default/images/widget/default.gif +/skin/adminhtml/default/default/images/widget/reports__product_widget_compared.gif +/skin/adminhtml/default/default/images/widget/reports__product_widget_viewed.gif +/skin/adminhtml/default/default/images/widget_placeholder.gif +/skin/adminhtml/default/default/images/window_close.png +/skin/adminhtml/default/default/images/window_content.png +/skin/adminhtml/default/default/images/window_top.png +/skin/adminhtml/default/default/images/wysiwyg/skin_image.png +/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/btn_bg.gif +/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/content_bg.gif +/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/top_bg.gif +/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/window_close.png +/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css +/skin/adminhtml/default/default/media/flex.swf +/skin/adminhtml/default/default/media/uploader.swf +/skin/adminhtml/default/default/media/uploaderSingle.swf +/skin/adminhtml/default/default/menu.css +/skin/adminhtml/default/default/merchandiser/css/category.css +/skin/adminhtml/default/default/merchandiser/css/openedit.css +/skin/adminhtml/default/default/merchandiser/css/smartmerch.css +/skin/adminhtml/default/default/merchandiser/images/add.png +/skin/adminhtml/default/default/merchandiser/images/arrow_down.png +/skin/adminhtml/default/default/merchandiser/images/arrow_up.png +/skin/adminhtml/default/default/merchandiser/images/bkg_rating.gif +/skin/adminhtml/default/default/merchandiser/images/btn_show-hide_icon.gif +/skin/adminhtml/default/default/merchandiser/images/cancel_icon.gif +/skin/adminhtml/default/default/merchandiser/images/cross.png +/skin/adminhtml/default/default/merchandiser/images/error_msg_icon.gif +/skin/adminhtml/default/default/merchandiser/images/pbar-ani.gif +/skin/adminhtml/default/default/merchandiser/images/placeholder.jpg +/skin/adminhtml/default/default/merchandiser/images/rule-ajax-loader.gif +/skin/adminhtml/default/default/merchandiser/images/rule_component_add.gif +/skin/adminhtml/default/default/merchandiser/images/star.png +/skin/adminhtml/default/default/merchandiser/js/merchandiser.js +/skin/adminhtml/default/default/merchandiser/js/openedit.js +/skin/adminhtml/default/default/merchandiser/js/searchform.js +/skin/adminhtml/default/default/oauth-simple.css +/skin/adminhtml/default/default/print.css +/skin/adminhtml/default/default/reset.css +/skin/adminhtml/default/enterprise/boxes.css +/skin/adminhtml/default/enterprise/images/accordion_close.gif +/skin/adminhtml/default/enterprise/images/accordion_close.png +/skin/adminhtml/default/enterprise/images/accordion_open.gif +/skin/adminhtml/default/enterprise/images/accordion_open.png +/skin/adminhtml/default/enterprise/images/add_btn_icon-disabled.gif +/skin/adminhtml/default/enterprise/images/add_btn_icon.gif +/skin/adminhtml/default/enterprise/images/address_list_li.gif +/skin/adminhtml/default/enterprise/images/address_list_on_arrow.gif +/skin/adminhtml/default/enterprise/images/address_list_over_arrow.gif +/skin/adminhtml/default/enterprise/images/address_list_over_bg.gif +/skin/adminhtml/default/enterprise/images/ajax-loader-tr.gif +/skin/adminhtml/default/enterprise/images/ajax-loader.gif +/skin/adminhtml/default/enterprise/images/application_view_tile.gif +/skin/adminhtml/default/enterprise/images/arrow_sort_move.gif +/skin/adminhtml/default/enterprise/images/bg_collapse.gif +/skin/adminhtml/default/enterprise/images/bg_create_order_totals.gif +/skin/adminhtml/default/enterprise/images/bg_notifications.gif +/skin/adminhtml/default/enterprise/images/bg_window_mask.png +/skin/adminhtml/default/enterprise/images/bkg_btn-close.gif +/skin/adminhtml/default/enterprise/images/bkg_btn-close2.gif +/skin/adminhtml/default/enterprise/images/bkg_config-advanced.png +/skin/adminhtml/default/enterprise/images/bkg_config-nested.png +/skin/adminhtml/default/enterprise/images/bkg_config-shaddow.png +/skin/adminhtml/default/enterprise/images/bkg_icon-reset.png +/skin/adminhtml/default/enterprise/images/bkg_icon-resetbtn.png +/skin/adminhtml/default/enterprise/images/bkg_toolbar.gif +/skin/adminhtml/default/enterprise/images/bkg_tooltip.png +/skin/adminhtml/default/enterprise/images/blank.gif +/skin/adminhtml/default/enterprise/images/box_bg.gif +/skin/adminhtml/default/enterprise/images/breadcrumb_bg.gif +/skin/adminhtml/default/enterprise/images/btn_add-image_icon.gif +/skin/adminhtml/default/enterprise/images/btn_add-variable_icon.gif +/skin/adminhtml/default/enterprise/images/btn_add-widget_icon.gif +/skin/adminhtml/default/enterprise/images/btn_add-widget_icon2.gif +/skin/adminhtml/default/enterprise/images/btn_back_bg.gif +/skin/adminhtml/default/enterprise/images/btn_bare_bg.gif +/skin/adminhtml/default/enterprise/images/btn_bg-disabled.gif +/skin/adminhtml/default/enterprise/images/btn_bg.gif +/skin/adminhtml/default/enterprise/images/btn_bg.png +/skin/adminhtml/default/enterprise/images/btn_cancel_bg.gif +/skin/adminhtml/default/enterprise/images/btn_delete_bg.gif +/skin/adminhtml/default/enterprise/images/btn_go.gif +/skin/adminhtml/default/enterprise/images/btn_gr_bg.gif +/skin/adminhtml/default/enterprise/images/btn_gr_on.gif +/skin/adminhtml/default/enterprise/images/btn_gr_over.gif +/skin/adminhtml/default/enterprise/images/btn_loading-icon.gif +/skin/adminhtml/default/enterprise/images/btn_login.gif +/skin/adminhtml/default/enterprise/images/btn_on_bg.gif +/skin/adminhtml/default/enterprise/images/btn_over_bg.gif +/skin/adminhtml/default/enterprise/images/btn_show-hide_icon.gif +/skin/adminhtml/default/enterprise/images/btn_task_bg.gif +/skin/adminhtml/default/enterprise/images/button-close.png +/skin/adminhtml/default/enterprise/images/cancel_btn_active_bg.gif +/skin/adminhtml/default/enterprise/images/cancel_btn_bg.gif +/skin/adminhtml/default/enterprise/images/cancel_btn_icon.gif +/skin/adminhtml/default/enterprise/images/cancel_btn_over_bg.gif +/skin/adminhtml/default/enterprise/images/cancel_icon.gif +/skin/adminhtml/default/enterprise/images/cms_tree_icons/cms_node.gif +/skin/adminhtml/default/enterprise/images/cms_tree_icons/cms_node2.gif +/skin/adminhtml/default/enterprise/images/cms_tree_icons/cms_node_root.gif +/skin/adminhtml/default/enterprise/images/cms_tree_icons/cms_page-disabled.gif +/skin/adminhtml/default/enterprise/images/cms_tree_icons/cms_page.gif +/skin/adminhtml/default/enterprise/images/cms_tree_icons/cms_page2.gif +/skin/adminhtml/default/enterprise/images/config_tab_dt_bg.gif +/skin/adminhtml/default/enterprise/images/dashboard-close.gif +/skin/adminhtml/default/enterprise/images/db-graph-bg.gif +/skin/adminhtml/default/enterprise/images/db-graph-bottom-bg.gif +/skin/adminhtml/default/enterprise/images/db-graph-line-bg.gif +/skin/adminhtml/default/enterprise/images/db-graph-line2-bg.gif +/skin/adminhtml/default/enterprise/images/db-graph-x-bg.png +/skin/adminhtml/default/enterprise/images/db-header-bg.png +/skin/adminhtml/default/enterprise/images/db-menu-bg-hov.gif +/skin/adminhtml/default/enterprise/images/db-menu-bg-up.gif +/skin/adminhtml/default/enterprise/images/db-menu-bg.gif +/skin/adminhtml/default/enterprise/images/db-menu-sep-last.gif +/skin/adminhtml/default/enterprise/images/db-menu-sep.gif +/skin/adminhtml/default/enterprise/images/db-menu-start.gif +/skin/adminhtml/default/enterprise/images/db-scroll-bg.gif +/skin/adminhtml/default/enterprise/images/db-scroll-but-bot-roll.png +/skin/adminhtml/default/enterprise/images/db-scroll-but-bot.png +/skin/adminhtml/default/enterprise/images/db-scroll-but-top-roll.png +/skin/adminhtml/default/enterprise/images/db-scroll-but-top.png +/skin/adminhtml/default/enterprise/images/db-scroll-roller.png +/skin/adminhtml/default/enterprise/images/db-tab-bottom-left-bg.gif +/skin/adminhtml/default/enterprise/images/db-tab-bottom-mid-bg.gif +/skin/adminhtml/default/enterprise/images/db-tab-bottom-right-bg.gif +/skin/adminhtml/default/enterprise/images/db-tab-footer.gif +/skin/adminhtml/default/enterprise/images/db-tab-header-sep.gif +/skin/adminhtml/default/enterprise/images/db-tab-header.gif +/skin/adminhtml/default/enterprise/images/db-tab-left.gif +/skin/adminhtml/default/enterprise/images/db-tab-right.gif +/skin/adminhtml/default/enterprise/images/dotted_divider_dark.gif +/skin/adminhtml/default/enterprise/images/dotted_divider_light.gif +/skin/adminhtml/default/enterprise/images/edit_icon.gif +/skin/adminhtml/default/enterprise/images/entry_edit_head_arrow_down.gif +/skin/adminhtml/default/enterprise/images/entry_edit_head_arrow_down2.gif +/skin/adminhtml/default/enterprise/images/entry_edit_head_arrow_up.gif +/skin/adminhtml/default/enterprise/images/entry_edit_head_bg.gif +/skin/adminhtml/default/enterprise/images/error-msg.png +/skin/adminhtml/default/enterprise/images/error_msg_icon.gif +/skin/adminhtml/default/enterprise/images/fam_account.gif +/skin/adminhtml/default/enterprise/images/fam_application_form_delete.png +/skin/adminhtml/default/enterprise/images/fam_application_view_tile.gif +/skin/adminhtml/default/enterprise/images/fam_asterisk_orange.gif +/skin/adminhtml/default/enterprise/images/fam_bin.gif +/skin/adminhtml/default/enterprise/images/fam_book_open.png +/skin/adminhtml/default/enterprise/images/fam_bullet_disk.gif +/skin/adminhtml/default/enterprise/images/fam_bullet_error.gif +/skin/adminhtml/default/enterprise/images/fam_bullet_success.gif +/skin/adminhtml/default/enterprise/images/fam_calendar.gif +/skin/adminhtml/default/enterprise/images/fam_cart.gif +/skin/adminhtml/default/enterprise/images/fam_comment.gif +/skin/adminhtml/default/enterprise/images/fam_creditcards.gif +/skin/adminhtml/default/enterprise/images/fam_folder_database.gif +/skin/adminhtml/default/enterprise/images/fam_folder_palette.gif +/skin/adminhtml/default/enterprise/images/fam_folder_table.gif +/skin/adminhtml/default/enterprise/images/fam_group.gif +/skin/adminhtml/default/enterprise/images/fam_help.gif +/skin/adminhtml/default/enterprise/images/fam_house.gif +/skin/adminhtml/default/enterprise/images/fam_layout.gif +/skin/adminhtml/default/enterprise/images/fam_leaf.png +/skin/adminhtml/default/enterprise/images/fam_link.gif +/skin/adminhtml/default/enterprise/images/fam_lorry.gif +/skin/adminhtml/default/enterprise/images/fam_money.gif +/skin/adminhtml/default/enterprise/images/fam_money_add.gif +/skin/adminhtml/default/enterprise/images/fam_monitor.gif +/skin/adminhtml/default/enterprise/images/fam_newspaper.gif +/skin/adminhtml/default/enterprise/images/fam_newspaper_delete.gif +/skin/adminhtml/default/enterprise/images/fam_newspaper_error.gif +/skin/adminhtml/default/enterprise/images/fam_newspaper_go.gif +/skin/adminhtml/default/enterprise/images/fam_package.gif +/skin/adminhtml/default/enterprise/images/fam_package_go.gif +/skin/adminhtml/default/enterprise/images/fam_page_white.gif +/skin/adminhtml/default/enterprise/images/fam_page_white_edit.gif +/skin/adminhtml/default/enterprise/images/fam_rainbow.gif +/skin/adminhtml/default/enterprise/images/fam_refresh.gif +/skin/adminhtml/default/enterprise/images/fam_server_database.gif +/skin/adminhtml/default/enterprise/images/fam_status_online.gif +/skin/adminhtml/default/enterprise/images/fam_tag_orange.gif +/skin/adminhtml/default/enterprise/images/fam_user.gif +/skin/adminhtml/default/enterprise/images/fam_user_comment.gif +/skin/adminhtml/default/enterprise/images/fam_user_edit.gif +/skin/adminhtml/default/enterprise/images/filter_row_bg.gif +/skin/adminhtml/default/enterprise/images/footer_bg.gif +/skin/adminhtml/default/enterprise/images/full-arrow.gif +/skin/adminhtml/default/enterprise/images/gift-message-collapse.gif +/skin/adminhtml/default/enterprise/images/gift-message-expand.gif +/skin/adminhtml/default/enterprise/images/gift-message-grid-column-bg.gif +/skin/adminhtml/default/enterprise/images/grid-cal.gif +/skin/adminhtml/default/enterprise/images/grid_sort_asc.gif +/skin/adminhtml/default/enterprise/images/grid_sort_desc.gif +/skin/adminhtml/default/enterprise/images/grid_th_bg.gif +/skin/adminhtml/default/enterprise/images/grid_th_onclick_bg.gif +/skin/adminhtml/default/enterprise/images/header_bg.gif +/skin/adminhtml/default/enterprise/images/header_top_bg.gif +/skin/adminhtml/default/enterprise/images/horiz_tabs_ul_bg.gif +/skin/adminhtml/default/enterprise/images/i_notice.gif +/skin/adminhtml/default/enterprise/images/i_question-mark.png +/skin/adminhtml/default/enterprise/images/ico_success.gif +/skin/adminhtml/default/enterprise/images/icon-enabled.png +/skin/adminhtml/default/enterprise/images/icon-tooltip.png +/skin/adminhtml/default/enterprise/images/icon_btn_add.gif +/skin/adminhtml/default/enterprise/images/icon_btn_back.gif +/skin/adminhtml/default/enterprise/images/icon_btn_delete.gif +/skin/adminhtml/default/enterprise/images/icon_btn_save.gif +/skin/adminhtml/default/enterprise/images/icon_edit_address.gif +/skin/adminhtml/default/enterprise/images/icon_export.gif +/skin/adminhtml/default/enterprise/images/icon_export.png +/skin/adminhtml/default/enterprise/images/icon_feed.gif +/skin/adminhtml/default/enterprise/images/icon_feed.png +/skin/adminhtml/default/enterprise/images/icon_note_list.gif +/skin/adminhtml/default/enterprise/images/icon_remove_address.gif +/skin/adminhtml/default/enterprise/images/l-arrow.gif +/skin/adminhtml/default/enterprise/images/login_box_bg.gif +/skin/adminhtml/default/enterprise/images/login_box_bg.jpg +/skin/adminhtml/default/enterprise/images/login_box_bg_auth.jpg +/skin/adminhtml/default/enterprise/images/login_box_bottom.jpg +/skin/adminhtml/default/enterprise/images/login_box_legal_bg.gif +/skin/adminhtml/default/enterprise/images/login_logo.gif +/skin/adminhtml/default/enterprise/images/logo-large.gif +/skin/adminhtml/default/enterprise/images/logo.gif +/skin/adminhtml/default/enterprise/images/massaction_bg.gif +/skin/adminhtml/default/enterprise/images/massaction_button_bg.gif +/skin/adminhtml/default/enterprise/images/massaction_links_delimiter.gif +/skin/adminhtml/default/enterprise/images/middle_bg.gif +/skin/adminhtml/default/enterprise/images/more_arrow.gif +/skin/adminhtml/default/enterprise/images/nav1_active.gif +/skin/adminhtml/default/enterprise/images/nav1_bg.gif +/skin/adminhtml/default/enterprise/images/nav1_off.gif +/skin/adminhtml/default/enterprise/images/nav1_on.gif +/skin/adminhtml/default/enterprise/images/nav1_over.gif +/skin/adminhtml/default/enterprise/images/nav1_sep.gif +/skin/adminhtml/default/enterprise/images/nav2_last_li_bg.png +/skin/adminhtml/default/enterprise/images/nav2_last_li_over_bg.png +/skin/adminhtml/default/enterprise/images/nav2_li_bg.gif +/skin/adminhtml/default/enterprise/images/nav2_li_bg.png +/skin/adminhtml/default/enterprise/images/nav2_li_over_bg.png +/skin/adminhtml/default/enterprise/images/nav2_link_bg.gif +/skin/adminhtml/default/enterprise/images/nav2_parent_arrow.gif +/skin/adminhtml/default/enterprise/images/nav3_bg.png +/skin/adminhtml/default/enterprise/images/nav_bg.gif +/skin/adminhtml/default/enterprise/images/nav_list_bg.gif +/skin/adminhtml/default/enterprise/images/nav_nest_link_bg.gif +/skin/adminhtml/default/enterprise/images/nav_nest_link_over_bg.gif +/skin/adminhtml/default/enterprise/images/nav_on_bg.gif +/skin/adminhtml/default/enterprise/images/nav_parent_arrow.gif +/skin/adminhtml/default/enterprise/images/note_bg.gif +/skin/adminhtml/default/enterprise/images/note_cell_bg.gif +/skin/adminhtml/default/enterprise/images/note_msg_icon.gif +/skin/adminhtml/default/enterprise/images/notice-msg.png +/skin/adminhtml/default/enterprise/images/pager_arrow_left.gif +/skin/adminhtml/default/enterprise/images/pager_arrow_left_off.gif +/skin/adminhtml/default/enterprise/images/pager_arrow_right.gif +/skin/adminhtml/default/enterprise/images/pager_arrow_right_off.gif +/skin/adminhtml/default/enterprise/images/paypal/logo-paypal.png +/skin/adminhtml/default/enterprise/images/paypal/pp-allinone.png +/skin/adminhtml/default/enterprise/images/paypal/pp-alt.png +/skin/adminhtml/default/enterprise/images/paypal/pp-gateways.png +/skin/adminhtml/default/enterprise/images/paypal/pp-uk.png +/skin/adminhtml/default/enterprise/images/paypal_logo.gif +/skin/adminhtml/default/enterprise/images/paypal_section.png +/skin/adminhtml/default/enterprise/images/paypal_tick.gif +/skin/adminhtml/default/enterprise/images/process_spinner.gif +/skin/adminhtml/default/enterprise/images/product_rating_blank_star.gif +/skin/adminhtml/default/enterprise/images/product_rating_full_star.gif +/skin/adminhtml/default/enterprise/images/r-arrow.gif +/skin/adminhtml/default/enterprise/images/rule-ajax-loader.gif +/skin/adminhtml/default/enterprise/images/rule_chooser_trigger.gif +/skin/adminhtml/default/enterprise/images/rule_component_add.gif +/skin/adminhtml/default/enterprise/images/rule_component_apply.gif +/skin/adminhtml/default/enterprise/images/rule_component_remove.gif +/skin/adminhtml/default/enterprise/images/save_btn_icon.gif +/skin/adminhtml/default/enterprise/images/sec_nav_bg.gif +/skin/adminhtml/default/enterprise/images/section_menu_bg.gif +/skin/adminhtml/default/enterprise/images/section_menu_bottom.gif +/skin/adminhtml/default/enterprise/images/section_menu_link_bg.gif +/skin/adminhtml/default/enterprise/images/section_menu_link_over_bg.gif +/skin/adminhtml/default/enterprise/images/section_menu_over_span_bg.gif +/skin/adminhtml/default/enterprise/images/section_menu_span_bg.gif +/skin/adminhtml/default/enterprise/images/section_menu_ul_bg.gif +/skin/adminhtml/default/enterprise/images/side_col_bg.gif +/skin/adminhtml/default/enterprise/images/simple_container_bg.gif +/skin/adminhtml/default/enterprise/images/small_logo.gif +/skin/adminhtml/default/enterprise/images/sort-arrow-down.gif +/skin/adminhtml/default/enterprise/images/sort-arrow-down.png +/skin/adminhtml/default/enterprise/images/sort-arrow-up.gif +/skin/adminhtml/default/enterprise/images/sort-arrow-up.png +/skin/adminhtml/default/enterprise/images/sort_heading_bg.gif +/skin/adminhtml/default/enterprise/images/sort_on_bg.gif +/skin/adminhtml/default/enterprise/images/sort_row_bg.gif +/skin/adminhtml/default/enterprise/images/spacer.gif +/skin/adminhtml/default/enterprise/images/sub_button_bg.gif +/skin/adminhtml/default/enterprise/images/success-msg.png +/skin/adminhtml/default/enterprise/images/success_msg_icon.gif +/skin/adminhtml/default/enterprise/images/tabs_link_bg.gif +/skin/adminhtml/default/enterprise/images/tabs_link_over_bg.gif +/skin/adminhtml/default/enterprise/images/tabs_span_bg.gif +/skin/adminhtml/default/enterprise/images/tag_blue_edit.gif +/skin/adminhtml/default/enterprise/images/tmp-icon.gif +/skin/adminhtml/default/enterprise/images/tn_cancel_bg.gif +/skin/adminhtml/default/enterprise/images/tooltip_bg.gif +/skin/adminhtml/default/enterprise/images/tooltip_corner.gif +/skin/adminhtml/default/enterprise/images/tooltip_top.gif +/skin/adminhtml/default/enterprise/images/tree_icons/join.gif +/skin/adminhtml/default/enterprise/images/tree_icons/joinbottom.gif +/skin/adminhtml/default/enterprise/images/tree_icons/line.gif +/skin/adminhtml/default/enterprise/images/tree_icons/minus.gif +/skin/adminhtml/default/enterprise/images/tree_icons/minusbottom.gif +/skin/adminhtml/default/enterprise/images/tree_icons/nolines_minus.gif +/skin/adminhtml/default/enterprise/images/tree_icons/nolines_plus.gif +/skin/adminhtml/default/enterprise/images/validation_advice_bg.gif +/skin/adminhtml/default/enterprise/images/varien_logo.gif +/skin/adminhtml/default/enterprise/images/warning_msg_icon.gif +/skin/adminhtml/default/enterprise/images/widget/catalog__category_widget_link.gif +/skin/adminhtml/default/enterprise/images/widget/catalog__product_widget_link.gif +/skin/adminhtml/default/enterprise/images/widget/catalog__product_widget_new.gif +/skin/adminhtml/default/enterprise/images/widget/cms__widget_block.gif +/skin/adminhtml/default/enterprise/images/widget/cms__widget_page_link.gif +/skin/adminhtml/default/enterprise/images/widget/default.gif +/skin/adminhtml/default/enterprise/images/widget/enterprise_banner__widget_banner.gif +/skin/adminhtml/default/enterprise/images/widget/enterprise_catalogevent__widget_lister.gif +/skin/adminhtml/default/enterprise/images/widget/enterprise_cms__widget_menu.gif +/skin/adminhtml/default/enterprise/images/widget/enterprise_cms__widget_node.gif +/skin/adminhtml/default/enterprise/images/widget/enterprise_cms__widget_pagination.gif +/skin/adminhtml/default/enterprise/images/widget/reports__product_widget_compared.gif +/skin/adminhtml/default/enterprise/images/widget/reports__product_widget_viewed.gif +/skin/adminhtml/default/enterprise/images/widget_placeholder.gif +/skin/adminhtml/default/enterprise/images/window_close.png +/skin/adminhtml/default/enterprise/images/window_content.png +/skin/adminhtml/default/enterprise/images/window_top.png +/skin/adminhtml/default/enterprise/images/wysiwyg/skin_image.png +/skin/adminhtml/default/enterprise/images/xmlconnect_tab.png +/skin/adminhtml/default/enterprise/support/base.css +/skin/adminhtml/default/enterprise/support/window.css +/skin/frontend/base/default/css/email-inline.css +/skin/frontend/base/default/css/email-non-inline.css +/skin/frontend/base/default/css/widgets.css +/skin/frontend/base/default/favicon.ico +/skin/frontend/base/default/images/calendar.gif +/skin/frontend/base/default/images/catalog/product/placeholder/image.jpg +/skin/frontend/base/default/images/catalog/product/placeholder/small_image.jpg +/skin/frontend/base/default/images/catalog/product/placeholder/thumbnail.jpg +/skin/frontend/base/default/images/centinel/sc_learn_62x34.png +/skin/frontend/base/default/images/centinel/v_activate_steps.gif +/skin/frontend/base/default/images/centinel/vbv_ltbg_71x57.png +/skin/frontend/base/default/images/cvv.gif +/skin/frontend/base/default/images/fam_book_open.png +/skin/frontend/base/default/images/reload.png +/skin/frontend/base/default/images/widgets/i_block-list.gif +/skin/frontend/base/default/images/widgets/i_widget-link.gif +/skin/frontend/base/default/images/widgets/i_widget-new.gif +/skin/frontend/base/default/js/bundle.js +/skin/frontend/base/default/js/checkout/review.js +/skin/frontend/base/default/js/giftmessage.js +/skin/frontend/base/default/js/ie6.js +/skin/frontend/base/default/js/msrp.js +/skin/frontend/base/default/js/opcheckout.js +/skin/frontend/base/default/lib/prototype/windows/themes/magento/btn_bg.gif +/skin/frontend/base/default/lib/prototype/windows/themes/magento/content_bg.gif +/skin/frontend/base/default/lib/prototype/windows/themes/magento/top_bg.gif +/skin/frontend/base/default/lib/prototype/windows/themes/magento/window_close.png +/skin/frontend/base/default/lib/prototype/windows/themes/magento.css +/skin/frontend/enterprise/default/css/oauth-simple.css +/skin/frontend/enterprise/default/css/print.css +/skin/frontend/enterprise/default/css/styles-ie.css +/skin/frontend/enterprise/default/css/styles.css +/skin/frontend/enterprise/default/css/widgets.css +/skin/frontend/enterprise/default/favicon.ico +/skin/frontend/enterprise/default/images/ajax-loader.gif +/skin/frontend/enterprise/default/images/bg_bundle_btn.gif +/skin/frontend/enterprise/default/images/bg_bundle_options.png +/skin/frontend/enterprise/default/images/bg_bundle_options_bottom.png +/skin/frontend/enterprise/default/images/bkg_account-item.gif +/skin/frontend/enterprise/default/images/bkg_active-step.gif +/skin/frontend/enterprise/default/images/bkg_arrow-bullet.gif +/skin/frontend/enterprise/default/images/bkg_block-collapse.gif +/skin/frontend/enterprise/default/images/bkg_block-title.gif +/skin/frontend/enterprise/default/images/bkg_block.gif +/skin/frontend/enterprise/default/images/bkg_btn-cart.gif +/skin/frontend/enterprise/default/images/bkg_btn-co.gif +/skin/frontend/enterprise/default/images/bkg_btn-gr.gif +/skin/frontend/enterprise/default/images/bkg_btn-onbg.gif +/skin/frontend/enterprise/default/images/bkg_btn-split-change.png +/skin/frontend/enterprise/default/images/bkg_btn-split-item.png +/skin/frontend/enterprise/default/images/bkg_btn.gif +/skin/frontend/enterprise/default/images/bkg_bullet.gif +/skin/frontend/enterprise/default/images/bkg_bulletsm.gif +/skin/frontend/enterprise/default/images/bkg_button-co.gif +/skin/frontend/enterprise/default/images/bkg_button.gif +/skin/frontend/enterprise/default/images/bkg_cart-collaterals.jpg +/skin/frontend/enterprise/default/images/bkg_cart-divider.gif +/skin/frontend/enterprise/default/images/bkg_cart.gif +/skin/frontend/enterprise/default/images/bkg_cartfix.gif +/skin/frontend/enterprise/default/images/bkg_category-info.gif +/skin/frontend/enterprise/default/images/bkg_change.gif +/skin/frontend/enterprise/default/images/bkg_close.gif +/skin/frontend/enterprise/default/images/bkg_cms-menu-arrow-down.gif +/skin/frontend/enterprise/default/images/bkg_cms-menu.gif +/skin/frontend/enterprise/default/images/bkg_co-progress.gif +/skin/frontend/enterprise/default/images/bkg_collapse.gif +/skin/frontend/enterprise/default/images/bkg_collateral-tabs.gif +/skin/frontend/enterprise/default/images/bkg_collateral-tabs_1.gif +/skin/frontend/enterprise/default/images/bkg_cols.gif +/skin/frontend/enterprise/default/images/bkg_crosssell.gif +/skin/frontend/enterprise/default/images/bkg_crumbs.gif +/skin/frontend/enterprise/default/images/bkg_currently.gif +/skin/frontend/enterprise/default/images/bkg_dots.gif +/skin/frontend/enterprise/default/images/bkg_event-container-open.gif +/skin/frontend/enterprise/default/images/bkg_event-container-upcoming.gif +/skin/frontend/enterprise/default/images/bkg_event-container.gif +/skin/frontend/enterprise/default/images/bkg_footer.gif +/skin/frontend/enterprise/default/images/bkg_header-panel-bg.gif +/skin/frontend/enterprise/default/images/bkg_header-panel.gif +/skin/frontend/enterprise/default/images/bkg_icon-back.png +/skin/frontend/enterprise/default/images/bkg_icon-reset.png +/skin/frontend/enterprise/default/images/bkg_input-failed.gif +/skin/frontend/enterprise/default/images/bkg_input.gif +/skin/frontend/enterprise/default/images/bkg_invitation-link.gif +/skin/frontend/enterprise/default/images/bkg_link-edit.png +/skin/frontend/enterprise/default/images/bkg_lock.png +/skin/frontend/enterprise/default/images/bkg_msg-error.gif +/skin/frontend/enterprise/default/images/bkg_msg-note.gif +/skin/frontend/enterprise/default/images/bkg_msg-success.gif +/skin/frontend/enterprise/default/images/bkg_nav-crumbs.gif +/skin/frontend/enterprise/default/images/bkg_nav-item-border.gif +/skin/frontend/enterprise/default/images/bkg_nav-item.gif +/skin/frontend/enterprise/default/images/bkg_nav.gif +/skin/frontend/enterprise/default/images/bkg_newsletter.gif +/skin/frontend/enterprise/default/images/bkg_openevent-btn.gif +/skin/frontend/enterprise/default/images/bkg_page-title.gif +/skin/frontend/enterprise/default/images/bkg_pager.gif +/skin/frontend/enterprise/default/images/bkg_parent.gif +/skin/frontend/enterprise/default/images/bkg_proceed-checkout.gif +/skin/frontend/enterprise/default/images/bkg_ps-descr.gif +/skin/frontend/enterprise/default/images/bkg_ps-home.jpg +/skin/frontend/enterprise/default/images/bkg_ps-logo.gif +/skin/frontend/enterprise/default/images/bkg_ps.gif +/skin/frontend/enterprise/default/images/bkg_rating.gif +/skin/frontend/enterprise/default/images/bkg_rewards.gif +/skin/frontend/enterprise/default/images/bkg_rewards1.gif +/skin/frontend/enterprise/default/images/bkg_rewards2.gif +/skin/frontend/enterprise/default/images/bkg_search-input.gif +/skin/frontend/enterprise/default/images/bkg_sep.gif +/skin/frontend/enterprise/default/images/bkg_separator.gif +/skin/frontend/enterprise/default/images/bkg_shadow-offline.gif +/skin/frontend/enterprise/default/images/bkg_slide-button.gif +/skin/frontend/enterprise/default/images/bkg_slider-events.gif +/skin/frontend/enterprise/default/images/bkg_sold-out.png +/skin/frontend/enterprise/default/images/bkg_store-switch.gif +/skin/frontend/enterprise/default/images/bkg_thead.gif +/skin/frontend/enterprise/default/images/bkg_ticker.gif +/skin/frontend/enterprise/default/images/bkg_ticker1.gif +/skin/frontend/enterprise/default/images/bkg_top-cart.gif +/skin/frontend/enterprise/default/images/bkg_topcart.gif +/skin/frontend/enterprise/default/images/bkg_truncated.gif +/skin/frontend/enterprise/default/images/bkg_v-dots.gif +/skin/frontend/enterprise/default/images/bkg_viewmode.gif +/skin/frontend/enterprise/default/images/bkg_widget-category-link-icon.gif +/skin/frontend/enterprise/default/images/bkg_widget-cms-link-icon.gif +/skin/frontend/enterprise/default/images/bkg_widget-link.gif +/skin/frontend/enterprise/default/images/bkg_widget-links.gif +/skin/frontend/enterprise/default/images/bkg_widget-links2.gif +/skin/frontend/enterprise/default/images/bkg_widget-product-link-icon.gif +/skin/frontend/enterprise/default/images/btn_google_checkout.gif +/skin/frontend/enterprise/default/images/btn_paypal_checkout.gif +/skin/frontend/enterprise/default/images/btn_remove.gif +/skin/frontend/enterprise/default/images/btn_trash.gif +/skin/frontend/enterprise/default/images/btn_window_close.gif +/skin/frontend/enterprise/default/images/calendar.gif +/skin/frontend/enterprise/default/images/callouts/apparel/breastcancer.gif +/skin/frontend/enterprise/default/images/callouts/apparel/link_view_all_womens.gif +/skin/frontend/enterprise/default/images/callouts/apparel/men_rock.jpg +/skin/frontend/enterprise/default/images/callouts/apparel/women_pick_style.gif +/skin/frontend/enterprise/default/images/callouts/apparel/women_rock.jpg +/skin/frontend/enterprise/default/images/callouts/apparel/women_style1.jpg +/skin/frontend/enterprise/default/images/callouts/apparel/women_style2.jpg +/skin/frontend/enterprise/default/images/callouts/apparel/women_style3.jpg +/skin/frontend/enterprise/default/images/callouts/apparel-sale.gif +/skin/frontend/enterprise/default/images/callouts/checkout-callout.gif +/skin/frontend/enterprise/default/images/callouts/electronics/build_computer.png +/skin/frontend/enterprise/default/images/callouts/electronics/more_new_arrow.gif +/skin/frontend/enterprise/default/images/callouts/electronics/nc_acer_laptop.jpg +/skin/frontend/enterprise/default/images/callouts/electronics/nc_my_computer.jpg +/skin/frontend/enterprise/default/images/callouts/electronics/nc_toshiba_laptop.jpg +/skin/frontend/enterprise/default/images/callouts/electronics/new_computer_bg.jpg +/skin/frontend/enterprise/default/images/callouts/electronics/order_by_2pm.gif +/skin/frontend/enterprise/default/images/callouts/header_free_shipping.gif +/skin/frontend/enterprise/default/images/callouts/home/15_off_new_evening_dresses.jpg +/skin/frontend/enterprise/default/images/callouts/home/flaunt_yourself.jpg +/skin/frontend/enterprise/default/images/callouts/home/free_shipping_all_handbags.jpg +/skin/frontend/enterprise/default/images/callouts/home/gift_cards.jpg +/skin/frontend/enterprise/default/images/callouts/home/just_in.gif +/skin/frontend/enterprise/default/images/callouts/home/link_gift_cards.gif +/skin/frontend/enterprise/default/images/callouts/home/link_handbags.jpg +/skin/frontend/enterprise/default/images/callouts/home/link_private_sales.gif +/skin/frontend/enterprise/default/images/callouts/home/main.jpg +/skin/frontend/enterprise/default/images/callouts/home/ps_co.jpg +/skin/frontend/enterprise/default/images/callouts/home/rediscover_identity.jpg +/skin/frontend/enterprise/default/images/callouts/home/refund_policy.jpg +/skin/frontend/enterprise/default/images/callouts/member_specials.gif +/skin/frontend/enterprise/default/images/catalog/product/placeholder/image.jpg +/skin/frontend/enterprise/default/images/catalog/product/placeholder/small_image.jpg +/skin/frontend/enterprise/default/images/catalog/product/placeholder/thumbnail.jpg +/skin/frontend/enterprise/default/images/cvv.gif +/skin/frontend/enterprise/default/images/error_msg_icon.gif +/skin/frontend/enterprise/default/images/fam_book_open.png +/skin/frontend/enterprise/default/images/gift-message-close.gif +/skin/frontend/enterprise/default/images/header_free_shipping.gif +/skin/frontend/enterprise/default/images/i_availability_only.gif +/skin/frontend/enterprise/default/images/i_availability_only_arrow.gif +/skin/frontend/enterprise/default/images/i_gift-registry1.gif +/skin/frontend/enterprise/default/images/i_gift-registry2.gif +/skin/frontend/enterprise/default/images/i_gift-registry3.gif +/skin/frontend/enterprise/default/images/i_notice.gif +/skin/frontend/enterprise/default/images/icon_big_rss.png +/skin/frontend/enterprise/default/images/icon_error.gif +/skin/frontend/enterprise/default/images/icon_feed.png +/skin/frontend/enterprise/default/images/icon_ok.gif +/skin/frontend/enterprise/default/images/icon_printer.gif +/skin/frontend/enterprise/default/images/icon_rss.gif +/skin/frontend/enterprise/default/images/list_remove_btn.gif +/skin/frontend/enterprise/default/images/logo-offline.gif +/skin/frontend/enterprise/default/images/logo.gif +/skin/frontend/enterprise/default/images/logo_email.gif +/skin/frontend/enterprise/default/images/logo_print.gif +/skin/frontend/enterprise/default/images/magnifier_handle.gif +/skin/frontend/enterprise/default/images/map_popup_arrow.gif +/skin/frontend/enterprise/default/images/media/404_callout1.jpg +/skin/frontend/enterprise/default/images/media/404_callout2.jpg +/skin/frontend/enterprise/default/images/media/about_us_img.jpg +/skin/frontend/enterprise/default/images/media/apparel/lacool.jpg +/skin/frontend/enterprise/default/images/media/apparel/timeless-vintage.jpg +/skin/frontend/enterprise/default/images/media/apparel/virtual-reality.jpg +/skin/frontend/enterprise/default/images/media/apparel/womens-spring09.gif +/skin/frontend/enterprise/default/images/media/col_left_callout.jpg +/skin/frontend/enterprise/default/images/media/col_right_callout.jpg +/skin/frontend/enterprise/default/images/media/electronics/bkg_electronics.jpg +/skin/frontend/enterprise/default/images/media/electronics/btn-buildyourcomputer.gif +/skin/frontend/enterprise/default/images/media/electronics/hp-touchsmart.gif +/skin/frontend/enterprise/default/images/media/electronics/order_by_2pm.gif +/skin/frontend/enterprise/default/images/media/top-callout.jpg +/skin/frontend/enterprise/default/images/note_msg_icon.gif +/skin/frontend/enterprise/default/images/opc-ajax-loader.gif +/skin/frontend/enterprise/default/images/pager_arrow_left.gif +/skin/frontend/enterprise/default/images/pager_arrow_right.gif +/skin/frontend/enterprise/default/images/px.gif +/skin/frontend/enterprise/default/images/reward_points/my_account.gif +/skin/frontend/enterprise/default/images/reward_points/payment.gif +/skin/frontend/enterprise/default/images/scroll-down.gif +/skin/frontend/enterprise/default/images/scroll-up.gif +/skin/frontend/enterprise/default/images/slider_bg.gif +/skin/frontend/enterprise/default/images/slider_btn_zoom_in.gif +/skin/frontend/enterprise/default/images/slider_btn_zoom_out.gif +/skin/frontend/enterprise/default/images/sort_asc_arrow.gif +/skin/frontend/enterprise/default/images/sort_desc_arrow.gif +/skin/frontend/enterprise/default/images/spacer.gif +/skin/frontend/enterprise/default/images/success_msg_icon.gif +/skin/frontend/enterprise/default/images/zoomloader.gif +/skin/frontend/enterprise/default/js/enterprise/catalogevent.js +/skin/frontend/enterprise/default/js/enterprise/wishlist.js +/skin/frontend/enterprise/default/js/giftmessage.js +/skin/frontend/enterprise/default/js/iehover-fix.js +/skin/frontend/enterprise/default/js/jqzoom/jquery-1.3.1.min.js +/skin/frontend/enterprise/default/js/jqzoom/jquery.jqzoom1.0.1.js +/skin/frontend/enterprise/default/js/opcheckout.js +/skin/frontend/enterprise/default/js/scripts.js +/skin/frontend/enterprise/iphone/css/custom.css +/skin/frontend/enterprise/iphone/css/iphone.css +/skin/frontend/enterprise/iphone/css/widgets.css +/skin/frontend/enterprise/iphone/favicon.ico +/skin/frontend/enterprise/iphone/images/arrow_left.png +/skin/frontend/enterprise/iphone/images/arrow_left_retina.png +/skin/frontend/enterprise/iphone/images/arrow_right.png +/skin/frontend/enterprise/iphone/images/arrow_right_retina.png +/skin/frontend/enterprise/iphone/images/bg_back_btn.png +/skin/frontend/enterprise/iphone/images/bg_back_btn_retina.png +/skin/frontend/enterprise/iphone/images/bg_checkbox.png +/skin/frontend/enterprise/iphone/images/bg_checkout_step_passed.png +/skin/frontend/enterprise/iphone/images/bg_divider.png +/skin/frontend/enterprise/iphone/images/bg_divider_dark.png +/skin/frontend/enterprise/iphone/images/bg_divider_dark_retina.png +/skin/frontend/enterprise/iphone/images/bg_divider_retina.png +/skin/frontend/enterprise/iphone/images/bg_gradient.png +/skin/frontend/enterprise/iphone/images/bg_gradient_retina.png +/skin/frontend/enterprise/iphone/images/bg_shadow.png +/skin/frontend/enterprise/iphone/images/bg_shadow_retina.png +/skin/frontend/enterprise/iphone/images/btn_edit.png +/skin/frontend/enterprise/iphone/images/btn_edit_retina.png +/skin/frontend/enterprise/iphone/images/btn_remove.png +/skin/frontend/enterprise/iphone/images/btn_remove_retina.png +/skin/frontend/enterprise/iphone/images/custom/arrow.png +/skin/frontend/enterprise/iphone/images/custom/arrow_retina.png +/skin/frontend/enterprise/iphone/images/custom/bg_header.png +/skin/frontend/enterprise/iphone/images/custom/bg_header_retina.png +/skin/frontend/enterprise/iphone/images/custom/bg_logo.png +/skin/frontend/enterprise/iphone/images/custom/bg_logo_retina.png +/skin/frontend/enterprise/iphone/images/i_cart.png +/skin/frontend/enterprise/iphone/images/i_cart_retina.png +/skin/frontend/enterprise/iphone/images/i_dropdown.png +/skin/frontend/enterprise/iphone/images/i_dropdown_retina.png +/skin/frontend/enterprise/iphone/images/i_menu.png +/skin/frontend/enterprise/iphone/images/i_menu_retina.png +/skin/frontend/enterprise/iphone/images/i_search.png +/skin/frontend/enterprise/iphone/images/i_search_retina.png +/skin/frontend/enterprise/iphone/images/i_star.png +/skin/frontend/enterprise/iphone/images/i_star_blank.png +/skin/frontend/enterprise/iphone/images/i_star_blank_retina.png +/skin/frontend/enterprise/iphone/images/i_star_retina.png +/skin/frontend/enterprise/iphone/images/i_zoom.png +/skin/frontend/enterprise/iphone/images/i_zoom_retina.png +/skin/frontend/enterprise/iphone/images/loader.gif +/skin/frontend/enterprise/iphone/images/logo.gif +/skin/frontend/enterprise/iphone/images/media/cell_phone_landing_banner1.jpg +/skin/frontend/enterprise/iphone/images/opc-ajax-loader.gif +/skin/frontend/enterprise/iphone/js/dnd.js +/skin/frontend/enterprise/iphone/js/iphone.js +/skin/frontend/enterprise/iphone/js/modernizr.js +/skin/frontend/rwd/default/css/madisonisland-ie8.css +/skin/frontend/rwd/default/css/madisonisland.css +/skin/frontend/rwd/default/css/scaffold-forms.css +/skin/frontend/rwd/default/css/styles-ie8.css +/skin/frontend/rwd/default/css/styles.css +/skin/frontend/rwd/default/images/ajax-loader.gif +/skin/frontend/rwd/default/images/bg_x.png +/skin/frontend/rwd/default/images/demo-logo.png +/skin/frontend/rwd/default/images/demo_logo.png +/skin/frontend/rwd/default/images/icon_sprite.png +/skin/frontend/rwd/default/images/icon_sprite@2x.png +/skin/frontend/rwd/default/images/logo.gif +/skin/frontend/rwd/default/images/logo_email.gif +/skin/frontend/rwd/default/images/logo_print.gif +/skin/frontend/rwd/default/images/media/col_left_callout.jpg +/skin/frontend/rwd/default/images/media/col_right_callout.jpg +/skin/frontend/rwd/default/images/media/homepage_banner_1.jpg +/skin/frontend/rwd/default/images/media/homepage_banner_1@2x.jpg +/skin/frontend/rwd/default/images/media/homepage_banner_2.jpg +/skin/frontend/rwd/default/images/media/homepage_callout_1.jpg +/skin/frontend/rwd/default/images/media/homepage_callout_1@2x.jpg +/skin/frontend/rwd/default/images/media/homepage_callout_2.jpg +/skin/frontend/rwd/default/images/media/homepage_callout_2@2x.jpg +/skin/frontend/rwd/default/images/media/homepage_callout_3.jpg +/skin/frontend/rwd/default/images/media/homepage_callout_3@2x.jpg +/skin/frontend/rwd/default/images/opc-ajax-loader.gif +/skin/frontend/rwd/default/images/social_icons.png +/skin/frontend/rwd/default/images/social_icons@2x.png +/skin/frontend/rwd/default/js/app.js +/skin/frontend/rwd/default/js/configurableswatches/product-media.js +/skin/frontend/rwd/default/js/configurableswatches/swatches-list.js +/skin/frontend/rwd/default/js/configurableswatches/swatches-product.js +/skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevateZoom-3.0.8.min.js +/skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevatezoom.js +/skin/frontend/rwd/default/js/lib/enquire.js +/skin/frontend/rwd/default/js/lib/fastclick.js +/skin/frontend/rwd/default/js/lib/imagesloaded.js +/skin/frontend/rwd/default/js/lib/jquery.cycle2.min.js +/skin/frontend/rwd/default/js/lib/jquery.cycle2.swipe.min.js +/skin/frontend/rwd/default/js/lib/matchMedia.addListener.js +/skin/frontend/rwd/default/js/lib/matchMedia.js +/skin/frontend/rwd/default/js/lib/modernizr.custom.min.js +/skin/frontend/rwd/default/js/lib/selectivizr.js +/skin/frontend/rwd/default/js/minicart.js +/skin/frontend/rwd/default/js/msrp_rwd.js +/skin/frontend/rwd/default/js/opcheckout_rwd.js +/skin/frontend/rwd/default/js/slideshow.js +/skin/frontend/rwd/enterprise/css/enterprise-ie8.css +/skin/frontend/rwd/enterprise/css/enterprise.css +/skin/frontend/rwd/enterprise/images/demo-logo.png +/skin/frontend/rwd/enterprise/images/reward_points/my_account.gif +/skin/frontend/rwd/enterprise/images/reward_points/payment.gif +/skin/frontend/rwd/enterprise/js/enterprise/catalogevent.js +/skin/frontend/rwd/enterprise/js/enterprise/wishlist.js +/skin/frontend/rwd/enterprise/js/scripts.js +/skin/frontend/rwd/enterprise/scss/.htaccess +/skin/frontend/rwd/enterprise/scss/_core.scss +/skin/frontend/rwd/enterprise/scss/config.rb +/skin/frontend/rwd/enterprise/scss/enterprise-ie8.scss +/skin/frontend/rwd/enterprise/scss/enterprise.scss +/skin/frontend/rwd/enterprise/scss/module/_account-rma.scss +/skin/frontend/rwd/enterprise/scss/module/_catalog-event.scss +/skin/frontend/rwd/enterprise/scss/module/_customer-order.scss +/skin/frontend/rwd/enterprise/scss/module/_enterprise-wishlist.scss +/skin/frontend/rwd/enterprise/scss/module/_enterprise.scss +/skin/frontend/rwd/enterprise/scss/module/_gift-message.scss +/skin/frontend/rwd/enterprise/scss/module/_gift-registry.scss +/skin/frontend/rwd/enterprise/scss/module/_reward.scss +/skin/frontend/rwd/enterprise/scss/module/_store-credit.scss +/skin/install/default/default/css/boxes.css +/skin/install/default/default/css/clears.css +/skin/install/default/default/css/ie7minus.css +/skin/install/default/default/css/iestyles.css +/skin/install/default/default/css/reset.css +/skin/install/default/default/favicon.ico +/skin/install/default/default/images/error_msg_icon.gif +/skin/install/default/default/images/footer_bg.gif +/skin/install/default/default/images/footer_container_bg.gif +/skin/install/default/default/images/footer_info_separator.gif +/skin/install/default/default/images/footer_informational_bg.gif +/skin/install/default/default/images/footer_left.gif +/skin/install/default/default/images/footer_legality_bg.gif +/skin/install/default/default/images/footer_right.gif +/skin/install/default/default/images/header_bg.gif +/skin/install/default/default/images/header_nav_bg.gif +/skin/install/default/default/images/header_top_bg.jpg +/skin/install/default/default/images/header_top_container_bg.jpg +/skin/install/default/default/images/i_notice.gif +/skin/install/default/default/images/logo.gif +/skin/install/default/default/images/main_bg.gif +/skin/install/default/default/images/main_container_bg.gif +/skin/install/default/default/images/note_msg_icon.gif +/skin/install/default/default/images/success_msg_icon.gif +/skin/install/default/default/images/validation_advice_bg.gif +/skin/install/default/enterprise/css/boxes.css +/skin/install/default/enterprise/css/clears.css +/skin/install/default/enterprise/css/ie7minus.css +/skin/install/default/enterprise/css/iestyles.css +/skin/install/default/enterprise/css/reset.css +/skin/install/default/enterprise/images/bkg_block.gif +/skin/install/default/enterprise/images/bkg_cols.gif +/skin/install/default/enterprise/images/bkg_input.gif +/skin/install/default/enterprise/images/bkg_page-title.gif +/skin/install/default/enterprise/images/i_notice.gif +/skin/install/default/enterprise/images/logo.gif +/skin/install/default/enterprise/images/validation_advice_bg.gif +/var/.htaccess +/var/package/Cm_RedisSession-1.14.2.2.xml +/var/package/Enterprise_Modules-1.14.2.2.xml +/var/package/Interface_Adminhtml_Default-1.14.2.2.xml +/var/package/Interface_Adminhtml_Default_Enterprise-1.14.2.2.xml +/var/package/Interface_Frontend_Base_Default-1.14.2.2.xml +/var/package/Interface_Frontend_Enterprise-1.14.2.2.xml +/var/package/Interface_Frontend_Enterprise_Iphone-1.14.2.2.xml +/var/package/Interface_Frontend_Rwd_Default-1.14.2.2.xml +/var/package/Interface_Frontend_Rwd_Enterprise-1.14.2.2.xml +/var/package/Interface_Install_Default-1.14.2.2.xml +/var/package/Interface_Install_Enterprise-1.14.2.2.xml +/var/package/Lib_Apache-1.14.2.2.xml +/var/package/Lib_Cm-1.14.2.2.xml +/var/package/Lib_Credis-1.14.2.2.xml +/var/package/Lib_Google_Checkout-1.14.2.2.xml +/var/package/Lib_IDNA2-1.14.2.2.xml +/var/package/Lib_Js_Calendar-1.51.1.3.xml +/var/package/Lib_Js_Enterprise-1.14.2.2.xml +/var/package/Lib_Js_Ext-1.14.2.2.xml +/var/package/Lib_Js_Jscolor-1.14.2.2.xml +/var/package/Lib_Js_Mage-1.14.2.2.xml +/var/package/Lib_Js_Prototype-1.14.2.2.xml +/var/package/Lib_Js_TinyMCE-3.5.11.2.xml +/var/package/Lib_LinLibertineFont-2.8.14.3.xml +/var/package/Lib_Mage-1.14.2.2.xml +/var/package/Lib_Magento-1.14.2.2.xml +/var/package/Lib_PEAR-1.14.2.2.xml +/var/package/Lib_Pelago-1.14.2.2.xml +/var/package/Lib_Phpseclib-1.14.2.2.xml +/var/package/Lib_Unserialize-1.14.2.2.xml +/var/package/Lib_Varien-1.14.2.2.xml +/var/package/Lib_ZF-1.14.2.2.xml +/var/package/Lib_ZF_Locale-1.14.2.2.xml +/var/package/Mage_All_Latest-1.14.2.2.xml +/var/package/Mage_Centinel-1.14.2.2.xml +/var/package/Mage_Compiler-1.14.2.2.xml +/var/package/Mage_Core_Adminhtml-1.14.2.2.xml +/var/package/Mage_Core_Modules-1.14.2.2.xml +/var/package/Mage_Downloader-1.14.2.2.xml +/var/package/Mage_Locale_en_US-1.14.2.2.xml +/var/package/Mage_Ogone_Official-1.14.2.2.xml +/var/package/Magento_Mobile-1.14.2.2.xml +/var/package/Phoenix_Moneybookers-1.14.2.2.xml +/var/session \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 94166bb..1c0ad61 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,47 +1,48 @@ -Open Software License ("OSL") v. 3.0 - -This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: - -Licensed under the Open Software License version 3.0 - - 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: - - 1. to reproduce the Original Work in copies, either alone or as part of a collective work; - - 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; - - 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; - - 4. to perform the Original Work publicly; and - - 5. to display the Original Work publicly. - - 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. - - 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. - - 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. - - 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). - - 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. - - 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. - - 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. - - 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). - - 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. - - 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. - - 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. - - 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. - - 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - - 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. - - 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Helper/Data.php b/app/code/community/Meanbee/Royalmail/Helper/Data.php index 62749d7..7eb151c 100644 --- a/app/code/community/Meanbee/Royalmail/Helper/Data.php +++ b/app/code/community/Meanbee/Royalmail/Helper/Data.php @@ -1,4 +1,5 @@ array(self::INTERNATIONAL_SIGNED), - 'AX' => array(self::INTERNATIONAL_SIGNED), - 'AL' => array(self::INTERNATIONAL_SIGNED), - 'DZ' => array(self::INTERNATIONAL_SIGNED), - 'AD' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'AO' => array(self::INTERNATIONAL_SIGNED), - 'AI' => array(self::INTERNATIONAL_SIGNED), - 'AG' => array(self::INTERNATIONAL_SIGNED), - 'AR' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'AM' => array(self::INTERNATIONAL_SIGNED), - 'AW' => array(self::INTERNATIONAL_SIGNED), - 'AU' => array(self::INTERNATIONAL_TRACKED, self::INTERNATIONAL_SIGNED), - 'AT' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'AZ' => array(self::INTERNATIONAL_SIGNED), - 'BS' => array(self::INTERNATIONAL_SIGNED), - 'BH' => array(self::INTERNATIONAL_SIGNED), - 'BD' => array(self::INTERNATIONAL_SIGNED), - 'BB' => array(self::INTERNATIONAL_SIGNED), - 'BY' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'BE' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'BZ' => array(self::INTERNATIONAL_SIGNED), - 'BJ' => array(self::INTERNATIONAL_SIGNED), - 'BM' => array(self::INTERNATIONAL_SIGNED), - 'BT' => array(self::INTERNATIONAL_SIGNED), - 'BO' => array(self::INTERNATIONAL_SIGNED), - 'BQ' => array(self::INTERNATIONAL_SIGNED), - 'BA' => array(self::INTERNATIONAL_SIGNED), - 'BW' => array(self::INTERNATIONAL_SIGNED), - 'BR' => array(self::INTERNATIONAL_TRACKED, self::INTERNATIONAL_SIGNED), - 'IO' => array(self::INTERNATIONAL_SIGNED), - 'VG' => array(self::INTERNATIONAL_SIGNED), - 'BN' => array(self::INTERNATIONAL_SIGNED), - 'BG' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'BF' => array(self::INTERNATIONAL_SIGNED), - 'BI' => array(self::INTERNATIONAL_SIGNED), - 'KH' => array(self::INTERNATIONAL_SIGNED), - 'CM' => array(self::INTERNATIONAL_SIGNED), - 'CA' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'CV' => array(self::INTERNATIONAL_SIGNED), - 'KY' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'CF' => array(self::INTERNATIONAL_SIGNED), - 'TD' => array(self::INTERNATIONAL_SIGNED), - 'CL' => array(self::INTERNATIONAL_SIGNED), - 'CN' => array(self::INTERNATIONAL_SIGNED), - 'CX' => array(self::INTERNATIONAL_SIGNED), - 'CO' => array(self::INTERNATIONAL_SIGNED), - 'KM' => array(self::INTERNATIONAL_SIGNED), - 'CD' => array(self::INTERNATIONAL_SIGNED), - 'CG' => array(self::INTERNATIONAL_SIGNED), - 'CK' => array(self::INTERNATIONAL_SIGNED), - 'CR' => array(self::INTERNATIONAL_SIGNED), - 'HR' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'CU' => array(self::INTERNATIONAL_SIGNED), - 'CW' => array(self::INTERNATIONAL_SIGNED), - 'CY' => array(self::INTERNATIONAL_SIGNED), - 'CZ' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'DK' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'DJ' => array(self::INTERNATIONAL_SIGNED), - 'DM' => array(self::INTERNATIONAL_SIGNED), - 'DO' => array(self::INTERNATIONAL_SIGNED), - 'EC' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'EG' => array(self::INTERNATIONAL_SIGNED), - 'SV' => array(self::INTERNATIONAL_SIGNED), - 'GQ' => array(self::INTERNATIONAL_SIGNED), - 'ER' => array(self::INTERNATIONAL_SIGNED), - 'EE' => array(self::INTERNATIONAL_TRACKED, self::INTERNATIONAL_SIGNED), - 'ET' => array(self::INTERNATIONAL_SIGNED), - 'FK' => array(self::INTERNATIONAL_SIGNED), - 'FO' => array(self::INTERNATIONAL_SIGNED), - 'FJ' => array(self::INTERNATIONAL_SIGNED), - 'FI' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'FR' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'GF' => array(self::INTERNATIONAL_SIGNED), - 'PF' => array(self::INTERNATIONAL_SIGNED), - 'GA' => array(self::INTERNATIONAL_SIGNED), - 'GM' => array(self::INTERNATIONAL_SIGNED), - 'GE' => array(self::INTERNATIONAL_SIGNED), - 'DE' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'GH' => array(self::INTERNATIONAL_SIGNED), - 'GI' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'GR' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'GL' => array(self::INTERNATIONAL_SIGNED), - 'GD' => array(self::INTERNATIONAL_SIGNED), - 'GP' => array(self::INTERNATIONAL_SIGNED), - 'GT' => array(self::INTERNATIONAL_SIGNED), - 'GN' => array(self::INTERNATIONAL_SIGNED), - 'GW' => array(self::INTERNATIONAL_SIGNED), - 'GY' => array(self::INTERNATIONAL_SIGNED), - 'HT' => array(self::INTERNATIONAL_SIGNED), - 'HN' => array(self::INTERNATIONAL_SIGNED), - 'HK' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'HU' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'IS' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'IN' => array(self::INTERNATIONAL_TRACKED, self::INTERNATIONAL_SIGNED), - 'ID' => array(self::INTERNATIONAL_SIGNED), - 'IR' => array(self::INTERNATIONAL_SIGNED), - 'IQ' => array(self::INTERNATIONAL_SIGNED), - 'IE' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'IL' => array(self::INTERNATIONAL_SIGNED), - 'IT' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'JM' => array(self::INTERNATIONAL_SIGNED), - 'JP' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'JO' => array(self::INTERNATIONAL_SIGNED), - 'KZ' => array(self::INTERNATIONAL_SIGNED), - 'KE' => array(self::INTERNATIONAL_SIGNED), - 'KI' => array(self::INTERNATIONAL_SIGNED), - 'KW' => array(self::INTERNATIONAL_SIGNED), - 'KG' => array(self::INTERNATIONAL_SIGNED), - 'LA' => array(self::INTERNATIONAL_SIGNED), - 'LV' => array(self::INTERNATIONAL_TRACKED, self::INTERNATIONAL_SIGNED), - 'LB' => array(self::INTERNATIONAL_SIGNED), - 'LS' => array(self::INTERNATIONAL_SIGNED), - 'LR' => array(self::INTERNATIONAL_SIGNED), - 'LY' => array(self::INTERNATIONAL_SIGNED), - 'LI' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'LT' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'LU' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'MO' => array(self::INTERNATIONAL_SIGNED), - 'MK' => array(self::INTERNATIONAL_SIGNED), - 'MG' => array(self::INTERNATIONAL_SIGNED), - 'YT' => array(self::INTERNATIONAL_SIGNED), - 'MW' => array(self::INTERNATIONAL_SIGNED), - 'MY' => array(self::INTERNATIONAL_TRACKED, self::INTERNATIONAL_SIGNED), - 'MV' => array(self::INTERNATIONAL_SIGNED), - 'ML' => array(self::INTERNATIONAL_SIGNED), - 'MT' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'MQ' => array(self::INTERNATIONAL_SIGNED), - 'MR' => array(self::INTERNATIONAL_SIGNED), - 'MU' => array(self::INTERNATIONAL_SIGNED), - 'MX' => array(self::INTERNATIONAL_SIGNED), - 'MD' => array(self::INTERNATIONAL_SIGNED), - 'MN' => array(self::INTERNATIONAL_SIGNED), - 'ME' => array(self::INTERNATIONAL_SIGNED), - 'MS' => array(self::INTERNATIONAL_SIGNED), - 'MA' => array(self::INTERNATIONAL_SIGNED), - 'MC' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'MZ' => array(self::INTERNATIONAL_SIGNED), - 'MM' => array(self::INTERNATIONAL_SIGNED), - 'NA' => array(self::INTERNATIONAL_SIGNED), - 'NR' => array(self::INTERNATIONAL_SIGNED), - 'NP' => array(self::INTERNATIONAL_SIGNED), - 'NL' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'NC' => array(self::INTERNATIONAL_SIGNED), - 'NZ' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'NI' => array(self::INTERNATIONAL_SIGNED), - 'NE' => array(self::INTERNATIONAL_SIGNED), - 'NG' => array(self::INTERNATIONAL_SIGNED), - 'NU' => array(self::INTERNATIONAL_SIGNED), - 'KP' => array(), - 'NO' => array(self::INTERNATIONAL_SIGNED), - 'OM' => array(self::INTERNATIONAL_SIGNED), - 'PK' => array(self::INTERNATIONAL_SIGNED), - 'PW' => array(self::INTERNATIONAL_SIGNED), - 'PA' => array(self::INTERNATIONAL_SIGNED), - 'PG' => array(self::INTERNATIONAL_SIGNED), - 'PY' => array(self::INTERNATIONAL_SIGNED), - 'PE' => array(self::INTERNATIONAL_SIGNED), - 'PH' => array(self::INTERNATIONAL_SIGNED), - 'PN' => array(self::INTERNATIONAL_SIGNED), - 'PL' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'PT' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'PR' => array(self::INTERNATIONAL_SIGNED), - 'QA' => array(self::INTERNATIONAL_SIGNED), - 'RE' => array(self::INTERNATIONAL_SIGNED), - 'RO' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'RU' => array(self::INTERNATIONAL_SIGNED), - 'RW' => array(self::INTERNATIONAL_SIGNED), - 'SM' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'ST' => array(self::INTERNATIONAL_SIGNED), - 'SA' => array(self::INTERNATIONAL_SIGNED), - 'SN' => array(self::INTERNATIONAL_SIGNED), - 'RS' => array(self::INTERNATIONAL_SIGNED), - 'SC' => array(self::INTERNATIONAL_SIGNED), - 'SL' => array(self::INTERNATIONAL_SIGNED), - 'SG' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'SK' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'SI' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'SB' => array(self::INTERNATIONAL_SIGNED), - 'ZA' => array(self::INTERNATIONAL_SIGNED), - 'KR' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'SS' => array(self::INTERNATIONAL_SIGNED), - 'ES' => array(self::INTERNATIONAL_TRACKED, self::INTERNATIONAL_SIGNED), - 'LK' => array(self::INTERNATIONAL_SIGNED), - 'KN' => array(self::INTERNATIONAL_SIGNED), - 'LC' => array(self::INTERNATIONAL_SIGNED), - 'SX' => array(self::INTERNATIONAL_SIGNED), - 'VC' => array(self::INTERNATIONAL_SIGNED), - 'SD' => array(self::INTERNATIONAL_SIGNED), - 'SR' => array(self::INTERNATIONAL_SIGNED), - 'SZ' => array(self::INTERNATIONAL_SIGNED), - 'SE' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'CH' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'SY' => array(self::INTERNATIONAL_SIGNED), - 'TW' => array(self::INTERNATIONAL_SIGNED), - 'TJ' => array(self::INTERNATIONAL_SIGNED), - 'TZ' => array(self::INTERNATIONAL_SIGNED), - 'TH' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'TL' => array(self::INTERNATIONAL_SIGNED), - 'TG' => array(self::INTERNATIONAL_SIGNED), - 'TK' => array(self::INTERNATIONAL_SIGNED), - 'TO' => array(self::INTERNATIONAL_SIGNED), - 'TT' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'TN' => array(self::INTERNATIONAL_SIGNED), - 'TR' => array(self::INTERNATIONAL_SIGNED), - 'TM' => array(self::INTERNATIONAL_SIGNED), - 'TC' => array(self::INTERNATIONAL_SIGNED), - 'TV' => array(self::INTERNATIONAL_SIGNED), - 'UG' => array(self::INTERNATIONAL_SIGNED), - 'UA' => array(self::INTERNATIONAL_SIGNED), - 'AE' => array(self::INTERNATIONAL_SIGNED), - 'US' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED, self::INTERNATIONAL_TRACKED), - 'UY' => array(self::INTERNATIONAL_SIGNED), - 'UZ' => array(self::INTERNATIONAL_SIGNED), - 'VU' => array(self::INTERNATIONAL_SIGNED), - 'VA' => array(self::INTERNATIONAL_TRACKED_AND_SIGNED), - 'VE' => array(self::INTERNATIONAL_SIGNED), - 'VN' => array(self::INTERNATIONAL_SIGNED), - 'WF' => array(self::INTERNATIONAL_SIGNED), - 'EH' => array(self::INTERNATIONAL_SIGNED), - 'WS' => array(self::INTERNATIONAL_SIGNED), - 'YE' => array(self::INTERNATIONAL_SIGNED), - 'ZM' => array(self::INTERNATIONAL_SIGNED), - 'ZW' => array(self::INTERNATIONAL_SIGNED) - ); + protected function _setCountry($data) + { + $this->_country = $data; + } - protected function _isCountryAvailableForMethod($countryCode, $method) { - if (isset(self::$_internationalMethodAvailability[$countryCode])) { - if (in_array($method, self::$_internationalMethodAvailability[$countryCode])) { - return true; - } - } - return false; + protected function _getCountry() + { + return $this->_country; } - public function isCountryAvailableForInternationalTrackedAndSigned($countryCode) { - return $this->_isCountryAvailableForMethod($countryCode, self::INTERNATIONAL_TRACKED_AND_SIGNED); + public function setWeightUnit($unit) + { + $this->_weight_unit = $unit; } - public function isCountryAvailableForInternationalTracked($countryCode) { - return $this->_isCountryAvailableForMethod($countryCode, self::INTERNATIONAL_TRACKED); + public function getWeightUnit() + { + return $this->_weight_unit; } - public function isCountryAvailableForInternationalSigned($countryCode) { - return $this->_isCountryAvailableForMethod($countryCode, self::INTERNATIONAL_SIGNED); + public function _setWeight($data) + { + $this->_weight = $data; } + // Return the weight in grammes + public function _getWeight() + { + $unit = $this->getWeightUnit(); + $weight = $this->_weight; - /** - * A simple helper to add the insurance charges on top of the rates supplied. - * RoyalMail will compensate an item up to a certain value, but this costs extra for more cover. - * - * @param $rates - * @param $charge - * @param $cartTotal - * @param int $valueOver - * @return mixed - */ - public function addInsuranceCharges($rates, $charge, $cartTotal, $valueOver = 50) { - if($cartTotal > $valueOver) { - for($i = 0; $i < count($rates); $i++) { - $rates[$i]['cost'] += $charge; - } + switch ($unit) { + case 'kg': + $weight *= 1000; + break; + case 'lb': + $weight *= 453.59237; + break; + default: // case 'g': + // No need to do anything.. + break; } - return $rates; + + return $weight; } - /** - * Figure out what World Zone a country is in, as defined by RoyalMail - * Used on International Rates. - * - * @param $countryCode - * @return null|string - */ - public function getWorldZone($countryCode) { - switch(strtoupper($countryCode)) { - case in_array($countryCode, $this->_worldZoneGb): - return self::WORLD_ZONE_GB; - case in_array($countryCode, $this->_worldZoneEu): - return self::WORLD_ZONE_EU; - case (in_array($countryCode, $this->_worldZone2)): - return self::WORLD_ZONE_TWO; - default: - return self::WORLD_ZONE_ONE; - } + protected function _setCartTotal($value) + { + $this->_cart_total = $value; + } + + public function getCartTotal() + { + return $this->_cart_total; + } + + public function setNegativeWeight($value) + { + $this->_negative_weight = $value; + } + public function getNegativeWeight() + { + return $this->_negative_weight; } -} +} \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Model/Parcelsize.php b/app/code/community/Meanbee/Royalmail/Model/Parcelsize.php index fde76c0..d2671cc 100644 --- a/app/code/community/Meanbee/Royalmail/Model/Parcelsize.php +++ b/app/code/community/Meanbee/Royalmail/Model/Parcelsize.php @@ -1,4 +1,5 @@ self::SMALL, 'label' => 'Small Parcel (up to 2kg)'), + array('value' => self::SMALL, 'label' => 'Small Parcel (up to 2kg)'), array('value' => self::MEDIUM, 'label' => 'Medium Parcel'), ); diff --git a/app/code/community/Meanbee/Royalmail/Model/Roundingrule.php b/app/code/community/Meanbee/Royalmail/Model/Roundingrule.php index d90907f..6582e83 100644 --- a/app/code/community/Meanbee/Royalmail/Model/Roundingrule.php +++ b/app/code/community/Meanbee/Royalmail/Model/Roundingrule.php @@ -1,4 +1,5 @@ 'none', 'label' => 'No rounding performed'), array('value' => 'pound', 'label' => 'Round to the nearest pound'), 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 8044fc4..2899897 100644 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail.php +++ b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail.php @@ -1,4 +1,5 @@ calculateMethodClass = new Meanbee_RoyalmailPHPLibrary_CalculateMethod(); + $this->dataClass = new Meanbee_RoyalmailPHPLibrary_Data( + $this->calculateMethodClass->_csvCountryCode, + $this->calculateMethodClass->_csvZoneToDeliverMethod, + $this->calculateMethodClass->_csvDeliveryMethodMeta, + $this->calculateMethodClass->_csvDeliveryToPrice, + $this->calculateMethodClass->_csvCleanNameToMethod, + $this->calculateMethodClass->_csvCleanNameMethodGroup + ); + } + + /** + * Collects the rates from the royal mail library and creates a request + * to be returned and then displayed. This is the main logic of this + * extension. + * + * @param Mage_Shipping_Model_Rate_Request $request + * + * @return bool|Mage_Shipping_Model_Rate_Result + */ + public function collectRates(Mage_Shipping_Model_Rate_Request $request) + { + if (!$this->getConfigFlag('active')) { return false; } @@ -42,52 +84,92 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request) { $result = Mage::getModel('shipping/rate_result'); - if (count($this->getAllowedMethods()) > 0) { - foreach ($this->getAllowedMethods() as $key => $value) { - $obj = Mage::getModel("royalmail/shipping_carrier_royalmail_$key"); + $allowedMethods = $this->getAllowedMethods(); + if (empty($allowedMethods) == false) { + + $data = $request->getData(); + $calculatedMethods = $this->calculateMethodClass->getMethods($data['dest_country_id'], + $data['package_value'], $data['package_weight']); - if ($obj === false) { - Mage::log("Error loading royal mail: $key"); - continue; + // Config check to remove small or medium parcel size based on the + // config value set in the admin panel + if ($data['package_weight'] <= 2) { + if (Mage::getStoreConfig('carriers/royalmail/parcel_size') == Meanbee_Royalmail_Model_Parcelsize::SMALL || + Mage::getStoreConfig('carriers/royalmail/parcel_size') == "" + ) { + foreach ($calculatedMethods as $key => $value) { + if ($value->size == 'MEDIUM') { + unset($calculatedMethods[$key]); + + } + } } - - $obj->setWeightUnit($this->getConfigData('weight_unit')); + if (Mage::getStoreConfig('carriers/royalmail/parcel_size') == Meanbee_Royalmail_Model_Parcelsize::MEDIUM) { + foreach ($calculatedMethods as $key => $value) { + if ($value->size == 'SMALL') { + unset($calculatedMethods[$key]); - $obj->setNegativeWeight($removeWeight); + } + } + } - $cost = $obj->getCost($request); + } - if ($cost !== null) { - $method = Mage::getModel('shipping/rate_result_method'); + foreach ($allowedMethods as $allowedMethod) { + foreach ($calculatedMethods as $methodItem) { + if ($allowedMethod[1] == $methodItem->shippingMethodNameClean) { - $method->setCarrier($this->_code); - $method->setCarrierTitle($this->getConfigData('title')); + $dataClass = Mage::helper('royalmail'); + $dataClass->setWeightUnit($this->getConfigData('weight_unit')); + $dataClass->setNegativeWeight($removeWeight); - $method->setMethod($key); - $method->setMethodTitle($value); + $method = Mage::getModel('shipping/rate_result_method'); - if ($request->getFreeShipping() === true || $request->getPackageQty() == $this->getFreeBoxes()) { - $price = '0.00'; - } else { - $price = $this->_performRounding($this->getFinalPriceWithHandlingFee($cost)); - } + $method->setCarrier($this->_code); + $method->setCarrierTitle($this->getConfigData('title')); + + $method->setMethod($methodItem->shippingMethodName); + $method->setMethodTitle($methodItem->shippingMethodNameClean); - $method->setPrice($price); - $method->setCost($price); + if ($request->getFreeShipping() === true || $request->getPackageQty() == $this->getFreeBoxes()) { + $price = '0.00'; + } else { + $price = $this->_performRounding($this->getFinalPriceWithHandlingFee($methodItem->methodPrice)); + } - $result->append($method); - - if ($price == '0.00') { - break; // No more free methods + $method->setPrice($price); + $method->setCost($price); + + $result->append($method); } } + } } - return $result; + if (empty($result->getAllRates()) == true) { + $error = Mage::getModel('shipping/rate_result_error'); + $error->setCarrier($this->_code); + $error->setCarrierTitle($this->getConfigData('title')); + $error->setErrorMessage($this->getConfigData('specificerrmsg')); + $result->append($error); + + return $result; + } else { + return $result; + } } - protected function _performRounding($number) { + /** + * Performs rounding of the allowed methods based on the set config + * option in the admin area + * + * @param $number + * + * @return float + */ + protected function _performRounding($number) + { $old = $number; switch ($this->getConfigData('rounding_rule')) { @@ -119,65 +201,40 @@ protected function _performRounding($number) { return $number; } - public function getAllowedMethods() { + /** + * Gets the methods selected in the admin area of the extension + * to ensure that not allowed methods can be removed in the collect + * rates method + * + * @return array + */ + public function getAllowedMethods() + { $allowed = explode(',', $this->getConfigData('allowed_methods')); $arr = array(); - foreach ($allowed as $k) { - $method_name = $this->getMethods($k); - if ($method_name) { - $arr[$k] = $method_name; + $allMethods = $this->getMethods(); + foreach ($allowed as $key) { + foreach ($allMethods as $method) { + if ($method[0] == $key) { + $arr[] = $method; + } } } - return $arr; } - public function getMethods($name=null) { - $codes = array( - // To maintain backwards comparability we need to keep letter and largeletter indices the same - - 'letter' => 'First Class Letter', - 'largeletter' => 'First Class Large Letter', - 'firstclasslettersignedfor' => 'First Class Letter (Signed for)', - 'firstclasslargelettersignedfor' => 'First Class Large Letter (Signed for)', - - 'secondclassletter' => 'Second Class Letter', - 'secondclasslargeletter' => 'Second Class Large Letter', - 'secondclasslettersignedfor' => 'Second Class Letter (Signed For)', - 'secondclasslargelettersignedfor' => 'Second Class Large Letter (Signed For)', - - 'secondclass' => 'Second Class Parcel', - 'secondclassrecordedsignedfor' => 'Second Class Parcel (Signed for)', - - 'firstclass' => 'First Class Parcel', - 'firstclassrecordedsignedfor' => 'First Class Parcel (Signed for)', - - 'specialdeliverynextday' => 'Special Delivery Guaranteed by 1pm (Up to 2,500GBP Insurance)', - 'specialdelivery9am' => 'Special Delivery Guaranteed by 9am (Up to 2,500GBP Insurance)', - 'specialdelivery9amsaturday' => 'Special Delivery Saturday Guaranteed by 9am (Up to 2,500GBP Insurance)', - 'specialdeliverynextdaysaturday' => 'Special Delivery Saturday Guaranteed by 1pm (Up to 2,500GBP Insurance)', - - 'internationalstandard' => 'International Standard (up to 2kg)', - 'internationaltrackedsigned' => 'International Tracked & Signed (Up to 250GBP Compensation)', - 'internationaltracked' => 'International Tracked (Up to 250GBP Compensation)', - 'internationalsigned' => 'International Signed (Up to 250GBP Compensation)', - 'internationaleconomy' => 'International Economy', - - 'internationallettertracked' => 'International Letter Tracked', - 'internationallettersigned' => 'International Letter Signed', - 'internationallettereconomy' => 'International Letter Economy', - 'internationalletterstandard' => 'International Letter Standard', - 'internationallettertrackedsigned' => 'International Letter Tracked (Signed)', - ); - - if ($name !== null) { - if (isset($codes[$name])) { - return $codes[$name]; - } else { - return null; - } - } else { - return $codes; - } + /** + * Gets the clean method names from the royal mail library data + * class. These names link directly to method names, but are used + * to ensure that duplicates are not created as similar names + * exists for multiple methods. + * + * @return array + */ + public function getMethods() + { + $allMethods = $this->dataClass->mappingCleanNameMethodGroup; + + return $allMethods; } } \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Source/Method.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Source/Method.php index 9e0b8d9..108e14a 100644 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Source/Method.php +++ b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Source/Method.php @@ -1,4 +1,5 @@ getMethods() as $k=>$v) { - $arr[] = array('value'=>$k, 'label'=>$v); + $methods = $rm->getMethods(); + + foreach ($methods as $item) { + $arr[] = array('value' => $item[0], 'label' => $item[1]); } - return $arr; } } \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Model/Weightunit.php b/app/code/community/Meanbee/Royalmail/Model/Weightunit.php index 35e5889..b62ecfc 100644 --- a/app/code/community/Meanbee/Royalmail/Model/Weightunit.php +++ b/app/code/community/Meanbee/Royalmail/Model/Weightunit.php @@ -1,4 +1,5 @@ 'kg', 'label' => 'Kilograms (kg)'), array('value' => 'g', 'label' => 'Grams (g)'), diff --git a/composer.json b/composer.json index 3433fe6..dbd1de3 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,51 @@ { - "name": "meanbee/royalmail", - "type": "magento-module", - "description": "A Magento shipping extension to add Royal Mail shipping methods.", - "homepage": "https://www.meanbee.com/magento-extensions/magento-royal-mail.html" -} + "name": "meanbee/royalmail", + "type": "magento-module", + "description": "A Magento shipping extension to add Royal Mail shipping methods.", + "homepage": "https://www.meanbee.com/magento-extensions/magento-royal-mail.html", + "repositories": [ + { + "type": "composer", + "url": "http://packages.firegento.com" + }, + { + "type": "vcs", + "url": "git@bitbucket.org:meanbee/magento.git" + } + ], + "require-dev": { + "aydin-hassan/magento-core-composer-installer": "^1.3", + "ecomdev/ecomdev_phpunit": "*", + "magento/magento": "1.14.2.2", + "squizlabs/php_codesniffer": "*", + "magento-ecg/coding-standard": "*" + }, + "autoload": { + "psr-0": { + "": [ + "app", + "app/code/local", + "app/code/community", + "app/code/core", + "lib" + ] + } + }, + "extra": { + "magento-root-dir": ".", + "auto-append-gitignore": true, + "magento-core-deploy": { + "excludes": [ + ".gitignore", + "composer.json", + "composer.lock" + ] + } + }, + "scripts": { + "test": [ + "./vendor/bin/phpcs --standard=./vendor/magento-ecg/coding-standard/Ecg src", + "./vendor/bin/phpunit" + ] + } +} \ No newline at end of file diff --git a/modman b/modman index 84acaac..e497df5 100644 --- a/modman +++ b/modman @@ -1,5 +1,13 @@ app/code/community/Meanbee/Royalmail app/code/community/Meanbee/Royalmail + app/etc/modules/* app/etc/modules/ +lib/Meanbee/RoyalmailPHPLibrary lib/Meanbee/RoyalmailPHPLibrary package.xml var/connect/Meanbee_Royalmail.xml phpunit.xml meanbee_royalmail_phpunit.xml + +app/code/community/EcomDev app/code/community/EcomDev +shell/ecomdev-phpunit.php shell/ecomdev-phpunit.php +lib/EcomDev lib/EcomDev +lib/Spyc lib/Spyc +lib/vfsStream lib/vsfStream \ No newline at end of file From c8cb7c2acb3170aaa042835873531b445422a3ec Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Mon, 21 Dec 2015 10:35:35 +0000 Subject: [PATCH 05/15] #33: Removed unused classes and CSV files Removed the now unused classes which consisted of the old style CSV files and the now unused model classes which have been replaced by the royal mail php library. --- .../Shipping/Carrier/Royalmail/Abstract.php | 206 ------------------ .../Shipping/Carrier/Royalmail/Firstclass.php | 46 ---- .../Firstclasslargelettersignedfor.php | 34 --- .../Royalmail/Firstclasslettersignedfor.php | 34 --- .../Royalmail/Firstclassrecordedsignedfor.php | 42 ---- .../Royalmail/Internationaleconomy.php | 30 --- .../Royalmail/Internationallettereconomy.php | 30 --- .../Royalmail/Internationallettersigned.php | 80 ------- .../Royalmail/Internationalletterstandard.php | 54 ----- .../Royalmail/Internationallettertracked.php | 72 ------ .../Internationallettertrackedsigned.php | 71 ------ .../Carrier/Royalmail/Internationalsigned.php | 82 ------- .../Royalmail/Internationalstandard.php | 59 ----- .../Royalmail/Internationaltracked.php | 82 ------- .../Royalmail/Internationaltrackedsigned.php | 82 ------- .../Carrier/Royalmail/Largeletter.php | 33 --- .../Shipping/Carrier/Royalmail/Letter.php | 33 --- .../Carrier/Royalmail/Secondclass.php | 42 ---- .../Royalmail/Secondclasslargeletter.php | 33 --- .../Secondclasslargelettersignedfor.php | 34 --- .../Carrier/Royalmail/Secondclassletter.php | 33 --- .../Royalmail/Secondclasslettersignedfor.php | 34 --- .../Secondclassrecordedsignedfor.php | 42 ---- .../Carrier/Royalmail/Specialdelivery9am.php | 45 ---- .../Royalmail/Specialdelivery9amsaturday.php | 45 ---- .../Royalmail/Specialdeliverynextday.php | 45 ---- .../Specialdeliverynextdaysaturday.php | 45 ---- .../Meanbee/Royalmail/data/9am1000.csv | 4 - .../Royalmail/data/9am1000saturday.csv | 4 - .../Meanbee/Royalmail/data/9am2500.csv | 4 - .../Royalmail/data/9am2500saturday.csv | 4 - .../Meanbee/Royalmail/data/9am50.csv | 4 - .../Meanbee/Royalmail/data/9am50saturday.csv | 4 - .../data/firstclass_largeletter_signedfor.csv | 4 - .../data/firstclass_letter_signedfor.csv | 1 - .../Royalmail/data/firstclass_medium.csv | 5 - .../data/firstclass_medium_signedfor.csv | 5 - .../Royalmail/data/firstclass_small.csv | 2 - .../data/firstclass_small_signedfor.csv | 7 - .../Royalmail/data/internationaleconomy.csv | 9 - .../data/internationallettersigned_eu.csv | 3 - .../data/internationallettersigned_wz.csv | 3 - .../data/internationalletterstandard_eu.csv | 3 - .../data/internationalletterstandard_wz.csv | 3 - .../data/internationallettertracked_eu.csv | 3 - .../data/internationallettertracked_wz.csv | 3 - .../internationallettertrackedsigned_eu.csv | 3 - .../internationallettertrackedsigned_wz.csv | 3 - .../data/internationalltettereconomy.csv | 3 - .../Royalmail/data/internationalsigned_eu.csv | 9 - .../data/internationalsigned_wz1.csv | 9 - .../data/internationalsigned_wz2.csv | 9 - .../data/internationalstandard_europe.csv | 9 - .../data/internationalstandard_wz1.csv | 9 - .../data/internationalstandard_wz2.csv | 9 - .../data/internationaltracked_eu.csv | 9 - .../data/internationaltracked_wz1.csv | 9 - .../data/internationaltracked_wz2.csv | 9 - .../data/internationaltrackedsigned_eu.csv | 9 - .../data/internationaltrackedsigned_wz1.csv | 9 - .../data/internationaltrackedsigned_wz2.csv | 9 - .../Meanbee/Royalmail/data/largeletter.csv | 4 - .../Meanbee/Royalmail/data/letter.csv | 1 - .../Meanbee/Royalmail/data/nextday1000.csv | 6 - .../Royalmail/data/nextday1000saturday.csv | 6 - .../Meanbee/Royalmail/data/nextday2500.csv | 6 - .../Royalmail/data/nextday2500saturday.csv | 6 - .../Meanbee/Royalmail/data/nextday500.csv | 6 - .../Royalmail/data/nextday500saturday.csv | 6 - .../data/secondclass_largeletter.csv | 4 - .../secondclass_largeletter_signedfor.csv | 4 - .../Royalmail/data/secondclass_letter.csv | 1 - .../data/secondclass_letter_signedfor.csv | 1 - .../Royalmail/data/secondclass_medium.csv | 5 - .../data/secondclass_medium_signedfor.csv | 5 - .../Royalmail/data/secondclass_small.csv | 2 - .../data/secondclass_small_signedfor.csv | 2 - 77 files changed, 1725 deletions(-) delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Abstract.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclass.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclasslargelettersignedfor.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclasslettersignedfor.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclassrecordedsignedfor.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaleconomy.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettereconomy.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettersigned.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalletterstandard.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertracked.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertrackedsigned.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalsigned.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalstandard.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltracked.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltrackedsigned.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Largeletter.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Letter.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclass.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslargeletter.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslargelettersignedfor.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclassletter.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslettersignedfor.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclassrecordedsignedfor.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdelivery9am.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdelivery9amsaturday.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdeliverynextday.php delete mode 100644 app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdeliverynextdaysaturday.php delete mode 100644 app/code/community/Meanbee/Royalmail/data/9am1000.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/9am1000saturday.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/9am2500.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/9am2500saturday.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/9am50.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/9am50saturday.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/firstclass_largeletter_signedfor.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/firstclass_letter_signedfor.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/firstclass_medium.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/firstclass_medium_signedfor.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/firstclass_small.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/firstclass_small_signedfor.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationaleconomy.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationallettersigned_eu.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationallettersigned_wz.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationalletterstandard_eu.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationalletterstandard_wz.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationallettertracked_eu.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationallettertracked_wz.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationallettertrackedsigned_eu.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationallettertrackedsigned_wz.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationalltettereconomy.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationalsigned_eu.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationalsigned_wz1.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationalsigned_wz2.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationalstandard_europe.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationalstandard_wz1.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationalstandard_wz2.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationaltracked_eu.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationaltracked_wz1.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationaltracked_wz2.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_eu.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_wz1.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_wz2.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/largeletter.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/letter.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/nextday1000.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/nextday1000saturday.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/nextday2500.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/nextday2500saturday.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/nextday500.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/nextday500saturday.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/secondclass_largeletter.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/secondclass_largeletter_signedfor.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/secondclass_letter.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/secondclass_letter_signedfor.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/secondclass_medium.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/secondclass_medium_signedfor.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/secondclass_small.csv delete mode 100644 app/code/community/Meanbee/Royalmail/data/secondclass_small_signedfor.csv diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Abstract.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Abstract.php deleted file mode 100644 index c4c9f10..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Abstract.php +++ /dev/null @@ -1,206 +0,0 @@ -_country = $data; - } - - protected function _getCountry() { - return $this->_country; - } - - public function setWeightUnit($unit) { - $this->_weight_unit = $unit; - } - - public function getWeightUnit() { - return $this->_weight_unit; - } - - public function _setWeight($data) { - $this->_weight = $data; - } - - // Return the weight in grammes - public function _getWeight() { - $unit = $this->getWeightUnit(); - $weight = $this->_weight; - - switch ($unit) { - case 'kg': - $weight *= 1000; - break; - case 'lb': - $weight *= 453.59237; - break; - default: // case 'g': - // No need to do anything.. - break; - } - - return $weight; - } - - protected function _setCartTotal($value) { - $this->_cart_total = $value; - } - - public function getCartTotal() { - return $this->_cart_total; - } - - public function setNegativeWeight($value) { - $this->_negative_weight = $value; - } - - public function getNegativeWeight() { - return $this->_negative_weight; - } - - protected function _calculateCost() { - $rates = $this->getRates(); - $cost = null; - - $min = $this->_getMinimumCartTotal(); - $max = $this->_getMaximumCartTotal(); - $cart = $this->getCartTotal(); - - //echo "Min: $min, Max: $max, Cart: $cart
"; - - if ($max !== null) { - if ($max < $cart) { - return null; - } - } - - if ($min !== null) { - if ($min > $cart) { - return null; - } - } - - $count = count($rates); - if (($this->_getWeight() - $this->getNegativeWeight()) <= $rates[$count-1]) { - for($i = 0; $i < $count; $i++) { - if ($rates[$i]['upper'] >= ($this->_getWeight() - $this->getNegativeWeight())) { - $cost = $rates[$i]['cost']; - break; - } - } - } - - if ($cost === null) { - $cost = $this->calculateRate($this->_getWeight()); - } - - return $cost; - } - - /** - * Will return the cost associated with sending via the - * implemented class. - * - * @param Mage_Shipping_Model_Rate_Request $request - * @return float May return null if consignment is too heavy or - * not applicable - */ - public function getCost(Mage_Shipping_Model_Rate_Request $request) { - $weight = $request->getPackageWeight(); - $country = $request->getDestCountryId(); - $cart_total = $request->getPackageValue(); - - $this->_setWeight($weight); - $this->_setCountry($country); - $this->_setCartTotal($cart_total); - - return $this->_calculateCost(); - } - - /** - * Function that allows for easy testing.. - */ - public function test($country, $weight) { - $this->_setWeight($weight); - $this->_setCountry($country); - $this->setWeightUnit("g"); - - return $this->_calculateCost(); - } - - protected function _loadCsv($file) { - $filename = Mage::getBaseDir('code') . "/community/Meanbee/Royalmail/data/{$file}.csv"; - $parser = new Varien_File_Csv(); - - if (!file_exists($filename)) { - throw new Exception("Unable to load the Royal Mail price data csv for '$file'. Ensure that the app/ directory is in your include path."); - } - - $data = $parser->getData($filename); - - $return = array(); - if (count($data)) { - foreach ($data as $key => $value) { - list($upper, $cost) = $value; - - $return[] = array( - "upper" => $upper, - "cost" => $cost - ); - } - } - - return $return; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclass.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclass.php deleted file mode 100644 index 4442ceb..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclass.php +++ /dev/null @@ -1,46 +0,0 @@ -_loadCsv($this->_getRateFile()); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } - - protected function _getRateFile() { - $weight = $this->_getWeight(); - - if ($weight <= 2000) { - if (Mage::getStoreConfig('carriers/royalmail/parcel_size') == Meanbee_Royalmail_Model_Parcelsize::SMALL || - Mage::getStoreConfig('carriers/royalmail/parcel_size') == "") { - return 'firstclass_small'; - } - } - - return 'firstclass_medium'; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclasslargelettersignedfor.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclasslargelettersignedfor.php deleted file mode 100644 index 227c8f4..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclasslargelettersignedfor.php +++ /dev/null @@ -1,34 +0,0 @@ -_loadCsv('firstclass_largeletter_signedfor'); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } - -} \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclasslettersignedfor.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclasslettersignedfor.php deleted file mode 100644 index 682089c..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclasslettersignedfor.php +++ /dev/null @@ -1,34 +0,0 @@ -_loadCsv('firstclass_letter_signedfor'); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } - -} \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclassrecordedsignedfor.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclassrecordedsignedfor.php deleted file mode 100644 index de09a68..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Firstclassrecordedsignedfor.php +++ /dev/null @@ -1,42 +0,0 @@ -_loadCsv($this->_getRateFile()); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } - - protected function _getRateFile() { - - if (Mage::getStoreConfig('carriers/royalmail/parcel_size') == Meanbee_Royalmail_Model_Parcelsize::SMALL) { - return 'firstclass_small_signedfor'; - } - - return 'firstclass_medium_signedfor'; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaleconomy.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaleconomy.php deleted file mode 100644 index 7a4a394..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaleconomy.php +++ /dev/null @@ -1,30 +0,0 @@ -getWorldZone($this->_getCountry()) !== Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $this->_loadCsv('internationaleconomy'); - } - return null; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettereconomy.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettereconomy.php deleted file mode 100644 index 051fccf..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettereconomy.php +++ /dev/null @@ -1,30 +0,0 @@ -getWorldZone($this->_getCountry()) !== Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $this->_loadCsv('internationalltettereconomy'); - } - return null; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettersigned.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettersigned.php deleted file mode 100644 index 34c950f..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettersigned.php +++ /dev/null @@ -1,80 +0,0 @@ -_getCountry(); - $worldZone = $_helper->getWorldZone($country); - - - if (!$_helper->isCountryAvailableForInternationalSigned($country)) { - return null; - } - - - switch($worldZone) { - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB: - return null; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_EU: - $rates = $_helper->addInsuranceCharges( - $this->_getEuRates(), - $this->additionalInsuranceChargeEu, - $this->getCartTotal(), - $this->insureOver - ); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE: - $rates = $_helper->addInsuranceCharges( - $this->_getWzRates(), - $this->additionalInsuranceChargeWz1, - $this->getCartTotal(), - $this->insureOver - ); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_TWO: - $rates = $_helper->addInsuranceCharges( - $this->_getWzRates(), - $this->additionalInsuranceChargeWz2, - $this->getCartTotal(), - $this->insureOver - ); - break; - default: - return null; - } - return $rates; - } - - protected function _getEuRates() { - return $this->_loadCsv('internationallettersigned_eu'); - } - - protected function _getWzRates() { - return $this->_loadCsv('internationallettersigned_wz'); - } - -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalletterstandard.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalletterstandard.php deleted file mode 100644 index 1e5b9f5..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalletterstandard.php +++ /dev/null @@ -1,54 +0,0 @@ -_getCountry(); - $worldZone = $_helper->getWorldZone($country); - - - switch($worldZone) { - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB: - return null; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_EU: - $rates = $this->_getEuropeRates(); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE: - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_TWO: - $rates = $this->_getWzRates(); - break; - default: - return null; - } - return $rates; - } - - protected function _getEuropeRates() { - return $this->_loadCsv('internationalletterstandard_eu'); - } - - protected function _getWzRates() { - return $this->_loadCsv('internationalletterstandard_wz'); - } - -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertracked.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertracked.php deleted file mode 100644 index d0c5b7a..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertracked.php +++ /dev/null @@ -1,72 +0,0 @@ -_getCountry(); - $worldZone = $_helper->getWorldZone($country); - - - if (!$_helper->isCountryAvailableForInternationalTracked($country)) { - return null; - } - - - switch($worldZone) { - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB: - return null; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_EU: - $rates = $_helper->addInsuranceCharges( - $this->_getEuRates(), - $this->additionalInsuranceChargeEu, - $this->getCartTotal(), - $this->insureOver - ); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE: - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_TWO: - $rates = $_helper->addInsuranceCharges( - $this->_getWzRates(), - $this->additionalInsuranceChargeWz, - $this->getCartTotal(), - $this->insureOver - ); - break; - default: - return null; - } - return $rates; - } - - protected function _getEuRates() { - return $this->_loadCsv('internationallettertracked_eu'); - } - - protected function _getWzRates() { - return $this->_loadCsv('internationallettertracked_wz'); - } - -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertrackedsigned.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertrackedsigned.php deleted file mode 100644 index 1f18102..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationallettertrackedsigned.php +++ /dev/null @@ -1,71 +0,0 @@ -_getCountry(); - $worldZone = $_helper->getWorldZone($country); - - - if (!$_helper->isCountryAvailableForInternationalTrackedAndSigned($country)) { - return null; - } - - switch($worldZone) { - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB: - return null; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_EU: - $rates = $_helper->addInsuranceCharges( - $this->_getEuRates(), - $this->additionalInsuranceChargeEu, - $this->getCartTotal(), - $this->insureOver - ); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE: - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_TWO: - $rates = $_helper->addInsuranceCharges( - $this->_getWzRates(), - $this->additionalInsuranceChargeWz, - $this->getCartTotal(), - $this->insureOver - ); - break; - default: - return null; - } - return $rates; - } - - protected function _getEuRates() { - return $this->_loadCsv('internationallettertrackedsigned_eu'); - } - - protected function _getWzRates() { - return $this->_loadCsv('internationallettertrackedsigned_wz'); - } - -} \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalsigned.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalsigned.php deleted file mode 100644 index 1fb5e9b..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalsigned.php +++ /dev/null @@ -1,82 +0,0 @@ -_getCountry(); - $worldZone = $_helper->getWorldZone($country); - - - if (!$_helper->isCountryAvailableForInternationalSigned($country)) { - return null; - } - - switch($worldZone) { - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB: - return null; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_EU: - $rates = $_helper->addInsuranceCharges( - $this->_getEuRates(), - $this->additionalInsuranceChargeEu, - $this->getCartTotal(), - $this->insureOver - ); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE: - $rates = $_helper->addInsuranceCharges( - $this->_getWz1Rates(), - $this->additionalInsuranceChargeWz1, - $this->getCartTotal(), - $this->insureOver - ); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_TWO: - $rates = $_helper->addInsuranceCharges( - $this->_getWz2Rates(), - $this->additionalInsuranceChargeWz2, - $this->getCartTotal(), - $this->insureOver - ); - break; - default: - return null; - } - return $rates; - } - - protected function _getEuRates() { - return $this->_loadCsv('internationalsigned_eu'); - } - - protected function _getWz1Rates() { - return $this->_loadCsv('internationalsigned_wz1'); - } - - protected function _getWz2Rates() { - return $this->_loadCsv('internationalsigned_wz2'); - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalstandard.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalstandard.php deleted file mode 100644 index c7eae07..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationalstandard.php +++ /dev/null @@ -1,59 +0,0 @@ -_getCountry(); - $worldZone = $_helper->getWorldZone($country); - - - switch($worldZone) { - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB: - return null; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_EU: - $rates = $this->_getEuropeRates(); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE: - $rates = $this->_getWz1Rates(); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_TWO: - $rates = $this->_getWz2Rates(); - break; - default: - return null; - } - return $rates; - } - - protected function _getEuropeRates() { - return $this->_loadCsv('internationalstandard_europe'); - } - - protected function _getWz1Rates() { - return $this->_loadCsv('internationalstandard_wz1'); - } - - protected function _getWz2Rates() { - return $this->_loadCsv('internationalstandard_wz2'); - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltracked.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltracked.php deleted file mode 100644 index 213788c..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltracked.php +++ /dev/null @@ -1,82 +0,0 @@ -_getCountry(); - $worldZone = $_helper->getWorldZone($country); - - - if (!$_helper->isCountryAvailableForInternationalTracked($country)) { - return null; - } - - switch($worldZone) { - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB: - return null; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_EU: - $rates = $_helper->addInsuranceCharges( - $this->_getEuRates(), - $this->additionalInsuranceChargeEu, - $this->getCartTotal(), - $this->insureOver - ); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE: - $rates = $_helper->addInsuranceCharges( - $this->_getWz1Rates(), - $this->additionalInsuranceChargeWz1, - $this->getCartTotal(), - $this->insureOver - ); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_TWO: - $rates = $_helper->addInsuranceCharges( - $this->_getWz2Rates(), - $this->additionalInsuranceChargeWz2, - $this->getCartTotal(), - $this->insureOver - ); - break; - default: - return null; - } - return $rates; - } - - protected function _getEuRates() { - return $this->_loadCsv('internationaltracked_eu'); - } - - protected function _getWz1Rates() { - return $this->_loadCsv('internationaltracked_wz1'); - } - - protected function _getWz2Rates() { - return $this->_loadCsv('internationaltracked_wz2'); - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltrackedsigned.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltrackedsigned.php deleted file mode 100644 index e73d242..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Internationaltrackedsigned.php +++ /dev/null @@ -1,82 +0,0 @@ -_getCountry(); - $worldZone = $_helper->getWorldZone($country); - - - if (!$_helper->isCountryAvailableForInternationalTrackedAndSigned($country)) { - return null; - } - - switch($worldZone) { - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB: - return null; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_EU: - $rates = $_helper->addInsuranceCharges( - $this->_getEuRates(), - $this->additionalInsuranceChargeEu, - $this->getCartTotal(), - $this->insureOver - ); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE: - $rates = $_helper->addInsuranceCharges( - $this->_getWz1Rates(), - $this->additionalInsuranceChargeWz1, - $this->getCartTotal(), - $this->insureOver - ); - break; - case Meanbee_Royalmail_Helper_Data::WORLD_ZONE_TWO: - $rates = $_helper->addInsuranceCharges( - $this->_getWz2Rates(), - $this->additionalInsuranceChargeWz2, - $this->getCartTotal(), - $this->insureOver - ); - break; - default: - return null; - } - return $rates; - } - - protected function _getEuRates() { - return $this->_loadCsv('internationaltrackedsigned_eu'); - } - - protected function _getWz1Rates() { - return $this->_loadCsv('internationaltrackedsigned_wz1'); - } - - protected function _getWz2Rates() { - return $this->_loadCsv('internationaltrackedsigned_wz2'); - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Largeletter.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Largeletter.php deleted file mode 100644 index 95182a4..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Largeletter.php +++ /dev/null @@ -1,33 +0,0 @@ -_loadCsv('largeletter'); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Letter.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Letter.php deleted file mode 100644 index 013c97e..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Letter.php +++ /dev/null @@ -1,33 +0,0 @@ -_loadCsv('letter'); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclass.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclass.php deleted file mode 100644 index c184483..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclass.php +++ /dev/null @@ -1,42 +0,0 @@ -_loadCsv($this->_getRateFile()); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } - - protected function _getRateFile() { - - if (Mage::getStoreConfig('carriers/royalmail/parcel_size') == Meanbee_Royalmail_Model_Parcelsize::SMALL) { - return 'secondclass_small'; - } - - return 'secondclass_medium'; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslargeletter.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslargeletter.php deleted file mode 100644 index 1fe93a5..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslargeletter.php +++ /dev/null @@ -1,33 +0,0 @@ -_loadCsv('secondclass_largeletter'); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslargelettersignedfor.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslargelettersignedfor.php deleted file mode 100644 index 5ccbedb..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslargelettersignedfor.php +++ /dev/null @@ -1,34 +0,0 @@ -_loadCsv('secondclass_largeletter_signedfor'); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } - -} \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclassletter.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclassletter.php deleted file mode 100644 index 0e91d2e..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclassletter.php +++ /dev/null @@ -1,33 +0,0 @@ -_loadCsv('secondclass_letter'); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslettersignedfor.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslettersignedfor.php deleted file mode 100644 index 220e15c..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclasslettersignedfor.php +++ /dev/null @@ -1,34 +0,0 @@ -_loadCsv('secondclass_letter_signedfor'); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } - -} \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclassrecordedsignedfor.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclassrecordedsignedfor.php deleted file mode 100644 index dfd34bd..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Secondclassrecordedsignedfor.php +++ /dev/null @@ -1,42 +0,0 @@ -_loadCsv($this->_getRateFile()); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } - - protected function _getRateFile() { - - if (Mage::getStoreConfig('carriers/royalmail/parcel_size') == Meanbee_Royalmail_Model_Parcelsize::SMALL) { - return 'secondclass_small_signedfor'; - } - - return 'secondclass_medium_signedfor'; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdelivery9am.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdelivery9am.php deleted file mode 100644 index 521f866..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdelivery9am.php +++ /dev/null @@ -1,45 +0,0 @@ -_getRatesCsv(); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB && $this->_getCountry() != "GG") { - return $rates; - } - - return null; - } - - protected function _getRatesCsv() { - $total = $this->getCartTotal(); - if ($total <= 50) { - return $this->_loadCsv('9am50'); - } else if ($total <= 1000) { - return $this->_loadCsv('9am1000'); - } else if ($total <= 2500) { - return $this->_loadCsv('9am2500'); - } - return null; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdelivery9amsaturday.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdelivery9amsaturday.php deleted file mode 100644 index 053014d..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdelivery9amsaturday.php +++ /dev/null @@ -1,45 +0,0 @@ -_getRatesCsv(); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB && $this->_getCountry() != "GG") { - return $rates; - } - - return null; - } - - protected function _getRatesCsv() { - $total = $this->getCartTotal(); - if ($total <= 50) { - return $this->_loadCsv('9am50saturday'); - } else if ($total <= 1000) { - return $this->_loadCsv('9am1000saturday'); - } else if ($total <= 2500) { - return $this->_loadCsv('9am2500saturday'); - } - return null; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdeliverynextday.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdeliverynextday.php deleted file mode 100644 index c0e12cf..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdeliverynextday.php +++ /dev/null @@ -1,45 +0,0 @@ -_getRatesCsv(); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } - - protected function _getRatesCsv() { - $total = $this->getCartTotal(); - if ($total <= 500) { - return $this->_loadCsv('nextday500'); - } else if ($total <= 1000) { - return $this->_loadCsv('nextday1000'); - } else if ($total <= 2500) { - return $this->_loadCsv('nextday2500'); - } - return null; - } -} diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdeliverynextdaysaturday.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdeliverynextdaysaturday.php deleted file mode 100644 index c1dd3d4..0000000 --- a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail/Specialdeliverynextdaysaturday.php +++ /dev/null @@ -1,45 +0,0 @@ -_getRatesCsv(); - - if ($helper->getWorldZone($this->_getCountry()) == Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB) { - return $rates; - } - - return null; - } - - protected function _getRatesCsv() { - $total = $this->getCartTotal(); - if ($total <= 500) { - return $this->_loadCsv('nextday500saturday'); - } else if ($total <= 1000) { - return $this->_loadCsv('nextday1000saturday'); - } else if ($total <= 2500) { - return $this->_loadCsv('nextday2500saturday'); - } - return null; - } -} diff --git a/app/code/community/Meanbee/Royalmail/data/9am1000.csv b/app/code/community/Meanbee/Royalmail/data/9am1000.csv deleted file mode 100644 index 72535d2..0000000 --- a/app/code/community/Meanbee/Royalmail/data/9am1000.csv +++ /dev/null @@ -1,4 +0,0 @@ -100,20.56 -500,22.96 -1000,24.70 -2000,29.14 diff --git a/app/code/community/Meanbee/Royalmail/data/9am1000saturday.csv b/app/code/community/Meanbee/Royalmail/data/9am1000saturday.csv deleted file mode 100644 index 2cb6795..0000000 --- a/app/code/community/Meanbee/Royalmail/data/9am1000saturday.csv +++ /dev/null @@ -1,4 +0,0 @@ -100,23.56 -500,25.96 -1000,27.70 -2000,32.14 diff --git a/app/code/community/Meanbee/Royalmail/data/9am2500.csv b/app/code/community/Meanbee/Royalmail/data/9am2500.csv deleted file mode 100644 index 9dbe004..0000000 --- a/app/code/community/Meanbee/Royalmail/data/9am2500.csv +++ /dev/null @@ -1,4 +0,0 @@ -100,24.06 -500,26.46 -1000,28.20 -2000,32.64 diff --git a/app/code/community/Meanbee/Royalmail/data/9am2500saturday.csv b/app/code/community/Meanbee/Royalmail/data/9am2500saturday.csv deleted file mode 100644 index 23ae178..0000000 --- a/app/code/community/Meanbee/Royalmail/data/9am2500saturday.csv +++ /dev/null @@ -1,4 +0,0 @@ -100,27.06 -500,29.46 -1000,31.20 -2000,35.64 diff --git a/app/code/community/Meanbee/Royalmail/data/9am50.csv b/app/code/community/Meanbee/Royalmail/data/9am50.csv deleted file mode 100644 index c20c5c5..0000000 --- a/app/code/community/Meanbee/Royalmail/data/9am50.csv +++ /dev/null @@ -1,4 +0,0 @@ -100,18.36 -500,20.76 -1000,22.50 -2000,26.94 diff --git a/app/code/community/Meanbee/Royalmail/data/9am50saturday.csv b/app/code/community/Meanbee/Royalmail/data/9am50saturday.csv deleted file mode 100644 index 0c4846f..0000000 --- a/app/code/community/Meanbee/Royalmail/data/9am50saturday.csv +++ /dev/null @@ -1,4 +0,0 @@ -100,21.36 -500,23.76 -1000,25.50 -2000,29.94 diff --git a/app/code/community/Meanbee/Royalmail/data/firstclass_largeletter_signedfor.csv b/app/code/community/Meanbee/Royalmail/data/firstclass_largeletter_signedfor.csv deleted file mode 100644 index 888d237..0000000 --- a/app/code/community/Meanbee/Royalmail/data/firstclass_largeletter_signedfor.csv +++ /dev/null @@ -1,4 +0,0 @@ -100,2.05 -250,2.36 -500,2.78 -750,3.52 diff --git a/app/code/community/Meanbee/Royalmail/data/firstclass_letter_signedfor.csv b/app/code/community/Meanbee/Royalmail/data/firstclass_letter_signedfor.csv deleted file mode 100644 index 2f66300..0000000 --- a/app/code/community/Meanbee/Royalmail/data/firstclass_letter_signedfor.csv +++ /dev/null @@ -1 +0,0 @@ -100,1.73 diff --git a/app/code/community/Meanbee/Royalmail/data/firstclass_medium.csv b/app/code/community/Meanbee/Royalmail/data/firstclass_medium.csv deleted file mode 100644 index 7cabbc2..0000000 --- a/app/code/community/Meanbee/Royalmail/data/firstclass_medium.csv +++ /dev/null @@ -1,5 +0,0 @@ -1000,5.65 -2000,9.90 -5000,15.85 -10000,21.90 -20000,33.40 diff --git a/app/code/community/Meanbee/Royalmail/data/firstclass_medium_signedfor.csv b/app/code/community/Meanbee/Royalmail/data/firstclass_medium_signedfor.csv deleted file mode 100644 index cad5b61..0000000 --- a/app/code/community/Meanbee/Royalmail/data/firstclass_medium_signedfor.csv +++ /dev/null @@ -1,5 +0,0 @@ -1000,6.75 -2000,10.00 -5000,16.95 -10000,23.00 -20000,34.50 diff --git a/app/code/community/Meanbee/Royalmail/data/firstclass_small.csv b/app/code/community/Meanbee/Royalmail/data/firstclass_small.csv deleted file mode 100644 index 7b6f1c7..0000000 --- a/app/code/community/Meanbee/Royalmail/data/firstclass_small.csv +++ /dev/null @@ -1,2 +0,0 @@ -1000,3.30 -2000,5.45 diff --git a/app/code/community/Meanbee/Royalmail/data/firstclass_small_signedfor.csv b/app/code/community/Meanbee/Royalmail/data/firstclass_small_signedfor.csv deleted file mode 100644 index 4e16f4e..0000000 --- a/app/code/community/Meanbee/Royalmail/data/firstclass_small_signedfor.csv +++ /dev/null @@ -1,7 +0,0 @@ -1000,4.10 -2000,6.25 -1000,6.75 -2000,10.00 -5000,16.95 -10000,23.00 -20000,34.50 diff --git a/app/code/community/Meanbee/Royalmail/data/internationaleconomy.csv b/app/code/community/Meanbee/Royalmail/data/internationaleconomy.csv deleted file mode 100644 index fa031ca..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationaleconomy.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,3.25 -250,3.75 -500,5.30 -750,6.65 -1000,8.06 -1250,9.41 -1500,10.76 -1750,12.11 -2000,13.26 diff --git a/app/code/community/Meanbee/Royalmail/data/internationallettersigned_eu.csv b/app/code/community/Meanbee/Royalmail/data/internationallettersigned_eu.csv deleted file mode 100644 index b29ebe5..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationallettersigned_eu.csv +++ /dev/null @@ -1,3 +0,0 @@ -10,6.00 -20,6.00 -100,6.52 diff --git a/app/code/community/Meanbee/Royalmail/data/internationallettersigned_wz.csv b/app/code/community/Meanbee/Royalmail/data/internationallettersigned_wz.csv deleted file mode 100644 index 63bd251..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationallettersigned_wz.csv +++ /dev/null @@ -1,3 +0,0 @@ -10,6.00 -20,6.33 -100,7.25 diff --git a/app/code/community/Meanbee/Royalmail/data/internationalletterstandard_eu.csv b/app/code/community/Meanbee/Royalmail/data/internationalletterstandard_eu.csv deleted file mode 100644 index d82240c..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationalletterstandard_eu.csv +++ /dev/null @@ -1,3 +0,0 @@ -10,1.00 -20,1.00 -100,1.52 diff --git a/app/code/community/Meanbee/Royalmail/data/internationalletterstandard_wz.csv b/app/code/community/Meanbee/Royalmail/data/internationalletterstandard_wz.csv deleted file mode 100644 index b7f6f76..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationalletterstandard_wz.csv +++ /dev/null @@ -1,3 +0,0 @@ -10,1.00 -20,1.33 -100,2.25 diff --git a/app/code/community/Meanbee/Royalmail/data/internationallettertracked_eu.csv b/app/code/community/Meanbee/Royalmail/data/internationallettertracked_eu.csv deleted file mode 100644 index df9c773..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationallettertracked_eu.csv +++ /dev/null @@ -1,3 +0,0 @@ -10,7.20 -20,7.20 -100,7.83 diff --git a/app/code/community/Meanbee/Royalmail/data/internationallettertracked_wz.csv b/app/code/community/Meanbee/Royalmail/data/internationallettertracked_wz.csv deleted file mode 100644 index 63bd251..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationallettertracked_wz.csv +++ /dev/null @@ -1,3 +0,0 @@ -10,6.00 -20,6.33 -100,7.25 diff --git a/app/code/community/Meanbee/Royalmail/data/internationallettertrackedsigned_eu.csv b/app/code/community/Meanbee/Royalmail/data/internationallettertrackedsigned_eu.csv deleted file mode 100644 index d82240c..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationallettertrackedsigned_eu.csv +++ /dev/null @@ -1,3 +0,0 @@ -10,1.00 -20,1.00 -100,1.52 diff --git a/app/code/community/Meanbee/Royalmail/data/internationallettertrackedsigned_wz.csv b/app/code/community/Meanbee/Royalmail/data/internationallettertrackedsigned_wz.csv deleted file mode 100644 index d376a4f..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationallettertrackedsigned_wz.csv +++ /dev/null @@ -1,3 +0,0 @@ -20,6.28 -60,7.15 -100,8.45 \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/data/internationalltettereconomy.csv b/app/code/community/Meanbee/Royalmail/data/internationalltettereconomy.csv deleted file mode 100644 index b7f6f76..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationalltettereconomy.csv +++ /dev/null @@ -1,3 +0,0 @@ -10,1.00 -20,1.33 -100,2.25 diff --git a/app/code/community/Meanbee/Royalmail/data/internationalsigned_eu.csv b/app/code/community/Meanbee/Royalmail/data/internationalsigned_eu.csv deleted file mode 100644 index 500fa83..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationalsigned_eu.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,8.2 -250,8.7 -500,10.15 -750,11.10 -1000,12.51 -1250,13.86 -1500,15.81 -1750,14.81 -2000,16.96 diff --git a/app/code/community/Meanbee/Royalmail/data/internationalsigned_wz1.csv b/app/code/community/Meanbee/Royalmail/data/internationalsigned_wz1.csv deleted file mode 100644 index 65c0bdd..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationalsigned_wz1.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,8.8 -250,9.75 -500,12.45 -750,14.55 -1000,17.20 -1250,18.90 -1500,20.60 -1750,21.55 -2000,23.25 diff --git a/app/code/community/Meanbee/Royalmail/data/internationalsigned_wz2.csv b/app/code/community/Meanbee/Royalmail/data/internationalsigned_wz2.csv deleted file mode 100644 index b1ed441..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationalsigned_wz2.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,9 -250,10.05 -500,12.9 -750,15.40 -1000,18.15 -1250,20.05 -1500,21.95 -1750,23.10 -2000,25.00 diff --git a/app/code/community/Meanbee/Royalmail/data/internationalstandard_europe.csv b/app/code/community/Meanbee/Royalmail/data/internationalstandard_europe.csv deleted file mode 100644 index 05ce75a..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationalstandard_europe.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,3.45 -250,3.95 -500,5.50 -750,6.85 -1000,8.26 -1250,9.61 -1500,10.96 -1750,12.31 -2000,13.46 diff --git a/app/code/community/Meanbee/Royalmail/data/internationalstandard_wz1.csv b/app/code/community/Meanbee/Royalmail/data/internationalstandard_wz1.csv deleted file mode 100644 index 56efe68..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationalstandard_wz1.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,4.10 -250,5.00 -500,7.70 -750,10.30 -1000,12.95 -1250,14.65 -1500,16.35 -1750,18.05 -2000,19.75 diff --git a/app/code/community/Meanbee/Royalmail/data/internationalstandard_wz2.csv b/app/code/community/Meanbee/Royalmail/data/internationalstandard_wz2.csv deleted file mode 100644 index 10f926b..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationalstandard_wz2.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,4.45 -250,5.45 -500,8.45 -750,11.15 -1000,13.90 -1250,15.90 -1500,17.70 -1750,19.60 -2000,21.50 diff --git a/app/code/community/Meanbee/Royalmail/data/internationaltracked_eu.csv b/app/code/community/Meanbee/Royalmail/data/internationaltracked_eu.csv deleted file mode 100644 index 0dd0457..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationaltracked_eu.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,9.84 -250,10.44 -500,12.18 -750,13.32 -1000,15.02 -1250,16.64 -1500,18.26 -1750,18.98 -2000,20.36 diff --git a/app/code/community/Meanbee/Royalmail/data/internationaltracked_wz1.csv b/app/code/community/Meanbee/Royalmail/data/internationaltracked_wz1.csv deleted file mode 100644 index 33c8f12..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationaltracked_wz1.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,8.80 -250,9.75 -500,12.45 -750,14.55 -1000,17.20 -1250,18.90 -1500,20.60 -1750,21.55 -2000,23.55 diff --git a/app/code/community/Meanbee/Royalmail/data/internationaltracked_wz2.csv b/app/code/community/Meanbee/Royalmail/data/internationaltracked_wz2.csv deleted file mode 100644 index f3a66d0..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationaltracked_wz2.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,9.00 -250,10.05 -500,12.90 -750,15.40 -1000,18.15 -1250,20.05 -1500,21.95 -1750,23.10 -2000,25.00 diff --git a/app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_eu.csv b/app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_eu.csv deleted file mode 100644 index fafde66..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_eu.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,8.2 -250,8.7 -500,10.15 -750,11.1 -1000,12.51 -1250,13.87 -1500,15.21 -1750,15.81 -2000,16.96 diff --git a/app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_wz1.csv b/app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_wz1.csv deleted file mode 100644 index 65c0bdd..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_wz1.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,8.8 -250,9.75 -500,12.45 -750,14.55 -1000,17.20 -1250,18.90 -1500,20.60 -1750,21.55 -2000,23.25 diff --git a/app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_wz2.csv b/app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_wz2.csv deleted file mode 100644 index b1ed441..0000000 --- a/app/code/community/Meanbee/Royalmail/data/internationaltrackedsigned_wz2.csv +++ /dev/null @@ -1,9 +0,0 @@ -100,9 -250,10.05 -500,12.9 -750,15.40 -1000,18.15 -1250,20.05 -1500,21.95 -1750,23.10 -2000,25.00 diff --git a/app/code/community/Meanbee/Royalmail/data/largeletter.csv b/app/code/community/Meanbee/Royalmail/data/largeletter.csv deleted file mode 100644 index ff5d2fc..0000000 --- a/app/code/community/Meanbee/Royalmail/data/largeletter.csv +++ /dev/null @@ -1,4 +0,0 @@ -100,0.95 -250,1.26 -500,1.68 -750,2.42 diff --git a/app/code/community/Meanbee/Royalmail/data/letter.csv b/app/code/community/Meanbee/Royalmail/data/letter.csv deleted file mode 100644 index e39fe68..0000000 --- a/app/code/community/Meanbee/Royalmail/data/letter.csv +++ /dev/null @@ -1 +0,0 @@ -100,0.63 diff --git a/app/code/community/Meanbee/Royalmail/data/nextday1000.csv b/app/code/community/Meanbee/Royalmail/data/nextday1000.csv deleted file mode 100644 index ffcbdd2..0000000 --- a/app/code/community/Meanbee/Royalmail/data/nextday1000.csv +++ /dev/null @@ -1,6 +0,0 @@ -100,7.45 -500,8.25 -1000,9.55 -2000,11.00 -10000,26.60 -20000,41.20 diff --git a/app/code/community/Meanbee/Royalmail/data/nextday1000saturday.csv b/app/code/community/Meanbee/Royalmail/data/nextday1000saturday.csv deleted file mode 100644 index af204c2..0000000 --- a/app/code/community/Meanbee/Royalmail/data/nextday1000saturday.csv +++ /dev/null @@ -1,6 +0,0 @@ -100,11.94 -500,12.90 -1000,14.46 -2000,17.40 -10000,36.12 -20000,53.64 diff --git a/app/code/community/Meanbee/Royalmail/data/nextday2500.csv b/app/code/community/Meanbee/Royalmail/data/nextday2500.csv deleted file mode 100644 index 2377244..0000000 --- a/app/code/community/Meanbee/Royalmail/data/nextday2500.csv +++ /dev/null @@ -1,6 +0,0 @@ -100,9.45 -500,10.25 -1000,11.55 -2000,14.00 -10000,29.60 -20000,44.20 diff --git a/app/code/community/Meanbee/Royalmail/data/nextday2500saturday.csv b/app/code/community/Meanbee/Royalmail/data/nextday2500saturday.csv deleted file mode 100644 index 85ac656..0000000 --- a/app/code/community/Meanbee/Royalmail/data/nextday2500saturday.csv +++ /dev/null @@ -1,6 +0,0 @@ -100,14.28 -500,15.18 -1000,16.74 -2000,19.80 -10000,38.52 -20000,56.04 \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/data/nextday500.csv b/app/code/community/Meanbee/Royalmail/data/nextday500.csv deleted file mode 100644 index 9a1cca4..0000000 --- a/app/code/community/Meanbee/Royalmail/data/nextday500.csv +++ /dev/null @@ -1,6 +0,0 @@ -100,6.45 -500,7.25 -1000,8.55 -2000,11.00 -10000,26.60 -20000,41.20 diff --git a/app/code/community/Meanbee/Royalmail/data/nextday500saturday.csv b/app/code/community/Meanbee/Royalmail/data/nextday500saturday.csv deleted file mode 100644 index c21e214..0000000 --- a/app/code/community/Meanbee/Royalmail/data/nextday500saturday.csv +++ /dev/null @@ -1,6 +0,0 @@ -100,10.74 -500,11.70 -1000,13.26 -2000,16.20 -10000,34.92 -20000,52.44 diff --git a/app/code/community/Meanbee/Royalmail/data/secondclass_largeletter.csv b/app/code/community/Meanbee/Royalmail/data/secondclass_largeletter.csv deleted file mode 100644 index 3a17a92..0000000 --- a/app/code/community/Meanbee/Royalmail/data/secondclass_largeletter.csv +++ /dev/null @@ -1,4 +0,0 @@ -100,0.74 -250,1.19 -500,1.51 -750,2.05 diff --git a/app/code/community/Meanbee/Royalmail/data/secondclass_largeletter_signedfor.csv b/app/code/community/Meanbee/Royalmail/data/secondclass_largeletter_signedfor.csv deleted file mode 100644 index 888d237..0000000 --- a/app/code/community/Meanbee/Royalmail/data/secondclass_largeletter_signedfor.csv +++ /dev/null @@ -1,4 +0,0 @@ -100,2.05 -250,2.36 -500,2.78 -750,3.52 diff --git a/app/code/community/Meanbee/Royalmail/data/secondclass_letter.csv b/app/code/community/Meanbee/Royalmail/data/secondclass_letter.csv deleted file mode 100644 index b6d326e..0000000 --- a/app/code/community/Meanbee/Royalmail/data/secondclass_letter.csv +++ /dev/null @@ -1 +0,0 @@ -100,0.54 diff --git a/app/code/community/Meanbee/Royalmail/data/secondclass_letter_signedfor.csv b/app/code/community/Meanbee/Royalmail/data/secondclass_letter_signedfor.csv deleted file mode 100644 index bf018fd..0000000 --- a/app/code/community/Meanbee/Royalmail/data/secondclass_letter_signedfor.csv +++ /dev/null @@ -1 +0,0 @@ -100,1.64 diff --git a/app/code/community/Meanbee/Royalmail/data/secondclass_medium.csv b/app/code/community/Meanbee/Royalmail/data/secondclass_medium.csv deleted file mode 100644 index eafe7ea..0000000 --- a/app/code/community/Meanbee/Royalmail/data/secondclass_medium.csv +++ /dev/null @@ -1,5 +0,0 @@ -1000,4.89 -2000,4.89 -5000,14.75 -10000,20.25 -20000,28.55 diff --git a/app/code/community/Meanbee/Royalmail/data/secondclass_medium_signedfor.csv b/app/code/community/Meanbee/Royalmail/data/secondclass_medium_signedfor.csv deleted file mode 100644 index 7794bcd..0000000 --- a/app/code/community/Meanbee/Royalmail/data/secondclass_medium_signedfor.csv +++ /dev/null @@ -1,5 +0,0 @@ -1000,5.99 -2000,5.99 -5000,14.85 -10000,21.35 -20000,29.65 diff --git a/app/code/community/Meanbee/Royalmail/data/secondclass_small.csv b/app/code/community/Meanbee/Royalmail/data/secondclass_small.csv deleted file mode 100644 index ac0b18f..0000000 --- a/app/code/community/Meanbee/Royalmail/data/secondclass_small.csv +++ /dev/null @@ -1,2 +0,0 @@ -1000,2.8 -2000,2.8 diff --git a/app/code/community/Meanbee/Royalmail/data/secondclass_small_signedfor.csv b/app/code/community/Meanbee/Royalmail/data/secondclass_small_signedfor.csv deleted file mode 100644 index ab37ec9..0000000 --- a/app/code/community/Meanbee/Royalmail/data/secondclass_small_signedfor.csv +++ /dev/null @@ -1,2 +0,0 @@ -1000,3.9 -2000,3.9 From 1bfdcb2df13ff4e244320ac76051981a51e1ad8e Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Tue, 22 Dec 2015 16:23:06 +0000 Subject: [PATCH 06/15] #34: Add new unit tests and remove unused tests Adds new unit tests to test a few new areas of the code and removes unit tests that tested the previous logic. Some of these tests are already run on the royal mail library, and have been moved there. --- .gitignore | 4 +- .../Meanbee/Royalmail/Helper/Data.php | 40 ++--- .../Meanbee/Royalmail/Test/Config/Base.php | 2 +- .../Meanbee/Royalmail/Test/Helper/Data.php | 42 ++++- .../Royalmail/Test/Model/Parcelsize.php | 13 ++ .../Test/Model/Shipping/Carrier/Royalmail.php | 14 +- .../Shipping/Carrier/Royalmail/Rules.php | 167 ------------------ .../Royalmail/Rules/providers/runTests.yaml | 126 ------------- composer.json | 1 + phpunit.xml | 34 ++-- 10 files changed, 108 insertions(+), 335 deletions(-) create mode 100644 app/code/community/Meanbee/Royalmail/Test/Model/Parcelsize.php delete mode 100644 app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules.php delete mode 100644 app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules/providers/runTests.yaml diff --git a/.gitignore b/.gitignore index 4b4b8b9..0cfc422 100644 --- a/.gitignore +++ b/.gitignore @@ -2643,4 +2643,6 @@ composer.lock /var/package/Mage_Ogone_Official-1.14.2.2.xml /var/package/Magento_Mobile-1.14.2.2.xml /var/package/Phoenix_Moneybookers-1.14.2.2.xml -/var/session \ No newline at end of file +/var/session +/var/cache +/var/phpunit.cache \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Helper/Data.php b/app/code/community/Meanbee/Royalmail/Helper/Data.php index 7eb151c..7cde7fe 100644 --- a/app/code/community/Meanbee/Royalmail/Helper/Data.php +++ b/app/code/community/Meanbee/Royalmail/Helper/Data.php @@ -65,6 +65,26 @@ public function _setWeight($data) $this->_weight = $data; } + protected function _setCartTotal($value) + { + $this->_cart_total = $value; + } + + public function getCartTotal() + { + return $this->_cart_total; + } + + public function setNegativeWeight($value) + { + $this->_negative_weight = $value; + } + + public function getNegativeWeight() + { + return $this->_negative_weight; + } + // Return the weight in grammes public function _getWeight() { @@ -85,24 +105,4 @@ public function _getWeight() return $weight; } - - protected function _setCartTotal($value) - { - $this->_cart_total = $value; - } - - public function getCartTotal() - { - return $this->_cart_total; - } - - public function setNegativeWeight($value) - { - $this->_negative_weight = $value; - } - - public function getNegativeWeight() - { - return $this->_negative_weight; - } } \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Test/Config/Base.php b/app/code/community/Meanbee/Royalmail/Test/Config/Base.php index 543c7d1..e606457 100644 --- a/app/code/community/Meanbee/Royalmail/Test/Config/Base.php +++ b/app/code/community/Meanbee/Royalmail/Test/Config/Base.php @@ -1,5 +1,5 @@ assertModuleCodePool('community'); } diff --git a/app/code/community/Meanbee/Royalmail/Test/Helper/Data.php b/app/code/community/Meanbee/Royalmail/Test/Helper/Data.php index be26691..32e59cd 100644 --- a/app/code/community/Meanbee/Royalmail/Test/Helper/Data.php +++ b/app/code/community/Meanbee/Royalmail/Test/Helper/Data.php @@ -1,11 +1,47 @@ _dataHelper = Mage::helper('royalmail'); + } + + public function tearDown() + { + $this->_dataHelper = null; + } + + /** + * @test + */ + public function testGetWeightKg() + { + $this->_dataHelper->setWeightUnit('kg'); + $this->_dataHelper->_setWeight(0.02); + $this->assertEquals(20.0, Mage::helper('royalmail')->_getWeight()); + } + + /** + * @test + */ + public function testGetWeightG() + { + $this->_dataHelper->setWeightUnit('g'); + $this->_dataHelper->_setWeight(0.02); + $this->assertEquals(0.02, Mage::helper('royalmail')->_getWeight()); + } /** * @test */ - public function testGetCountryWorldZone() { - $this->assertEquals('wz2', Mage::helper('royalmail')->getWorldZone('TO')); + public function testGetWeightlb() + { + $this->_dataHelper->setWeightUnit('lb'); + $this->_dataHelper->_setWeight(0.02); + $this->assertEquals(9.0718474000000011, Mage::helper('royalmail')->_getWeight()); } } \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Test/Model/Parcelsize.php b/app/code/community/Meanbee/Royalmail/Test/Model/Parcelsize.php new file mode 100644 index 0000000..d2b0ce7 --- /dev/null +++ b/app/code/community/Meanbee/Royalmail/Test/Model/Parcelsize.php @@ -0,0 +1,13 @@ +_model = Mage::getModel('royalmail/parcelsize'); + } + + public function tearDown() { + $this->_model = null; + } +} diff --git a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail.php b/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail.php index b7d0349..4014aa2 100644 --- a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail.php +++ b/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail.php @@ -1,23 +1,26 @@ _model = Mage::getModel('royalmail/shipping_carrier_royalmail'); + $this->_request = Mage::getModel('shipping/rate_request'); } public function tearDown() { $this->_model = null; + $this->_request = null; } + public function testGetAllowedMethods() { $this->assertTrue(is_array($this->_model->getAllowedMethods())); } public function testGetMethodsSingle() { - $this->assertTrue(is_string($this->_model->getMethods('letter'))); - $this->assertNull($this->_model->getMethods('idontexist')); + $this->assertTrue(is_array($this->_model->getMethods())); } /** @@ -28,4 +31,5 @@ public function testDisableByDefault() { 100, 1.0, 'GB' ))); } -} + +} \ No newline at end of file diff --git a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules.php b/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules.php deleted file mode 100644 index 60c15b3..0000000 --- a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules.php +++ /dev/null @@ -1,167 +0,0 @@ - 'GB', - Meanbee_Royalmail_Helper_Data::WORLD_ZONE_EU => 'FR', - Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE => 'US', - Meanbee_Royalmail_Helper_Data::WORLD_ZONE_TWO => 'AU', - ); - - /** - * @test - * @dataProvider dataProvider - * @dataProviderFile runTests.yaml - * - * @param $modelAlias - * @param $data - */ - public function runTests($modelAlias, $data) - { - $this->_model = Mage::getModel("royalmail/shipping_carrier_royalmail_{$modelAlias}"); - - if (!is_array($data['zones'])) { - $this->testAllowedZone($this->getCountryCode($data), $data['weights']['lowest'], $data['weights']['highest']); - $this->testNotAllowedZones($this->getNotAllowedCountryCode($data), $data['weights']['lowest'], $data['weights']['highest']); - } else { - foreach ($data['zones'] as $key => $zone) { - $this->testAllowedZone($this->getCountryCode($data, $key), $data['weights']['lowest'], $data['weights']['highest']); - $this->testNotAllowedZones($this->getNotAllowedCountryCode($data, $key), $data['weights']['lowest'], $data['weights']['highest']); - } - } - } - - /** - * Test each allowed zones set, for the maximum and minimum - * weight and prices. - * - * @param string $zone - * @param string $lowest - * @param string $highest - */ - protected function testAllowedZone($zone, $lowest, $highest) - { - $this->testWeight(floatval($lowest['price']), floatval($lowest['weight']), $zone, $this->getCartTotal($lowest)); - $this->testWeight(floatval($highest['price']), floatval($highest['weight']), $zone, $this->getCartTotal($highest)); - } - - /** - * Test each all zones which are not allowed for the maximum and - * minimum weight and prices. - * - * @param string $zone - * @param array $lowest - * @param array $highest - * @param float $cartTotal - */ - protected function testNotAllowedZones($zone, $lowest, $highest, $cartTotal = 1.00) - { - $this->assertNull( - $this->_model->getCost( - $this->_getRateRequest( - $lowest['weight'], - $cartTotal, - $zone - ) - ) - ); - $this->assertNull( - $this->_model->getCost( - $this->_getRateRequest( - $highest['weight'], - $cartTotal, - $zone - ) - ) - ); - } - - /** - * Test that the price is correct based on country code and weight. - * - * @param mixed $price - * @param float $weight - * @param string $zone - * @param float $cartTotal - */ - protected function testWeight($price, $weight, $zone, $cartTotal = 1.00) - { - $this->assertEquals( - $price, - $this->_model->getCost( - $this->_getRateRequest( - $weight, - $cartTotal, - $zone - ) - ) - ); - } - - /** - * Get the Country Code from Zone. - * - * @param $data - * @param null|string $key - * - * @return string - */ - protected function getCountryCode($data, $key = null) - { - if (isset($data['country_code'])) { - if (is_array($data['country_code'])) { - return $data['country_code'][$key]; - } else { - return $data['country_code']; - } - } - - if (is_array($data['zones'])) { - return $this->_countryCodes[$data['zones'][$key]]; - } else { - return $this->_countryCodes[$data['zones']]; - } - - } - - /** - * Get the total price of the cart. - * - * @param $data - * @return float - */ - protected function getCartTotal($data) - { - if (isset($data['cart_total'])) { - return $data['cart_total']; - } else { - return 1.00; - } - } - - /** - * Get a country code that isn't aloud for the method. - * - * @param array $data - * @param null|string $key - * - * @return string - */ - protected function getNotAllowedCountryCode($data, $key = null) - { - if(isset($data['not_allowed_zone'])) { - $data['zone'] = $data['not_allowed_zone']; - return $this->getCountryCode($data, $key); - } - $code = $this->getCountryCode($data, $key); - if($code == 'GB') { - return $this->_countryCodes[Meanbee_Royalmail_Helper_Data::WORLD_ZONE_ONE]; - } else { - return $this->_countryCodes[Meanbee_Royalmail_Helper_Data::WORLD_ZONE_GB]; - } - } - -} diff --git a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules/providers/runTests.yaml b/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules/providers/runTests.yaml deleted file mode 100644 index 77b7c39..0000000 --- a/app/code/community/Meanbee/Royalmail/Test/Model/Shipping/Carrier/Royalmail/Rules/providers/runTests.yaml +++ /dev/null @@ -1,126 +0,0 @@ -- - model_alias: letter - data: { csv: letter, weights: { lowest: { weight: '100', price: "0.63" }, highest: { weight: '100', price: "0.63" } }, zones: gb } -- - model_alias: largeletter - data: { csv: largeletter, weights: { lowest: { weight: '250', price: '1.26' }, highest: { weight: '750', price: '2.42' } }, zones: gb } -- - model_alias: firstclasslettersignedfor - data: { csv: firstclass_letter_signedfor, weights: { lowest: { weight: '100', price: "1.73" }, highest: { weight: '100', price: "1.73" } }, zones: gb } -- - model_alias: firstclasslargelettersignedfor - data: { csv: firstclass_largeletter_signedfor, weights: { lowest: { weight: '250', price: '2.36' }, highest: { weight: '750', price: '3.52' } }, zones: gb } -- - model_alias: secondclassletter - data: { csv: secondclass_letter, weights: { lowest: { weight: '100', price: "0.54" }, highest: { weight: '100', price: "0.54" } }, zones: gb } -- - model_alias: secondclasslargeletter - data: { csv: secondclass_largeletter, weights: { lowest: { weight: '250', price: '1.19' }, highest: { weight: '750', price: '2.05' } }, zones: gb } -- - model_alias: secondclasslettersignedfor - data: { csv: secondclass_letter_signedfor, weights: { lowest: { weight: '100', price: "1.64" }, highest: { weight: '100', price: "1.64" } }, zones: gb } -- - model_alias: secondclasslargelettersignedfor - data: { csv: secondclass_largeletter_signedfor, weights: { lowest: { weight: '250', price: '2.36' }, highest: { weight: '750', price: '3.52' } }, zones: gb } -- - model_alias: specialdeliverynextday - data: { csv: nextday500, weights: { lowest: { weight: '500', price: '7.25' }, highest: { weight: '20000', price: '41.20' } }, zones: gb } -- - model_alias: specialdeliverynextday - data: { csv: nextday1000, weights: { lowest: { weight: '500', price: '8.25', cart_total: '999' }, highest: { weight: '20000', price: '41.20', cart_total: '999' } }, zones: gb } -- - model_alias: specialdeliverynextday - data: { csv: nextday2500, weights: { lowest: { weight: '500', price: '10.25', cart_total: '2499' }, highest: { weight: '20000', price: '44.20', cart_total: '2499' } }, zones: gb } -- - model_alias: specialdelivery9am - data: { csv: 9am50, weights: { lowest: { weight: '500', price: '20.76' }, highest: { weight: '2000', price: '26.94' } }, zones: gb } -- - model_alias: specialdelivery9am - data: { csv: 9am1000, weights: { lowest: { weight: '500', price: '22.96', cart_total: '999' }, highest: { weight: '2000', price: '29.14', cart_total: '999' } }, zones: gb } -- - model_alias: specialdelivery9am - data: { csv: 9am2500, weights: { lowest: { weight: '500', price: '26.46', cart_total: '2499' }, highest: { weight: '2000', price: '32.64', cart_total: '2499' } }, zones: gb } -- - model_alias: specialdelivery9amsaturday - data: { csv: 9am50saturday, weights: { lowest: { weight: '500', price: '23.76' }, highest: { weight: '2000', price: '29.94' } }, zones: gb } -- - model_alias: specialdelivery9amsaturday - data: { csv: 9am1000saturday, weights: { lowest: { weight: '500', price: '25.96', cart_total: '999' }, highest: { weight: '2000', price: '32.14', cart_total: '999' } }, zones: gb } -- - model_alias: specialdelivery9amsaturday - data: { csv: 9am2500saturday, weights: { lowest: { weight: '500', price: '29.46', cart_total: '2499' }, highest: { weight: '2000', price: '35.64', cart_total: '2499' } }, zones: gb } -- - model_alias: specialdeliverynextdaysaturday - data: { csv: nextday500saturday, weights: { lowest: { weight: '500', price: '11.70' }, highest: { weight: '20000', price: '52.44' } }, zones: gb } -- - model_alias: specialdeliverynextdaysaturday - data: { csv: nextday1000saturday, weights: { lowest: { weight: '500', price: '12.90', cart_total: '999' }, highest: { weight: '20000', price: '53.64', cart_total: '999' } }, zones: gb } -- - model_alias: specialdeliverynextdaysaturday - data: { csv: nextday2500saturday, weights: { lowest: { weight: '500', price: '15.18', cart_total: '2499' }, highest: { weight: '20000', price: '56.04', cart_total: '2499' } }, zones: gb } -- - model_alias: internationalstandard - data: { csv: internationalstandard_europe, weights: { lowest: { weight: '250', price: '3.95' }, highest: { weight: '2000', price: '13.46' } }, zones: eu } -- - model_alias: internationalstandard - data: { csv: internationalstandard_wz1, weights: { lowest: { weight: '250', price: '5.00' }, highest: { weight: '2000', price: '19.75' } }, zones: wz1 } -- - model_alias: internationalstandard - data: { csv: internationalstandard_wz2, weights: { lowest: { weight: '250', price: '5.45' }, highest: { weight: '2000', price: '21.50' } }, zones: wz2 } -- - model_alias: internationaltrackedsigned - data: { csv: internationaltrackedsigned_eu, weights: { lowest: { weight: '250', price: '8.7' }, highest: { weight: '2000', price: '16.96' } }, zones: eu } -- - model_alias: internationaltrackedsigned - data: { csv: internationaltrackedsigned_wz1, weights: { lowest: { weight: '250', price: '9.75' }, highest: { weight: '2000', price: '23.25' } }, zones: wz1 } -- - model_alias: internationaltrackedsigned - data: { csv: internationaltrackedsigned_wz2, weights: { lowest: { weight: '250', price: '10.05' }, highest: { weight: '2000', price: '25.00' } }, zones: wz2, country_code: NZ } -- - model_alias: internationaltracked - data: { csv: internationaltracked_eu, weights: { lowest: { weight: '250', price: '10.44' }, highest: { weight: '2000', price: '20.36' } }, zones: eu } -- - model_alias: internationaltracked - data: { csv: internationaltracked_wz1, weights: { lowest: { weight: '250', price: '9.75' }, highest: { weight: '2000', price: '23.55' } }, zones: wz1 } -- - model_alias: internationaltracked - data: { csv: internationaltracked_wz2, weights: { lowest: { weight: '250', price: '10.05' }, highest: { weight: '2000', price: '25.00' } }, zones: wz2 } -- - model_alias: internationalsigned - data: { csv: internationalsigned_eu, weights: { lowest: { weight: '250', price: '8.7' }, highest: { weight: '2000', price: '16.96' } }, zones: eu, country_code: CY } -- - model_alias: internationalsigned - data: { csv: internationalsigned_wz1, weights: { lowest: { weight: '250', price: '9.75' }, highest: { weight: '2000', price: '23.25' } }, zones: wz1, country_code: AO } -- - model_alias: internationalsigned - data: { csv: internationalsigned_wz2, weights: { lowest: { weight: '250', price: '10.05' }, highest: { weight: '2000', price: '25.00' } }, zones: wz2 } -- - model_alias: internationaleconomy - data: { csv: internationaleconomy, weights: { lowest: { weight: '250', price: '3.75' }, highest: { weight: '2000', price: '13.26' } }, zones: wz1 } -- - model_alias: internationallettertracked - data: { csv: internationallettertracked_eu, weights: { lowest: { weight: '20', price: '7.20' }, highest: { weight: '100', price: '7.83' } }, zones: eu } -- - model_alias: internationallettertracked - data: { csv: internationallettertracked_wz, weights: { lowest: { weight: '20', price: '6.33' }, highest: { weight: '100', price: '7.25' } }, zones: [wz1, wz2] } -- - model_alias: internationallettersigned - data: { csv: internationallettersigned_eu, weights: { lowest: { weight: '20', price: null }, highest: { weight: '100', price: null } }, zones: eu } -- - model_alias: internationallettersigned - data: { csv: internationallettersigned_wz, weights: { lowest: { weight: '20', price: '6.33' }, highest: { weight: '100', price: '7.25' } }, zones: [wz1, wz2], country_code: [TN, NC] } -- - model_alias: internationallettereconomy - data: { csv: internationalltettereconomy, weights: { lowest: { weight: '20', price: '1.33' }, highest: { weight: '100', price: '2.25' } }, zones: [wz1, wz2, eu] } -- - model_alias: internationalletterstandard - data: { csv: internationalletterstandard_eu, weights: { lowest: { weight: '20', price: '1.00' }, highest: { weight: '100', price: '1.52' } }, zones: eu } -- - model_alias: internationalletterstandard - data: { csv: internationalletterstandard_wz, weights: { lowest: { weight: '20', price: '1.33' }, highest: { weight: '100', price: '2.25' } }, zones: [wz1, wz2] } -- - model_alias: internationallettertrackedsigned - data: { csv: internationallettertrackedsigned_eu, weights: { lowest: { weight: '20', price: '1.00' }, highest: { weight: '100', price: '1.52' } }, zones: eu, country_code: AT } -- - model_alias: internationallettertrackedsigned - data: { csv: internationallettertrackedsigned_wz, weights: { lowest: { weight: '60', price: '7.15' }, highest: { weight: '100', price: '8.45' } }, zones: [wz1, wz2], country_code: [CA, CA] } diff --git a/composer.json b/composer.json index dbd1de3..400980d 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,7 @@ "require-dev": { "aydin-hassan/magento-core-composer-installer": "^1.3", "ecomdev/ecomdev_phpunit": "*", + "mikey179/vfsStream": "*@stable", "magento/magento": "1.14.2.2", "squizlabs/php_codesniffer": "*", "magento-ecg/coding-standard": "*" diff --git a/phpunit.xml b/phpunit.xml index 9d72497..70dcdd2 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,16 +1,26 @@ - - - UnitTests.php + + + + + + + + app/code/community/EcomDev/PHPUnit/Test/Suite.php - - - - - app/code/community/Meanbee/Royalmail - - app/code/community/Meanbee/Royalmail/Test - - + + app/code/community/Meanbee/Royalmail + From ad55648cc31a6ce0427889507b704c715fdac09d Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Wed, 23 Dec 2015 11:23:02 +0000 Subject: [PATCH 07/15] #35: Refactor the zone to delivery method CSV to better represent the data This refactors the CSV to show the data more clearly on github, and to allow for easier searching. --- .../data/2_zoneToDeliveryMethod.csv | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv index d1a6cd4..c3920ab 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv @@ -1,4 +1,27 @@ -WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE -WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE -WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE -WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY,UK_STANDARD_FIRST_CLASS_LETTER,UK_STANDARD_FIRST_CLASS_LARGE_LETTER,UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL \ No newline at end of file +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY +WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY +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 +WORLD_ZONE_GB,UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL +WORLD_ZONE_GB,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL +WORLD_ZONE_GB,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL \ No newline at end of file From 7a88763825b134065d090b8a63735f2836bff791 Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Wed, 23 Dec 2015 11:52:16 +0000 Subject: [PATCH 08/15] #35: Refactor delivery to price to better show the data This refactors the delivery to price to better show the data --- .../data/4_deliveryToPrice.csv | 186 +++++++++--------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv index 896c355..fd6844e 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv @@ -1,97 +1,97 @@ -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50 -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.00,50 -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,6.52,50 -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,6.00,250 -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,6.00,250 -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,6.52,250 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.00,50 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,6.52,50 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,08.10,50 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,08.60,50 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,10.05,50 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,11.00,50 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.50,250 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.02,250 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,10.60,250 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,11.10,250 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,12.55,250 -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,13.50,250 -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50 -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50 -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50 -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250 -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250 -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.70,50 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.65,50 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.35,50 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,14.45,50 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.20,250 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.05,250 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,14.85,250 -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,16.95,250 -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50 -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50 -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50 -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250 -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250 -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.90,50 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.95,50 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.80,50 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,15.30,50 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.40,250 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.45,250 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,15.30,250 -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,17.80,250 -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_STANDARD_FIRST_CLASS_LETTER,0.001,0.100,.63,20 -UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.001,0.100,.95,20 -UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.101,0.250,1.26,20 -UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.251,0.500,1.68,20 -UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.501,0.750,2.42,20 -UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,0.001,1.000,3.30,20,SMALL -UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,1.001,2.000,5.45,20,SMALL -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,20 +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50,, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.00,50,, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,6.52,50,, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,6.00,250,, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,6.00,250,, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,6.52,250,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.00,50,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,6.52,50,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,08.10,50,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,08.60,50,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,10.05,50,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,11.00,50,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.50,250,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.02,250,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,10.60,250,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,11.10,250,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,12.55,250,, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,13.50,250,, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50,, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50,, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50,, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250,, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250,, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.70,50,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.65,50,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.35,50,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,14.45,50,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.20,250,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.05,250,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,14.85,250,, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,16.95,250,, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50,, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50,, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50,, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250,, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250,, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.90,50,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.95,50,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.80,50,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,15.30,50,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.40,250,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.45,250,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,15.30,250,, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,17.80,250,, +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_STANDARD_FIRST_CLASS_LETTER,0.001,0.100,.63,20,, +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.001,0.100,.95,20,, +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.101,0.250,1.26,20,, +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.251,0.500,1.68,20,, +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.501,0.750,2.42,20,, +UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,0.001,1.000,3.30,20,SMALL,, +UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,1.001,2.000,5.45,20,SMALL,, +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,20,, UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0.001,1.000,4.40,20,SMALL UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,1.001,2.000,6.55,20,SMALL UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0.001,1.000,6.75,20,MEDIUM UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,1.001,2.000,10.00,20,MEDIUM -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,2.001,5.000,16.95,20 -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,5.001,10.000,23.00,20 -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,10.001,20.000,34.50,20 \ No newline at end of file +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,2.001,5.000,16.95,20,, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,5.001,10.000,23.00,20,, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,10.001,20.000,34.50,20,, \ No newline at end of file From 826c5129fa9da61ab3bcd08ff7edd39a1daba2d9 Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Wed, 23 Dec 2015 11:59:20 +0000 Subject: [PATCH 09/15] #35: Refactor delivery to price to better show the data --- .../RoyalmailPHPLibrary/data/4_deliveryToPrice.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv index fd6844e..6f7bb5b 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv @@ -81,10 +81,10 @@ UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.001,0.100,.95,20,, UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.101,0.250,1.26,20,, UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.251,0.500,1.68,20,, UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.501,0.750,2.42,20,, -UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,0.001,1.000,3.30,20,SMALL,, -UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,1.001,2.000,5.45,20,SMALL,, -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_SMALL_PARCEL,0.001,1.000,3.30,20,SMALL +UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,1.001,2.000,5.45,20,SMALL +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,20,, From 7f26a3798eea4930dab7dda290153eecd9282729 Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Wed, 23 Dec 2015 13:10:15 +0000 Subject: [PATCH 10/15] #35: CSV Refactor CSV refactor to better display the content --- .../data/3_deliveryMethodMeta.csv | 6 +- .../data/4_deliveryToPrice.csv | 178 +++++++++--------- 2 files changed, 92 insertions(+), 92 deletions(-) diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv index b76f2ea..b83fc87 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv @@ -1,16 +1,16 @@ -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0,50,20,"International Signed Letter" +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0,50,50,"International Signed Letter" WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Letter" WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50,"International Tracked and Signed Letter" WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50,"International Tracked and Signed Large Letter" WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Letter" WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Large Letter" -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0,50,20,"International Signed Letter" +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0,50,50,"International Signed Letter" WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed" WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50,"International Tracked and Signed Letter" WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50,"International Tracked and Signed Large Letter" WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Letter" WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Large Letter" -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0,50,20,"International Signed Letter" +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0,50,50,"International Signed Letter" WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed" WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50,"International Tracked and Signed Letter" WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50,"International Tracked and Signed Large Letter" diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv index 6f7bb5b..5580f19 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv @@ -1,97 +1,97 @@ -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50,, -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.00,50,, -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,6.52,50,, -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,6.00,250,, -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,6.00,250,, -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,6.52,250,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.00,50,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,6.52,50,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,08.10,50,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,08.60,50,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,10.05,50,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,11.00,50,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.50,250,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.02,250,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,10.60,250,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,11.10,250,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,12.55,250,, -WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,13.50,250,, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50,, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50,, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50,, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250,, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250,, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.70,50,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.65,50,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.35,50,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,14.45,50,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.20,250,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.05,250,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,14.85,250,, -WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,16.95,250,, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50,, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50,, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50,, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250,, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250,, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.90,50,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.95,50,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.80,50,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,15.30,50,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.40,250,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.45,250,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,15.30,250,, -WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,17.80,250,, -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_STANDARD_FIRST_CLASS_LETTER,0.001,0.100,.63,20,, -UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.001,0.100,.95,20,, -UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.101,0.250,1.26,20,, -UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.251,0.500,1.68,20,, -UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.501,0.750,2.42,20,, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.00,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,6.52,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,6.00,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,6.00,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,6.52,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.00,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,6.52,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,08.10,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,08.60,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,10.05,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,11.00,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.50,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.02,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,10.60,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,11.10,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,12.55,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,13.50,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.70,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.65,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.35,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,14.45,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.20,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.05,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,14.85,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,16.95,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.90,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.95,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.80,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,15.30,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.40,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.45,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,15.30,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,17.80,250, +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_STANDARD_FIRST_CLASS_LETTER,0.001,0.100,.63,20, +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.001,0.100,.95,20, +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.101,0.250,1.26,20, +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.251,0.500,1.68,20, +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.501,0.750,2.42,20, UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,0.001,1.000,3.30,20,SMALL UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,1.001,2.000,5.45,20,SMALL 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,20,, +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,20, UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0.001,1.000,4.40,20,SMALL UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,1.001,2.000,6.55,20,SMALL UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0.001,1.000,6.75,20,MEDIUM UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,1.001,2.000,10.00,20,MEDIUM -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,2.001,5.000,16.95,20,, -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,5.001,10.000,23.00,20,, -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,10.001,20.000,34.50,20,, \ No newline at end of file +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,2.001,5.000,16.95,20, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,5.001,10.000,23.00,20, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,10.001,20.000,34.50,20, \ No newline at end of file From dd75f1c592441c86e86cc1305e5302a8fb4f507b Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Thu, 7 Jan 2016 09:57:15 +0000 Subject: [PATCH 11/15] #36: Add the full CSV data for the 2015 Royalmail price list Adds the full csv data for the royal mail price list. These prices are retrieved from the 2015 Royal Mail price list PDF. --- .../data/1_countryToZone.csv | 261 ++++++++- .../data/2_zoneToDeliveryMethod.csv | 86 ++- .../data/3_deliveryMethodMeta.csv | 98 +++- .../data/4_deliveryToPrice.csv | 505 +++++++++++++++++- .../data/5_cleanNameToMethod.csv | 124 +++-- .../data/6_cleanNameMethodGroup.csv | 45 +- 6 files changed, 1032 insertions(+), 87 deletions(-) diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/1_countryToZone.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/1_countryToZone.csv index c63ff62..5a5905f 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/1_countryToZone.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/1_countryToZone.csv @@ -1,7 +1,258 @@ -GB,WORLD_ZONE_EU GB,WORLD_ZONE_GB -FA,WORLD_ZONE_EU -IM,WORLD_ZONE_ONE -JE,WORLD_ZONE_TWO +IM,WORLD_ZONE_GB +JE,WORLD_ZONE_GB GG,WORLD_ZONE_GB -GG,WORLD_ZONE_EU \ No newline at end of file +AL,WORLD_ZONE_EU +DK,WORLD_ZONE_EU +KG,WORLD_ZONE_EU +RU,WORLD_ZONE_EU +AD,WORLD_ZONE_EU +EE,WORLD_ZONE_EU +LV,WORLD_ZONE_EU +SM,WORLD_ZONE_EU +AM,WORLD_ZONE_EU +FO,WORLD_ZONE_EU +LI,WORLD_ZONE_EU +RS,WORLD_ZONE_EU +AT,WORLD_ZONE_EU +FI,WORLD_ZONE_EU +LT,WORLD_ZONE_EU +SK,WORLD_ZONE_EU +AZ,WORLD_ZONE_EU +FR,WORLD_ZONE_EU +LU,WORLD_ZONE_EU +SI,WORLD_ZONE_EU +PT-20,WORLD_ZONE_EU +GE,WORLD_ZONE_EU +MK,WORLD_ZONE_EU +ES,WORLD_ZONE_EU +IB,WORLD_ZONE_EU +DE,WORLD_ZONE_EU +PT-30,WORLD_ZONE_EU +SE,WORLD_ZONE_EU +BY,WORLD_ZONE_EU +GI,WORLD_ZONE_EU +MT,WORLD_ZONE_EU +CH,WORLD_ZONE_EU +BE,WORLD_ZONE_EU +GR,WORLD_ZONE_EU +MD,WORLD_ZONE_EU +TJ,WORLD_ZONE_EU +BA,WORLD_ZONE_EU +GL,WORLD_ZONE_EU +MC,WORLD_ZONE_EU +TR,WORLD_ZONE_EU +BG,WORLD_ZONE_EU +HU,WORLD_ZONE_EU +ME,WORLD_ZONE_EU +TM,WORLD_ZONE_EU +IC,WORLD_ZONE_EU +IS,WORLD_ZONE_EU +NL,WORLD_ZONE_EU +UA,WORLD_ZONE_EU +FR-H,WORLD_ZONE_EU +NO,WORLD_ZONE_EU +UZ,WORLD_ZONE_EU +IE,WORLD_ZONE_EU +HR,WORLD_ZONE_EU +IT,WORLD_ZONE_EU +PL,WORLD_ZONE_EU +VA,WORLD_ZONE_EU +CY,WORLD_ZONE_EU +KZ,WORLD_ZONE_EU +PT,WORLD_ZONE_EU +CZ,WORLD_ZONE_EU +XK,WORLD_ZONE_EU +RO,WORLD_ZONE_EU +AE,WORLD_ZONE_ONE +AF,WORLD_ZONE_ONE +AG,WORLD_ZONE_ONE +AI,WORLD_ZONE_ONE +AO,WORLD_ZONE_ONE +AR,WORLD_ZONE_ONE +AW,WORLD_ZONE_ONE +AX,WORLD_ZONE_ONE +BB,WORLD_ZONE_ONE +BD,WORLD_ZONE_ONE +BF,WORLD_ZONE_ONE +BH,WORLD_ZONE_ONE +BI,WORLD_ZONE_ONE +BJ,WORLD_ZONE_ONE +BL,WORLD_ZONE_ONE +BM,WORLD_ZONE_ONE +BN,WORLD_ZONE_ONE +BO,WORLD_ZONE_ONE +BQ,WORLD_ZONE_ONE +BQ,WORLD_ZONE_ONE +BR,WORLD_ZONE_ONE +BS,WORLD_ZONE_ONE +BT,WORLD_ZONE_ONE +BV,WORLD_ZONE_ONE +BW,WORLD_ZONE_ONE +BZ,WORLD_ZONE_ONE +CA,WORLD_ZONE_ONE +CD,WORLD_ZONE_ONE +CF,WORLD_ZONE_ONE +CG,WORLD_ZONE_ONE +CI,WORLD_ZONE_ONE +CL,WORLD_ZONE_ONE +CM,WORLD_ZONE_ONE +CN,WORLD_ZONE_ONE +CO,WORLD_ZONE_ONE +CR,WORLD_ZONE_ONE +CU,WORLD_ZONE_ONE +CV,WORLD_ZONE_ONE +CW,WORLD_ZONE_ONE +DJ,WORLD_ZONE_ONE +DM,WORLD_ZONE_ONE +DO,WORLD_ZONE_ONE +DZ,WORLD_ZONE_ONE +EC,WORLD_ZONE_ONE +EG,WORLD_ZONE_ONE +EH,WORLD_ZONE_ONE +ER,WORLD_ZONE_ONE +ET,WORLD_ZONE_ONE +FK,WORLD_ZONE_ONE +FM,WORLD_ZONE_ONE +GA,WORLD_ZONE_ONE +GD,WORLD_ZONE_ONE +GF,WORLD_ZONE_ONE +GH,WORLD_ZONE_ONE +GM,WORLD_ZONE_ONE +GN,WORLD_ZONE_ONE +GP,WORLD_ZONE_ONE +GQ,WORLD_ZONE_ONE +GS,WORLD_ZONE_ONE +GT,WORLD_ZONE_ONE +GU,WORLD_ZONE_ONE +GW,WORLD_ZONE_ONE +GY,WORLD_ZONE_ONE +HK,WORLD_ZONE_ONE +HM,WORLD_ZONE_ONE +HN,WORLD_ZONE_ONE +HT,WORLD_ZONE_ONE +ID,WORLD_ZONE_ONE +IL,WORLD_ZONE_ONE +IN,WORLD_ZONE_ONE +IQ,WORLD_ZONE_ONE +IR,WORLD_ZONE_ONE +JM,WORLD_ZONE_ONE +JO,WORLD_ZONE_ONE +JP,WORLD_ZONE_ONE +KE,WORLD_ZONE_ONE +KH,WORLD_ZONE_ONE +KM,WORLD_ZONE_ONE +KN,WORLD_ZONE_ONE +KP,WORLD_ZONE_ONE +KR,WORLD_ZONE_ONE +KW,WORLD_ZONE_ONE +KY,WORLD_ZONE_ONE +LB,WORLD_ZONE_ONE +LC,WORLD_ZONE_ONE +LK,WORLD_ZONE_ONE +LR,WORLD_ZONE_ONE +LS,WORLD_ZONE_ONE +LY,WORLD_ZONE_ONE +MA,WORLD_ZONE_ONE +MF,WORLD_ZONE_ONE +MG,WORLD_ZONE_ONE +MH,WORLD_ZONE_ONE +ML,WORLD_ZONE_ONE +MM,WORLD_ZONE_ONE +MN,WORLD_ZONE_ONE +MP,WORLD_ZONE_ONE +MQ,WORLD_ZONE_ONE +MR,WORLD_ZONE_ONE +MS,WORLD_ZONE_ONE +MU,WORLD_ZONE_ONE +MV,WORLD_ZONE_ONE +MW,WORLD_ZONE_ONE +MX,WORLD_ZONE_ONE +MY,WORLD_ZONE_ONE +MZ,WORLD_ZONE_ONE +NA,WORLD_ZONE_ONE +NE,WORLD_ZONE_ONE +NF,WORLD_ZONE_ONE +NG,WORLD_ZONE_ONE +NI,WORLD_ZONE_ONE +NP,WORLD_ZONE_ONE +OM,WORLD_ZONE_ONE +PA,WORLD_ZONE_ONE +PE,WORLD_ZONE_ONE +PH,WORLD_ZONE_ONE +PK,WORLD_ZONE_ONE +PM,WORLD_ZONE_ONE +PR,WORLD_ZONE_ONE +PS,WORLD_ZONE_ONE +PY,WORLD_ZONE_ONE +QA,WORLD_ZONE_ONE +RE,WORLD_ZONE_ONE +RW,WORLD_ZONE_ONE +SA,WORLD_ZONE_ONE +SC,WORLD_ZONE_ONE +SD,WORLD_ZONE_ONE +SH,WORLD_ZONE_ONE +SJ,WORLD_ZONE_ONE +SL,WORLD_ZONE_ONE +SN,WORLD_ZONE_ONE +SO,WORLD_ZONE_ONE +SR,WORLD_ZONE_ONE +SS,WORLD_ZONE_ONE +ST,WORLD_ZONE_ONE +SV,WORLD_ZONE_ONE +SX,WORLD_ZONE_ONE +SY,WORLD_ZONE_ONE +SZ,WORLD_ZONE_ONE +TC,WORLD_ZONE_ONE +TD,WORLD_ZONE_ONE +TG,WORLD_ZONE_ONE +TH,WORLD_ZONE_ONE +TL,WORLD_ZONE_ONE +TN,WORLD_ZONE_ONE +TT,WORLD_ZONE_ONE +TW,WORLD_ZONE_ONE +TZ,WORLD_ZONE_ONE +UG,WORLD_ZONE_ONE +UM,WORLD_ZONE_ONE +US,WORLD_ZONE_ONE +UY,WORLD_ZONE_ONE +VC,WORLD_ZONE_ONE +VE,WORLD_ZONE_ONE +VG,WORLD_ZONE_ONE +VI,WORLD_ZONE_ONE +VN,WORLD_ZONE_ONE +VU,WORLD_ZONE_ONE +WF,WORLD_ZONE_ONE +YE,WORLD_ZONE_ONE +YT,WORLD_ZONE_ONE +ZA,WORLD_ZONE_ONE +ZM,WORLD_ZONE_ONE +ZW,WORLD_ZONE_ONE +AU,WORLD_ZONE_TWO +PW,WORLD_ZONE_TWO +IO,WORLD_ZONE_TWO +CX,WORLD_ZONE_TWO +CC,WORLD_ZONE_TWO +CK,WORLD_ZONE_TWO +FJ,WORLD_ZONE_TWO +PF,WORLD_ZONE_TWO +TF,WORLD_ZONE_TWO +KI,WORLD_ZONE_TWO +MO,WORLD_ZONE_TWO +NR,WORLD_ZONE_TWO +NC,WORLD_ZONE_TWO +NZ,WORLD_ZONE_TWO +AQ,WORLD_ZONE_TWO +NU,WORLD_ZONE_TWO +NF,WORLD_ZONE_TWO +NQAQ,WORLD_ZONE_TWO +PG,WORLD_ZONE_TWO +LA,WORLD_ZONE_TWO +PN,WORLD_ZONE_TWO +SG,WORLD_ZONE_TWO +SB,WORLD_ZONE_TWO +TK,WORLD_ZONE_TWO +TO,WORLD_ZONE_TWO +TV,WORLD_ZONE_TWO +AS,WORLD_ZONE_TWO +WS,WORLD_ZONE_TWO \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv index c3920ab..31174bf 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/2_zoneToDeliveryMethod.csv @@ -1,27 +1,99 @@ +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LETTER +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LARGE_LETTER +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER -WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE +WORLD_ZONE_EU,WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LARGE_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER -WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LARGE_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE +WORLD_ZONE_ONE,WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LETTER +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LARGE_LETTER +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER -WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE -WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM -WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_1PM_SATURDAY -WORLD_ZONE_GB,UK_GUARANTEED_ROYAL_MAIL_SPECIAL_DELIVER_9AM_SATURDAY +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LETTER +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LARGE_LETTER +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER +WORLD_ZONE_TWO,WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER +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_STANDARD_FIRST_CLASS_LETTER WORLD_ZONE_GB,UK_STANDARD_FIRST_CLASS_LARGE_LETTER WORLD_ZONE_GB,UK_STANDARD_FIRST_CLASS_SMALL_PARCEL WORLD_ZONE_GB,UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL +WORLD_ZONE_GB,UK_STANDARD_SECOND_CLASS_LETTER +WORLD_ZONE_GB,UK_STANDARD_SECOND_CLASS_LARGE_LETTER +WORLD_ZONE_GB,UK_STANDARD_SECOND_CLASS_SMALL_PARCEL +WORLD_ZONE_GB,UK_STANDARD_SECOND_CLASS_MEDIUM_PARCEL +WORLD_ZONE_GB,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LETTER +WORLD_ZONE_GB,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LARGE_LETTER WORLD_ZONE_GB,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL -WORLD_ZONE_GB,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL \ No newline at end of file +WORLD_ZONE_GB,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL +WORLD_ZONE_GB,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LETTER +WORLD_ZONE_GB,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LARGE_LETTER +WORLD_ZONE_GB,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_SMALL_PARCEL +WORLD_ZONE_GB,UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_MEDIUM_PARCEL +WORLD_ZONE_GB,PARCELFORCE_WORLDWIDE_EXPRESS_9 +WORLD_ZONE_GB,PARCELFORCE_WORLDWIDE_EXPRESS_10 +WORLD_ZONE_GB,PARCELFORCE_WORLDWIDE_EXPRESS_AM +WORLD_ZONE_GB,PARCELFORCE_WORLDWIDE_EXPRESS_24 +WORLD_ZONE_GB,PARCELFORCE_WORLDWIDE_EXPRESS_48 +WORLD_ZONE_GB,PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY +WORLD_ZONE_GB,PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY +WORLD_ZONE_GB,PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY +WORLD_ZONE_GB,PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY +WORLD_ZONE_GB,PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv index b83fc87..24b17ac 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/3_deliveryMethodMeta.csv @@ -1,33 +1,107 @@ -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0,50,50,"International Signed Letter" -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Letter" +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LETTER,0,20,20,"International Standard Letter" +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LARGE_LETTER,0,20,20,"International Standard Large Letter" +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL,0,20,20,"International Standard Small Parcel" WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50,"International Tracked and Signed Letter" WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50,"International Tracked and Signed Large Letter" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0,50,50,"International Tracked and Signed Small Parcel" WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Letter" WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Large Letter" -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0,50,50,"International Signed Letter" -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Small Parcel" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER,0,50,50,"International Tracked Letter" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER,0,50,50,"International Tracked Large Letter" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL,0,50,50,"International Tracked Small Parcel" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked Letter" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked Large Letter" +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250,"International Tracked Small Parcel" +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0,50,50,"International Signed Letter" +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER,0,50,50,"International Signed Large Letter" +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL,0,50,50,"International Signed Small Parcel" +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed Letter" +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed Large Letter" +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250,"International Signed Small Parcel" +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LETTER,0,20,20,"International Standard Letter" +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LARGE_LETTER,0,20,20,"International Standard Large Letter" +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL,0,20,20,"International Standard Small Parcel" WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50,"International Tracked and Signed Letter" WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50,"International Tracked and Signed Large Letter" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0,50,50,"International Tracked and Signed Small Parcel" WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Letter" WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Large Letter" -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0,50,50,"International Signed Letter" -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Small Parcel" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER,0,50,50,"International Tracked Letter" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER,0,50,50,"International Tracked Large Letter" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL,0,50,50,"International Tracked Small Parcel" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked Letter" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked Large Letter" +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250,"International Tracked Small Parcel" +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0,50,50,"International Signed Letter" +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER,0,50,50,"International Signed Large Letter" +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL,0,50,50,"International Signed Small Parcel" +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed Letter" +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed Large Letter" +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250,"International Signed Small Parcel" +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LETTER,0,20,20,"International Economy Letter" +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LARGE_LETTER,0,20,20,"International Economy Large Letter" +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0,20,20,"International Economy Small Parcel" +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LETTER,0,20,20,"International Standard Letter" +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LARGE_LETTER,0,20,20,"International Standard Large Letter" +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL,0,20,20,"International Standard Small Parcel" WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0,50,50,"International Tracked and Signed Letter" WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50,"International Tracked and Signed Large Letter" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0,50,50,"International Tracked and Signed Small Parcel" WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Letter" WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Large Letter" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250,"International Tracked and Signed Small Parcel" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER,0,50,50,"International Tracked Letter" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER,0,50,50,"International Tracked Large Letter" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL,0,50,50,"International Tracked Small Parcel" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked Letter" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Tracked Large Letter" +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250,"International Tracked Small Parcel" +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0,50,50,"International Signed Letter" +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER,0,50,50,"International Signed Large Letter" +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL,0,50,50,"International Signed Small Parcel" +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed Letter" +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250,"International Signed Large Letter" +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250,"International Signed Small Parcel" +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_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,50,50,"Standard First Class Small Parcel" -UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,50,50,"Standard First Class Medium Parcel" -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0,50,50,"First Class Parcel Small - Signed For" -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50,"First Class Parcel Medium - Signed For" \ No newline at end of file +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_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_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" +UK_STANDARD_SECOND_CLASS_MEDIUM_PARCEL,0,20,20,"Second Class: Medium Parcel" +PARCELFORCE_WORLDWIDE_EXPRESS_9,0,200,200,"Parcelforce Worldwide: Express 9" +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 diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv index 5580f19..af06966 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/4_deliveryToPrice.csv @@ -1,9 +1,19 @@ -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50, -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.00,50, -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,6.52,50, -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,6.00,250, -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,6.00,250, -WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,6.52,250, +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_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, +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LARGE_LETTER,0.501,0.750,6.60,20, +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.001,0.100,3.45,20, +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.101,0.250,3.95,20, +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.251,0.500,5.50,20, +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.501,0.750,6.85,20, +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.751,1.000,8.26,20, +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.001,1.250,9.61,20, +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.251,1.500,10.96,20, +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.501,1.750,12.31,20, +WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.751,2.000,13.46,20, WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50, WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.00,50, WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,6.52,50, @@ -11,6 +21,15 @@ WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,08.10,50 WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,08.60,50, WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,10.05,50, WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,11.00,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.001,0.100,8.20,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.101,0.250,8.70,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.251,0.500,10.15,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.501,0.750,11.10,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.751,1.000,12.51,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.001,1.250,13.86,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.251,1.500,15.21,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.501,1.750,15.81,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.751,2.000,16.96,50, WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.50,250, WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.02,250, @@ -18,12 +37,95 @@ WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.00 WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,11.10,250, WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,12.55,250, WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,13.50,250, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, -WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.001,0.100,10.70,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.101,0.250,11.20,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.251,0.500,12.65,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.501,0.750,13.60,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.751,1.000,15.01,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.001,1.250,16.36,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.251,1.500,17.71,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.501,1.750,18.31,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.751,2.000,19.46,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER,0.001,0.010,7.20,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER,0.011,0.020,7.20,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER,0.021,0.100,7.83,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER,0.001,0.100,8.10,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER,0.101,0.250,8.60,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER,0.251,0.500,10.05,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER,0.501,0.750,11.00,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.001,0.100,9.84,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.101,0.250,10.44,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.251,0.500,12.18,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.501,0.750,13.32,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.751,1.000,15.02,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.001,1.250,16.64,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.251,1.500,18.26,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.501,1.750,18.98,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.751,2.000,20.36,50, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,0.001,0.010,9.70,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,0.011,0.020,9.70,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,0.021,0.100,10.33,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.22,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.82,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,14.56,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,15.70,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.001,0.100,12.84,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.101,0.250,13.44,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.251,0.500,15.18,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.501,0.750,16.32,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.751,1.000,18.02,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.001,1.250,19.64,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.251,1.500,21.26,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.501,1.750,21.98,250, +WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.751,2.000,23.36,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.00,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,6.52,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER,0.001,0.100,8.10,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER,0.101,0.250,8.60,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER,0.251,0.500,10.05,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER,0.501,0.750,11.00,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.001,0.100,8.20,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.101,0.250,8.70,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.251,0.500,10.15,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.501,0.750,11.10,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.751,1.000,12.51,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.001,1.250,13.86,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.251,1.500,15.21,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.501,1.750,15.81,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.751,2.000,16.96,50, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,6.00,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,6.00,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,6.52,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,10.60,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,11.10,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,12.55,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,13.50,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.001,0.100,10.70,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.101,0.250,12.30,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.251,0.500,12.65,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.501,0.750,13.60,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.751,1.000,15.01,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.001,1.250,16.36,250, +WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.251,1.500,17.71,250, +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_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, +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LARGE_LETTER,0.501,0.750,10.15,20, +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.001,0.100,4.10,20, +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.101,0.250,5.00,20, +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.251,0.500,7.70,20, +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.501,0.750,10.30,20, +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.751,1.000,12.95,20, +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.001,1.250,14.65,20, +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.251,1.500,16.35,20, +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.501,1.750,18.05,20, +WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.751,2.000,19.75,20 WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50, WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50, WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50, @@ -31,6 +133,15 @@ WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.70,50 WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.65,50, WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.35,50, WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,14.45,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.001,0.100,8.80,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.101,0.250,9.75,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.251,0.500,12.45,50 +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.501,0.750,14.55,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.751,1.000,17.20,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.001,1.250,18.90,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.251,1.500,20.60,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.501,1.750,21.55,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.751,2.000,23.25,50, WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250, @@ -38,12 +149,111 @@ WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.0 WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.05,250, WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,14.85,250, WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,16.95,250, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, -WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.001,0.100,11.30,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.101,0.250,12.25,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.251,0.500,14.95,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.501,0.750,17.05,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.751,1.000,19.70,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.001,1.250,21.40,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.251,1.500,23.10,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.501,1.750,24.05,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.751,2.000,25.75,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER,0.001,0.010,6.00,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER,0.011,0.020,6.33,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER,0.021,0.100,7.25,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER,0.001,0.100,8.70,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER,0.101,0.250,9.65,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER,0.251,0.500,12.35,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER,0.501,0.750,14.45,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.001,0.100,8.80,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.101,0.250,9.75,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.251,0.500,12.45,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.501,0.750,14.55,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.751,1.000,17.20,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.001,1.250,18.90,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.251,1.500,20.60,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.501,1.750,21.55,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.751,2.000,23.25,50, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.40,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.45,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,15.30,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,17.80,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.001,0.100,11.30,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.101,0.250,12.25,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.251,0.500,14.95,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.501,0.750,17.05,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.751,1.000,19.70,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.001,1.250,21.40,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.251,1.500,23.10,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.501,1.750,24.05,250, +WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.751,2.000,25.75,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER,0.001,0.100,8.70,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER,0.101,0.250,9.65,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER,0.251,0.500,12.35,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER,0.501,0.750,14.45,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.001,0.100,8.80,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.101,0.250,9.75,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.251,0.500,12.45,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.501,0.750,14.55,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.751,1.000,17.20,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.001,1.250,18.90,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.251,1.500,20.60,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.501,1.750,21.55,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.751,2.000,23.25,50, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.30,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.05,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,14.85,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,16.95,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.001,0.100,11.30,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.101,0.250,12.25,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.251,0.500,14.95,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.501,0.750,17.05,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.751,1.000,19.70,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.001,1.250,21.40,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.251,1.500,23.10,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.501,1.750,24.04,250, +WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.751,2.000,25.75,250, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LETTER,0.001,0.010,0.85,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LETTER,0.011,0.020,0.85,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LETTER,0.021,0.100,1.37,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LARGE_LETTER,0.001,0.100,2.38,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LARGE_LETTER,0.101,0.250,3.63,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LARGE_LETTER,0.251,0.500,5.08,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LARGE_LETTER,0.501,0.750,6.53,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0.001,0.100,3.25,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0.101,0.250,3.75,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0.251,0.500,5.30,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0.501,0.750,6.65,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0.751,1.000,8.06,20, +WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL,1.001,1.250,9.41,20, +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_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, +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LARGE_LETTER,0.501,0.750,10.75,20 +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.001,0.100,4.45,20, +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.101,0.250,5.45,20, +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.251,0.500,8.45,20, +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.501,0.750,11.15,20, +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL,0.751,1.000,13.90,20, +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.001,1.250,15.80,20, +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.251,1.500,17.70,20, +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.501,1.750,19.60,20, +WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_SMALL_PARCEL,1.751,2.000,21.50,20, WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.001,0.010,6.00,50, WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.011,0.020,6.33,50, WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER,0.021,0.100,7.25,50, @@ -51,6 +261,15 @@ WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.001,0.100,8.90,50 WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.101,0.250,9.95,50, WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.251,0.500,12.80,50, WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0.501,0.750,15.30,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.001,0.100,9.00,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.101,0.250,10.05,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.251,0.500,12.90,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.501,0.750,15.40,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0.751,1.000,18.15,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.001,1.250,20.05,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.251,1.500,21.95,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.501,1.750,23.10,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,1.751,2.000,25.00,50, WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250, @@ -58,6 +277,95 @@ WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.0 WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.45,250, WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,15.30,250, WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,17.80,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.001,0.100,11.50,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.101,0.250,12.55,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.251,0.500,15.40,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.501,0.750,17.90,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.751,1.000,20.65,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.001,1.250,22.55,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.251,1.500,24.45,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.501,1.750,25.60,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.751,2.000,27.50,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER,0.001,0.010,6.00,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER,0.011,0.020,6.33,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER,0.021,0.100,7.25,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER,0.001,0.100,8.90,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER,0.101,0.250,9.95,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER,0.251,0.500,12.80,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER,0.501,0.750,15.30,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.001,0.100,9.00,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.101,0.250,10.05,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.251,0.500,12.90,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.501,0.750,15.40,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL,0.751,1.000,18.15,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.001,1.250,20.05,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.251,1.500,21.95,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.501,1.750,23.10,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL,1.751,2.000,25.00,50, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,0.021,0.100,9.75,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,12.22,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.82,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,14.56,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,15.70,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.001,0.100,11.50,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.101,0.250,12.55,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.251,0.500,15.40,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.501,0.750,17.90,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,0.751,1.000,20.65,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.001,1.250,22.55,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.251,1.500,24.45,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.501,1.750,25.60,250, +WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL_EXTRA_INSURANCE,1.751,2.000,27.50,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.001,0.010,6.00,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.011,0.020,6.33,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER,0.020,0.100,7.25,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER,0.001,0.100,8.90,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER,0.101,0.250,9.95,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER,0.251,0.500,12.80,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER,0.501,0.750,15.30,50 +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.001,0.100,9.00,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.101,0.250,10.05,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.251,0.500,12.90,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.501,0.750,15.40,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL,0.751,1.000,18.15,50 +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.001,1.250,20.05,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.251,1.500,21.95,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.501,1.750,23.10,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL,1.751,2.000,25.00,50, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.001,0.010,8.50,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.011,0.020,8.83,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,0.020,0.100,9.75,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.001,0.100,11.40,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.101,0.250,12.45,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.251,0.500,15.30,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,0.501,0.750,17.80,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.001,0.100,11.50,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.101,0.250,12.55,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.251,0.500,15.40,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.501,0.750,17.90,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,0.751,1.000,20.65,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.001,1.250,20.55,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.251,1.500,24.45,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.501,1.750,25.60,250, +WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,1.751,2.000,27.50,250, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LETTER,0.001,0.010,0.85,20, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LETTER,0.011,0.020,0.85,20, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LETTER,0.021,0.100,1.37,20, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LARGE_LETTER,0.001,0.100,2.38,20, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LARGE_LETTER,0.101,0.250,3.63,20, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LARGE_LETTER,0.251,0.500,5.08,20, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LARGE_LETTER,0.501,0.750,6.53,20, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0.001,0.100,3.25,20, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0.101,0.250,3.75,20, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0.251,0.500,5.30,20, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0.501,0.750,6.65,20, +WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0.751,1.000,8.06,20, +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, @@ -76,8 +384,74 @@ 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_STANDARD_FIRST_CLASS_LETTER,0.001,0.100,.63,20, -UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.001,0.100,.95,20, +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_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, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LARGE_LETTER,0.251,0.500,2.78,50, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_LARGE_LETTER,0.501,0.750,3.52,50, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0.001,1.000,4.40,50,SMALL +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,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, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LARGE_LETTER,0.001,0.100,1.84,50, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LARGE_LETTER,0.101,0.250,2.29,50, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LARGE_LETTER,0.251,0.500,2.61,50, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LARGE_LETTER,0.501,0.750,3.15,50, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_SMALL_PARCEL,0.001,1.000,3.90,50,SMALL +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_SMALL_PARCEL,1.001,2.000,3.90,50,SMALL +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_MEDIUM_PARCEL,0.001,1.000,5.99,50,MEDIUM +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_MEDIUM_PARCEL,1.001,2.000,5.99,50,MEDIUM +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_MEDIUM_PARCEL,2.001,5.000,14.85,50, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_MEDIUM_PARCEL,5.001,10.000,21.35,50, +UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_MEDIUM_PARCEL,10.001,20.000,29.65,50, +UK_STANDARD_FIRST_CLASS_LETTER,0.001,0.100,0.63,20, +UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.001,0.100,0.95,20, UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.101,0.250,1.26,20, UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.251,0.500,1.68,20, UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0.501,0.750,2.42,20, @@ -87,11 +461,86 @@ 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,20, -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0.001,1.000,4.40,20,SMALL -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,1.001,2.000,6.55,20,SMALL -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0.001,1.000,6.75,20,MEDIUM -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,1.001,2.000,10.00,20,MEDIUM -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,2.001,5.000,16.95,20, -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,5.001,10.000,23.00,20, -UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,10.001,20.000,34.50,20, \ No newline at end of file +UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,10.001,20.000,33.40, +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, +UK_STANDARD_SECOND_CLASS_LARGE_LETTER,0.251,0.500,1.51,20, +UK_STANDARD_SECOND_CLASS_LARGE_LETTER,0.501,0.750,2.05,20, +UK_STANDARD_SECOND_CLASS_SMALL_PARCEL,0.001,1.000,2.80,20,SMALL +UK_STANDARD_SECOND_CLASS_SMALL_PARCEL,1.001,2.000,2.80,20,SMALL +UK_STANDARD_SECOND_CLASS_MEDIUM_PARCEL,0.001,1.000,4.89,20,MEDIUM +UK_STANDARD_SECOND_CLASS_MEDIUM_PARCEL,1.001,2.000,4.89,20,MEDIUM +UK_STANDARD_SECOND_CLASS_MEDIUM_PARCEL,2.001,5.000,13.75,20, +UK_STANDARD_SECOND_CLASS_MEDIUM_PARCEL,5.001,10.000,20.25,20, +UK_STANDARD_SECOND_CLASS_MEDIUM_PARCEL,10.001,20.000,28.55,20, +PARCELFORCE_WORLDWIDE_EXPRESS_9,0.001,2.000,39.48,200, +PARCELFORCE_WORLDWIDE_EXPRESS_9,2.001,5.000,40.48,200, +PARCELFORCE_WORLDWIDE_EXPRESS_9,5.001,10.000,43.90,200, +PARCELFORCE_WORLDWIDE_EXPRESS_9,10.001,15.000,50.63,200, +PARCELFORCE_WORLDWIDE_EXPRESS_9,15.001,20.000,56.00,200, +PARCELFORCE_WORLDWIDE_EXPRESS_9,20.001,25.000,67.13.200, +PARCELFORCE_WORLDWIDE_EXPRESS_9,25.001,30.000,71.27,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10,0.001,2.000,29.46,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10,2.001,5.000,30.48,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10,5.001,10.000,33.90,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10,10.001,15.000,40.63,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10,15.001,20.000,46.01,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10,20.001,25.000,57.13,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10,25.001,30.000,61.27,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM,0.001,2.000,19.49,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM,2.001,5.000,20.48,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM,5.001,10.000,23.90,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM,10.001,15.000,30.64,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM,15.001,20.000,36.01,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM,20.001,25.000,47.14,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM,25.001,30.000,51.28,200, +PARCELFORCE_WORLDWIDE_EXPRESS_24,0.001,2.000,16.49,100, +PARCELFORCE_WORLDWIDE_EXPRESS_24,2.001,5.000,17.48,100, +PARCELFORCE_WORLDWIDE_EXPRESS_24,5.001,10.000,20.90,100, +PARCELFORCE_WORLDWIDE_EXPRESS_24,10.001,15.000,27.64,100, +PARCELFORCE_WORLDWIDE_EXPRESS_24,15.001,20.000,33.01,100, +PARCELFORCE_WORLDWIDE_EXPRESS_24,20.001,25.000,44.14,100, +PARCELFORCE_WORLDWIDE_EXPRESS_24,25.001,30.000,48.28,100, +PARCELFORCE_WORLDWIDE_EXPRESS_48,0.001,2.000,11.99,100, +PARCELFORCE_WORLDWIDE_EXPRESS_48,2.001,5.000,12.98,100, +PARCELFORCE_WORLDWIDE_EXPRESS_48,5.001,10.000,16.40,100, +PARCELFORCE_WORLDWIDE_EXPRESS_48,10.001,15.000,23.14,100, +PARCELFORCE_WORLDWIDE_EXPRESS_48,15.001,20.000,28.51,100, +PARCELFORCE_WORLDWIDE_EXPRESS_48,20.001,25.000,39.64,100, +PARCELFORCE_WORLDWIDE_EXPRESS_48,25.001,30.000,43.78,100, +PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY,0.001,2.000,48.48,200, +PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY,2.001,5.000,49.48,200, +PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY,5.001,10.000,52.90,200, +PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY,10.001,15.000,59.63,200, +PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY,15.001,20.000,65.00,200, +PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY,20.001,25.000,76.13,200, +PARCELFORCE_WORLDWIDE_EXPRESS_9_SATURDAY,25.001,30.000,80.27,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY,0.001,2.000,38.48,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY,2.001,5.000,39.48,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY,5.001,10.000,42.90,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY,10.001,15.000,49.63,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY,15.001,20.000,55.01,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY,20.001,25.000,66.13,200, +PARCELFORCE_WORLDWIDE_EXPRESS_10_SATURDAY,25.001,30.000,70.27,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY,0.001,2.000,28.49,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY,2.001,5.000,29.48,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY,5.001,10.000,33.90,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY,10.001,15.000,39.64,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY,15.001,20.000,45.01,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY,20.001,25.000,56.14,200, +PARCELFORCE_WORLDWIDE_EXPRESS_AM_SATURDAY,25.001,30.000,60.28,200, +PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY,0.001,2.000,25.49,100, +PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY,2.001,5.000,26.48,100 +PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY,5.001,10.000,29.90,100, +PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY,10.001,15.000,36.64,100, +PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY,15.001,20.000,42.01,100, +PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY,20.001,25.000,53.14,100, +PARCELFORCE_WORLDWIDE_EXPRESS_24_SATURDAY,25.001,30.000,57.28,100, +PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,0.001,2.000,21.99,100, +PARCELFORCE_WORLDWIDE_EXPRESS_48_SATURDAY,2.001,5.000,22.98,100, +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, \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv index fe79937..07696c6 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/5_cleanNameToMethod.csv @@ -1,21 +1,6 @@ -"internationallettersigned","International Signed Letter",WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LETTER,0,50,20 -"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,0,50,20 -"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,0,50,20 -"internationallettersigned","International Signed Letter",WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LETTER_EXTRA_INSURANCE,50.01,250,250 -"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_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 -"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50 -"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50 -"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50 -"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 -"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 -"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"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 @@ -25,19 +10,98 @@ "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 +"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 +"firstclasssignedformedium","Signed For: First Medium Parcel",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50 +"secondclasslettersignedfor","Signed For: Second Class Class Letter",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LETTER,0,50,50 +"secondclasslargelettersignedfor","Signed For: Second Class Class Large Letter",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_LARGE_LETTER,0,50,50 +"secondclasssmallparcelsignedfor","Signed For: Second Class Small Parcel",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_SMALL_PARCEL,0,50,50 +"secondclassmediumparcelsignedfor","Signed For: Second Class Medium Parcel",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_SECOND_CLASS_MEDIUM_PARCEL,0,50,50 "letter","Standard First Class Letter",UK_STANDARD_FIRST_CLASS_LETTER,0,20,20 "largeletter","Standard First Class Large Letter",UK_STANDARD_FIRST_CLASS_LARGE_LETTER,0,20,20 "firstclasssmall","Standard First Class Small Parcel",UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,0,20,20 -"firstclasssmall","Standard First Class Small Parcel",UK_STANDARD_FIRST_CLASS_SMALL_PARCEL,0,20,20 -"firstclassmedium","Standard First Class Medium Parcel",UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20 -"firstclassmedium","Standard First Class Medium Parcel",UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20 "firstclassmedium","Standard First Class Medium Parcel",UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20 -"firstclassmedium","Standard First Class Medium Parcel",UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20 -"firstclassmedium","Standard First Class Medium Parcel",UK_STANDARD_FIRST_CLASS_MEDIUM_PARCEL,0,20,20 -"firstclassrecordedsignedforsmall","First Class Parcel Small - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0,50,50 -"firstclassrecordedsignedforsmall","First Class Parcel Small - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_SMALL_PARCEL,0,50,50 -"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50 -"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50 -"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50 -"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50 -"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For",UK_CONFIRMED_ROYAL_MAIL_SIGNED_FOR_FIRST_CLASS_MEDIUM_PARCEL,0,50,50 \ No newline at end of file +"secondclassletter","Second Class: Letter",UK_STANDARD_SECOND_CLASS_LETTER,0,20,20 +"secondclasslargeletter","Second Class: Large Letter",UK_STANDARD_SECOND_CLASS_LARGE_LETTER,0,20,20 +"secondclasssmallparcel","Second Class: Small Parcel",UK_STANDARD_SECOND_CLASS_SMALL_PARCEL,0,20,20 +"secondclassmediumparcel","Second Class: Medium Parcel",UK_STANDARD_SECOND_CLASS_MEDIUM_PARCEL,0,20,20 +"internationalstandardletter","International Standard Letter",WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LETTER,0,20,20 +"internationalstandardletter","International Standard Letter",WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LETTER,0,20,20 +"internationalstandardletter","International Standard Letter",WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LETTER,0,20,20 +"internationalstandardlargeletter","International Standard Large Letter",WORLD_ZONE_EU_INTERNATIONAL_STANDARD_LARGE_LETTER,0,20,20 +"internationalstandardlargeletter","International Standard Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_STANDARD_LARGE_LETTER,0,20,20 +"internationalstandardlargeletter","International Standard Large Letter",WORLD_ZONE_TWO_INTERNATIONAL_STANDARD_LARGE_LETTER,0,20,20 +"internationalstandardsmallparcel","International Standard Small Parcel",WORLD_ZONE_EU_INTERNATIONAL_STANDARD_SMALL_PARCEL,0,20,20 +"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_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 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER,0,50,50 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationalsmallparceltrackedsigned","International Tracked and Signed Small Parcel",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0,50,50 +"internationalsmallparceltrackedsigned","International Tracked and Signed Small Parcel",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0,50,50 +"internationalsmallparceltrackedsigned","International Tracked and Signed Small Parcel",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL,0,50,50 +"internationalsmallparceltrackedsigned","International Tracked and Signed Small Parcel",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250 +"internationalsmallparceltrackedsigned","International Tracked and Signed Small Parcel",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250 +"internationalsmallparceltrackedsigned","International Tracked and Signed Small Parcel",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_AND_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250 +"internationaltrackedletter","International Tracked Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER,0,50,50 +"internationaltrackedletter","International Tracked Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER,0,50,50 +"internationaltrackedletter","International Tracked Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER,0,50,50 +"internationaltrackedletter","International Tracked Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationaltrackedletter","International Tracked Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationaltrackedletter","International Tracked Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationaltrackedlargeletter","International Tracked Large Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER,0,50,50 +"internationaltrackedlargeletter","International Tracked Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER,0,50,50 +"internationaltrackedlargeletter","International Tracked Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER,0,50,50 +"internationaltrackedlargeletter","International Tracked Large Letter",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationaltrackedlargeletter","International Tracked Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationaltrackedlargeletter","International Tracked Large Letter",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationaltrackedsmallparcel","International Tracked Small Parcel",WORLD_ZONE_EU_INTERNATIONAL_TRACKED_SMALL_PARCEL,0,50,50 +"internationaltrackedsmallparcel","International Tracked Small Parcel",WORLD_ZONE_ONE_INTERNATIONAL_TRACKED_SMALL_PARCEL,0,50,50 +"internationaltrackedsmallparcel","International Tracked Small Parcel",WORLD_ZONE_TWO_INTERNATIONAL_TRACKED_SMALL_PARCEL,0,50,50 +"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_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 +"internationalsignedlargeletter","International Signed Large Letter",WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER,0,50,50 +"internationalsignedlargeletter","International Signed Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER,0,50,50 +"internationalsignedlargeletter","International Signed Large Letter",WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER,0,50,50 +"internationalsignedlargeletter","International Signed Large Letter",WORLD_ZONE_EU_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationalsignedlargeletter","International Signed Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationalsignedlargeletter","International Signed Large Letter",WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_LARGE_LETTER_EXTRA_INSURANCE,50.01,250,250 +"internationalsignedsmallparcel","International Signed Small Parcel",WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL,0,50,50 +"internationalsignedsmallparcel","International Signed Small Parcel",WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL,0,50,50 +"internationalsignedsmallparcel","International Signed Small Parcel",WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL,0,50,50 +"internationalsignedsmallparcel","International Signed Small Parcel",WORLD_ZONE_EU_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250 +"internationalsignedsmallparcel","International Signed Small Parcel",WORLD_ZONE_ONE_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250 +"internationalsignedsmallparcel","International Signed Small Parcel",WORLD_ZONE_TWO_INTERNATIONAL_SIGNED_SMALL_PARCEL_EXTRA_INSURANCE,50.01,250,250 +"internationaleconomyletter","International Economy Letter",WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LETTER,0,20,20 +"internationaleconomyletter","International Economy Letter",WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LETTER,0,20,20 +"internationaleconomylargeletter","International Economy Large Letter",WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_LARGE_LETTER,0,20,20 +"internationaleconomylargeletter","International Economy Large Letter",WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_LARGE_LETTER,0,20,20 +"internationaleconomysmallparcel","International Economy Small Parcel",WORLD_ZONE_ONE_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0,20,20 +"internationaleconomysmallparcel","International Economy Small Parcel",WORLD_ZONE_TWO_INTERNATIONAL_ECONOMY_SMALL_PARCEL,0,20,20 +"parcelforceworldwideexpress9","Parcelforce Worldwide: Express 9",PARCELFORCE_WORLDWIDE_EXPRESS_9,0,200,200 +"parcelforceworldwideexpress10","Parcelforce Worldwide: Express 10",PARCELFORCE_WORLDWIDE_EXPRESS_10,0,200,200 +"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 diff --git a/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv b/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv index 48d685b..0adea46 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv +++ b/lib/Meanbee/RoyalmailPHPLibrary/data/6_cleanNameMethodGroup.csv @@ -1,12 +1,47 @@ -"internationallettersigned","International Signed Letter" -"internationallettertrackedsigned","International Tracked and Signed Letter" -"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter" +"specialdelivery9am","Special Delivery: Guaranteed by 9am" "specialdelivery1pm","Special Delivery: Guaranteed by 1pm" "specialdelivery1pmsaturday","Special Delivery: Guaranteed by 1pm Saturday" "specialdelivery9amsaturday","Special Delivery: Guaranteed by 9am Saturday" +"firstclasslettersignedfor","Signed For: First Class Letter" +"firstclasslargelettersignedfor","Signed For: First Class Large Letter" +"firstclasssignedforsmall","Signed For: First Small Parcel" +"firstclasssignedformedium","Signed For: First Medium Parcel" +"secondclasslettersignedfor","Signed For: Second Class Class Letter" +"secondclasslargelettersignedfor","Signed For: Second Class Class Large Letter" +"secondclasssmallparcelsignedfor","Signed For: Second Class Small Parcel" +"secondclassmediumparcelsignedfor","Signed For: Second Class Medium Parcel" "letter","Standard First Class Letter" "largeletter","Standard First Class Large Letter" "firstclasssmall","Standard First Class Small Parcel" "firstclassmedium","Standard First Class Medium Parcel" -"firstclassrecordedsignedforsmall","First Class Parcel Small - Signed For" -"firstclassrecordedsignedformedium","First Class Parcel Medium - Signed For" \ No newline at end of file +"secondclassletter","Second Class: Letter" +"secondclasslargeletter","Second Class: Large Letter" +"secondclasssmallparcel","Second Class: Small Parcel" +"secondclassmediumparcel","Second Class: Medium Parcel" +"internationalstandardletter","International Standard Letter" +"internationalstandardlargeletter","International Standard Large Letter" +"internationalstandardsmallparcel","International Standard Small Parcel" +"internationallettertrackedsigned","International Tracked and Signed Letter" +"internationallargelettertrackedandsigned","International Tracked and Signed Large Letter" +"internationalsmallparceltrackedsigned","International Tracked and Signed Small Parcel" +"internationaltrackedletter","International Tracked Letter" +"internationaltrackedlargeletter","International Tracked Large Letter" +"internationaltrackedsmallparcel","International Tracked Small Parcel" +"internationallettersigned","International Signed Letter" +"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" +"parcelforceworldwideexpress10","Parcelforce Worldwide: Express 10" +"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 From 567b6d2f499fa0265fc7e2de3f07541cab47cdd7 Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Thu, 7 Jan 2016 10:21:09 +0000 Subject: [PATCH 12/15] #37: Update the Library files to follow code review changes Updates the library files with the code changes required by code review --- README.md | 4 +- lib/Meanbee/RoyalmailPHPLibrary/README.md | 51 +++++++++++++++++--- lib/Meanbee/RoyalmailPHPLibrary/src/Data.php | 49 ++++++++++++------- 3 files changed, 79 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 4bca20a..66777b7 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,6 @@ At the time of writing, the module has over 8.8k downloads. A popular choice fo ## Unit Testing -Run `phpunit` with the Ecomdev_PHPUnit module installed, and this module's tests will be picked up. \ No newline at end of file +Run `phpunit` with the Ecomdev_PHPUnit module installed, and this module's tests will be picked up. + +Please note, the countries Azores, Madeira, Corisca, Kosovo, and the Balearic Islands are not covered by magento despite the country codes being included. \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/README.md b/lib/Meanbee/RoyalmailPHPLibrary/README.md index d5ea100..71cb53b 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/README.md +++ b/lib/Meanbee/RoyalmailPHPLibrary/README.md @@ -23,11 +23,50 @@ This program is automatically unit tested with phpunit and travis. ## CSV data format -This library uses four 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 - maps country code to world zone -2. 2_zoneToDeliveryMethod.csv - maps world zone to all possible shipping methods in that world zone -3. 3_deliveryMethodMeta.csv - maps delivery method to minimum and maximum price available to the method, max insurance available on method, and the clean method name -4. 4_deliveryToPrice.csv - maps method name to minimum and maximum weight, max insurance value, price of method, and max insurance value +1. [1_countryCodeToZone.csv](https://github.com/meanbee/royalmail/blob/develop/lib/Meanbee/RoyalmailPHPLibrary/data/1_countryToZone.csv) + * Country code + * World zone. Each country, defined by its country code can be in more then one zone. The code "GB" for Great Britain is in the EU and the GB World zone. There are four world zones: + * WORLD_ZONE_GB + * 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. + + 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) + * 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) + * 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. + +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. -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. \ No newline at end of file diff --git a/lib/Meanbee/RoyalmailPHPLibrary/src/Data.php b/lib/Meanbee/RoyalmailPHPLibrary/src/Data.php index b69a46a..6f61f8d 100644 --- a/lib/Meanbee/RoyalmailPHPLibrary/src/Data.php +++ b/lib/Meanbee/RoyalmailPHPLibrary/src/Data.php @@ -3,6 +3,19 @@ class Meanbee_RoyalmailPHPLibrary_Data { + // Constants to link to the appropriate columns in the CSV files + const COUNTRY_CODE = 0; + const WORLD_ZONE = 0; + const SHIPPING_METHOD = 0; + const METHOD_MIN_VALUE = 1; + const METHOD_MAX_VALUE = 2; + const METHOD_MIN_WEIGHT = 1; + const METHOD_MAX_WEIGHT = 2; + const METHOD_PRICE = 3; + const METHOD_INSURANCE_VALUE = 4; + const METHOD_NAME_CLEAN = 4; + const METHOD_SIZE = 5; + // Maps the method group name to the clean name and // the related method public $mappingCleanNameToMethod = array(); @@ -117,7 +130,7 @@ private function getCountryCodeData($country_code, $mappingCountryToZone) // Get All array items that match the country code $countryCodeData = array(); foreach ($mappingCountryToZone as $item) { - if (isset($item[0]) && $item[0] == $country_code) { + if (isset($item[self::COUNTRY_CODE]) && $item[self::COUNTRY_CODE] == $country_code) { foreach ($item as $keys) { $countryCodeData[] = $keys; } @@ -151,7 +164,7 @@ private function getZoneToMethod($sortedCountryCodeMethods, $mappingZoneToMethod foreach ($sortedCountryCodeMethods as $key => $value) { foreach ($value as $zone) { foreach ($mappingZoneToMethod as $item) { - if (isset($item[0]) && $item[0] == $zone) { + if (isset($item[self::WORLD_ZONE]) && $item[self::WORLD_ZONE] == $zone) { foreach ($item as $keys) { $mappingZoneData[] = $keys; } @@ -195,8 +208,8 @@ private function getMethodToMeta($packageValue, $sortedZoneToMethods, $mappingMe foreach ($sortedZoneToMethods as $key => $value) { foreach ($value as $method) { foreach ($mappingMethodToMeta as $item) { - if (isset($item[0]) && $item[0] == $method) { - if ($packageValue >= $item[1] && $packageValue <= $item[2]) { + if (isset($item[self::SHIPPING_METHOD]) && $item[self::SHIPPING_METHOD] == $method) { + if ($packageValue >= $item[self::METHOD_MIN_VALUE] && $packageValue <= $item[self::METHOD_MAX_VALUE]) { $mappingZoneMethodData[] = array($item); } @@ -228,26 +241,26 @@ private function getMethodToPrice($package_weight, $sortedMethodToMeta, $mapping { $mappingDeliveryToPriceData = array(); foreach ($sortedMethodToMeta as $method) { - foreach ($method as $thing) { - foreach ($thing as $key => $value) { + foreach ($method as $meta) { + foreach ($meta as $key => $value) { foreach ($value as $methodData) { foreach ($mappingDeliveryToPrice as $item) { - if (isset($item[0]) && $item[0] == $methodData) { - if ($package_weight >= $item[1] && $package_weight <= $item[2]) { - $objectArray = array( - 'shippingMethodName' => $item[0], - 'minimumWeight' => $item[1], - 'maximumWeight' => $item[2], - 'methodPrice' => $item[3], - 'insuranceValue' => $item[4], - 'shippingMethodNameClean' => $value[4] + if (isset($item[self::SHIPPING_METHOD]) && $item[self::SHIPPING_METHOD] == $methodData) { + if ($package_weight >= $item[self::METHOD_MIN_WEIGHT] && $package_weight <= $item[self::METHOD_MAX_WEIGHT]) { + $resultArray = array( + 'shippingMethodName' => $item[self::SHIPPING_METHOD], + 'minimumWeight' => $item[self::METHOD_MIN_WEIGHT], + 'maximumWeight' => $item[self::METHOD_MAX_WEIGHT], + 'methodPrice' => $item[self::METHOD_PRICE], + 'insuranceValue' => $item[self::METHOD_INSURANCE_VALUE], + 'shippingMethodNameClean' => $value[self::METHOD_NAME_CLEAN] ); - if (isset($item[5])) { - $objectArray['size'] = $item[5]; + if (isset($item[self::METHOD_SIZE])) { + $resultArray['size'] = $item[self::METHOD_SIZE]; } - $mappingDeliveryToPriceData[] = $objectArray; + $mappingDeliveryToPriceData[] = $resultArray; } } From 6dfe6c8ce910fe51cf55154c45338330254d85f8 Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Thu, 7 Jan 2016 10:31:02 +0000 Subject: [PATCH 13/15] #37: Correct spelling mistake in readme file This corrects a spelling mistake in the Readme file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66777b7..ecbca4f 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,4 @@ At the time of writing, the module has over 8.8k downloads. A popular choice fo Run `phpunit` with the Ecomdev_PHPUnit module installed, and this module's tests will be picked up. -Please note, the countries Azores, Madeira, Corisca, Kosovo, and the Balearic Islands are not covered by magento despite the country codes being included. \ No newline at end of file +Please note, the countries Azores, Madeira, Corisca, Kosovo, and the Balearic Islands are not covered by Magento despite the country codes being included. \ No newline at end of file From 9d8cdeb84a8b628bd7a564f716672ab363ba8774 Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Thu, 7 Jan 2016 14:01:36 +0000 Subject: [PATCH 14/15] #38: Update the package files and versioning for magento packaging --- .../Meanbee/Royalmail/etc/config.xml | 2 +- .../Meanbee/Royalmail/etc/system.xml | 2 +- package.xml | 23 +++++++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/code/community/Meanbee/Royalmail/etc/config.xml b/app/code/community/Meanbee/Royalmail/etc/config.xml index fdf4105..8b9680c 100644 --- a/app/code/community/Meanbee/Royalmail/etc/config.xml +++ b/app/code/community/Meanbee/Royalmail/etc/config.xml @@ -22,7 +22,7 @@ - 2.6.5 + 2.7.0 diff --git a/app/code/community/Meanbee/Royalmail/etc/system.xml b/app/code/community/Meanbee/Royalmail/etc/system.xml index 422526f..6dffac0 100644 --- a/app/code/community/Meanbee/Royalmail/etc/system.xml +++ b/app/code/community/Meanbee/Royalmail/etc/system.xml @@ -90,7 +90,7 @@ 1 1 1 - Select the shipping options that you would like to appear to the customer as an option. Any options that are not selected will not be presented to the customer. + Select the shipping options that you would like to appear to the customer as an option. Any options that are not selected will not be presented to the customer. Hold CTRL + Click on Windows or CMD + Click on Mac to select multiple shipping methods. Alternately, press CTRL or CMD + A to select all shipping methods. diff --git a/package.xml b/package.xml index 05a2d4c..915e266 100644 --- a/package.xml +++ b/package.xml @@ -1,18 +1,20 @@ <_> - WZE4hknVqBLFeb2i + gKO33Xg2wx6wdQza Meanbee_Royalmail community 2 - 1 Automatically calculated Royal Mail delivery methods. Automatically calculated Royal Mail delivery methods. Open Software License v3.0 (OSL-3.0) http://www.opensource.org/licenses/osl-3.0.php - 2.6.2 + 2.7.0 stable - * Added second class letter and large letter rates which were previously missing + *Update to 2015 prices + +*Migrate to using a library format to allow for easier future updates + Meanbee @@ -25,7 +27,7 @@ 5.2.0 - 6.0.0 + 7.1.0 @@ -41,7 +43,7 @@ - + @@ -61,30 +63,31 @@ magelocal magecommunity mageetc + magelib Meanbee/Royalmail modules/Meanbee_Royalmail.xml + Meanbee/RoyalmailPHPLibrary file dir file + dir + + - 1 - 200 - - From fbd49c8b94d389f65903913984b5efabc2d919e8 Mon Sep 17 00:00:00 2001 From: Aaron Rickard Date: Thu, 7 Jan 2016 14:09:14 +0000 Subject: [PATCH 15/15] #38: Update gitignore file Updates the gitignore file --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0cfc422..d35d08d 100644 --- a/.gitignore +++ b/.gitignore @@ -2645,4 +2645,6 @@ composer.lock /var/package/Phoenix_Moneybookers-1.14.2.2.xml /var/session /var/cache -/var/phpunit.cache \ No newline at end of file +/var/phpunit.cache +app/etc/local.xml +app/etc/local.xml.phpunit