poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions 46 Packages Projects Releases Wiki Activity

Merge pull request 'ranjith-dev' (#644) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Details

Browse Source 
Reviewed-on: #644
This commit was merged in pull request #644.
This commit is contained in:
jothi
2026-05-26 03:33:42 +00:00
parent 97f8088a52 4378f3adbd
commit 979a5e633c
5 changed files with 946 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Filament/Exports/InvoiceValidationExporter.php
View File

@@ -36,6 +36,15 @@ class InvoiceValidationExporter extends Exporter
->label('ITEM DESCRIPTION'),
ExportColumn::make('stickerMaster.item.uom')
->label('UNIT OF MEASURE'),
ExportColumn::make('stickerMaster.material_type')
->label('MATERIAL TYPE')
->formatStateUsing(fn ($state) => match ($state) {
1 => 'Individual',
2 => 'Bundle',
3 => 'Quantity',
4 => 'Bundle Individual',
default => '-',
}),
ExportColumn::make('motor_scanned_status')
->label('MOTOR SCANNED STATUS'),
ExportColumn::make('pump_scanned_status')

1850
app/Filament/Resources/InvoiceValidationResource.php
View File

File diff suppressed because it is too large Load Diff

4
app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php
View File

@@ -581,7 +581,7 @@ class CreateInvoiceValidation extends CreateRecord
$materialType = $sticker->material_type;
// $sticker = StickerMaster::where('plant_id', $plantId)->whereHas('item', function ($query) use ($code) { $query->where('plant_id', $this->plantId)->where('code', $code); })->first();
if ($materialType == 1) {
if ($materialType == 1 || $materialType == 4) {
$totalExcelQty = 0;
foreach ($rows as $index => $row) {
@@ -1765,7 +1765,7 @@ class CreateInvoiceValidation extends CreateRecord
$materialType = $sticker->material_type;
// $sticker = StickerMaster::where('plant_id', $plantId)->whereHas('item', function ($query) use ($code) { $query->where('plant_id', $this->plantId)->where('code', $code); })->first();
if ($materialType == 1) {
if ($materialType == 1 || $materialType == 4) {
$totalExcelQty = 0;
foreach ($rows as $index => $row) {

3
app/Livewire/InvoiceDataTable.php
View File

@@ -50,6 +50,7 @@ class InvoiceDataTable extends Component
'refreshEmptyInvoice' => 'loadEmptyData',
'refreshInvoiceData' => 'loadData',
'refreshMaterialInvoiceData' => 'loadMaterialData',
'refreshMaterialInvoiceData1' => 'loadMaterialData1',
'openCapacitorModal' => 'showCapacitorInputBox',
];
@@ -602,6 +603,8 @@ class InvoiceDataTable extends Component
$row['material_type'] = 'Bundle';
} elseif ($matType === 3) {
$row['material_type'] = 'Quantity';
} elseif ($matType === 4) {
$row['material_type'] = 'Bundle Individual';
} else {
$row['material_type'] = 'N/A';
}

2
resources/views/livewire/invoice-data-table.blade.php
View File

@@ -243,7 +243,7 @@
<td class="border px-4 py-2">{{ $row['code'] ?? 'N/A' }}</td>
<td class="border px-4 py-2">{{ $row['material_type'] ?? 'N/A' }}</td>
<td class="border px-4 py-2">
@if(($row['material_type'] ?? '') === 'Individual' || ($row['material_type'] ?? '') === 'Bundle')
@if(($row['material_type'] ?? '') == 'Individual' || ($row['material_type'] ?? '') == 'Bundle' || ($row['material_type'] ?? '') == 'Bundle Individual')
{{ number_format((float)($row['quantity'] ?? 0), 0) }}
@else
{{ $row['quantity'] ?? 'N/A' }}