OneClick TNT module integration (#191) #266
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mehdichaouch
suggested changes
Feb 23, 2018
| $formattedAddress = array( | ||
| 'email' => $this->apiData['user']['email'], | ||
| 'firstname' => isset($customerAddress['first_name']) ? $customerAddress['first_name'] : '', | ||
| 'lastname' => isset($customerAddress['last_name']) ? $customerAddress['last_name'] : '', | ||
| 'telephone' => $this->apiData['user']['phone'], | ||
| 'street' => $street, | ||
| 'postcode' => isset($customerAddress['postcode']) ? $customerAddress['postcode'] : '', | ||
| 'city' => isset($customerAddress['city']) ? $customerAddress['city'] : '', | ||
| 'city' => $city ? $city : isset($customerAddress['city']) ? $customerAddress['city'] : '', | ||
| //'city' => isset($customerAddress['city']) ? $customerAddress['city'] : '', |
| @@ -534,4 +540,23 @@ private function clearQuoteItemsCache() | |||
| $address->unsetData('cached_items_nonominal'); | |||
| } | |||
| } | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
Remove this empty line
| $formattedAddress = array( | ||
| 'email' => $this->apiData['user']['email'], | ||
| 'firstname' => isset($customerAddress['first_name']) ? $customerAddress['first_name'] : '', | ||
| 'lastname' => isset($customerAddress['last_name']) ? $customerAddress['last_name'] : '', | ||
| 'telephone' => $this->apiData['user']['phone'], | ||
| 'street' => $street, | ||
| 'postcode' => isset($customerAddress['postcode']) ? $customerAddress['postcode'] : '', | ||
| 'city' => isset($customerAddress['city']) ? $customerAddress['city'] : '', | ||
| 'city' => $city ? $city : isset($customerAddress['city']) ? $customerAddress['city'] : '', |
|
|
||
|
|
||
| /** | ||
| * Get city name from the zipCode |
There was a problem hiding this comment.
- Get city name from the zipCode ; Specific for TNT module
rus-daniel
force-pushed
the
oc-tnt-module-integration
branch
from
8063589
to
99b64a3
Compare
mehdichaouch
suggested changes
Feb 23, 2018
| */ | ||
| class Oyst_OneClick_Helper_ZipMap | ||
| { | ||
| const ZIP_MAP = array( |
There was a problem hiding this comment.
In PHP 5.3 https://travis-ci.org/oystparis/oyst-1click-magento/jobs/345208028#L963
So could you use a property.
rus-daniel
force-pushed
the
oc-tnt-module-integration
branch
from
466b2b2
to
49bd268
Compare
| if (isset($customerAddress['postcode'])) { | ||
| $city = $this->mapCityZipCode($customerAddress['postcode']); | ||
|
|
||
| if (is_null($city)) { |
There was a problem hiding this comment.
this if block have to be outside of if (isset($customerAddress['postcode'])) {
rus-daniel
force-pushed
the
oc-tnt-module-integration
branch
from
7ca7699
to
cdbabae
Compare
mehdichaouch
approved these changes
Feb 26, 2018
mehdichaouch
force-pushed
the
oc-tnt-module-integration
branch
from
cdbabae
to
bdd4f2f
Compare
mehdichaouch
force-pushed
the
oc-tnt-module-integration
branch
from
bdd4f2f
to
7cb7452
Compare
StefBrito
approved these changes
Mar 28, 2018
mehdichaouch
force-pushed
the
oc-tnt-module-integration
branch
from
7cb7452
to
ad5e752
Compare
mehdichaouch
force-pushed
the
oc-tnt-module-integration
branch
from
ad5e752
to
ccafeaf
Compare
mehdichaouch
force-pushed
the
oc-tnt-module-integration
branch
from
ccafeaf
to
842c9a9
Compare
mehdichaouch
force-pushed
the
oc-tnt-module-integration
branch
from
842c9a9
to
8d8871d
Compare
mehdichaouch
force-pushed
the
oc-tnt-module-integration
branch
from
8d8871d
to
f6cca78
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.