diff --git a/app/Filament/SupplierPortal/Resources/ProductStocks/Tables/ProductStocksTable.php b/app/Filament/SupplierPortal/Resources/ProductStocks/Tables/ProductStocksTable.php index 1d211a0..68622e2 100644 --- a/app/Filament/SupplierPortal/Resources/ProductStocks/Tables/ProductStocksTable.php +++ b/app/Filament/SupplierPortal/Resources/ProductStocks/Tables/ProductStocksTable.php @@ -18,7 +18,7 @@ public static function configure(Table $table): Table ->searchable() ->sortable(), - TextColumn::make('sku') + TextColumn::make('supplierProductNumber') ->label('Cikkszám') ->searchable(), diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php index 00ea007..1a7eb02 100644 --- a/app/Http/Controllers/OrderController.php +++ b/app/Http/Controllers/OrderController.php @@ -1808,6 +1808,7 @@ public function getDataTableContent(): JsonResponse $product['krel'] = ''; } $data['krel'] = $product['krel']; + $data['stock_status'] = $product['stock_status']; $data['picture'] = false; if ($product['picture']) { diff --git a/resources/js/moduleJs/order.js b/resources/js/moduleJs/order.js index 6455831..17da437 100644 --- a/resources/js/moduleJs/order.js +++ b/resources/js/moduleJs/order.js @@ -1229,18 +1229,12 @@ solution before template "defaultContent":'' }; if(Order.getData('orderType')=='daily'){ - actionColumn.defaultContent='' - /* - "defaultContent":'