stitza/d2d.emegrendeles.hu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/SuppplierPortal' into test

Browse Source 
# Conflicts:
#	public/js/admin.js
#	public/js/module.js
#	public/mix-manifest.json
This commit is contained in:
E98Developer 2026-04-27 07:06:48 +02:00
commit 4d861ffc04
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Filament/SupplierPortal/Resources/ProductStocks/Tables/ProductStocksTable.php
View File

@ -18,7 +18,7 @@ public static function configure(Table $table): Table
->searchable() ->searchable()
->sortable(), ->sortable(),
TextColumn::make('sku') TextColumn::make('supplierProductNumber')
->label('Cikkszám') ->label('Cikkszám')
->searchable(), ->searchable(),

1
app/Http/Controllers/OrderController.php
View File

@ -1808,6 +1808,7 @@ public function getDataTableContent(): JsonResponse
$product['krel'] = ''; $product['krel'] = '';
} }
$data['krel'] = $product['krel']; $data['krel'] = $product['krel'];
$data['stock_status'] = $product['stock_status'];
$data['picture'] = false; $data['picture'] = false;
if ($product['picture']) { if ($product['picture']) {

18
resources/js/moduleJs/order.js
View File

@ -1229,18 +1229,12 @@ solution before template
"defaultContent":'' "defaultContent":''
}; };
if(Order.getData('orderType')=='daily'){ if(Order.getData('orderType')=='daily'){
actionColumn.defaultContent='<input type="number" value="0" min="0" max="9999" step="1" data-decimals="1" class="form-control-sm inputNumberSpinner" style="width: 1em;" "/>' actionColumn.render = function (data, type, row) {
/* if (row.stock_status === 'out_of_stock') {
"defaultContent":'<div class="input-group input-group-sm ">' + return '<img src="/images/icons/details_close.png" title="Nincs raktáron" style="width: 24px;">';
'<button style="min-width: 1.5rem" class="btn-sm btn-decrement btn-outline-secondary btn-minus" type="button">' + }
'<strong>−</strong></button>' + return '<input type="number" value="0" min="0" max="9999" step="1" data-decimals="1" class="form-control-sm inputNumberSpinner" style="width: 1em;"/>';
'<input type="text" inputmode="decimal" style="text-align: center" class="form-control " placeholder="">' + };
'<button style="min-width: 1.5rem" class="btn-sm btn-increment btn-outline-secondary btn-plus" type="button">' +
'<strong>+</strong></button>' +
'</div>'
*/
;
} }
columnData.push(actionColumn); columnData.push(actionColumn);
return columnData; return columnData;