feat(default-theme): promotion code functionality #1155

niklaswolf · 2020-10-05T14:25:02Z

Changes

closes #1154

User can add/remove promotion codes
List of applied promotion codes (labels of promotion are displayed)
Cart totals update accordingly

Help wanted

showing error message (toast) when there is an error returned from API (e.g. promo code does not exist)
Mobile: where should the promo code input be placed as there is no such thing as the sidebar on desktop

Testing

To test this, a promotion code has to be added to the backend.

Checklist

the list of features is updated (if it's a feature and it's relevant)
I followed contributing guidelines

Update Master

vercel · 2020-10-05T14:25:10Z

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/shopware-pwa/shopware-pwa-docs/7m8icg3a6
✅ Preview: https://shopware-pwa-docs-git-1154-promotion-code-functionality.shopware-pwa.vercel.app

…de-functionality

packages/composables/src/hooks/useCart/index.ts

mkucmus · 2020-10-07T18:40:41Z

in regards to point 2. from help wanted:
you can follow that design: https://storybook.storefrontui.io/?path=/story/pages-checkout--common

and on the occasion please resolve the conflicts.

…de-functionality # Conflicts: # packages/default-theme/components/checkout/sidebar/SidebarOrderSummary.vue # packages/default-theme/locales/de-DE.json # packages/default-theme/locales/en-GB.json

niklaswolf · 2020-10-08T08:22:00Z

@mkucmus thanks, I added toast notifications and resolved the conflicts. :)
Regarding my second point: in the UI you linked https://storybook.storefrontui.io/?path=/story/pages-checkout--common there is no coupon code input for mobile devices. That's what my question was about: where should the coupon input field be placed for mobile devices?

mkucmus · 2020-10-08T10:17:14Z

@mkucmus thanks, I added toast notifications and resolved the conflicts. :)
Regarding my second point: in the UI you linked https://storybook.storefrontui.io/?path=/story/pages-checkout--common there is no coupon code input for mobile devices. That's what my question was about: where should the coupon input field be placed for mobile devices?

here is a design from storefront-ui figma:

niklaswolf · 2020-10-08T11:48:55Z

@mkucmus okay that looks good. Right now the whole totals section is missing in mobile checkout. So to keep this PR in scope I'd not add the whole totals section in this PR, but create a new issue for it. The scope of the new issue should then also include adding the coupon code component from this PR, which should be usable by just dropping it in.
Would this be okay?

patzick

Thanks, few notes from me.
Also a question - why there is so big difference in generated api/composables.api.md? Have you linted it? If so please generate new one without linting, so it should only show changes made by this PR in public API.
Cheers!

patzick · 2020-10-09T13:10:27Z

packages/composables/src/hooks/useCart/index.ts

-import { getApplicationContext } from "@shopware-pwa/composables";
+import {
+ getApplicationContext,
+ useNotifications,


notifications Should not be used inside other composables. Users need to have a choice of how they want to react on events across the system. Use interceptors instead: https://shopware-pwa-docs.vuestorefront.io/landing/concepts/interceptor.html#events-interceptor

patzick · 2020-10-09T13:11:48Z

packages/composables/src/hooks/useCart/index.ts

 import { ApplicationVueContext } from "../../appContext";

+const TYPE_PROMOTION = "promotion";


this could be a type in commons package
example

export type CartItemType = "promotion" | "product"

You're right and there even is a CartItemType interface already with the needed types... I'll use that one.

packages/composables/src/hooks/useCart/index.ts

patzick · 2020-10-09T13:16:59Z

packages/composables/src/hooks/useCart/index.ts

+ // It's strange that success also ends up as an error in the API response
+ const err = <any>Object.values(result.errors)[0];
+ switch (err.messageKey) {
+ case "promotion-discount-added":
+ pushSuccess(rootContext.$t("Promotion code added successfully"));
+ break;
+ case "promotion-not-found":
+ pushError(rootContext.$t("Promotion code does not exist"));
+ break;
+ default:
+ pushError(err.message.toString());
+ }


this logic should go into notifications.js

Co-authored-by: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>

niklaswolf · 2020-10-12T09:57:27Z

@patzick I think I have tackled all your notes.
Regarding composables.api.md: I don't know why it's displaying such a big diff, I did not lint it and with my last commit I even regenerated it, but still no difference. My Diff-Viewer in my IDE only shows the small changes I really made...

patzick · 2020-10-12T12:43:27Z

@niklas-wolf please change PR settings and allow edition from maintainers. I'll check out your code and see what's wrong with API contract.

patzick

Made some small changes, it's ready for merge now. Thanks for your contribution! 💪

niklaswolf added 7 commits September 21, 2020 15:38

Merge pull request #1 from DivanteLtd/master

1774853

Update Master

Merge pull request #2 from DivanteLtd/master

e62deee

Update Master

Merge remote-tracking branch 'upstream/master'

1196cec

Merge remote-tracking branch 'upstream/master'

250bab4

feat: added functionality to promo code input

c472945

test: added promotion code tests

2ca922a

docs: added promotion codes to feature list

f25c9da

vercel bot temporarily deployed to preview October 5, 2020 14:25 Inactive

niklaswolf marked this pull request as draft October 5, 2020 14:25

docs: updated composables.api.md

1b98965

vercel bot temporarily deployed to preview October 5, 2020 14:38 Inactive

Merge remote-tracking branch 'upstream/master' into 1154-promotion-co…

f4a3d15

…de-functionality

vercel bot temporarily deployed to preview October 6, 2020 09:42 Inactive

mkucmus reviewed Oct 7, 2020

View reviewed changes

packages/composables/src/hooks/useCart/index.ts Outdated Show resolved Hide resolved

niklaswolf added 2 commits October 8, 2020 10:13

feat: added toast notifications when adding coupon code

ccb06bd

Merge remote-tracking branch 'upstream/master' into 1154-promotion-co…

04130c0

…de-functionality # Conflicts: # packages/default-theme/components/checkout/sidebar/SidebarOrderSummary.vue # packages/default-theme/locales/de-DE.json # packages/default-theme/locales/en-GB.json

vercel bot temporarily deployed to preview October 8, 2020 08:19 Inactive

Merge branch 'master' into 1154-promotion-code-functionality

7597f97

vercel bot temporarily deployed to preview October 9, 2020 11:55 Inactive

patzick requested changes Oct 9, 2020

View reviewed changes

Merge branch 'master' into 1154-promotion-code-functionality

352f393

vercel bot temporarily deployed to Preview October 9, 2020 15:04 Inactive

Update typings

499012a

Co-authored-by: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>

vercel bot temporarily deployed to Preview October 9, 2020 15:07 Inactive

Update typings

be85189

Co-authored-by: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>

vercel bot temporarily deployed to preview October 9, 2020 15:08 Inactive

feat: refactoring to trigger notification through interceptor

37bee8f

vercel bot temporarily deployed to preview October 12, 2020 09:53 Inactive

niklaswolf marked this pull request as ready for review October 12, 2020 09:53

Merge branch 'master' into pr/niklaswolf/1155

7b68155

vercel bot temporarily deployed to Preview October 12, 2020 12:53 Inactive

chore: generate docs with composable api file

7c12f93

vercel bot temporarily deployed to preview October 12, 2020 12:56 Inactive

Merge branch 'master' into pr/niklaswolf/1155

6b9b7ef

vercel bot temporarily deployed to preview October 12, 2020 14:51 Inactive

patzick added 3 commits October 12, 2020 17:44

refactor: interfaces after cr

a2b093d

chore: docs after cr changes

e82b924

chore: remove passing method as prop

17f16c9

vercel bot temporarily deployed to preview October 12, 2020 16:03 Inactive

fix: errors during manual tests

ec90bc2

vercel bot temporarily deployed to preview October 13, 2020 08:20 Inactive

patzick approved these changes Oct 13, 2020

View reviewed changes

patzick merged commit 66661f7 into vuestorefront:master Oct 13, 2020

niklaswolf mentioned this pull request Oct 13, 2020

[FEATURE] Totals section in checkout for mobile #1173

Closed

2 tasks

niklaswolf deleted the 1154-promotion-code-functionality branch October 13, 2020 08:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(default-theme): promotion code functionality #1155

feat(default-theme): promotion code functionality #1155

niklaswolf commented Oct 5, 2020

vercel bot commented Oct 5, 2020 •

edited

Loading

mkucmus commented Oct 7, 2020

niklaswolf commented Oct 8, 2020

mkucmus commented Oct 8, 2020

niklaswolf commented Oct 8, 2020

patzick left a comment

patzick Oct 9, 2020

patzick Oct 9, 2020

niklaswolf Oct 9, 2020

patzick Oct 9, 2020

niklaswolf commented Oct 12, 2020

patzick commented Oct 12, 2020

patzick left a comment

		import { ApplicationVueContext } from "../../appContext";

		const TYPE_PROMOTION = "promotion";

feat(default-theme): promotion code functionality #1155

feat(default-theme): promotion code functionality #1155

Conversation

niklaswolf commented Oct 5, 2020

Changes

Help wanted

Testing

Checklist

vercel bot commented Oct 5, 2020 • edited Loading

mkucmus commented Oct 7, 2020

niklaswolf commented Oct 8, 2020

mkucmus commented Oct 8, 2020

niklaswolf commented Oct 8, 2020

patzick left a comment

Choose a reason for hiding this comment

patzick Oct 9, 2020

Choose a reason for hiding this comment

patzick Oct 9, 2020

Choose a reason for hiding this comment

niklaswolf Oct 9, 2020

Choose a reason for hiding this comment

patzick Oct 9, 2020

Choose a reason for hiding this comment

niklaswolf commented Oct 12, 2020

patzick commented Oct 12, 2020

patzick left a comment

Choose a reason for hiding this comment

vercel bot commented Oct 5, 2020 •

edited

Loading