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.

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

Voucher codes with API #4316

Merged
merged 112 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
123631f
Init voucher codes datagrid
poulch Sep 12, 2023
66792f3
Submenu
poulch Sep 12, 2023
9455b90
Change dropdown button
poulch Sep 13, 2023
b9870ef
Delete voucher codes dialog
poulch Sep 13, 2023
5425cf0
Generate voucher codes dialog
poulch Sep 13, 2023
c69b6f7
Allow only dgits in voucher generate modal quantity field
poulch Sep 14, 2023
de26f87
Update storybook props
poulch Sep 15, 2023
4459f44
Add more codes
poulch Sep 15, 2023
3a60268
Merge branch 'main' into 4182-voucher-codes-datagrid
poulch Sep 19, 2023
7fd5b00
Update schema
poulch Sep 19, 2023
2967e29
Fetch voucher codes
poulch Sep 20, 2023
2fae9d6
Add manual voucher code modal
poulch Sep 20, 2023
e3f55a1
Add manual voucher code
poulch Sep 20, 2023
81291aa
Update prosp and fixtures
poulch Sep 20, 2023
c5c8720
Remove delete codes from datgrid menu item
poulch Sep 20, 2023
453895c
Refactor components
poulch Sep 20, 2023
be939f0
Bulk voucher delete by row selection
poulch Sep 20, 2023
b8255bb
Handle add manual voucher code form data
poulch Sep 21, 2023
6683265
Use separate query to fetch codes
poulch Sep 21, 2023
f85e74f
Pagination wip
poulch Sep 21, 2023
858246d
Clear add manual code after submit
poulch Sep 21, 2023
0a921b0
Block dots in usage input
poulch Sep 21, 2023
e8def68
Refetch voucher codes when update
poulch Sep 21, 2023
403d298
Code refactor, replace any types
poulch Sep 21, 2023
cc99b15
Update fixture
poulch Sep 21, 2023
1e08eb6
Merge branch 'main' into 4182-voucher-codes-datagrid
poulch Sep 22, 2023
eaba340
Add changeset
poulch Sep 22, 2023
edf8b45
Remove VoucherLimit from details page
poulch Sep 25, 2023
6afdeeb
No poiner in ddatagrid, add placeholder in case of no data
poulch Sep 25, 2023
88bc81b
Revert "Remove VoucherLimit from details page"
poulch Sep 25, 2023
c9699d7
Show limit only for create voucher form
poulch Sep 25, 2023
077d2f2
Restore usage limit
poulch Sep 26, 2023
1be24a0
Create voucher codes
poulch Sep 27, 2023
1d8eeeb
Genrate multipe codes
poulch Sep 27, 2023
0429666
Create voucher with codes generating
poulch Sep 28, 2023
a96cd87
Add uuid types
poulch Sep 28, 2023
0e9bc2d
Prevent provide qunatity greater than limit
poulch Sep 28, 2023
1b0b7a8
Merge branch 'main' into 4182-voucher-codes-datagrid
poulch Sep 28, 2023
54ae988
Use list settings
poulch Sep 28, 2023
ad4fc59
edit pagination wip
poulch Oct 3, 2023
4aeca9c
Add status column
poulch Oct 3, 2023
7572946
refactor useVoucherCodes
poulch Oct 4, 2023
4d14180
Merge branch 'main' into 4182-voucher-codes-datagrid
poulch Oct 5, 2023
2b60d8c
Fix type checks
poulch Oct 5, 2023
7671621
Finish voucher codes pagination
poulch Oct 5, 2023
ceccd9c
Restart local pagiation page to 0 when change row numbers
poulch Oct 5, 2023
514768d
useVoucherCodes tests poc
poulch Oct 6, 2023
5ce4132
Tests refactor
poulch Oct 6, 2023
e4f6a64
Merge branch 'main' into 4182-voucher-codes-datagrid
poulch Oct 7, 2023
a0131d9
useVoucherCodes refactor
poulch Oct 9, 2023
0d03d02
New generated codes always at top
poulch Oct 9, 2023
e76a289
Update schema
poulch Oct 9, 2023
af5852d
Improve pagination, restart to first page when add voucher
poulch Oct 9, 2023
137f573
Fix types
poulch Oct 9, 2023
0e35f71
Send voucher codes on update
poulch Oct 9, 2023
018562f
Display isActive voucher code
poulch Oct 9, 2023
9f9963a
Single use support
poulch Oct 9, 2023
ce061dd
Send only added voucher codes on update
poulch Oct 10, 2023
1cabf3d
Extract messages
poulch Oct 10, 2023
21f6c4e
Handle delete added vouche codes
poulch Oct 10, 2023
bd2e401
Add missing prop to storybook
poulch Oct 10, 2023
3081a2e
New voucher codes at begining in create page
poulch Oct 10, 2023
0828f44
Display voucher name in topbar
poulch Oct 10, 2023
9f8a978
Clear row selection
poulch Oct 10, 2023
59a1730
Merge branch 'main' into 4182-voucher-codes-datagrid
poulch Oct 10, 2023
07a45ea
Make voucher codes datagrid checkbox visible
poulch Oct 10, 2023
836e275
Fix tabing in dialog
poulch Oct 10, 2023
e4709bc
Restructure voucher codes dialogs
poulch Oct 10, 2023
faabdd4
Update stpries
poulch Oct 10, 2023
bad30a8
Merge branch 'main' into 4182-voucher-codes-with-api
poulch Oct 10, 2023
747ef62
Init VoucherCodes tests
poulch Oct 12, 2023
82856d5
Test voucher codes
poulch Oct 12, 2023
a656749
Merge branch 'main' into 4182-voucher-codes-with-api
poulch Oct 12, 2023
223c5a1
Update schema and types
poulch Oct 12, 2023
3720b3c
Send codes in addCodes prop
poulch Oct 12, 2023
3ec4d11
Fix export types
poulch Oct 12, 2023
877641e
Add changeset
poulch Oct 12, 2023
02de04b
Remove voucher codes flag
poulch Oct 13, 2023
a65698c
Replace code with name, remove code from summary
poulch Oct 13, 2023
103743b
Remove VoucherList and fix types
poulch Oct 13, 2023
e3ffc9a
Merge branch 'main' into 4182-voucher-codes-with-api
poulch Oct 13, 2023
faf496e
Improve server and clint pagination
poulch Oct 15, 2023
6c6d756
Fix blocking no digit values
poulch Oct 15, 2023
348c6dc
Reverse list of create codes
poulch Oct 16, 2023
5d0a8bc
Clear added voucher codes after submit
poulch Oct 16, 2023
0bdf76f
Use tag cell instead of status cell
poulch Oct 16, 2023
b44ddb1
Allow to copy and select cells
poulch Oct 16, 2023
7adba65
Handdle code already exists in client codes
poulch Oct 16, 2023
e2cb169
Merge branch 'main' into 4182-voucher-codes-with-api
poulch Oct 19, 2023
d2b01bd
Merge branch 'main' into 4182-voucher-codes-with-api
poulch Oct 20, 2023
db3f3dd
Merge branch 'main' into 4182-voucher-codes-with-api
poulch Oct 23, 2023
2410c6c
Extract messages
poulch Oct 23, 2023
f9793be
Merge branch 'main' into 4182-voucher-codes-with-api
poulch Oct 25, 2023
c5d1bde
Merge branch 'main' into 4182-voucher-codes-with-api
poulch Oct 31, 2023
91af015
Update scheme
poulch Oct 31, 2023
34350fe
Merge branch 'main' into 4182-voucher-codes-with-api
poulch Nov 5, 2023
18eb8b9
Merge branch 'main' into 4182-voucher-codes-with-api
poulch Nov 7, 2023
0350b1b
Fix only numbers
poulch Nov 7, 2023
ce31889
Fixes for generating dialogs
poulch Nov 7, 2023
70e27a8
Validate voucher codes length during creation
poulch Nov 7, 2023
55a1e62
Show voucher codes already exists error message
poulch Nov 7, 2023
5c5d0d8
Disable delete button when selected saved codes
poulch Nov 7, 2023
c0e0a67
Status column readonly
poulch Nov 7, 2023
a4a6a31
Fix error types
poulch Nov 7, 2023
c60578d
Update voucher codes delete tests
poulch Nov 7, 2023
716a3db
Prevent on back when new codes added
poulch Nov 7, 2023
47e8ae1
Merge branch 'main' into 4182-voucher-codes-with-api
poulch Nov 7, 2023
2ec727a
Fix on close
poulch Nov 7, 2023
050ee9a
Make delete modal plurar
poulch Nov 8, 2023
b4cb69e
Change voucher column name
poulch Nov 8, 2023
606ffbe
Allow to update name
poulch Nov 8, 2023
e94bacb
Send name to api
poulch Nov 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/yellow-rats-swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": minor
---

Integrate voucher codes with API
15 changes: 2 additions & 13 deletions .featureFlags/generated.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
// @ts-nocheck

import O81816 from "./images/filters.png"
import D31948 from "./images/filters.png"

const product_filters = () => (<><p><img src={O81816} alt="new filters"/></p>
const product_filters = () => (<><p><img src={D31948} alt="new filters"/></p>
<p>Experience the new look and enhanced abilities of new fitering mechanism.
Easily combine any criteria you want, and quickly browse their values.</p>
</>)
const voucher_codes = () => (<><p>Allow to generat multple codes per single voucher</p>
</>)

export const AVAILABLE_FLAGS = [{
name: "product_filters",
Expand All @@ -18,13 +16,4 @@ export const AVAILABLE_FLAGS = [{
enabled: true,
payload: "default",
}
},{
name: "voucher_codes",
displayName: "Voucher codes",
component: voucher_codes,
visible: false,
content: {
enabled: false,
payload: "default",
}
}] as const;
9 changes: 0 additions & 9 deletions .featureFlags/voucher-codes.md

This file was deleted.

Loading