Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Add `currency` type filter for Admin SPA

Damian Legawiec68abb78802c9
diff --git a/packages/admin/src/components/spree/table-toolbar.tsx b/packages/admin/src/components/spree/table-toolbar.tsx
index 259f4bdb83..841d04ad38 100644
--- a/packages/admin/src/components/spree/table-toolbar.tsx
+++ b/packages/admin/src/components/spree/table-toolbar.tsx
@@ -39,6 +39,7 @@ import {
parseFilterIds,
type SortOption,
} from '@/lib/table-registry'
+import { useStore } from '@/providers/store-provider'
interface TableToolbarProps {
/** Displayable columns (for column selector and table headers) */
@@ -100,6 +101,14 @@ const operatorsByType: Record<string, { value: string; label: string }[]> = {
{ value: 'in', label: 'is any of' },
{ value: 'not_in', label: 'is none of' },
],
+ // Same shape as `enum` — the value picker just sources its option list
+ // from the active store's `supported_currencies`.
+ currency: [
+ { value: 'eq', label: 'is' },
+ { value: 'not_eq', label: 'is not' },
+ { value: 'in', label: 'is any of' },
+ { value: 'not_in', label: 'is none of' },
+ ],
}
function getOperators(type: string) {
@@ -316,6 +325,90 @@ function ResourceFilterValue({
return <span className="font-medium">{labels.join(', ')}</span>
}
+/**
+ * Currency value-picker for `filterType: 'currency'`. Options come from the
+ * active store's `supported_currencies`. Branches on operator: `eq`/`not_eq`
+ * use a single `<Select>`; `in`/`not_in` accept a CSV via Base UI's
+ * multi-select Combobox chips, matching the other array-valued filters.
+ */
+function CurrencyFilterPicker({
+ value,
+ operator,
+ onChange,
+}: {
+ value: string
+ operator: string
+ onChange: (next: string) => void
+}) {
+ const { currencies } = useStore()
+ const items = useMemo(
+ () => currencies.map((code) => ({ value: code, label: code })),
+ [currencies],
+ )
+
+ if (operator === 'in' || operator === 'not_in') {
+ return (
+ <div className="flex-1 min-w-0">
+ <CurrencyMultiSelect
+ codes={currencies}
+ value={parseFilterIds(value)}
+ onChange={(next) => onChange(next.join(','))}
+ />
+ </div>
+ )
+ }
+
+ return (
+ <Select items={items} value={value || undefined} onValueChange={(val) => onChange(val)}>
+ <SelectTrigger size="sm" className="flex-1">
+ <SelectValue placeholder="Select…" />
+ </SelectTrigger>
+ <SelectContent>
+ {items.map((opt) => (
+ <SelectItem key={opt.value} value={opt.value}>
+ {opt.label}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ )
+}
+
+function CurrencyMultiSelect({
+ codes,
+ value,
+ onChange,
+}: {
+ codes: string[]
+ value: string[]
+ onChange: (next: string[]) => void
+}) {
+ function toggle(code: string) {
+ onChange(value.includes(code) ? value.filter((c) => c !== code) : [...value, code])
+ }
+ return (
+ <div className="flex flex-wrap gap-1 rounded-md border border-input px-2 py-1.5 text-sm">
+ {codes.map((code) => {
+ const selected = value.includes(code)
+ return (
+ <button
+ key={code}
+ type="button"
+ onClick={() => toggle(code)}
+ className={`rounded px-1.5 py-0.5 text-xs font-medium ${
+ selected
+ ? 'bg-primary text-primary-foreground'
+ : 'bg-muted text-muted-foreground hover:bg-accent'
+ }`}
+ >
+ {code}
+ </button>
+ )
+ })}
+ </div>
+ )
+}
+
// ============================================================================
// Sort Dropdown
// ============================================================================
@@ -583,6 +676,12 @@ function FilterPanel({
))}
</SelectContent>
</Select>
+ ) : col?.filterType === 'currency' ? (
+ <CurrencyFilterPicker
+ value={filter.value}
+ operator={filter.operator}
+ onChange={(val) => updateFilter(filter.id, { value: val })}
+ />
) : col?.filterType === 'boolean' ? (
<Select
items={booleanItems}
diff --git a/packages/admin/src/lib/table-registry.ts b/packages/admin/src/lib/table-registry.ts
index cb6488b1fe..da4610bb77 100644
--- a/packages/admin/src/lib/table-registry.ts
+++ b/packages/admin/src/lib/table-registry.ts
@@ -46,7 +46,7 @@ export interface ResourceFilterConfig<R extends { id: string } = { id: string }>
*/
export type ColumnDef<T = any> =
| (ColumnDefBase<T> & {
- filterType?: 'string' | 'boolean' | 'number' | 'date'
+ filterType?: 'string' | 'boolean' | 'number' | 'date' | 'currency'
filterOptions?: never
filterResource?: never
})
diff --git a/packages/admin/src/tables/orders.tsx b/packages/admin/src/tables/orders.tsx
index da20ead177..d23aafe8dc 100644
--- a/packages/admin/src/tables/orders.tsx
+++ b/packages/admin/src/tables/orders.tsx
@@ -102,6 +102,15 @@ defineTable('orders', {
className: 'text-right tabular-nums whitespace-nowrap font-medium',
render: (order) => order.display_total ?? '—',
},
+ {
+ key: 'currency',
+ label: 'Currency',
+ sortable: true,
+ filterable: true,
+ filterType: 'currency',
+ default: false,
+ render: (order) => order.currency ?? '—',
+ },
{
key: 'status',
label: 'Status',
diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rb
index 244d3ebd0c..c1ad7ed63b 100644
--- a/spree/core/app/models/spree/order.rb
+++ b/spree/core/app/models/spree/order.rb
@@ -112,7 +112,7 @@ module Spree
self.whitelisted_ransackable_associations = %w[shipments user created_by approver canceler promotions bill_address ship_address line_items store channel]
self.whitelisted_ransackable_attributes = %w[
completed_at email number state status payment_state shipment_state
- total item_total item_count considered_risky channel_id
+ total item_total item_count considered_risky channel_id currency
]
self.whitelisted_ransackable_scopes = %w[complete incomplete refunded partially_refunded search multi_search]