@stacksjs/defaults 0.75.37 → 0.75.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ai/skills/stacks-ai/SKILL.md +24 -1
- package/ai/skills/stacks-commerce/SKILL.md +1 -1
- package/ai/skills/stacks-config/SKILL.md +1 -1
- package/ai/skills/stacks-database/SKILL.md +1 -1
- package/ai/skills/stacks-dependencies/SKILL.md +35 -3
- package/ai/skills/stacks-env/SKILL.md +4 -1
- package/ai/skills/stacks-migrations/SKILL.md +2 -2
- package/ai/skills/stacks-models/SKILL.md +2 -2
- package/app/Actions/Commerce/Product/ProductStoreAction.ts +9 -1
- package/app/Actions/Commerce/Product/ProductUpdateAction.ts +4 -1
- package/app/Actions/Commerce/commerce-action.test.ts +30 -1
- package/app/Actions/Commerce/commerce-action.ts +44 -0
- package/app/Actions/Dashboard/Analytics/sales-analytics.test.ts +19 -0
- package/app/Actions/Dashboard/Analytics/sales-analytics.ts +2 -1
- package/app/Actions/Dashboard/Ci/failure-notifier.ts +11 -7
- package/app/Actions/Dashboard/Ci/runner-pressure-monitor.ts +13 -7
- package/app/Actions/Dashboard/Commerce/CommercePosCheckoutAction.ts +3 -2
- package/app/Actions/Dashboard/Commerce/commerce-dashboard.test.ts +29 -9
- package/app/Actions/Dashboard/Commerce/commerce-dashboard.ts +5 -12
- package/app/Actions/Dashboard/Commerce/commerce-delivery.test.ts +15 -0
- package/app/Actions/Dashboard/Commerce/commerce-delivery.ts +8 -10
- package/app/Actions/Dashboard/Commerce/commerce-pos.test.ts +26 -6
- package/app/Actions/Dashboard/Commerce/commerce-pos.ts +8 -3
- package/app/Actions/Dashboard/Commerce/commerce-product-records.ts +69 -0
- package/app/Actions/Dashboard/Kanban/BoardDestroyAction.ts +7 -4
- package/app/Actions/Dashboard/Kanban/BoardShowAction.ts +10 -7
- package/app/Actions/Dashboard/Kanban/CardAssigneesSyncAction.ts +7 -4
- package/app/Actions/Dashboard/Kanban/CardLabelsSyncAction.ts +9 -5
- package/app/Actions/Dashboard/Kanban/CardShowAction.ts +8 -5
- package/app/Actions/Dashboard/Kanban/CardStoreAction.ts +3 -2
- package/app/Actions/Dashboard/Kanban/CardsReorderAction.ts +7 -4
- package/app/Actions/Dashboard/Kanban/ColumnDestroyAction.ts +7 -4
- package/app/Actions/Dashboard/Kanban/ColumnStoreAction.ts +3 -2
- package/app/Actions/Dashboard/Kanban/ColumnsReorderAction.ts +7 -3
- package/app/Actions/Dashboard/Marketing/abandoned-cart-records.test.ts +39 -0
- package/app/Actions/Dashboard/Marketing/abandoned-cart-records.ts +9 -3
- package/app/Actions/Dashboard/Marketing/campaign-records.ts +17 -3
- package/app/Actions/Storefront/AddToCartAction.ts +4 -1
- package/app/Actions/Storefront/GetCartAction.ts +25 -10
- package/app/Actions/Storefront/PlaceOrderAction.ts +6 -1
- package/app/Actions/Storefront/_shipping.ts +63 -37
- package/app/Broadcasts/OrderShipped.ts +1 -1
- package/app/Mail/OrderConfirmation.ts +14 -7
- package/app/Models/Campaign.ts +9 -4
- package/app/Models/commerce/Cart.ts +5 -4
- package/app/Models/commerce/CartItem.ts +6 -4
- package/app/Models/commerce/Coupon.ts +9 -3
- package/app/Models/commerce/Customer.ts +2 -1
- package/app/Models/commerce/GiftCard.ts +5 -2
- package/app/Models/commerce/Order.ts +6 -5
- package/app/Models/commerce/OrderItem.ts +2 -1
- package/app/Models/commerce/ProductVariant.ts +71 -4
- package/app/Models/commerce/Transaction.ts +3 -2
- package/app/Storefront/StorefrontMoney.ts +54 -0
- package/ide/vscode/package.json +1 -1
- package/package.json +2 -2
- package/resources/components/Dashboard/Analytics/CampaignAnalytics.stx +8 -8
- package/resources/components/Dashboard/Analytics/SalesAnalytics.stx +4 -3
- package/resources/components/Dashboard/Billing/BillingPlanSummary.stx +4 -1
- package/resources/components/Dashboard/Commerce/CommerceCouponDetailsDialog.stx +4 -1
- package/resources/components/Dashboard/Commerce/CommerceCouponDialog.stx +34 -10
- package/resources/components/Dashboard/Commerce/CommerceCouponsDashboard.stx +3 -1
- package/resources/components/Dashboard/Commerce/CommerceCouponsTable.stx +4 -1
- package/resources/components/Dashboard/Commerce/CommerceCustomerDetailsDialog.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommerceCustomerDialog.stx +6 -6
- package/resources/components/Dashboard/Commerce/CommerceCustomersDashboard.stx +3 -11
- package/resources/components/Dashboard/Commerce/CommerceCustomersTable.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommerceGiftCardBreakdown.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommerceGiftCardDetailsDialog.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommerceGiftCardDialog.stx +20 -17
- package/resources/components/Dashboard/Commerce/CommerceGiftCardsDashboard.stx +3 -2
- package/resources/components/Dashboard/Commerce/CommerceGiftCardsTable.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommerceOrderDetailsDialog.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommerceOrderDialog.stx +28 -20
- package/resources/components/Dashboard/Commerce/CommerceOrdersDashboard.stx +7 -15
- package/resources/components/Dashboard/Commerce/CommerceOrdersTable.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommercePaymentsBreakdown.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommercePaymentsTable.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommercePosCart.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommercePosCatalog.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommercePosCheckoutDialog.stx +2 -6
- package/resources/components/Dashboard/Commerce/CommercePosDashboard.stx +5 -7
- package/resources/components/Dashboard/Commerce/CommercePosReceiptDialog.stx +2 -8
- package/resources/components/Dashboard/Commerce/CommerceProductDetailDashboard.stx +3 -20
- package/resources/components/Dashboard/Commerce/CommerceProductDialog.stx +27 -19
- package/resources/components/Dashboard/Commerce/CommerceProductsDashboard.stx +4 -15
- package/resources/components/Dashboard/Commerce/CommerceProductsTable.stx +2 -6
- package/resources/components/Dashboard/Commerce/Delivery/ShippingMethodDialog.stx +12 -10
- package/resources/components/Dashboard/Commerce/Delivery/ShippingMethodsTable.stx +3 -4
- package/resources/components/Dashboard/Commerce/Delivery/ShippingRateDialog.stx +7 -5
- package/resources/components/Dashboard/Commerce/Delivery/ShippingRatesDashboard.stx +3 -2
- package/resources/components/Dashboard/Commerce/Delivery/ShippingRatesTable.stx +3 -4
- package/resources/components/Dashboard/Commerce/PaymentDetailsDialog.stx +2 -6
- package/resources/components/Dashboard/Commerce/PaymentRefundDialog.stx +12 -10
- package/resources/components/Dashboard/Marketing/AbandonedCartsDashboard.stx +3 -10
- package/resources/components/Dashboard/Marketing/AbandonedCartsTable.stx +3 -8
- package/resources/components/Dashboard/Marketing/CampaignDialog.stx +26 -8
- package/resources/components/Dashboard/Marketing/CampaignsDashboard.stx +4 -2
- package/resources/components/Dashboard/Marketing/RecoveryCampaignDialog.stx +25 -13
- package/resources/components/Dashboard/Transaction/index.stx +6 -3
- package/resources/components/Storefront/CartDrawer.stx +11 -7
- package/resources/views/cart.stx +19 -23
- package/resources/views/checkout/contact.stx +12 -14
- package/resources/views/checkout/payment.stx +13 -13
- package/resources/views/checkout/shipping.stx +13 -13
- package/resources/views/cms/blocks/form.stx +50 -1
- package/resources/views/orders/[id].stx +13 -4
- package/vcs/github/workflows/buddy-bot.yml +5 -5
- package/vcs/github/workflows/ci.yml +3 -3
- package/vcs/github/workflows/release.yml +1 -1
|
@@ -3,9 +3,11 @@ import type {
|
|
|
3
3
|
CommerceProductRecord,
|
|
4
4
|
CommerceProductSummary,
|
|
5
5
|
ProductOption,
|
|
6
|
+
ProductWritePayload,
|
|
6
7
|
} from '../../../../app/Actions/Dashboard/Commerce/commerce-product-records'
|
|
7
8
|
import { DashboardApiError, dashboardApi } from '../../../../functions/dashboard-api'
|
|
8
9
|
import { pushToast } from '../../../../functions/toasts'
|
|
10
|
+
import { minorToInput } from '@stacksjs/commerce/money'
|
|
9
11
|
|
|
10
12
|
interface ProductIndexResponse {
|
|
11
13
|
records: CommerceProductRecord[]
|
|
@@ -15,20 +17,6 @@ interface ProductIndexResponse {
|
|
|
15
17
|
defaultCurrency: string
|
|
16
18
|
}
|
|
17
19
|
|
|
18
|
-
interface ProductWritePayload {
|
|
19
|
-
name: string
|
|
20
|
-
description: string
|
|
21
|
-
price: number
|
|
22
|
-
imageUrl: string
|
|
23
|
-
isAvailable: boolean
|
|
24
|
-
inventoryCount: number
|
|
25
|
-
preparationTime: number
|
|
26
|
-
allergens: string
|
|
27
|
-
nutritionalInfo: string
|
|
28
|
-
categoryId: number | null
|
|
29
|
-
manufacturerId: number | null
|
|
30
|
-
}
|
|
31
|
-
|
|
32
20
|
const emptySummary: CommerceProductSummary = {
|
|
33
21
|
total: 0,
|
|
34
22
|
available: 0,
|
|
@@ -135,7 +123,8 @@ function exportHref(): string {
|
|
|
135
123
|
record.id,
|
|
136
124
|
record.name,
|
|
137
125
|
record.description,
|
|
138
|
-
|
|
126
|
+
// Stored as integer minor units; the CSV carries the decimal a person reads.
|
|
127
|
+
minorToInput(record.price, defaultCurrency()),
|
|
139
128
|
defaultCurrency(),
|
|
140
129
|
record.isAvailable ? 'Available' : 'Unavailable',
|
|
141
130
|
String(record.inventoryCount),
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
<script client>
|
|
2
2
|
import type { CommerceProductRecord } from '../../../../app/Actions/Dashboard/Commerce/commerce-product-records'
|
|
3
|
+
import { formatCurrency } from '@stacksjs/commerce/money'
|
|
3
4
|
|
|
4
5
|
const records = useReactiveProp('records', [] as CommerceProductRecord[])
|
|
5
6
|
const loading = useReactiveProp('loading', false)
|
|
@@ -11,12 +12,7 @@ function initials(name: string): string {
|
|
|
11
12
|
}
|
|
12
13
|
|
|
13
14
|
function formatMoney(value: number): string {
|
|
14
|
-
|
|
15
|
-
return new Intl.NumberFormat(undefined, { style: 'currency', currency: currency() }).format(value)
|
|
16
|
-
}
|
|
17
|
-
catch {
|
|
18
|
-
return `${value.toFixed(2)} ${currency()}`
|
|
19
|
-
}
|
|
15
|
+
return formatCurrency(value, currency())
|
|
20
16
|
}
|
|
21
17
|
|
|
22
18
|
function availabilityClass(record: CommerceProductRecord): string {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<script client>
|
|
2
|
+
import { minorToInput, moneyInputError, parseMoneyInput } from '@stacksjs/commerce/money'
|
|
2
3
|
interface ShippingMethodRecord {
|
|
3
4
|
id: number
|
|
4
5
|
name: string
|
|
@@ -33,33 +34,34 @@ effect(() => {
|
|
|
33
34
|
hydrationKey = nextKey
|
|
34
35
|
name.set(current?.name || '')
|
|
35
36
|
description.set(current?.description || '')
|
|
36
|
-
baseRate.set(current ? (current.base_rate
|
|
37
|
+
baseRate.set(current ? minorToInput(current.base_rate, 'USD') : '')
|
|
37
38
|
freeShipping.set(current?.free_shipping === null || current?.free_shipping === undefined
|
|
38
39
|
? ''
|
|
39
|
-
: (current.free_shipping
|
|
40
|
+
: minorToInput(current.free_shipping, 'USD'))
|
|
40
41
|
status.set(current?.status || 'active')
|
|
41
42
|
})
|
|
42
43
|
|
|
44
|
+
// Amounts are typed in dollars and stored as integer cents.
|
|
43
45
|
function submit(): void {
|
|
44
|
-
const baseRateValue = Number(baseRate())
|
|
45
|
-
const freeShippingValue = freeShipping().trim() === '' ? null : Number(freeShipping())
|
|
46
46
|
if (!name().trim()) {
|
|
47
47
|
emit('invalid', 'Method name is required.')
|
|
48
48
|
return
|
|
49
49
|
}
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
const baseRateError = moneyInputError(baseRate(), 'USD')
|
|
51
|
+
if (baseRateError) {
|
|
52
|
+
emit('invalid', `Base rate: ${baseRateError}`)
|
|
52
53
|
return
|
|
53
54
|
}
|
|
54
|
-
|
|
55
|
-
|
|
55
|
+
const freeShippingError = moneyInputError(freeShipping(), 'USD', { required: false })
|
|
56
|
+
if (freeShippingError) {
|
|
57
|
+
emit('invalid', `Free shipping threshold: ${freeShippingError}`)
|
|
56
58
|
return
|
|
57
59
|
}
|
|
58
60
|
emit('submit', {
|
|
59
61
|
name: name().trim(),
|
|
60
62
|
description: description().trim(),
|
|
61
|
-
baseRate:
|
|
62
|
-
freeShipping:
|
|
63
|
+
baseRate: parseMoneyInput(baseRate(), 'USD'),
|
|
64
|
+
freeShipping: parseMoneyInput(freeShipping(), 'USD', { required: false }),
|
|
63
65
|
status: status(),
|
|
64
66
|
})
|
|
65
67
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<script client>
|
|
2
|
+
import { formatCurrency as formatMinorUnits } from '@stacksjs/commerce/money'
|
|
2
3
|
interface ShippingZoneSummary {
|
|
3
4
|
id: number
|
|
4
5
|
name: string
|
|
@@ -17,14 +18,12 @@ interface ShippingMethodRow {
|
|
|
17
18
|
const methods = useReactiveProp('methods', [] as ShippingMethodRow[])
|
|
18
19
|
const emit = defineEmits()
|
|
19
20
|
|
|
21
|
+
// Shipping amounts are stored as integer cents, in USD.
|
|
20
22
|
function formatCurrency(cents?: number | null): string {
|
|
21
23
|
if (cents === null || cents === undefined)
|
|
22
24
|
return 'Not available'
|
|
23
25
|
|
|
24
|
-
return
|
|
25
|
-
style: 'currency',
|
|
26
|
-
currency: 'USD',
|
|
27
|
-
}).format(cents / 100)
|
|
26
|
+
return formatMinorUnits(cents, 'USD', 'en-US')
|
|
28
27
|
}
|
|
29
28
|
|
|
30
29
|
function statusClass(status: string): string {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<script client>
|
|
2
|
+
import { minorToInput, moneyInputError, parseMoneyInput } from '@stacksjs/commerce/money'
|
|
2
3
|
interface ShippingResourceOption {
|
|
3
4
|
id: number
|
|
4
5
|
name: string
|
|
@@ -42,7 +43,7 @@ effect(() => {
|
|
|
42
43
|
zoneId.set(current ? String(current.shipping_zone_id) : '')
|
|
43
44
|
weightFrom.set(current ? String(current.weight_from) : '')
|
|
44
45
|
weightTo.set(current ? String(current.weight_to) : '')
|
|
45
|
-
amount.set(current ? (current.rate
|
|
46
|
+
amount.set(current ? minorToInput(current.rate, 'USD') : '')
|
|
46
47
|
})
|
|
47
48
|
|
|
48
49
|
function submit(): void {
|
|
@@ -50,7 +51,6 @@ function submit(): void {
|
|
|
50
51
|
const selectedZoneId = Number(zoneId())
|
|
51
52
|
const from = Number(weightFrom())
|
|
52
53
|
const to = Number(weightTo())
|
|
53
|
-
const rate = Number(amount())
|
|
54
54
|
|
|
55
55
|
if (!Number.isInteger(selectedMethodId) || selectedMethodId < 1) {
|
|
56
56
|
emit('invalid', 'Select a shipping method.')
|
|
@@ -68,8 +68,10 @@ function submit(): void {
|
|
|
68
68
|
emit('invalid', 'Ending weight must be greater than or equal to the starting weight.')
|
|
69
69
|
return
|
|
70
70
|
}
|
|
71
|
-
|
|
72
|
-
|
|
71
|
+
// Typed in dollars, stored as integer cents.
|
|
72
|
+
const rateError = moneyInputError(amount(), 'USD')
|
|
73
|
+
if (rateError) {
|
|
74
|
+
emit('invalid', `Rate: ${rateError}`)
|
|
73
75
|
return
|
|
74
76
|
}
|
|
75
77
|
|
|
@@ -78,7 +80,7 @@ function submit(): void {
|
|
|
78
80
|
shippingZoneId: selectedZoneId,
|
|
79
81
|
weightFrom: from,
|
|
80
82
|
weightTo: to,
|
|
81
|
-
rate:
|
|
83
|
+
rate: parseMoneyInput(amount(), 'USD'),
|
|
82
84
|
})
|
|
83
85
|
}
|
|
84
86
|
</script>
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
<script client>
|
|
2
2
|
import { dashboardApi } from '../../../../../functions/dashboard-api'
|
|
3
3
|
import { pushToast } from '../../../../../functions/toasts'
|
|
4
|
+
import { formatCurrency, minorToInput } from '@stacksjs/commerce/money'
|
|
4
5
|
|
|
5
6
|
interface ShippingResourceOption {
|
|
6
7
|
id: number
|
|
@@ -69,7 +70,7 @@ function filteredRecords(): ShippingRateRecord[] {
|
|
|
69
70
|
record.shipping_zone?.name,
|
|
70
71
|
record.weight_from,
|
|
71
72
|
record.weight_to,
|
|
72
|
-
record.rate
|
|
73
|
+
minorToInput(record.rate, 'USD'),
|
|
73
74
|
].some(value => String(value ?? '').toLowerCase().includes(query)))
|
|
74
75
|
}
|
|
75
76
|
|
|
@@ -86,7 +87,7 @@ function averageRate(): string {
|
|
|
86
87
|
if (!records().length)
|
|
87
88
|
return '$0.00'
|
|
88
89
|
const average = records().reduce((sum, record) => sum + record.rate, 0) / records().length
|
|
89
|
-
return
|
|
90
|
+
return formatCurrency(average, 'USD', 'en-US')
|
|
90
91
|
}
|
|
91
92
|
|
|
92
93
|
function metricCards(): Array<{ label: string, value: string, detail: string }> {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<script client>
|
|
2
|
+
import { formatCurrency as formatMinorUnits } from '@stacksjs/commerce/money'
|
|
2
3
|
interface ResourceSummary {
|
|
3
4
|
id: number
|
|
4
5
|
name: string
|
|
@@ -18,11 +19,9 @@ interface ShippingRateRow {
|
|
|
18
19
|
const rates = useReactiveProp('rates', [] as ShippingRateRow[])
|
|
19
20
|
const emit = defineEmits()
|
|
20
21
|
|
|
22
|
+
// Shipping amounts are stored as integer cents, in USD.
|
|
21
23
|
function formatCurrency(cents: number): string {
|
|
22
|
-
return
|
|
23
|
-
style: 'currency',
|
|
24
|
-
currency: 'USD',
|
|
25
|
-
}).format(cents / 100)
|
|
24
|
+
return formatMinorUnits(cents, 'USD', 'en-US')
|
|
26
25
|
}
|
|
27
26
|
|
|
28
27
|
function formatWeight(weight: number): string {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
<script client>
|
|
2
2
|
import type { PaymentRecord } from '../../../../app/Actions/Dashboard/Commerce/payment-records'
|
|
3
3
|
import { isRefundablePayment } from '../../../../app/Actions/Dashboard/Commerce/payment-records'
|
|
4
|
+
import { formatCurrency } from '@stacksjs/commerce/money'
|
|
4
5
|
|
|
5
6
|
const open = useReactiveProp('open', false)
|
|
6
7
|
const record = useReactiveProp('record', null as PaymentRecord | null)
|
|
@@ -11,12 +12,7 @@ function label(value: string): string {
|
|
|
11
12
|
}
|
|
12
13
|
|
|
13
14
|
function money(value: number, currency: string): string {
|
|
14
|
-
|
|
15
|
-
return new Intl.NumberFormat(undefined, { style: 'currency', currency }).format(value / 100)
|
|
16
|
-
}
|
|
17
|
-
catch {
|
|
18
|
-
return `${currency} ${(value / 100).toFixed(2)}`
|
|
19
|
-
}
|
|
15
|
+
return formatCurrency(value, currency)
|
|
20
16
|
}
|
|
21
17
|
|
|
22
18
|
function detailRows(): Array<{ label: string, value: string }> {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
<script client>
|
|
2
2
|
import type { PaymentRecord } from '../../../../app/Actions/Dashboard/Commerce/payment-records'
|
|
3
|
+
import { formatCurrency, minorToInput, moneyInputError, moneyInputStep, parseMoneyInput } from '@stacksjs/commerce/money'
|
|
3
4
|
|
|
4
5
|
const open = useReactiveProp('open', false)
|
|
5
6
|
const record = useReactiveProp('record', null as PaymentRecord | null)
|
|
@@ -18,7 +19,7 @@ effect(() => {
|
|
|
18
19
|
if (!payment || hydrationKey === key)
|
|
19
20
|
return
|
|
20
21
|
hydrationKey = key
|
|
21
|
-
amount.set((
|
|
22
|
+
amount.set(minorToInput(payment.amount - payment.refundAmount, payment.currency))
|
|
22
23
|
})
|
|
23
24
|
|
|
24
25
|
function remaining(): number {
|
|
@@ -26,9 +27,15 @@ function remaining(): number {
|
|
|
26
27
|
return payment ? Math.max(0, payment.amount - payment.refundAmount) : 0
|
|
27
28
|
}
|
|
28
29
|
|
|
30
|
+
function paymentCurrency(): string {
|
|
31
|
+
return record()?.currency || 'USD'
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
// What was typed, in integer minor units, or 0 while it is not a valid amount.
|
|
29
35
|
function amountCents(): number {
|
|
30
|
-
|
|
31
|
-
|
|
36
|
+
if (moneyInputError(amount(), paymentCurrency(), { min: 1 }))
|
|
37
|
+
return 0
|
|
38
|
+
return parseMoneyInput(amount(), paymentCurrency(), { min: 1 })
|
|
32
39
|
}
|
|
33
40
|
|
|
34
41
|
function valid(): boolean {
|
|
@@ -37,12 +44,7 @@ function valid(): boolean {
|
|
|
37
44
|
}
|
|
38
45
|
|
|
39
46
|
function money(value: number, currency: string): string {
|
|
40
|
-
|
|
41
|
-
return new Intl.NumberFormat(undefined, { style: 'currency', currency }).format(value / 100)
|
|
42
|
-
}
|
|
43
|
-
catch {
|
|
44
|
-
return `${currency} ${(value / 100).toFixed(2)}`
|
|
45
|
-
}
|
|
47
|
+
return formatCurrency(value, currency)
|
|
46
48
|
}
|
|
47
49
|
|
|
48
50
|
function submit(): void {
|
|
@@ -59,7 +61,7 @@ function submit(): void {
|
|
|
59
61
|
@close="emit('close')"
|
|
60
62
|
>
|
|
61
63
|
<form id="payment-refund-form" @submit.prevent="submit">
|
|
62
|
-
<label class="block"><span class="font-medium text-gray-700 text-sm dark:text-neutral-200">Refund amount</span><input x-model="amount" type="number" min="
|
|
64
|
+
<label class="block"><span class="font-medium text-gray-700 text-sm dark:text-neutral-200">Refund amount</span><input x-model="amount" type="number" :min="minorToInput(1, paymentCurrency())" :max="minorToInput(remaining(), paymentCurrency())" :step="moneyInputStep(paymentCurrency())" required class="mt-1 px-3 py-2 w-full text-gray-900 text-sm dark:text-white bg-white dark:bg-neutral-900 border border-gray-300 rounded-md dark:border-neutral-700" /></label>
|
|
63
65
|
<p class="mt-2 text-amber-700 text-xs dark:text-amber-300">This records an already confirmed processor refund. It does not initiate money movement.</p>
|
|
64
66
|
</form>
|
|
65
67
|
<template #footer>
|
|
@@ -5,6 +5,7 @@ import type {
|
|
|
5
5
|
AbandonedCartSummary,
|
|
6
6
|
RecoveryCampaignRecord,
|
|
7
7
|
} from '../../../../app/Actions/Dashboard/Marketing/abandoned-cart-records'
|
|
8
|
+
import { formatCurrency } from '@stacksjs/commerce/money'
|
|
8
9
|
import { dashboardApi } from '../../../../functions/dashboard-api'
|
|
9
10
|
import { pushToast } from '../../../../functions/toasts'
|
|
10
11
|
|
|
@@ -88,17 +89,9 @@ effect(() => {
|
|
|
88
89
|
page.set(1)
|
|
89
90
|
})
|
|
90
91
|
|
|
92
|
+
/** Cart totals and campaign thresholds are integer minor units (stacksjs/stacks#2851). */
|
|
91
93
|
function money(value: number): string {
|
|
92
|
-
|
|
93
|
-
return new Intl.NumberFormat(undefined, {
|
|
94
|
-
style: 'currency',
|
|
95
|
-
currency: summary().currency || defaultCurrency() || 'USD',
|
|
96
|
-
maximumFractionDigits: 0,
|
|
97
|
-
}).format(value)
|
|
98
|
-
}
|
|
99
|
-
catch {
|
|
100
|
-
return `${Math.round(value)} ${defaultCurrency()}`
|
|
101
|
-
}
|
|
94
|
+
return formatCurrency(value, summary().currency || defaultCurrency())
|
|
102
95
|
}
|
|
103
96
|
|
|
104
97
|
function percentage(value: number): string {
|
|
@@ -1,18 +1,13 @@
|
|
|
1
1
|
<script client>
|
|
2
2
|
import type { AbandonedCartRecord } from '../../../../app/Actions/Dashboard/Marketing/abandoned-cart-records'
|
|
3
|
+
import { formatCurrency } from '@stacksjs/commerce/money'
|
|
3
4
|
|
|
4
5
|
const records = useReactiveProp('records', [] as AbandonedCartRecord[])
|
|
5
6
|
const loading = useReactiveProp('loading', false)
|
|
6
7
|
|
|
8
|
+
/** A cart's total is integer minor units, like every commerce amount (stacksjs/stacks#2851). */
|
|
7
9
|
function money(value: number, currency: string): string {
|
|
8
|
-
|
|
9
|
-
return new Intl.NumberFormat(undefined, { style: 'currency', currency: currency || 'USD' }).format(value)
|
|
10
|
-
}
|
|
11
|
-
catch {
|
|
12
|
-
// A currency the browser does not know is not a reason to render nothing
|
|
13
|
-
// where a number belongs.
|
|
14
|
-
return `${value.toFixed(2)} ${currency}`
|
|
15
|
-
}
|
|
10
|
+
return formatCurrency(value, currency)
|
|
16
11
|
}
|
|
17
12
|
|
|
18
13
|
/**
|
|
@@ -5,6 +5,7 @@ import type {
|
|
|
5
5
|
CampaignStatus,
|
|
6
6
|
CampaignType,
|
|
7
7
|
} from '../../../../app/Actions/Dashboard/Marketing/campaign-records'
|
|
8
|
+
import { minorToInput, moneyInputError, moneyInputStep, parseMoneyInput } from '@stacksjs/commerce/money'
|
|
8
9
|
|
|
9
10
|
const open = useReactiveProp('open', false)
|
|
10
11
|
const mode = useReactiveProp('mode', 'add')
|
|
@@ -25,6 +26,9 @@ const fromName = state('')
|
|
|
25
26
|
const fromAddress = state('')
|
|
26
27
|
const emailListId = state('')
|
|
27
28
|
const scheduledAt = state('')
|
|
29
|
+
// Budget and spend as typed, in major units of `currency`. The record and
|
|
30
|
+
// the API hold integer minor units (1999 is $19.99), converted at this
|
|
31
|
+
// boundary through @stacksjs/commerce/money.
|
|
28
32
|
const budget = state('')
|
|
29
33
|
const spent = state('0')
|
|
30
34
|
const currency = state('USD')
|
|
@@ -33,6 +37,8 @@ const endDate = state('')
|
|
|
33
37
|
const canSubmit = derived(() => {
|
|
34
38
|
if (!name().trim())
|
|
35
39
|
return false
|
|
40
|
+
if (budgetError() || spentError())
|
|
41
|
+
return false
|
|
36
42
|
return type() !== 'email'
|
|
37
43
|
|| Boolean(subject().trim() && template().trim() && emailListId())
|
|
38
44
|
})
|
|
@@ -67,13 +73,22 @@ effect(() => {
|
|
|
67
73
|
fromAddress.set(current?.fromAddress || '')
|
|
68
74
|
emailListId.set(current?.emailListId || '')
|
|
69
75
|
scheduledAt.set(localDateTime(current?.scheduledAt || ''))
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
76
|
+
const recordCurrency = current?.currency || defaultCurrency()
|
|
77
|
+
budget.set(current?.budget ? minorToInput(current.budget, recordCurrency) : '')
|
|
78
|
+
spent.set(minorToInput(current?.spent || 0, recordCurrency))
|
|
79
|
+
currency.set(recordCurrency)
|
|
73
80
|
startDate.set(localDateTime(current?.startDate || ''))
|
|
74
81
|
endDate.set(localDateTime(current?.endDate || ''))
|
|
75
82
|
})
|
|
76
83
|
|
|
84
|
+
function budgetError(): string {
|
|
85
|
+
return moneyInputError(budget(), currency(), { required: false })
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
function spentError(): string {
|
|
89
|
+
return moneyInputError(spent(), currency(), { required: false })
|
|
90
|
+
}
|
|
91
|
+
|
|
77
92
|
function normalizeType(event: Event): void {
|
|
78
93
|
const nextType = (event.target as HTMLSelectElement).value as CampaignType
|
|
79
94
|
if (nextType === 'email')
|
|
@@ -85,6 +100,7 @@ function normalizeType(event: Event): void {
|
|
|
85
100
|
function submit(): void {
|
|
86
101
|
if (!canSubmit())
|
|
87
102
|
return
|
|
103
|
+
const code = currency().trim().toUpperCase()
|
|
88
104
|
emit('submit', {
|
|
89
105
|
name: name().trim(),
|
|
90
106
|
description: description().trim(),
|
|
@@ -97,9 +113,9 @@ function submit(): void {
|
|
|
97
113
|
fromAddress: fromAddress().trim(),
|
|
98
114
|
emailListId: emailListId() || null,
|
|
99
115
|
scheduledAt: databaseDateTime(scheduledAt()) || null,
|
|
100
|
-
budget: budget(),
|
|
101
|
-
spent: spent(),
|
|
102
|
-
currency:
|
|
116
|
+
budget: parseMoneyInput(budget(), code, { required: false }),
|
|
117
|
+
spent: parseMoneyInput(spent(), code, { required: false }) ?? 0,
|
|
118
|
+
currency: code,
|
|
103
119
|
startDate: databaseDateTime(startDate()),
|
|
104
120
|
endDate: databaseDateTime(endDate()),
|
|
105
121
|
})
|
|
@@ -200,12 +216,14 @@ function submit(): void {
|
|
|
200
216
|
</label>
|
|
201
217
|
<label class="block">
|
|
202
218
|
<span class="font-medium text-gray-700 text-sm dark:text-neutral-200">Budget</span>
|
|
203
|
-
<input x-model="budget" type="number" min="0" step="
|
|
219
|
+
<input x-model="budget" type="number" min="0" :step="moneyInputStep(currency())" class="mt-1 px-3 py-2 w-full text-gray-900 text-sm dark:text-white bg-white dark:bg-neutral-900 border border-gray-300 rounded-md dark:border-neutral-700" />
|
|
220
|
+
<span :if="budgetError()" class="block mt-1 text-red-600 text-xs dark:text-red-400">{{ budgetError() }}</span>
|
|
204
221
|
</label>
|
|
205
222
|
<div class="grid gap-3 grid-cols-[1fr_7rem]">
|
|
206
223
|
<label class="block">
|
|
207
224
|
<span class="font-medium text-gray-700 text-sm dark:text-neutral-200">Spent</span>
|
|
208
|
-
<input x-model="spent" type="number" min="0" step="
|
|
225
|
+
<input x-model="spent" type="number" min="0" :step="moneyInputStep(currency())" class="mt-1 px-3 py-2 w-full text-gray-900 text-sm dark:text-white bg-white dark:bg-neutral-900 border border-gray-300 rounded-md dark:border-neutral-700" />
|
|
226
|
+
<span :if="spentError()" class="block mt-1 text-red-600 text-xs dark:text-red-400">{{ spentError() }}</span>
|
|
209
227
|
</label>
|
|
210
228
|
<label class="block">
|
|
211
229
|
<span class="font-medium text-gray-700 text-sm dark:text-neutral-200">Currency</span>
|
|
@@ -27,8 +27,10 @@ interface CampaignPayload {
|
|
|
27
27
|
fromAddress: string
|
|
28
28
|
emailListId: string | null
|
|
29
29
|
scheduledAt: string | null
|
|
30
|
-
budget
|
|
31
|
-
|
|
30
|
+
/** Integer minor units of `currency`, or null for no budget. */
|
|
31
|
+
budget: number | null
|
|
32
|
+
/** Integer minor units of `currency`. */
|
|
33
|
+
spent: number
|
|
32
34
|
currency: string
|
|
33
35
|
startDate: string
|
|
34
36
|
endDate: string
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
<script client>
|
|
2
2
|
import type { AbandonedCartRecord } from '../../../../app/Actions/Dashboard/Marketing/abandoned-cart-records'
|
|
3
3
|
import { reachOf } from '../../../../app/Actions/Dashboard/Marketing/abandoned-cart-records'
|
|
4
|
+
import { formatCurrency, moneyInputError, moneyInputStep, parseMoneyInput } from '@stacksjs/commerce/money'
|
|
4
5
|
|
|
5
6
|
const open = useReactiveProp('open', false)
|
|
6
7
|
const records = useReactiveProp('records', [] as AbandonedCartRecord[])
|
|
@@ -16,7 +17,9 @@ const text = state('')
|
|
|
16
17
|
const fromName = state('')
|
|
17
18
|
const fromAddress = state('')
|
|
18
19
|
const idleHours = state(4)
|
|
19
|
-
|
|
20
|
+
// The threshold as typed, in major units. Carts and the stored rule hold
|
|
21
|
+
// integer minor units (stacksjs/stacks#2851).
|
|
22
|
+
const minimumValue = state('0')
|
|
20
23
|
const scheduledAt = state('')
|
|
21
24
|
let hydrated = false
|
|
22
25
|
|
|
@@ -34,7 +37,7 @@ effect(() => {
|
|
|
34
37
|
fromName.set('')
|
|
35
38
|
fromAddress.set('')
|
|
36
39
|
idleHours.set(defaultIdleHours())
|
|
37
|
-
minimumValue.set(0)
|
|
40
|
+
minimumValue.set('0')
|
|
38
41
|
scheduledAt.set('')
|
|
39
42
|
})
|
|
40
43
|
|
|
@@ -46,22 +49,30 @@ effect(() => {
|
|
|
46
49
|
* still choosing it, not after they have scheduled a send to an empty room.
|
|
47
50
|
*/
|
|
48
51
|
function reach(): { carts: number, value: number } {
|
|
49
|
-
return reachOf(records(), Number(idleHours()) || 0,
|
|
52
|
+
return reachOf(records(), Number(idleHours()) || 0, minimumMinor())
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
function minimumError(): string {
|
|
56
|
+
return moneyInputError(minimumValue(), defaultCurrency(), { required: false })
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/** The typed threshold in minor units, or 0 while it is empty or unreadable. */
|
|
60
|
+
function minimumMinor(): number {
|
|
61
|
+
if (minimumError())
|
|
62
|
+
return 0
|
|
63
|
+
return parseMoneyInput(minimumValue(), defaultCurrency(), { required: false }) ?? 0
|
|
50
64
|
}
|
|
51
65
|
|
|
52
66
|
function money(value: number): string {
|
|
53
|
-
|
|
54
|
-
return new Intl.NumberFormat(undefined, { style: 'currency', currency: defaultCurrency() || 'USD' }).format(value)
|
|
55
|
-
}
|
|
56
|
-
catch {
|
|
57
|
-
return `${value.toFixed(2)} ${defaultCurrency()}`
|
|
58
|
-
}
|
|
67
|
+
return formatCurrency(value, defaultCurrency())
|
|
59
68
|
}
|
|
60
69
|
|
|
61
70
|
function submit(): void {
|
|
62
71
|
const when = scheduledAt() ? new Date(scheduledAt()) : null
|
|
63
72
|
if (when && !Number.isFinite(when.getTime()))
|
|
64
73
|
return
|
|
74
|
+
if (minimumError())
|
|
75
|
+
return
|
|
65
76
|
|
|
66
77
|
emit('submit', {
|
|
67
78
|
name: name(),
|
|
@@ -70,7 +81,7 @@ function submit(): void {
|
|
|
70
81
|
fromName: fromName(),
|
|
71
82
|
fromAddress: fromAddress(),
|
|
72
83
|
idleHours: Number(idleHours()) || 0,
|
|
73
|
-
minimumValue:
|
|
84
|
+
minimumValue: minimumMinor(),
|
|
74
85
|
scheduledAt: when ? when.toISOString() : null,
|
|
75
86
|
currency: defaultCurrency(),
|
|
76
87
|
})
|
|
@@ -101,8 +112,9 @@ function submit(): void {
|
|
|
101
112
|
</label>
|
|
102
113
|
<label class="block">
|
|
103
114
|
<span class="font-medium text-gray-700 text-sm dark:text-neutral-200">Minimum cart value</span>
|
|
104
|
-
<input x-model="minimumValue" type="number" min="0" step="
|
|
105
|
-
<span class="block mt-1 text-
|
|
115
|
+
<input x-model="minimumValue" type="number" min="0" :step="moneyInputStep(defaultCurrency())" class="mt-1 px-3 py-2 w-full text-gray-900 text-sm dark:text-white bg-white dark:bg-neutral-900 border border-gray-300 rounded-md dark:border-neutral-700" />
|
|
116
|
+
<span :if="minimumError()" class="block mt-1 text-red-600 text-xs dark:text-red-400">{{ minimumError() }}</span>
|
|
117
|
+
<span :if="!minimumError()" class="block mt-1 text-gray-500 text-xs dark:text-neutral-400">Leave at zero to chase every cart.</span>
|
|
106
118
|
</label>
|
|
107
119
|
</div>
|
|
108
120
|
|
|
@@ -139,7 +151,7 @@ function submit(): void {
|
|
|
139
151
|
<template #footer>
|
|
140
152
|
<div class="flex gap-2 justify-end w-full">
|
|
141
153
|
<Button :disabled="busy()" variant="secondary" @click="emit('close')">Close</Button>
|
|
142
|
-
<Button :disabled="busy() || !name() || !subject()" :loading="busy()" @click="submit()">{{ scheduledAt() ? 'Schedule campaign' : 'Save as draft' }}</Button>
|
|
154
|
+
<Button :disabled="busy() || !name() || !subject() || !!minimumError()" :loading="busy()" @click="submit()">{{ scheduledAt() ? 'Schedule campaign' : 'Save as draft' }}</Button>
|
|
143
155
|
</div>
|
|
144
156
|
</template>
|
|
145
157
|
</Modal>
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
<script server>
|
|
2
|
+
import { formatCurrency } from '@stacksjs/commerce/money'
|
|
3
|
+
|
|
2
4
|
interface indexProps {
|
|
3
5
|
transactionHistory?: any[]
|
|
4
6
|
}
|
|
@@ -15,8 +17,9 @@ function formatTimestampDate(timestamp: number) {
|
|
|
15
17
|
return lineData?.[0]?.plan?.interval || ''
|
|
16
18
|
}
|
|
17
19
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
+
// Stripe reports `unit_amount` in the currency's minor unit.
|
|
21
|
+
function getUnitPrice(lineData: Array<{ price?: { unit_amount?: number | string, currency?: string } }> | undefined) {
|
|
22
|
+
return formatCurrency(lineData?.[0]?.price?.unit_amount || 0, lineData?.[0]?.price?.currency || 'USD')
|
|
20
23
|
}
|
|
21
24
|
|
|
22
25
|
function getLastDigits(paymentIntent: { payment_method?: { card?: { last4?: string } } } | undefined) {
|
|
@@ -66,7 +69,7 @@ function formatTimestampDate(timestamp: number) {
|
|
|
66
69
|
{{ formatTimestampDate(transaction.created_at) }}
|
|
67
70
|
</td>
|
|
68
71
|
<td class="px-3 py-4 text-gray-500 text-sm whitespace-nowrap">
|
|
69
|
-
|
|
72
|
+
{{ getUnitPrice(transaction.unit_price) }}
|
|
70
73
|
</td>
|
|
71
74
|
<td class="flex items-center px-3 py-4 space-x-2 text-gray-500 text-sm whitespace-nowrap">
|
|
72
75
|
<slot name="cardBrand" />
|
|
@@ -143,7 +143,11 @@
|
|
|
143
143
|
return String(s ?? '').replace(/[&<>"']/g, c => entities[c] ?? c)
|
|
144
144
|
}
|
|
145
145
|
|
|
146
|
-
|
|
146
|
+
// Amounts arrive from /api/cart already formatted (`priceLabel`,
|
|
147
|
+
// `lineTotalLabel`, `subtotalLabel`): the stored values are integer minor
|
|
148
|
+
// units of the cart's currency, and only the server formats them, through
|
|
149
|
+
// @stacksjs/commerce/money.
|
|
150
|
+
const render = (items: Array<{ slug?: string, name?: string, image?: string, qty?: number | string, priceLabel?: string, lineTotalLabel?: string }> | null | undefined, subtotalLabel: string) => {
|
|
147
151
|
if (!list || !empty || !footer) return
|
|
148
152
|
if (!items || items.length === 0) {
|
|
149
153
|
list.classList.add('hidden')
|
|
@@ -159,8 +163,8 @@
|
|
|
159
163
|
const name = escapeHtml(it.name || '')
|
|
160
164
|
const image = escapeHtml(it.image || '')
|
|
161
165
|
const qty = Number(it.qty) || 0
|
|
162
|
-
const
|
|
163
|
-
const
|
|
166
|
+
const priceLabel = escapeHtml(it.priceLabel || '')
|
|
167
|
+
const lineTotalLabel = escapeHtml(it.lineTotalLabel || '')
|
|
164
168
|
return [
|
|
165
169
|
'<li class="flex gap-3 items-start">',
|
|
166
170
|
' <a href="/products/' + slug + '" class="block overflow-hidden flex-shrink-0 h-16 w-16 bg-stone-200 rounded-xl">',
|
|
@@ -168,13 +172,13 @@
|
|
|
168
172
|
' </a>',
|
|
169
173
|
' <div class="flex-1 min-w-0">',
|
|
170
174
|
' <p class="font-semibold text-sm text-stone-900 truncate">' + name + '</p>',
|
|
171
|
-
' <p class="mt-0.5 text-stone-500 text-xs">Qty ' + qty + ' ·
|
|
175
|
+
' <p class="mt-0.5 text-stone-500 text-xs">Qty ' + qty + ' · ' + priceLabel + '</p>',
|
|
172
176
|
' </div>',
|
|
173
|
-
' <p class="font-semibold text-sm text-stone-900"
|
|
177
|
+
' <p class="font-semibold text-sm text-stone-900">' + lineTotalLabel + '</p>',
|
|
174
178
|
'</li>',
|
|
175
179
|
].join('')
|
|
176
180
|
}).join('')
|
|
177
|
-
if (subtotalEl) subtotalEl.textContent =
|
|
181
|
+
if (subtotalEl) subtotalEl.textContent = subtotalLabel
|
|
178
182
|
}
|
|
179
183
|
|
|
180
184
|
let inflightRefresh: Promise<void> | null = null
|
|
@@ -193,7 +197,7 @@
|
|
|
193
197
|
})
|
|
194
198
|
if (!res.ok) return
|
|
195
199
|
const data = await res.json()
|
|
196
|
-
render(data.items || [], data.
|
|
200
|
+
render(data.items || [], data.subtotalLabel || '')
|
|
197
201
|
const badge = document.querySelector('[data-stx-cart-count]')
|
|
198
202
|
if (badge) {
|
|
199
203
|
const total = (data.items || []).reduce((sum: number, item: { qty?: number | string }) => sum + (Number(item.qty) || 0), 0)
|