-
Notifications
You must be signed in to change notification settings - Fork 212
@W-20540715 MERGE 1CC TO DEVELOP #3552
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
Merged
Merged
Changes from 38 commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
a903665
One click checkout
syadupathi-sf 1e7e5fd
changes to fix install, tests and lint - needs to be reviewed
syadupathi-sf b707b09
Change log
syadupathi-sf a72864b
revert the test change in pwa-kit-runtime
syadupathi-sf 0fd5d2c
Change commerce-sdk-react package-lock in an attempt to get the CI wo…
syadupathi-sf fdb57a2
Increase bundle size of template-retail-react-app by 1KB
syadupathi-sf 355bc0d
@W-20542850 Remove promotion from Shipping Method summary view (#3563)
syadupathi-sf 96f1b89
W-19728108 Add amount to payment instrument in the basket (#3568)
syadupathi-sf 5c8c6ce
W-19728108 Amount for the registered shopper (#3572)
syadupathi-sf 8fd1ab2
W-20892453 Remove store pickup shipping option (#3575)
syadupathi-sf 81973db
@W-20892497 Show Phone number in Contact Info summary (#3576)
syadupathi-sf 128ccd5
@W-20892554 Show spinner when user registration checkbox is clicked (…
syadupathi-sf a5deb6c
@W-20892592 Remove gift messaging for multi shipment (#3579)
syadupathi-sf 80c1c80
@W-20892530 @W-20892577 Billing Address Validation and Using contact …
syadupathi-sf 0e79176
Merge branch 'develop' into feature/1cc_merge
syadupathi-sf a0d8325
@W-20931438 Add spinner for place order button (#3587)
syadupathi-sf 35a9a4d
Update isomorphic version to the newly released version (#3592)
syadupathi-sf d6fe32c
Merge branch 'develop' into feature/1cc_merge
syadupathi-sf b9cb29d
Fix SDK tests (#3593)
syadupathi-sf b7515c4
@W-20931758 Allow guest shopper to change payment (#3591)
syadupathi-sf c292a78
@W-21000333: [BOPIS] Should skip pick up address (#3601)
dannyphan2000 9fa4455
W-21005962 Disable user registration when billing address is not vali…
syadupathi-sf 411fc67
@W-21000338: [BOPIS] Auto-populate billing address with default addre…
dannyphan2000 dbb914e
@W-21006290: [BOPIS] Continue to Shipping Address label fix for BOPIS…
dannyphan2000 9c618de
@W-21000344: [BOPIS] Pickup address component enhancement (#3607)
dannyphan2000 753f306
W-21005976 Newly registered user can change payment (#3608)
syadupathi-sf 4f04c56
@W-21038080: [1CC][PWA] Add new feature toggle in config to template …
dannyphan2000 8a25361
@W-21038080: Rework to use billing address phone number for guest sho…
dannyphan2000 aff72eb
@ W-20540715 Address 1CC feature branch review comments (#3619)
syadupathi-sf b73115a
Merge branch 'develop' into feature/1cc_merge
syadupathi-sf 44b2347
test
syadupathi-sf 7ed0da9
passwordless mode updates
syadupathi-sf e6b9f3d
fix unit test
syadupathi-sf 77551f2
@W-20892603: Remove empty shipment fix (#3622)
dannyphan2000 6649505
Update packages/template-retail-react-app/app/pages/checkout-one-clic…
syadupathi-sf 5144503
revert to generic error message as per code review comment
syadupathi-sf 3db7729
activity event tracking for 1cc (#3627)
kumaravinashcommercecloud 82e8e36
Merge branch 'develop' into feature/1cc_merge
syadupathi-sf 1eb4f7b
test failure (#3629)
kumaravinashcommercecloud File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "@salesforce/commerce-sdk-react", | ||
| "version": "4.4.0-dev", | ||
| "version": "5.0.0-dev", | ||
| "description": "A library that provides react hooks for fetching data from Commerce Cloud", | ||
| "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/ecom-react-hooks#readme", | ||
| "bugs": { | ||
|
|
@@ -40,7 +40,7 @@ | |
| "version": "node ./scripts/version.js" | ||
| }, | ||
| "dependencies": { | ||
| "commerce-sdk-isomorphic": "4.2.0", | ||
| "commerce-sdk-isomorphic": "5.0.0-preview.1", | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Linking to the PR that will release isomorphic v5: SalesforceCommerceCloud/commerce-sdk-isomorphic#268 |
||
| "js-cookie": "^3.0.1", | ||
| "jwt-decode": "^4.0.0" | ||
| }, | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
13 changes: 13 additions & 0 deletions
13
packages/template-retail-react-app/app/assets/svg/credit-card.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
commerce-sdk-reactpackage will need its major version bumped up too. Historically, whenever we jumped to the next major version of this underlying dependency, we also bumped the major version of our package.Call this npm script:
npm run bump-version:commerce-sdk-react -- 100.0.0Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be 5.0.0? 100.0.0 is an example, I assume @vmarta
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@syadupathi-sf commerce-sdk-react is currently at
4.4.0-dev. So pls bump it up to5.0.0-dev.