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.

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

Fix incorrect DHL Product codes #12666

Merged
merged 8 commits into from
Dec 14, 2017
Merged

Fix incorrect DHL Product codes #12666

merged 8 commits into from
Dec 14, 2017

Conversation

gwharton
Copy link
Contributor

There are three DHL product codes in the DHL Shipping module that are incorrect.

Description

Product Code "1" changed from "Customer Services" to "Domestic express 12:00"
Product Code "I" changed from "Break bulk economy" to "Domestic express 9:00"
Product Code "O" changed from "Others" to "Domestic express 10:30"

DHL product codes are now inline with those published in latest DHL products and services guide.

See DHLIS1 - Products and Services

Fixed Issues (if relevant)

N/A

Manual testing scenarios

N/A

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)

gwharton added 5 commits December 13, 2017 10:39
Updated product codes for Products I, O and 1 in accordance with DHL Document DHLIS1 - Products and Services Version 2.1

Legacy product codes, no longer listed in the above document left in place and not changed.

http://www.dhl.co.uk/content/dam/downloads/uk/Express/PDFs/developer_centre/dhlis1_products_and_services.pdf
Old code "I" was not removed in initial commit for some reason.
Added product codes to i18n
These codes have been renamed, so entries removed from i18n
Added quotes around strings in i18n
@sidolov sidolov self-assigned this Dec 13, 2017
@sidolov sidolov added this to the December 2017 milestone Dec 13, 2017
@sidolov
Copy link
Contributor

sidolov commented Dec 13, 2017

Hi @gwharton , in provided link to documentation I found records for:
I => 'Domestic express 9:00'
1 => 'Domestic express 12:00'

but I can't find information about:
O =>Domestic express 10:30'
in document code 'O' matching with 'Express 09:00'

Please, help me understand why record with code 'O' has changed.

Product code "O" changed in error. This reverts the change.
@gwharton
Copy link
Contributor Author

@sidolov Yes, you are quite correct. I missed the fact that the product code "O" is not listed in the documents. I have reverted the change to product code "O", as certainly in the UK, there is no such service "Domestic Express 10:30"

I had incorrectly found the change to the "O" product code in the code base for another shopping cart application and copied it over into this update. My mistake. Perhaps in the US, where there may be a domestic express 10:30 service, that code "O" is indeed used, but I can't find any evidence for it in the docs.

I have double checked my test data from the DHL test environment and product codes "1" and "I" are both being returned from DHL with the correct updated product description, as per this PR. No product with code "O" is present in any returns.

@sidolov
Copy link
Contributor

sidolov commented Dec 13, 2017

@gwharton thanks for quick response!

@sidolov
Copy link
Contributor

sidolov commented Dec 14, 2017

Changes covered with unit test

@magento-team magento-team merged commit b9d01bf into magento:2.2-develop Dec 14, 2017
@gwharton
Copy link
Contributor Author

Thanks all for a speedy merge.

@sidolov I'm not sure on what process to follow to get this backported into 2.3-develop aswell. Is that a process where the same commits can be merged into the different branch through some automated process, or do I need to branch 2.3-develop and manually make the same changes again and generate another PR.

@gwharton gwharton deleted the 2.2-develop-gw-dhl branch December 14, 2017 21:05
@gwharton gwharton restored the 2.2-develop-gw-dhl branch December 14, 2017 21:11
@gwharton gwharton deleted the 2.2-develop-gw-dhl branch December 28, 2017 11:19
magento-team pushed a commit that referenced this pull request Jan 3, 2018
…roduct codes #12905

 - Merge Pull Request #12905 from gwharton/magento2:2.3-develop-gw-dhl
 - Merged commits:
   1. f3409be
magento-team pushed a commit that referenced this pull request Jan 3, 2018
magento-team added a commit that referenced this pull request Jan 3, 2018
Accepted Public Pull Requests:
 - #12905: [Backport #12666 into 2.3-develop] Fix incorrect DHL Product codes (by @gwharton)
 - #12896: Add product ID and SKU to wishlist customer data (by @jameshalsall)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants