Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mage_Usa: added "USPS Ground Advantage" and removed "First Class Package" #3413

Merged
merged 6 commits into from
Aug 29, 2023
Merged

Mage_Usa: added "USPS Ground Advantage" and removed "First Class Package" #3413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b607f3
Added USPS Ground Advantage to Mage_Usa
fballiano Jul 27, 2023
fd11a3b
Removed First Class Package
fballiano Jul 27, 2023
db79659
Added 1058 to config.xml
fballiano Jul 28, 2023
a0e5f4f
Merge branch 'main' into usps
fballiano Aug 17, 2023
884d0e3
Merge branch 'main' into usps
fballiano Aug 24, 2023
5d81fc3
Merge branch 'main' into usps
fballiano Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,6 @@ public function getCode($type, $code = '')
'0_FCLE' => Mage::helper('usa')->__('First-Class Mail Large Envelope'),
'0_FCL' => Mage::helper('usa')->__('First-Class Mail Letter'),
'0_FCSL' => Mage::helper('usa')->__('First-Class Mail Stamped Letter'),
'0_FCP' => Mage::helper('usa')->__('First-Class Package Service - Retail'),
fballiano marked this conversation as resolved.
Show resolved Hide resolved
'0_FCPC' => Mage::helper('usa')->__('First-Class Mail Postcards'),
'1' => Mage::helper('usa')->__('Priority Mail'),
'2' => Mage::helper('usa')->__('Priority Mail Express Hold For Pickup'),
Expand Down Expand Up @@ -569,7 +568,6 @@ public function getCode($type, $code = '')
'57' => Mage::helper('usa')->__('Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes'),
'58' => Mage::helper('usa')->__('Priority Mail Regional Rate Box C'),
'59' => Mage::helper('usa')->__('Priority Mail Regional Rate Box C Hold For Pickup'),
'61' => Mage::helper('usa')->__('First-Class Package Service'),
'62' => Mage::helper('usa')->__('Priority Mail Express Padded Flat Rate Envelope'),
'63' => Mage::helper('usa')->__('Priority Mail Express Padded Flat Rate Envelope Hold For Pickup'),
'64' => Mage::helper('usa')->__('Priority Mail Express Sunday/Holiday Delivery Padded Flat Rate Envelope'),
Expand Down Expand Up @@ -599,13 +597,13 @@ public function getCode($type, $code = '')
'INT_24' => Mage::helper('usa')->__('Priority Mail International DVD Flat Rate priced box'),
'INT_25' => Mage::helper('usa')->__('Priority Mail International Large Video Flat Rate priced box'),
'INT_27' => Mage::helper('usa')->__('Priority Mail Express International Padded Flat Rate Envelope'),
'1058' => Mage::helper('usa')->__('USPS Ground Advantage'),
],

'service_to_code' => [
'0_FCLE' => 'First Class',
'0_FCL' => 'First Class',
'0_FCSL' => 'First Class',
'0_FCP' => 'First Class',
'0_FCPC' => 'First Class',
'1' => 'Priority',
'2' => 'Priority Express',
Expand Down Expand Up @@ -648,7 +646,6 @@ public function getCode($type, $code = '')
'57' => 'Priority Express',
'58' => 'Priority',
'59' => 'Priority',
'61' => 'First Class',
'62' => 'Priority Express',
'63' => 'Priority Express',
'64' => 'Priority Express',
Expand Down Expand Up @@ -678,6 +675,7 @@ public function getCode($type, $code = '')
'INT_24' => 'Priority',
'INT_25' => 'Priority',
'INT_27' => 'Priority Express',
'1058' => 'Ground Advantage',
],

// Added because USPS has different services but with same CLASSID value, which is "0"
Expand All @@ -686,7 +684,6 @@ public function getCode($type, $code = '')
'First-Class Mail Letter' => '0_FCL',
'First-Class Mail Stamped Letter' => '0_FCSL',
'First-Class Mail Metered Letter' => '72',
'First-Class Package Service - Retail' => '0_FCP',
],

'first_class_mail_type' => [
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Usa/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
<usps>
<active>0</active>
<sallowspecific>0</sallowspecific>
<allowed_methods>0_FCLE,0_FCL,0_FCSL,0_FCP,0_FCPC,1,2,3,4,6,7,13,15,16,17,22,23,25,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,53,57,58,59,61,62,63,64,72,INT_1,INT_2,INT_4,INT_5,INT_6,INT_7,INT_8,INT_9,INT_10,INT_11,INT_12,INT_13,INT_14,INT_15,INT_16,INT_17,INT_18,INT_19,INT_20,INT_21,INT_22,INT_23,INT_24,INT_25,INT_27</allowed_methods>
<allowed_methods>0_FCLE,0_FCL,0_FCSL,0_FCPC,1,2,3,4,6,7,13,15,16,17,22,23,25,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,53,57,58,59,62,63,64,72,INT_1,INT_2,INT_4,INT_5,INT_6,INT_7,INT_8,INT_9,INT_10,INT_11,INT_12,INT_13,INT_14,INT_15,INT_16,INT_17,INT_18,INT_19,INT_20,INT_21,INT_22,INT_23,INT_24,INT_25,INT_27,1058</allowed_methods>
<container>VARIABLE</container>
<cutoff_cost/>
<free_method/>
Expand Down
Loading