Skip to content

Commit 71222e4

Browse files
authored
Improve order line discount discoverability and modal (#6434)
1 parent e730dcd commit 71222e4

60 files changed

Lines changed: 4065 additions & 905 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/spotty-bikes-brush.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"saleor-dashboard": patch
3+
---
4+
5+
Order-level and order-line discount flows now share the same UX in Draft and Unconfirmed orders. Access Add/Edit order line discount now also from the order row menu.

locale/defaultMessages.json

Lines changed: 101 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,10 @@
490490
"0ix6PR": {
491491
"string": "Order cancelled"
492492
},
493+
"0j4/kV": {
494+
"context": "discount reason input label",
495+
"string": "Reason"
496+
},
493497
"0kPdlb": {
494498
"context": "deprecated secret key toolbar label",
495499
"string": "Use RS256 signature instead."
@@ -1665,6 +1669,9 @@
16651669
"context": "Authorized (amount locked on card, not transfered to store owner) transaction amount, data display header",
16661670
"string": "Authorized"
16671671
},
1672+
"7gXPhB": {
1673+
"string": "Qty"
1674+
},
16681675
"7hNjaI": {
16691676
"context": "button",
16701677
"string": "Delete Variant"
@@ -1928,6 +1935,10 @@
19281935
"9Fiuq2": {
19291936
"string": "Learn more about {customExtensionDocsLink}"
19301937
},
1938+
"9GevHe": {
1939+
"context": "discount type label in line discount modal",
1940+
"string": "voucher"
1941+
},
19311942
"9HSbdS": {
19321943
"context": "structure loading",
19331944
"string": "working..."
@@ -3293,6 +3304,10 @@
32933304
"context": "shipping method description",
32943305
"string": "Description"
32953306
},
3307+
"GrMiRT": {
3308+
"context": "fallback product name in remove product confirmation dialog",
3309+
"string": "this product"
3310+
},
32963311
"GsBRWL": {
32973312
"string": "Languages"
32983313
},
@@ -3498,6 +3513,9 @@
34983513
"HoBGng": {
34993514
"string": "Voucher created"
35003515
},
3516+
"HpxNPd": {
3517+
"string": "Add discount"
3518+
},
35013519
"HqRNN8": {
35023520
"string": "Support"
35033521
},
@@ -3578,10 +3596,6 @@
35783596
"IH47ID": {
35793597
"string": "Use button above to add new product variants"
35803598
},
3581-
"IHTyjM": {
3582-
"context": "orderLine.variant.name, subheader, order line metadata dialog",
3583-
"string": "Variant"
3584-
},
35853599
"IKvOK+": {
35863600
"context": "Amount error message",
35873601
"string": "Amount must be bigger than 0"
@@ -4327,6 +4341,10 @@
43274341
"context": "customers section name",
43284342
"string": "Customers"
43294343
},
4344+
"McotWC": {
4345+
"context": "button label to confirm product removal",
4346+
"string": "Remove product"
4347+
},
43304348
"MdFdbd": {
43314349
"string": "Delete rule"
43324350
},
@@ -4376,6 +4394,10 @@
43764394
"context": "customer details, header",
43774395
"string": "{fullName} Details"
43784396
},
4397+
"MtBjgE": {
4398+
"context": "secondary helper text in line discount modal, explaining what happens when a manual discount is added on top of an automatic one",
4399+
"string": "A manual discount below will replace the existing one."
4400+
},
43794401
"MwfSVA": {
43804402
"context": "input helper text",
43814403
"string": "Customers can not add quantities to a single cart above the limit when value is provided."
@@ -4460,10 +4482,6 @@
44604482
"NJ9ngY": {
44614483
"string": "Visible Action"
44624484
},
4463-
"NL5C12": {
4464-
"context": "orderLine.quantity, subheader, oredr line metadata dialog",
4465-
"string": "Qty"
4466-
},
44674485
"NLNonj": {
44684486
"context": "send to channel select label",
44694487
"string": "Send to channel"
@@ -5058,9 +5076,9 @@
50585076
"QOm7+P": {
50595077
"string": "Create new order"
50605078
},
5061-
"QSnh4Y": {
5062-
"context": "add button label",
5063-
"string": "Add"
5079+
"QSTD5z": {
5080+
"context": "dialog title for order line metadata",
5081+
"string": "Order line metadata"
50645082
},
50655083
"QUyUJy": {
50665084
"string": "Main Product"
@@ -5161,6 +5179,10 @@
51615179
"context": "label for amount already captured from this transaction",
51625180
"string": "Already captured"
51635181
},
5182+
"R06XZQ": {
5183+
"context": "tooltip explanation for before-discounts subtotal amount",
5184+
"string": "Sum of each line's undiscounted total from the order"
5185+
},
51645186
"R4IIw1": {
51655187
"context": "tracking number of the shipment",
51665188
"string": "Tracking number"
@@ -5183,6 +5205,10 @@
51835205
"RABrGb": {
51845206
"string": "Save hours of evaluating Saleor on your own by speaking with our solution engineer."
51855207
},
5208+
"RADyO6": {
5209+
"context": "sub-header for order-level discounts in summary",
5210+
"string": "Order"
5211+
},
51865212
"RBkNPr": {
51875213
"string": "Full coverage of advanced checkout cases like split payments, split fulfillments, and orchestrated payments."
51885214
},
@@ -5375,6 +5401,10 @@
53755401
"SHm7ee": {
53765402
"string": "Search by product name, attribute, product type etc..."
53775403
},
5404+
"SIrDwV": {
5405+
"context": "dialog title for order line discount",
5406+
"string": "Line discount"
5407+
},
53785408
"SKFr04": {
53795409
"string": "Attribute not found."
53805410
},
@@ -5651,6 +5681,10 @@
56515681
"context": "add custom select input option",
56525682
"string": "Add new value: {value}"
56535683
},
5684+
"U2il94": {
5685+
"context": "number of order lines with this discount type",
5686+
"string": "{count, plural, one {# line} other {# lines}}"
5687+
},
56545688
"U2mOqA": {
56555689
"string": "No vouchers found"
56565690
},
@@ -6081,10 +6115,6 @@
60816115
"context": "notifier message",
60826116
"string": "Note was added sucessfully"
60836117
},
6084-
"WTj17Z": {
6085-
"context": "dialog title item discount",
6086-
"string": "Discount Item"
6087-
},
60886118
"WUKB5Z": {
60896119
"context": "Shown after verification with relative time",
60906120
"string": "Verified {time}"
@@ -6431,10 +6461,6 @@
64316461
"context": "input helper text",
64326462
"string": "Leaving this setting empty will mean that stock won’t be reserved"
64336463
},
6434-
"YFDAaX": {
6435-
"context": "dialog title order discount",
6436-
"string": "Discount this Order by:"
6437-
},
64386464
"YFQBs1": {
64396465
"context": "product availability date label",
64406466
"string": "Set availability date"
@@ -6668,6 +6694,10 @@
66686694
"context": "automatically complete checkouts checkbox description",
66696695
"string": "When enabled, checkouts detected as fully paid will be completed automatically, without checkoutComplete mutation. {link}"
66706696
},
6697+
"ZaDvwq": {
6698+
"context": "helper text shown in line discount modal when automatic discount is applied",
6699+
"string": "This line is already discounted by {source}."
6700+
},
66716701
"ZayvsI": {
66726702
"context": "metric unit system",
66736703
"string": "Metric"
@@ -7341,6 +7371,10 @@
73417371
"context": "attribute",
73427372
"string": "Visible on Product Page in Storefront"
73437373
},
7374+
"cwYYx4": {
7375+
"context": "discount type label in line discount modal",
7376+
"string": "promotion"
7377+
},
73447378
"cwjmte": {
73457379
"context": "fulfillment status refunded",
73467380
"string": "Refunded"
@@ -7688,6 +7722,10 @@
76887722
"context": "Amount error message",
76897723
"string": "Amount cannot be bigger than max refund"
76907724
},
7725+
"fdJjic": {
7726+
"context": "dialog title for removing product from draft order",
7727+
"string": "Remove product"
7728+
},
76917729
"fg8dzN": {
76927730
"string": "Add condition"
76937731
},
@@ -7956,10 +7994,6 @@
79567994
"context": "times voucher used",
79577995
"string": "Used"
79587996
},
7959-
"h6MWxB": {
7960-
"context": "orderLine.productSku, subheader, order line metadata dialog",
7961-
"string": "SKU"
7962-
},
79637997
"h75GAF": {
79647998
"context": "voucher",
79657999
"string": "Times used"
@@ -8334,6 +8368,10 @@
83348368
"jL7f0z": {
83358369
"string": "No conditions added, click button below to create one"
83368370
},
8371+
"jLePAq": {
8372+
"context": "fallback discount source label in line discount modal",
8373+
"string": "a voucher or promotion"
8374+
},
83378375
"jMzyU8": {
83388376
"context": "tax classes card header",
83398377
"string": "Tax classes"
@@ -8358,6 +8396,10 @@
83588396
"jd/LWa": {
83598397
"string": "Voucher applies to all countries"
83608398
},
8399+
"jg8M0x": {
8400+
"context": "sub-header for line-level discounts in summary",
8401+
"string": "Lines"
8402+
},
83618403
"jgURyO": {
83628404
"context": "product price",
83638405
"string": "Select channel"
@@ -8832,6 +8874,10 @@
88328874
"context": "webhook input help text",
88338875
"string": "Secret key is used to create a hash signature with each payload. *optional field"
88348876
},
8877+
"lrTQWC": {
8878+
"context": "label for promotion discount type in order summary",
8879+
"string": "Promotion"
8880+
},
88358881
"lrq8O6": {
88368882
"context": "order refund amount, input label",
88378883
"string": "Amount"
@@ -9068,6 +9114,10 @@
90689114
"nLML8Y": {
90699115
"string": "Default Shipping Address"
90709116
},
9117+
"nMQ3ZW": {
9118+
"context": "label for voucher discount type in order summary",
9119+
"string": "Voucher"
9120+
},
90719121
"nMojhT": {
90729122
"context": "Clear filters button text",
90739123
"string": "Reset"
@@ -9157,10 +9207,6 @@
91579207
"context": "metadata field name, header",
91589208
"string": "Field"
91599209
},
9160-
"nvSJNR": {
9161-
"context": "discount reason input lavel",
9162-
"string": "Reason"
9163-
},
91649210
"nwcJVT": {
91659211
"context": "When enabled, all transactions would require an additional step to be charged.",
91669212
"string": "When enabled, all transactions would require an additional step to be charged. ({link})"
@@ -9239,6 +9285,10 @@
92399285
"context": "order status",
92409286
"string": "Ready to fulfill"
92419287
},
9288+
"oO2fji": {
9289+
"context": "dialog title for order discount",
9290+
"string": "Order discount"
9291+
},
92429292
"oQ27V4": {
92439293
"context": "order history message",
92449294
"string": "Order placed information was sent to customer"
@@ -9303,6 +9353,10 @@
93039353
"context": "currency filter label",
93049354
"string": "Currency"
93059355
},
9356+
"ous0aA": {
9357+
"context": "dialog subtitle for order discount",
9358+
"string": "Discount this order by a percentage or fixed amount"
9359+
},
93069360
"owCz2y": {
93079361
"context": "message when matrix view cannot be shown",
93089362
"string": "Matrix view requires exactly 2 attributes with selected values"
@@ -10142,6 +10196,10 @@
1014210196
"context": "link to edit variant metadata",
1014310197
"string": "Edit on variant page"
1014410198
},
10199+
"th06kZ": {
10200+
"context": "dialog body asking to confirm product removal from draft order",
10201+
"string": "Are you sure you want to remove {productName} from this draft order?"
10202+
},
1014510203
"tiY7bx": {
1014610204
"string": "Add new product"
1014710205
},
@@ -10210,6 +10268,10 @@
1021010268
"u0V06N": {
1021110269
"string": "Max. Order Weight"
1021210270
},
10271+
"u2/qds": {
10272+
"context": "label for manually added order discount",
10273+
"string": "Manual"
10274+
},
1021310275
"u24Ppd": {
1021410276
"string": "This attribute cannot be assigned to this product type"
1021510277
},
@@ -10305,6 +10367,10 @@
1030510367
"uX+Vg7": {
1030610368
"string": "Voucher updated"
1030710369
},
10370+
"uY8rPp": {
10371+
"context": "button label to cancel product removal",
10372+
"string": "Keep product"
10373+
},
1030810374
"ubasgL": {
1030910375
"context": "order history message",
1031010376
"string": "Order was confirmed"
@@ -10854,6 +10920,10 @@
1085410920
"context": "ProductTypeDeleteWarningDialog title",
1085510921
"string": "Delete product {selectedTypesCount,plural,one{type} other{types}}"
1085610922
},
10923+
"x5wgj0": {
10924+
"context": "link to replace automatic order discounts with a manual one",
10925+
"string": "Override with manual discount"
10926+
},
1085710927
"x79cEk": {
1085810928
"context": "dialog header",
1085910929
"string": "Delete structure"
@@ -11254,6 +11324,10 @@
1125411324
"context": "attribute type",
1125511325
"string": "Content Attribute"
1125611326
},
11327+
"zcyBm+": {
11328+
"context": "tooltip title for undiscounted subtotal next to order subtotal",
11329+
"string": "Before discounts"
11330+
},
1125711331
"zehNKT": {
1125811332
"string": "Rule has error, open rule to see details"
1125911333
},

0 commit comments

Comments
 (0)