fix: add shipping provider to basket #171
Merged
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
bloodf
approved these changes
Sep 5, 2021
1 task
bloodf
added a commit
that referenced
this pull request
Oct 5, 2021
* fix: fixed user password reset and resolved other minor issues (#170) * fix(theme): does not display add to wishlist when not user not authenticated * fix(theme): add zoom to gallery * chore: fixed the gitflow GitHub action * refactor(api-client): updated the requestPasswordResetEmail to add customQuery * feat(api-client): add the resetPassword method * feat(composables): add the useForgotPasswordFactory * refactor(composables): add initial logic for resetting the password * refactor(api-client): fixed customQuery implementation * refactor(composables): fixed Magento method application * refactor(composables): applied forgotPasswordGetters.ts rules for isPasswordChanged * feat(theme): created page for resetting user password * fix(composables): fixed useUser not being correctly updated fixes #159 * fix(theme): add Ui notification on user data update fixes #161 fixes #160 * fix(theme): fixed onSSR to onBeforeMount * fix: add shipping provider to basket (#171) * fix: set shipping provider to cart * fix: query full cart from M2 * fix: remove console log * fix: set cart id for logged in customer (#172) * fix(theme): fixed Product display and search result display (#175) * fix(theme): fixed wishlist icon appearing in search result fixes #173 * fix(theme): fixed not showing loader in Product.vue page * fix(theme): fixed not showing loader in Product.vue page * fix(theme): separated GroupedProduct as a component fixes #174 * fix(theme): added canAddToCart prop to BundleProductSelector.vue * fix(composables): fixed name as undefined * fix(composables): fixed name as undefined * docs: update base information in docs (#176) * docs: added api-extraction * docs: fixed api-extraction * docs: fixed api-extraction * docs: updated about page * docs: fixed docs building * refactor(api-client): updated graphql queries * refactor(theme): add PM2 for server control * refactor: updated dependencies and fixed theme bugs (#178) * chore(eslint): updated dependencies - updated **eslint-plugin-unicorn** to **36.0.0** * chore(eslint-import): updated dependencies - updated **eslint-import-resolver-typescript** to **2.5.0** - updated **eslint-plugin-import** to **2.24.2** * chore(eslint-typescript): updated dependencies - updated **@typescript-eslint/eslint-plugin** to **4.31.1** - updated **@typescript-eslint/parser** to **4.31.1** * chore(eslint-vue): updated dependencies - updated **eslint-plugin-vue** to **7.17.0** * chore(api-client): updated dependencies - updated **@apollo/client** to **3.4.11** - updated **graphql** to **15.5.3** - updated **graphql-tools** to **8.2.0** - updated **node-fetch** to **3.0.0** - updated **typescript** to **4.4.3** * chore(theme): updated dependencies - updated **core-js** to **3.17.3** - updated **vee-validate** to **3.4.13** - updated **babel-jest** to **27.2.0** - updated **cypress** to **8.4.0** - updated **jest** to **27.2.0** - updated **npm-check-updates** to **11.8.5** - updated **typescript** to **4.4.3** * chore: updated dependencies - updated **@babel/core** to **7.15.5** - updated **@graphql-codegen/cli** to **2.2.0** - updated **@graphql-codegen/typescript** to **2.2.2** - updated **@graphql-codegen/typescript-operations** to **2.1.4** - updated **@types/node** to **16.9.2** - updated **@typescript-eslint/parser** to **4.31.1** - updated **husky** to **7.0.2** - updated **jest** to **27.2.0** - updated **npm-check-updates** to **11.8.5** - updated **vue-eslint-parser** to **7.11.0** * feat(theme): add new environment variables and configuration * refactor(theme): fixed missing composables state * feat(theme): added wishlist control on bottom menu * docs: updated docs for how to create new store * chore: update docs-deployment.yaml * chore: update docs-deployment.yaml * refactor(theme): updated theme Core Web Vitals * docs: update documentation deployment * docs: update documentation deployment * refactor(theme): fixed performance build * docs: fixed Dockerfile image * docs: updated Dockerfile to node 14 * docs: added yarn to the Dockerfile * docs: update Dockerfile build command * docs: add new nuxt tips and tricks to documentation * feat!: new changes to GraphQL and `theme` components (#180) * chore: updated dependencies and devDependencies - updated **@rollup/plugin-node-resolve** to **13.0.5** - updated **@types/node** to **16.9.6** - updated **@typescript-eslint/parser** to **4.31.2** - updated **jest** to **27.2.1** - updated **jest-localstorage-mock** to **2.4.18** - updated **rollup** to **2.57.0** * chore(eslint-jest): updated dependencies and devDependencies - updated **eslint-plugin-jest** to **24.4.2** * chore(eslint-typescript): updated dependencies and devDependencies - updated **@typescript-eslint/eslint-plugin** to **4.31.2** - updated **@typescript-eslint/parser** to **4.31.2** * chore(eslint-vue): updated dependencies and devDependencies - updated **eslint-plugin-vue** to **7.18.0** * chore(api-client): updated dependencies and devDependencies - updated **@apollo/client** to **3.4.13** - updated **@vue-storefront/core** to **2.4.2** - updated **graphql** to **15.6.0** * chore(composables): updated dependencies and devDependencies - updated @vue-storefront/core** to **2.4.2** - updated jsdom** to **17.0.0** - updated jsdom-global** to **3.0.2** - updated vue-template-compiler** to **2.6.x** * chore(theme): updated dependencies and devDependencies - updated **@vue-storefront/core** to **2.4.2** - updated **@vue-storefront/middleware** to **2.4.2** - updated **@vue-storefront/nuxt** to **2.4.2** - updated **@vue-storefront/nuxt-theme** to **2.4.2** - updated **core-js** to **3.18.0** - updated **pm2** to **5.1.2** - updated **babel-jest** to **27.2.1** - updated **cypress** to **8.4.1** - updated **jest** to **27.2.1** - updated **jest-localstorage-mock** to **2.4.18** * refactor(composables): moved getters to root folder * refactor(theme): removed TS typing from Page.vue * refactor!(api-client): removed fragments and applied single queries / mutations - all the fragments needed to be removed due to Magento GraphQL server does not support it and causing problematic errors, reporting `null` and `undefined` values, because it wont recognize the fragment. - Added single queries / mutations with higher complexity, requiring a change in the Magento configuration or the usage of custom Caravel module to configure the GraphQL server BREAKING CHANGE: removal of the fragments, require changes in the Magento server * feat(composables): created the useUpsellProducts composable * feat(composables): created the useRelatedProducts composable * refactor(composables): removed the multiple queries search from useProduct composable * chore(composables): fixed file imports in the getters and exports in index.ts * feat(theme): created the RelatedProducts.vue component * feat(theme): created the UpsellProducts.vue component * chore: fixed yarn.lock file * refactor(theme): fixed PostCSS calc * refactor(composables): added base test files * refactor(composables): added missing loggers * refactor(composables): extracted generators * refactor(theme): removed lang="ts" * refactor(composables): updated logger result * feat(theme): created CategorySidebarMenu.vue component * refactor(composables): updated getters * chore(api-client): updated API schema * feat(theme): created useRoute composable * doc: added information about the Magento GraphQL module * feat: added `useCustomQuery` & `useCustomMutation` (#183) * feat(api-client): created `customQuery` api method * feat(api-client): created `customMutation` api method * feat(api-client): exported `customQuery` & `customMutation` api methods * feat(composables): created `useCustomMutation` composable * feat(composables): created `useCustomQuery` composable * feat(composables): added `useCustomQuery` & `useCustomMutation` types * docs: updated api-reference * docs: added docs for `useCustomQuery` * refactor(composables): fixed `useCustomQuery` & `useCustomMutation` factories * refactor(composables): fixed composables exporters * refactor(composables): fixed `useCustomQuery` & `useCustomMutation` loggers * refactor(composables): fixed api-extractor-data exporter * chore: updated README.md * docs: added base composables docs * docs: added composables docs to config.js * docs: added demo link * fix(theme): load addresses on remove (#189) * refactor(composables): update `load` method of `useCart` composable (#182) * refactor(composables): do not create empty cart on M2 side, clean up load method * refactor(composables): overwrite useCartFactory for new param * chore: updated README.md * docs: updated honorable mentions * chore: remove gitflow action Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Bogdan Podlesnii <bogdan.podlesnii@gmail.com>
bloodf
added a commit
that referenced
this pull request
Oct 5, 2021
* fix: fixed user password reset and resolved other minor issues (#170) * fix(theme): does not display add to wishlist when not user not authenticated * fix(theme): add zoom to gallery * chore: fixed the gitflow GitHub action * refactor(api-client): updated the requestPasswordResetEmail to add customQuery * feat(api-client): add the resetPassword method * feat(composables): add the useForgotPasswordFactory * refactor(composables): add initial logic for resetting the password * refactor(api-client): fixed customQuery implementation * refactor(composables): fixed Magento method application * refactor(composables): applied forgotPasswordGetters.ts rules for isPasswordChanged * feat(theme): created page for resetting user password * fix(composables): fixed useUser not being correctly updated fixes #159 * fix(theme): add Ui notification on user data update fixes #161 fixes #160 * fix(theme): fixed onSSR to onBeforeMount * fix: add shipping provider to basket (#171) * fix: set shipping provider to cart * fix: query full cart from M2 * fix: remove console log * fix: set cart id for logged in customer (#172) * fix(theme): fixed Product display and search result display (#175) * fix(theme): fixed wishlist icon appearing in search result fixes #173 * fix(theme): fixed not showing loader in Product.vue page * fix(theme): fixed not showing loader in Product.vue page * fix(theme): separated GroupedProduct as a component fixes #174 * fix(theme): added canAddToCart prop to BundleProductSelector.vue * fix(composables): fixed name as undefined * fix(composables): fixed name as undefined * docs: update base information in docs (#176) * docs: added api-extraction * docs: fixed api-extraction * docs: fixed api-extraction * docs: updated about page * docs: fixed docs building * refactor(api-client): updated graphql queries * refactor(theme): add PM2 for server control * refactor: updated dependencies and fixed theme bugs (#178) * chore(eslint): updated dependencies - updated **eslint-plugin-unicorn** to **36.0.0** * chore(eslint-import): updated dependencies - updated **eslint-import-resolver-typescript** to **2.5.0** - updated **eslint-plugin-import** to **2.24.2** * chore(eslint-typescript): updated dependencies - updated **@typescript-eslint/eslint-plugin** to **4.31.1** - updated **@typescript-eslint/parser** to **4.31.1** * chore(eslint-vue): updated dependencies - updated **eslint-plugin-vue** to **7.17.0** * chore(api-client): updated dependencies - updated **@apollo/client** to **3.4.11** - updated **graphql** to **15.5.3** - updated **graphql-tools** to **8.2.0** - updated **node-fetch** to **3.0.0** - updated **typescript** to **4.4.3** * chore(theme): updated dependencies - updated **core-js** to **3.17.3** - updated **vee-validate** to **3.4.13** - updated **babel-jest** to **27.2.0** - updated **cypress** to **8.4.0** - updated **jest** to **27.2.0** - updated **npm-check-updates** to **11.8.5** - updated **typescript** to **4.4.3** * chore: updated dependencies - updated **@babel/core** to **7.15.5** - updated **@graphql-codegen/cli** to **2.2.0** - updated **@graphql-codegen/typescript** to **2.2.2** - updated **@graphql-codegen/typescript-operations** to **2.1.4** - updated **@types/node** to **16.9.2** - updated **@typescript-eslint/parser** to **4.31.1** - updated **husky** to **7.0.2** - updated **jest** to **27.2.0** - updated **npm-check-updates** to **11.8.5** - updated **vue-eslint-parser** to **7.11.0** * feat(theme): add new environment variables and configuration * refactor(theme): fixed missing composables state * feat(theme): added wishlist control on bottom menu * docs: updated docs for how to create new store * chore: update docs-deployment.yaml * chore: update docs-deployment.yaml * refactor(theme): updated theme Core Web Vitals * docs: update documentation deployment * docs: update documentation deployment * refactor(theme): fixed performance build * docs: fixed Dockerfile image * docs: updated Dockerfile to node 14 * docs: added yarn to the Dockerfile * docs: update Dockerfile build command * docs: add new nuxt tips and tricks to documentation * feat!: new changes to GraphQL and `theme` components (#180) * chore: updated dependencies and devDependencies - updated **@rollup/plugin-node-resolve** to **13.0.5** - updated **@types/node** to **16.9.6** - updated **@typescript-eslint/parser** to **4.31.2** - updated **jest** to **27.2.1** - updated **jest-localstorage-mock** to **2.4.18** - updated **rollup** to **2.57.0** * chore(eslint-jest): updated dependencies and devDependencies - updated **eslint-plugin-jest** to **24.4.2** * chore(eslint-typescript): updated dependencies and devDependencies - updated **@typescript-eslint/eslint-plugin** to **4.31.2** - updated **@typescript-eslint/parser** to **4.31.2** * chore(eslint-vue): updated dependencies and devDependencies - updated **eslint-plugin-vue** to **7.18.0** * chore(api-client): updated dependencies and devDependencies - updated **@apollo/client** to **3.4.13** - updated **@vue-storefront/core** to **2.4.2** - updated **graphql** to **15.6.0** * chore(composables): updated dependencies and devDependencies - updated @vue-storefront/core** to **2.4.2** - updated jsdom** to **17.0.0** - updated jsdom-global** to **3.0.2** - updated vue-template-compiler** to **2.6.x** * chore(theme): updated dependencies and devDependencies - updated **@vue-storefront/core** to **2.4.2** - updated **@vue-storefront/middleware** to **2.4.2** - updated **@vue-storefront/nuxt** to **2.4.2** - updated **@vue-storefront/nuxt-theme** to **2.4.2** - updated **core-js** to **3.18.0** - updated **pm2** to **5.1.2** - updated **babel-jest** to **27.2.1** - updated **cypress** to **8.4.1** - updated **jest** to **27.2.1** - updated **jest-localstorage-mock** to **2.4.18** * refactor(composables): moved getters to root folder * refactor(theme): removed TS typing from Page.vue * refactor!(api-client): removed fragments and applied single queries / mutations - all the fragments needed to be removed due to Magento GraphQL server does not support it and causing problematic errors, reporting `null` and `undefined` values, because it wont recognize the fragment. - Added single queries / mutations with higher complexity, requiring a change in the Magento configuration or the usage of custom Caravel module to configure the GraphQL server BREAKING CHANGE: removal of the fragments, require changes in the Magento server * feat(composables): created the useUpsellProducts composable * feat(composables): created the useRelatedProducts composable * refactor(composables): removed the multiple queries search from useProduct composable * chore(composables): fixed file imports in the getters and exports in index.ts * feat(theme): created the RelatedProducts.vue component * feat(theme): created the UpsellProducts.vue component * chore: fixed yarn.lock file * refactor(theme): fixed PostCSS calc * refactor(composables): added base test files * refactor(composables): added missing loggers * refactor(composables): extracted generators * refactor(theme): removed lang="ts" * refactor(composables): updated logger result * feat(theme): created CategorySidebarMenu.vue component * refactor(composables): updated getters * chore(api-client): updated API schema * feat(theme): created useRoute composable * doc: added information about the Magento GraphQL module * feat: added `useCustomQuery` & `useCustomMutation` (#183) * feat(api-client): created `customQuery` api method * feat(api-client): created `customMutation` api method * feat(api-client): exported `customQuery` & `customMutation` api methods * feat(composables): created `useCustomMutation` composable * feat(composables): created `useCustomQuery` composable * feat(composables): added `useCustomQuery` & `useCustomMutation` types * docs: updated api-reference * docs: added docs for `useCustomQuery` * refactor(composables): fixed `useCustomQuery` & `useCustomMutation` factories * refactor(composables): fixed composables exporters * refactor(composables): fixed `useCustomQuery` & `useCustomMutation` loggers * refactor(composables): fixed api-extractor-data exporter * chore: updated README.md * docs: added base composables docs * docs: added composables docs to config.js * docs: added demo link * fix(theme): load addresses on remove (#189) * refactor(composables): update `load` method of `useCart` composable (#182) * refactor(composables): do not create empty cart on M2 side, clean up load method * refactor(composables): overwrite useCartFactory for new param * chore: updated README.md * docs: updated honorable mentions * chore: updated README.md * chore: updated README.md * chore: updated README.md * chore: fixed versioning * refactor(api-client): fixed API exports * refactor(composables): fixed composables types Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Bogdan Podlesnii <bogdan.podlesnii@gmail.com>
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.
Description
Shipping data is loaded from cart, so in order to display it right we load cart from M2 in setShippingMethodsOnCart same as done for other cart modifications, like removeItemFromCart, etc.
Related Issue
#144
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: