Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Promotion rule gifts reward #4655

Merged
merged 138 commits into from
Feb 12, 2024
Merged

Promotion rule gifts reward #4655

merged 138 commits into from
Feb 12, 2024

Conversation

poulch
Copy link
Member

@poulch poulch commented Feb 1, 2024 •
edited
Loading

What type of PR is this?

  • 💅 Refactor
  • 🌟 Feature
  • 🔥 Bug Fix
  • 🔩 Maintenance
  • 🛠 Workflow CI/CD changes

Related Issues or Documents

Usage Instructions, Screenshots, Recordings

Have you written tests?

  • Yes!
  • No... here is why: Writing tests are mandatory, please replace this text with why test are not included in this PR

[Optional] Description

poulch added 30 commits January 5, 2024 12:21
@poulch
Update schema
9e2280a
@poulch
Add checkout option to add button submenu
86e470a
@poulch
Merge branch 'main' into 4598-checkout-discount
be3a53d
@poulch
Update rules
cd91135
@poulch
Merge branch 'main' into 4598-checkout-discount
5d7885d
@poulch
Refactor Condition
25dd33b
@poulch
Split model to order and catalog
831f8c0
@poulch
Prepare context
adbb83b
@poulch
Store condtion type
be4ca9b
@poulch
Support multiple inputs depend on condition type
c85cb23
@poulch
handleOpenModal
06a636b
@poulch
Use rule union
05309ba
@poulch
Fix create object from static methods
139bb4c
@poulch
Fix add new rule
4988f35
@poulch
Refactor model
ff84f37
@poulch
Use BaseRule type in form
7959255
@poulch
Update schema and support field with new names
6f3999f
@poulch
Filter AddButton submenu by discount type
b7bc0a2
@poulch
Filter add button options by discount type
2afb439
@poulch
Fix showing conditions
0cbd7af
@poulch
Show saved conditions
4c4b303
@poulch
Merge branch 'main' into 4598-checkout-discount
dd9b274
@poulch
Fix catalog conditions
6ee6b65
@poulch
Show base rule summary for order rules
674cd55
@poulch
Bump macaw to fix select onChange prop
f6f97ef
@poulch
Use Rule interface, add OrderRule tests
a9f9941
@poulch
Refactor types
4511e02
@poulch
Refactor model
cfa05a7
@poulch
Update scheme, add type to promotion query
d966e39
@poulch
Handle discount type field
03eb2ce
@github-actions github-actions bot temporarily deployed to storybook pr-4655 February 11, 2024 01:24 Destroyed
@github-actions github-actions bot temporarily deployed to pr-4655 February 11, 2024 01:24 Destroyed
@github-actions github-actions bot temporarily deployed to pr-4655 February 11, 2024 18:59 Destroyed
@github-actions github-actions bot temporarily deployed to storybook pr-4655 February 11, 2024 18:59 Destroyed
@github-actions github-actions bot temporarily deployed to pr-4655 February 11, 2024 22:17 Destroyed
@github-actions github-actions bot temporarily deployed to storybook pr-4655 February 11, 2024 22:17 Destroyed
@github-actions github-actions bot temporarily deployed to storybook pr-4655 February 11, 2024 22:23 Destroyed
@github-actions github-actions bot temporarily deployed to pr-4655 February 11, 2024 22:23 Destroyed
@github-actions github-actions bot temporarily deployed to pr-4655 February 11, 2024 22:32 Destroyed
@github-actions github-actions bot temporarily deployed to storybook pr-4655 February 11, 2024 22:32 Destroyed
andrzejewsky
andrzejewsky previously approved these changes Feb 12, 2024
View reviewed changes
@poulch
Show is gift boolean at order datagrid (#4661)
c9e36a7 
* Add is gift to query

* Add isGift column to order datagrids

* Update fixtures

* Add changeset
@poulch poulch requested a review from yellowee February 12, 2024 09:16
@andrzejewsky andrzejewsky self-requested a review February 12, 2024 10:30
@poulch poulch merged commit bb2232b into main Feb 12, 2024
15 of 16 checks passed
@poulch poulch deleted the 4651-gift-reward branch February 12, 2024 10:31
@poulch poulch restored the 4651-gift-reward branch July 1, 2024 11:27
@poulch poulch deleted the 4651-gift-reward branch July 1, 2024 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrzejewsky andrzejewsky andrzejewsky approved these changes

@Droniu Droniu Awaiting requested review from Droniu

@yellowee yellowee Awaiting requested review from yellowee

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Introduce gift cards reward API Add reward type select
2 participants
@poulch @andrzejewsky