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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Merge branch 'main' into feat/seller-payouts
Damian Legawiec2f3befeadc54
diff --cc packages/admin-sdk/src/types/generated/Store.tsindex 75e220399b,50f9abd8c2..b6c0c09b2b--- a/packages/admin-sdk/src/types/generated/Store.ts+++ b/packages/admin-sdk/src/types/generated/Store.ts@@@ -1,4 -1,4 +1,4 @@@- // Typelizer digest 1ae39318e19bbb3e23c8f9a85882a81f-// Typelizer digest f8869482793ad0b975b2258ee740126f++// Typelizer digest 7456a5ab83a9e63d9d779cf4b10b9bc9//// DO NOT MODIFY: This file was automatically generated by Typelizer.import type {SetupTask} from '@/types'diff --cc packages/admin-sdk/src/types/generated/index.tsindex 91d795f4b7,33ed15c3c2..e3f2a8e9d6--- a/packages/admin-sdk/src/types/generated/index.ts+++ b/packages/admin-sdk/src/types/generated/index.ts@@@ -1,4 -1,4 +1,4 @@@- // Typelizer digest fbb5bda7997c319242cbc1176a37e74f-// Typelizer digest 68675617ca11d85c019637f50ef162ac++// Typelizer digest 06159cf1a26f250939f2b18824fd37ba//// DO NOT MODIFY: This file was automatically generated by Typelizer.export type { default as Address } from './Address'diff --cc packages/dashboard/src/locales/ar.jsonindex febbe8f05e,c0aeed1103..1169264474--- a/packages/dashboard/src/locales/ar.json+++ b/packages/dashboard/src/locales/ar.json@@@ -1892,31 -1945,19 +1945,45 @@@"help": "الاحتفاظ بالأسعار السابقة ليتمكن المتجر من عرض أقل سعر خلال آخر 30 يومًا، وفقًا لقواعد الاتحاد الأوروبي.","label": "تسجيل سجل الأسعار"},+ "payouts": {+ "title": "مدفوعات البائعين",+ "description": "كيف يدفع هذا السوق للبائعين الذين يتاجرون فيه.",+ "provider": {+ "label": "الدفع عبر",+ "help": "من ينقل الأموال. مع دفاترك الخاصة، ترسل التحويلات بنفسك وتضع علامة على كل منها كمدفوع.",+ "requires_account": "يجب على البائعين إعداد حساب لدى هذا المزود قبل أن يدفع لهم."+ },+ "provider_none": "دفاترك الخاصة",+ "provider_unavailable": "اربط هذا المزود قبل أن تتمكن من الدفع عبره",+ "schedule": {+ "label": "تسوية البائعين",+ "help": "كم مرة تُجمَّع الأرباح في دفعة واحدة. يمكن للبائع أن يتبع جدوله الخاص."+ },+ "schedule_intervals": {+ "daily": "يوميًا",+ "weekly": "أسبوعيًا",+ "biweekly": "كل أسبوعين",+ "monthly": "شهريًا",+ "manual": "فقط عندما تطلب ذلك"+ },+ "minimum": {+ "label": "الحد الأدنى للدفع",+ "help": "دون ذلك، يُرحَّل رصيد البائع إلى الفترة التالية بدل إرساله. الصفر يدفع كل ما هو مستحق."+ }++ },+ "limit_digital_download_count": {+ "help": "عند الإيقاف يمكن للمشترين التنزيل بلا حدود.",+ "label": "تحديد عدد التنزيلات"+ },+ "digital_asset_authorized_clicks": {+ "label": "التنزيلات المسموح بها"+ },+ "limit_digital_download_days": {+ "help": "عند الإيقاف لا تنتهي صلاحية روابط التنزيل أبدًا.",+ "label": "تحديد مدة التنزيل"+ },+ "digital_asset_authorized_days": {+ "label": "الأيام المتاحة"}},"store_credit": {diff --cc packages/dashboard/src/locales/de.jsonindex 9772c14352,4c5a9e9cfc..cfdeecb2f6--- a/packages/dashboard/src/locales/de.json+++ b/packages/dashboard/src/locales/de.json@@@ -1875,31 -1928,19 +1928,45 @@@"help": "Frühere Preise speichern, damit der Shop den niedrigsten Preis der letzten 30 Tage anzeigen kann, wie es EU-Regeln verlangen.","label": "Preisverlauf aufzeichnen"},+ "payouts": {+ "title": "Auszahlungen an Verkäufer",+ "description": "Wie dieser Marktplatz die Verkäufer bezahlt, die auf ihm handeln.",+ "provider": {+ "label": "Bezahlt über",+ "help": "Wer das Geld bewegt. Bei eigener Buchführung überweisen Sie selbst und markieren jede Zahlung als erledigt.",+ "requires_account": "Verkäufer müssen bei diesem Anbieter ein Konto einrichten, bevor er sie bezahlt."+ },+ "provider_none": "Eigene Buchführung",+ "provider_unavailable": "Verbinden Sie diesen Anbieter, bevor Sie darüber bezahlen können",+ "schedule": {+ "label": "Verkäufer abrechnen",+ "help": "Wie oft Einnahmen zu einer Zahlung gebündelt werden. Ein Verkäufer kann einen eigenen Rhythmus haben."+ },+ "schedule_intervals": {+ "daily": "Täglich",+ "weekly": "Wöchentlich",+ "biweekly": "Alle zwei Wochen",+ "monthly": "Monatlich",+ "manual": "Nur auf Ihre Anweisung"+ },+ "minimum": {+ "label": "Mindestauszahlung",+ "help": "Darunter wird das Guthaben in die nächste Periode übertragen statt ausgezahlt. Null zahlt jeden offenen Betrag."+ }++ },+ "limit_digital_download_count": {+ "help": "Aus bedeutet, dass Käufer beliebig oft herunterladen können.",+ "label": "Anzahl der Downloads begrenzen"+ },+ "digital_asset_authorized_clicks": {+ "label": "Erlaubte Downloads"+ },+ "limit_digital_download_days": {+ "help": "Aus bedeutet, dass Download-Links nie ablaufen.",+ "label": "Download-Zeitraum begrenzen"+ },+ "digital_asset_authorized_days": {+ "label": "Verfügbare Tage"}},"store_credit": {diff --cc packages/dashboard/src/locales/en.jsonindex 1b2099738f,21851eea8c..2c04807da3--- a/packages/dashboard/src/locales/en.json+++ b/packages/dashboard/src/locales/en.json@@@ -1875,31 -1928,19 +1928,45 @@@"help": "Keep past prices so the storefront can show the lowest price of the last 30 days, as EU rules require.","label": "Record price history"},+ "payouts": {+ "title": "Seller payouts",+ "description": "How this marketplace pays the sellers who trade on it.",+ "provider": {+ "label": "Paid through",+ "help": "Who moves the money. Keeping your own books means you send the transfers yourself and mark each one paid.",+ "requires_account": "Sellers must set up an account with this provider before it will pay them."+ },+ "provider_none": "Your own books",+ "provider_unavailable": "Connect this provider before you can pay through it",+ "schedule": {+ "label": "Settle sellers",+ "help": "How often earnings are batched into a payment. A seller can carry their own schedule instead."+ },+ "schedule_intervals": {+ "daily": "Daily",+ "weekly": "Weekly",+ "biweekly": "Every two weeks",+ "monthly": "Monthly",+ "manual": "Only when you say so"+ },+ "minimum": {+ "label": "Minimum payout",+ "help": "Below this, a seller’s balance carries to the next period rather than being sent. Zero pays whatever is owed."+ }++ },+ "limit_digital_download_count": {+ "help": "Off means buyers can download as often as they like.",+ "label": "Limit number of downloads"+ },+ "digital_asset_authorized_clicks": {+ "label": "Downloads allowed"+ },+ "limit_digital_download_days": {+ "help": "Off means download links never expire.",+ "label": "Limit download period"+ },+ "digital_asset_authorized_days": {+ "label": "Days available"}},"store_credit": {diff --cc packages/dashboard/src/locales/fr.jsonindex f3aaab8710,7fdc31bc64..168dfc0963--- a/packages/dashboard/src/locales/fr.json+++ b/packages/dashboard/src/locales/fr.json@@@ -1875,31 -1928,19 +1928,45 @@@"help": "Conserver les anciens prix afin d’afficher le prix le plus bas des 30 derniers jours, comme l’exige la réglementation européenne.","label": "Enregistrer l’historique des prix"},+ "payouts": {+ "title": "Paiements aux vendeurs",+ "description": "Comment cette marketplace paie les vendeurs qui y vendent.",+ "provider": {+ "label": "Payé via",+ "help": "Qui déplace l’argent. Avec vos propres comptes, vous effectuez les virements et marquez chacun comme payé.",+ "requires_account": "Les vendeurs doivent créer un compte chez ce prestataire avant d’être payés."+ },+ "provider_none": "Vos propres comptes",+ "provider_unavailable": "Connectez ce prestataire avant de pouvoir payer par son intermédiaire",+ "schedule": {+ "label": "Régler les vendeurs",+ "help": "À quelle fréquence les gains sont regroupés en un paiement. Un vendeur peut avoir son propre rythme."+ },+ "schedule_intervals": {+ "daily": "Chaque jour",+ "weekly": "Chaque semaine",+ "biweekly": "Toutes les deux semaines",+ "monthly": "Chaque mois",+ "manual": "Uniquement sur votre demande"+ },+ "minimum": {+ "label": "Paiement minimum",+ "help": "En dessous, le solde du vendeur est reporté à la période suivante. Zéro paie tout ce qui est dû."+ }++ },+ "limit_digital_download_count": {+ "help": "Désactivé, les acheteurs peuvent télécharger autant de fois qu'ils le souhaitent.",+ "label": "Limiter le nombre de téléchargements"+ },+ "digital_asset_authorized_clicks": {+ "label": "Téléchargements autorisés"+ },+ "limit_digital_download_days": {+ "help": "Désactivé, les liens de téléchargement n'expirent jamais.",+ "label": "Limiter la période de téléchargement"+ },+ "digital_asset_authorized_days": {+ "label": "Jours de disponibilité"}},"store_credit": {diff --cc packages/dashboard/src/locales/pl.jsonindex 0cb03c7e1e,456b04cd58..f69ffdeb88--- a/packages/dashboard/src/locales/pl.json+++ b/packages/dashboard/src/locales/pl.json@@@ -1893,31 -1946,19 +1946,45 @@@"help": "Przechowuj poprzednie ceny, aby sklep mógł pokazać najniższą cenę z ostatnich 30 dni, zgodnie z przepisami UE.","label": "Zapisuj historię cen"},+ "payouts": {+ "title": "Wypłaty dla sprzedawców",+ "description": "Jak ten marketplace płaci sprzedawcom, którzy na nim handlują.",+ "provider": {+ "label": "Wypłacane przez",+ "help": "Kto przenosi pieniądze. Przy własnej księgowości sam wykonujesz przelewy i oznaczasz każdy jako zapłacony.",+ "requires_account": "Sprzedawcy muszą założyć konto u tego dostawcy, zanim otrzymają wypłatę."+ },+ "provider_none": "Własna księgowość",+ "provider_unavailable": "Połącz tego dostawcę, zanim będziesz mógł przez niego płacić",+ "schedule": {+ "label": "Rozliczaj sprzedawców",+ "help": "Jak często zarobki są łączone w jedną wypłatę. Sprzedawca może mieć własny harmonogram."+ },+ "schedule_intervals": {+ "daily": "Codziennie",+ "weekly": "Co tydzień",+ "biweekly": "Co dwa tygodnie",+ "monthly": "Co miesiąc",+ "manual": "Tylko na Twoje polecenie"+ },+ "minimum": {+ "label": "Minimalna wypłata",+ "help": "Poniżej tej kwoty saldo przechodzi na następny okres zamiast zostać wypłacone. Zero wypłaca każdą należność."+ }++ },+ "limit_digital_download_count": {+ "help": "Wyłączone oznacza, że kupujący mogą pobierać dowolną liczbę razy.",+ "label": "Ogranicz liczbę pobrań"+ },+ "digital_asset_authorized_clicks": {+ "label": "Dozwolone pobrania"+ },+ "limit_digital_download_days": {+ "help": "Wyłączone oznacza, że linki do pobrania nigdy nie wygasają.",+ "label": "Ogranicz okres pobierania"+ },+ "digital_asset_authorized_days": {+ "label": "Dostępne dni"}},"store_credit": {diff --cc packages/dashboard/src/locales/zh-CN.jsonindex a6ca65510e,cff62adde5..1e605fe650--- a/packages/dashboard/src/locales/zh-CN.json+++ b/packages/dashboard/src/locales/zh-CN.json@@@ -1870,31 -1923,19 +1923,45 @@@"help": "保留历史价格,以便店铺按欧盟规定显示最近 30 天的最低价。","label": "记录价格历史"},+ "payouts": {+ "title": "卖家付款",+ "description": "本平台如何向在此交易的卖家付款。",+ "provider": {+ "label": "付款方式",+ "help": "由谁转移资金。自行记账时,由你自己转账并逐笔标记为已付。",+ "requires_account": "卖家需先在该服务商开设账户,才能收到款项。"+ },+ "provider_none": "自行记账",+ "provider_unavailable": "请先连接该服务商,然后才能通过它付款",+ "schedule": {+ "label": "结算卖家",+ "help": "收益多久汇总为一笔付款。卖家也可以使用自己的周期。"+ },+ "schedule_intervals": {+ "daily": "每天",+ "weekly": "每周",+ "biweekly": "每两周",+ "monthly": "每月",+ "manual": "仅在你指定时"+ },+ "minimum": {+ "label": "最低付款额",+ "help": "低于此金额时,卖家余额结转至下一周期而不发放。设为零则支付所有应付款项。"+ }++ },+ "limit_digital_download_count": {+ "help": "关闭后,买家可以不限次数下载。",+ "label": "限制下载次数"+ },+ "digital_asset_authorized_clicks": {+ "label": "允许的下载次数"+ },+ "limit_digital_download_days": {+ "help": "关闭后,下载链接永不过期。",+ "label": "限制下载期限"+ },+ "digital_asset_authorized_days": {+ "label": "可用天数"}},"store_credit": {diff --cc spree/core/lib/spree/core/engine.rbindex 2e692e468d,330a21481b..5d2be32aa3--- a/spree/core/lib/spree/core/engine.rb+++ b/spree/core/lib/spree/core/engine.rb@@@ -170,13 -169,10 +171,17 @@@ module Spreapp.config.spree.inventory_providers = []end+ # How sellers get paid. A provider gem — the Stripe Connect one, or a+ # marketplace's own — registers from an initializer file; core's+ # record-only System concatenates below.+ initializer 'spree.register.payout_providers', before: :load_config_initializers do |app|+ app.config.spree.payout_providers = []+ end++ initializer 'spree.register.digital_asset_providers', before: :load_config_initializers do |app|+ app.config.spree.digital_asset_providers = []+ end+initializer 'spree.register.delivery_profile_types', before: :load_config_initializers do |app|app.config.spree.delivery_profile_types = []end