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

Las Palmas and Tenerife should be represented by Canary Islands in UPS #20222

Merged
merged 3 commits into from
Jan 23, 2019
Merged

Las Palmas and Tenerife should be represented by Canary Islands in UPS #20222

merged 3 commits into from
Jan 23, 2019

Conversation

duckchip
Copy link
Contributor

@duckchip duckchip commented Jan 11, 2019 •
edited
Loading

For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country

Description

For Puerto Rico and Guam the country id was already changed but not for countries part of the Canary Islands.

This PR changes the country id necessary for the UPS request to 'IC' instead of 'ES'

Manual testing scenarios (*)

  1. Add Product to cart
  2. Go to cart or checkout page
  3. Change Country to Spain
  4. Change region to either Las Palmas or Santa Cruz de Tenerife
  5. Shipping rate will be calculated with country id 'IC' (Canary Islands) instead of Spain

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

@magento-cicd2
Copy link
Contributor

magento-cicd2 commented Jan 11, 2019 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@magento-engcom-team
Copy link
Contributor

Hi @duckchip. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento-engcom-team give me test instance - deploy test instance based on PR changes
  • @magento-engcom-team give me 2.3-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

@miguelbalparda miguelbalparda self-assigned this Jan 11, 2019
@miguelbalparda
Copy link
Contributor

Hi @duckchip! Can you please sign the CLA so we can process this? Thanks!

@magento-engcom-team magento-engcom-team added this to the Release: 2.3.1 milestone Jan 14, 2019
@magento-engcom-team
Copy link
Contributor

Hi @miguelbalparda, thank you for the review.
ENGCOM-3850 has been created to process this Pull Request

@magento-engcom-team
Copy link
Contributor

@duckchip thank you for contributing. Please accept Community Contributors team invitation here to gain extended permissions for this repository.

@duckchip duckchip mentioned this pull request Jan 14, 2019
Merged
4 tasks
@magento-engcom-team magento-engcom-team merged commit 204e9d8 into magento:2.3-develop Jan 23, 2019
@ghost
Copy link

ghost commented Jan 23, 2019

Hi @duckchip, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

magento-engcom-team pushed a commit that referenced this pull request Jan 23, 2019
@sidolov
ENGCOM-3850: Las Palmas and Tenerife should be represented by Canary …
6457701 
…Islands in UPS #20222
@magento-engcom-team
Copy link
Contributor

Hi @duckchip. Thank you for your contribution.
We will aim to release these changes as part of 2.3.1.
Please check the release notes for final confirmation.

magento-engcom-team added a commit that referenced this pull request Jan 31, 2019
@magento-engcom-team
ENGCOM-4005: [Backport]#20222 Canary islands in ups carrier 2.2 #20285
f9fc94e 
 - Merge Pull Request #20285 from duckchip/magento2:canary_islands_in_ups_carrier_2.2
 - Merged commits:
   1. 1a0ecd6
   2. d741b30
   3. 41d641e
magento-engcom-team pushed a commit that referenced this pull request Jan 31, 2019
@sidolov
ENGCOM-4005: [Backport]#20222 Canary islands in ups carrier 2.2 #20285
818d1a1
magento-engcom-team added a commit that referenced this pull request Jan 31, 2019
@magento-engcom-team
🔃 [EngCom] Public Pull Requests - 2.2-develop
d700436 
Accepted Public Pull Requests:
 - #20739: [Backport] issue fixed #20563 Go to shipping information, Update qty & Addresses� (by @amol2jcommerce)
 - #20744: [Backport] recent-order-product-title-misaligned (by @amol2jcommerce)
 - #20270: [Backport] Fixed-Widget-option-labels-are-misalinged (by @amol2jcommerce)
 - #20613: [Backport] admin-order-info-issue2.2 (by @dipti2jcommerce)
 - #20418: [Backport] issue fixed #20304 No space between step title and saved address in c� (by @shikhamis11)
 - #20285: [Backport]#20222 Canary islands in ups carrier 2.2 (by @duckchip)
 - #18809: [Backport] catalog:images:resize total images count calculates incorrectly #18387 (by @vpodorozh)
 - #19461: [Backport 2.2] issue #18931 fixed. (by @JeroenVanLeusden)
 - #19655: Fixed - Shipping issue on PayPal Express #14712 (by @ssp58bleuciel)


Fixed GitHub Issues:
 - #20563: Go to shipping information, Update qty & Addresses and Enter a new address button Not aligned from left and right in 767px screen size (reported by @swetacedcoss) has been fixed in #20739 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. 6e7281d

 - #20500: Recent Order Product Title Misaligned in Sidebar (reported by @parag2jcommerce) has been fixed in #20744 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. a971270
     2. 81d8781
     3. 73cb5c8

 - #20113: Widget option labels are misalinged (reported by @yashwant2jcommerce) has been fixed in #20270 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. 936d71f
     2. 935d3d2

 - #20609: Currency rate value not align proper in order information tab  when we create creditmemo from admin (reported by @dipti2jcommerce) has been fixed in #20613 by @dipti2jcommerce in 2.2-develop branch
   Related commits:
     1. 7bf7ce1

 - #20304: No space between step title and saved address in checkout  (reported by @swetacedcoss) has been fixed in #20418 by @shikhamis11 in 2.2-develop branch
   Related commits:
     1. 16d7461

 - #18387: catalog:images:resize fails to process all images -> Possible underlying Magento/Framework/DB/Query/Generator issue (reported by @gwharton) has been fixed in #18809 by @vpodorozh in 2.2-develop branch
   Related commits:
     1. f114f2a
     2. 95eeb9f
     3. 84590de
     4. 4653d3e
     5. d2e5345
     6. 2539a71
     7. 76bd089
     8. b81b550
     9. 051d82d
     10. 10a1a88

 - #18931: Product added to shopping cart / comparison list message not translated by default (reported by @arnoudhgz) has been fixed in #19461 by @JeroenVanLeusden in 2.2-develop branch
   Related commits:
     1. 3b521b0

 - #14712: Shipping issue on PayPal Express (reported by @raymond62) has been fixed in #19655 by @ssp58bleuciel in 2.2-develop branch
   Related commits:
     1. 8a059e6
     2. 8bdcca9
     3. c3d5010
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miguelbalparda miguelbalparda miguelbalparda approved these changes

Assignees

@miguelbalparda miguelbalparda

Labels
Component: Shipping Component: Ups Progress: accept Release Line: 2.3
Projects
None yet
Milestone
Release: 2.3.1
Development

Successfully merging this pull request may close these issues.
6 participants
@duckchip @magento-cicd2 @magento-engcom-team @miguelbalparda @tristanhofman @p-bystritsky