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.

Fix: Balance fixtures and formatting missed before pushing

Łukasz Adamczyk0e1dd6646484
diff --git a/packages/dashboard/src/components/spree/sellers/seller-balance-card.tsx b/packages/dashboard/src/components/spree/sellers/seller-balance-card.tsx
index 8009bad203..d820eb435e 100644
--- a/packages/dashboard/src/components/spree/sellers/seller-balance-card.tsx
+++ b/packages/dashboard/src/components/spree/sellers/seller-balance-card.tsx
@@ -64,9 +64,14 @@ export function SellerBalanceCard({ seller }: { seller: Seller }) {
</CardHeader>
<CardContent className="flex flex-col gap-4">
{balances.map((balance, index) => (
- <div key={`${balance.currency}-${balance.settlement_currency}`} className="flex flex-col gap-3">
+ <div
+ key={`${balance.currency}-${balance.settlement_currency}`}
+ className="flex flex-col gap-3"
+ >
{index > 0 && <Separator />}
- <ReadRow label={t('admin.payouts.balance.owed', { currency: balance.settlement_currency })}>
+ <ReadRow
+ label={t('admin.payouts.balance.owed', { currency: balance.settlement_currency })}
+ >
<span className="font-medium">{balance.display_balance}</span>
</ReadRow>
<ReadRow
@@ -79,7 +84,9 @@ export function SellerBalanceCard({ seller }: { seller: Seller }) {
{balance.display_earned}
</ReadRow>
{balance.converted && (
- <ReadRow label={t('admin.payouts.balance.payable')}>{balance.display_payable}</ReadRow>
+ <ReadRow label={t('admin.payouts.balance.payable')}>
+ {balance.display_payable}
+ </ReadRow>
)}
<ReadRow label={t('admin.payouts.balance.paid')}>{balance.display_paid}</ReadRow>
<ReadRow label={t('admin.payouts.balance.pending')}>{balance.display_pending}</ReadRow>
diff --git a/packages/seller-dashboard/src/components/finance/balance-summary.tsx b/packages/seller-dashboard/src/components/finance/balance-summary.tsx
index 6279def3c6..b52b2d081d 100644
--- a/packages/seller-dashboard/src/components/finance/balance-summary.tsx
+++ b/packages/seller-dashboard/src/components/finance/balance-summary.tsx
@@ -33,7 +33,9 @@ export function BalanceSummary({ balances }: { balances: Balance[] }) {
{balances.map((balance) => (
<Card key={`${balance.currency}-${balance.settlement_currency}`}>
<CardHeader>
- <CardTitle>{t('earnings.balance.owed', { currency: balance.settlement_currency })}</CardTitle>
+ <CardTitle>
+ {t('earnings.balance.owed', { currency: balance.settlement_currency })}
+ </CardTitle>
{balance.converted && (
<CardDescription>
{t('earnings.balance.converted', { currency: balance.currency })}
diff --git a/spree/api/spec/integration/spree/api/v3/seller/balances_spec.rb b/spree/api/spec/integration/spree/api/v3/seller/balances_spec.rb
index dacce216cf..c4ef056b5b 100644
--- a/spree/api/spec/integration/spree/api/v3/seller/balances_spec.rb
+++ b/spree/api/spec/integration/spree/api/v3/seller/balances_spec.rb
@@ -10,9 +10,13 @@ RSpec.describe 'Seller Balances API', type: :request, swagger_doc: 'api-referenc
end
before do
- create(:seller_transfer, :completed, seller: seller, amount: 40,
+ create(:seller_transfer, :completed, seller: seller, amount: 25,
+ order: create(:completed_order_with_totals, store: store, seller: seller))
+ # A settlement claims the earnings it covers; one claiming none is not
+ # something the sweep can produce, and it is the claim that debits.
+ settled = create(:seller_payout, :completed, seller: seller, amount: 15)
+ create(:seller_transfer, :completed, seller: seller, amount: 15, payout: settled,
order: create(:completed_order_with_totals, store: store, seller: seller))
- create(:seller_payout, :completed, seller: seller, amount: 15)
end
path '/api/v3/seller/balances' do