Skip to content

Commit 2f6edf3

Browse files
authored
feat(dashboard,cart,types,utils): refine order details summary (#13313)
* feat(dashboard,types,utils): refine order details summary * fix tests * changeset * ui corrections * tests again * weird tests failing * revert update to subtotal * revert http tests too * comments * move credit lines so it makes more sense * remove currency codes and add bold prices * add new properties in default for storefront * minor to patch * remove bold on things that should be * olis comment about taxes * remove bold from shipping
1 parent 753e808 commit 2f6edf3

File tree

13 files changed

+339
-205
lines changed

13 files changed

+339
-205
lines changed

.changeset/spotty-games-retire.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@medusajs/utils": patch
3+
"@medusajs/dashboard": patch
4+
"@medusajs/types": patch
5+
---
6+
7+
feat(dashboard,cart,types,utils): refine order details summary

integration-tests/http/__tests__/draft-order/admin/draft-order.spec.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import { medusaIntegrationTestRunner } from "@medusajs/test-utils"
22
import { HttpTypes } from "@medusajs/types"
33
import { ModuleRegistrationName } from "@medusajs/utils"
4-
import {
5-
adminHeaders,
6-
createAdminUser,
7-
} from "../../../../helpers/create-admin-user"
4+
import { adminHeaders, createAdminUser, } from "../../../../helpers/create-admin-user"
85
import { setupTaxStructure } from "../../../../modules/__tests__/fixtures"
96

107
jest.setTimeout(300000)

packages/admin/dashboard/src/i18n/translations/$schema.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3987,6 +3987,9 @@
39873987
},
39883988
"taxTotal": {
39893989
"type": "string"
3990+
},
3991+
"totalAfterDiscount": {
3992+
"type": "string"
39903993
}
39913994
},
39923995
"required": [
@@ -4002,7 +4005,8 @@
40024005
"itemSubtotal",
40034006
"shippingSubtotal",
40044007
"discountSubtotal",
4005-
"taxTotal"
4008+
"taxTotal",
4009+
"totalAfterDiscount"
40064010
],
40074011
"additionalProperties": false
40084012
},

packages/admin/dashboard/src/i18n/translations/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,8 @@
10671067
"itemSubtotal": "Item Subtotal",
10681068
"shippingSubtotal": "Shipping Subtotal",
10691069
"discountSubtotal": "Discount Subtotal",
1070-
"taxTotal": "Tax Total"
1070+
"taxTotal": "Tax Total",
1071+
"totalAfterDiscount": "Total After Discount"
10711072
},
10721073
"transfer": {
10731074
"title": "Transfer ownership",

0 commit comments

Comments
 (0)