Skip to content

Commit

Permalink
Merge pull request #410 from commercelayer/fix/save-only-new-payment-…
Browse files Browse the repository at this point in the history
…source-on-subscription

Save only new payment source on subscription and display stock transfers
  • Loading branch information
malessani authored Dec 22, 2023
2 parents d5e3d79 + b4309d9 commit a216436
Show file tree
Hide file tree
Showing 4 changed files with 475 additions and 407 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ orbs:
jobs:
test: # this can be any name you choose
docker:
- image: mcr.microsoft.com/playwright:v1.39.0-focal
- image: mcr.microsoft.com/playwright:v1.40.1-focal
resource_class: medium+
parallelism: 10

Expand Down
7 changes: 1 addition & 6 deletions components/data/AppProvider/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -338,14 +338,9 @@ export function calculateSettings(
order.line_items?.some((item) => {
return item.frequency && item.frequency?.length > 0
}) ||
(order.subscription_created_at !== undefined &&
order.subscription_created_at !== null) ||
order.subscription_created_at != null ||
false

if (hasSubscriptions && !isGuest) {
localStorage.setItem("_save_payment_source_to_customer_wallet", "true")
}

return {
isGuest,
shippingCountryCodeLock: order.shipping_country_code_lock,
Expand Down
54 changes: 27 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,69 +71,69 @@
"commercelayer"
],
"dependencies": {
"@commercelayer/react-components": "^4.7.11",
"@commercelayer/react-components": "^4.8.4",
"@commercelayer/sdk": "5.21.1",
"@faker-js/faker": "^8.3.1",
"@headlessui/react": "^1.7.17",
"@next/bundle-analyzer": "14.0.2",
"@next/eslint-plugin-next": "14.0.2",
"@playwright/test": "^1.39.0",
"@playwright/test": "^1.40.1",
"@tailwindcss/forms": "^0.5.7",
"@types/async-retry": "1.4.8",
"@types/jsonwebtoken": "^9.0.5",
"@types/node": "^20.9.0",
"@types/react": "^18.2.37",
"@types/node": "^20.10.5",
"@types/react": "^18.2.45",
"@types/react-gtm-module": "^2.0.3",
"@types/styled-components": "^5.1.30",
"@types/styled-components": "^5.1.34",
"async-retry": "^1.3.3",
"autoprefixer": "^10.4.16",
"babel-plugin-macros": "^3.1.0",
"babel-plugin-styled-components": "^2.1.4",
"classnames": "^2.3.2",
"cron-parser": "^4.9.0",
"cronstrue": "^2.43.0",
"cronstrue": "^2.47.0",
"dotenv": "^16.3.1",
"i18next": "^23.7.6",
"i18next": "^23.7.11",
"jsonwebtoken": "^9.0.2",
"jwt-decode": "^4.0.0",
"lerna": "^7.4.2",
"next": "14.0.2",
"next-build-id": "^3.0.0",
"next-i18next": "^15.0.0",
"postcss": "^8.4.31",
"next-i18next": "^15.1.1",
"postcss": "^8.4.32",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-gtm-module": "^2.0.11",
"react-i18next": "^13.4.1",
"react-router-dom": "^6.18.0",
"styled-components": "^6.1.1",
"tailwindcss": "^3.3.5",
"react-i18next": "^13.5.0",
"react-router-dom": "^6.21.1",
"styled-components": "^6.1.2",
"tailwindcss": "^3.4.0",
"twin.macro": "^3.4.0",
"typescript": "^5.2.2"
"typescript": "^5.3.3"
},
"devDependencies": {
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/commit-analyzer": "^11.1.0",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "^9.2.3",
"@semantic-release/npm": "^11.0.1",
"@semantic-release/github": "^9.2.5",
"@semantic-release/npm": "^11.0.2",
"@semantic-release/release-notes-generator": "^12.1.0",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"eslint": "^8.53.0",
"eslint-config-next": "^14.0.2",
"eslint-config-prettier": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
"eslint": "^8.56.0",
"eslint-config-next": "^14.0.4",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard": "^17.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-n": "^16.3.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^16.5.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-prettier": "^5.1.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-tailwind": "^0.2.1",
"npm-check-updates": "^16.14.6",
"prettier": "^3.1.0",
"semantic-release": "^22.0.7",
"npm-check-updates": "^16.14.12",
"prettier": "^3.1.1",
"semantic-release": "^22.0.12",
"serve": "^14.2.1",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0"
Expand Down
Loading

0 comments on commit a216436

Please sign in to comment.