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 main into the typed stock movements branch
Łukasz Adamczyk3e6c74274fd9
diff --cc packages/admin-sdk/src/admin-client.tsindex a1ffb4ee4b,e6539432a3..1e3d6898a2--- a/packages/admin-sdk/src/admin-client.ts+++ b/packages/admin-sdk/src/admin-client.ts@@@ -290,9 -295,9 +295,10 @@@ import typeReturn,ReturnReason,Role,+ Seller,- StockItem,+ StockLevel,StockLocation,+ StockMovement,StockTransfer,Store,StoreCredit,diff --cc packages/admin-sdk/src/types/generated/index.tsindex e2b6a2743b,2a6d8d1e7b..24457eb9cb--- 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 873006e8e3f716c2d4b1e6a2db8ed642-// Typelizer digest c8dd0851774341fcf48344cc82e34046++// Typelizer digest dc73404812d261d8e6ba124e0a473047//// DO NOT MODIFY: This file was automatically generated by Typelizer.export type { default as Address } from './Address'@@@ -76,11 -79,11 +79,12 @@@ export type { default as ReturnLineIteexport type { default as ReturnReason } from './ReturnReason'export type { default as Return } from './Return'export type { default as Role } from './Role'+ export type { default as Seller } from './Seller'export type { default as SetupTask } from './SetupTask'export type { default as State } from './State'-export type { default as StockItem } from './StockItem'+export type { default as StockLevel } from './StockLevel'export type { default as StockLocation } from './StockLocation'+export type { default as StockMovement } from './StockMovement'export type { default as StockReservation } from './StockReservation'export type { default as StockTransfer } from './StockTransfer'export type { default as StoreCreditCategory } from './StoreCreditCategory'diff --cc packages/admin-sdk/src/types/index.tsindex 1b92cf957f,742fc39006..a8a5b32282--- a/packages/admin-sdk/src/types/index.ts+++ b/packages/admin-sdk/src/types/index.ts@@@ -86,11 -89,11 +89,12 @@@ export type { default as Return } fromexport type { default as ReturnLineItem } from './generated/ReturnLineItem'export type { default as ReturnReason } from './generated/ReturnReason'export type { default as Role } from './generated/Role'+ export type { default as Seller } from './generated/Seller'export type { default as SetupTask } from './generated/SetupTask'export type { default as State } from './generated/State'-export type { default as StockItem } from './generated/StockItem'+export type { default as StockLevel } from './generated/StockLevel'export type { default as StockLocation } from './generated/StockLocation'+export type { default as StockMovement } from './generated/StockMovement'export type { default as StockReservation } from './generated/StockReservation'export type { default as StockTransfer } from './generated/StockTransfer'export type { default as Store } from './generated/Store'diff --cc packages/dashboard/src/routes/_authenticated/$storeId/settings/stock-locations.tsxindex bf5ccbbe02,d6179302eb..e98a06ab46--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/stock-locations.tsx+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/stock-locations.tsx@@@ -460,27 -466,23 +466,23 @@@ function ProductGroup({ group, defaultO</div></CollapsibleTrigger><CollapsibleContent>- <table className="w-full text-sm">- <thead className="sticky top-0 bg-card text-xs text-muted-foreground">- <tr className="border-y">- <th className="px-4 py-2 text-left font-medium">- {t('admin.stock_locations.stock_levels.table.variant')}- </th>- <th className="px-3 py-2 text-right font-medium">+ <Table>+ <TableHeader>+ <TableRow>- <TableHead>{t('admin.stock_locations.stock_items.table.variant')}</TableHead>++ <TableHead>{t('admin.stock_locations.stock_levels.table.variant')}</TableHead>+ <TableHead className="text-right">- {t('admin.stock_locations.stock_items.table.on_hand')}+ {t('admin.stock_locations.stock_levels.table.on_hand')}- </th>- <th className="px-3 py-2 text-left font-medium">- {t('admin.stock_locations.stock_levels.table.backorder')}- </th>- <th className="px-3 py-2" />- </tr>- </thead>- <tbody>+ </TableHead>- <TableHead>{t('admin.stock_locations.stock_items.table.backorder')}</TableHead>++ <TableHead>{t('admin.stock_locations.stock_levels.table.backorder')}</TableHead>+ <TableHead className="w-10" />+ </TableRow>+ </TableHeader>+ <TableBody>{group.items.map((item) => (- <StockItemRow key={item.id} item={item} />+ <StockLevelRow key={item.id} item={item} />))}- </tbody>- </table>+ </TableBody>+ </Table></CollapsibleContent></Collapsible>)diff --cc spree/api/spec/controllers/spree/api/v3/admin/stock_transfers_controller_spec.rbindex 58abf06bc4,d4ae0123c4..f0b695ba1e--- a/spree/api/spec/controllers/spree/api/v3/admin/stock_transfers_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/stock_transfers_controller_spec.rb@@@ -42,11 -42,11 +42,11 @@@ RSpec.describe Spree::Api::V3::Admin::Sto change(Spree::StockTransfer, :count).by(1)expect(response).to have_http_status(:created)- expect(source_location.stock_item(variant).reload.count_on_hand).to eq(45)- expect(destination_location.stock_item(variant).reload.count_on_hand).to eq(5)+ expect(source_location.stock_level(variant).reload.count_on_hand).to eq(45)+ expect(destination_location.stock_level(variant).reload.count_on_hand).to eq(5)end- it 'receives from external vendor when source is omitted' do+ it 'receives from external seller when source is omitted' dopost :create, params: base_params.except(:source_location_id), as: :jsonexpect(response).to have_http_status(:created)diff --cc spree/core/lib/spree/core/permission_configuration.rbindex 0a3c2f8ef0,792443c4e5..9050a18826--- a/spree/core/lib/spree/core/permission_configuration.rb+++ b/spree/core/lib/spree/core/permission_configuration.rb@@@ -301,8 -301,8 +301,8 @@@ module Spreregister_resource(:collections, group: :catalog, subjects: -> {[Spree::Collection, Spree::ProductCollection, Spree::CollectionRule]})- register_resource(:stock, group: :catalog, audiences: %i[vendor], subjects: -> {+ register_resource(:stock, group: :catalog, audiences: %i[seller], subjects: -> {- [Spree::StockItem, Spree::StockLocation, Spree::StockMovement,+ [Spree::StockLevel, Spree::StockLocation, Spree::StockMovement,Spree::StockTransfer, Spree::StockReservation]})