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

Merge pull request 'ranjith-dev' (#1045) 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: #1045
This commit was merged in pull request #1045.
This commit is contained in:
jothi
2026-09-18 05:11:48 +00:00
parent dc2a9759e5 3de173ed0f
commit 3f357cebb7
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Filament/Pages/StickerOrderReprint.php
View File

@@ -790,7 +790,7 @@ class StickerOrderReprint extends Page implements HasForms
} }
} }
public function generateStickerId() public function generateStickerId1()
{ {
$state = $this->form->getState(); $state = $this->form->getState();
@@ -877,16 +877,16 @@ class StickerOrderReprint extends Page implements HasForms
} }
} }
$updatePrintStatusCompleted = StickerOrder::where('plant_id', $plantId)->where('production_order', $pOrder)->where('from_serial_number', $fromSerNo)->where('to_serial_number', $toSerNo)->where('sticker_id', $stickerId)->where('print_status', 'Printed')->first(); // $updatePrintStatusCompleted = StickerOrder::where('plant_id', $plantId)->where('production_order', $pOrder)->where('from_serial_number', $fromSerNo)->where('to_serial_number', $toSerNo)->where('sticker_id', $stickerId)->where('print_status', 'Printed')->first();
if ($updatePrintStatusCompleted) { // if ($updatePrintStatusCompleted) {
Notification::make() // Notification::make()
->danger() // ->danger()
->title('Duplicate Sticker') // ->title('Duplicate Sticker')
->body("Already StickerId '$stickerId' generated successfully for Production Order '$pOrder' and plant '$plantName'.") // ->body("Already StickerId '$stickerId' generated successfully for Production Order '$pOrder' and plant '$plantName'.")
->send(); // ->send();
return; // return;
} // }
$structure = StickerStructureDetail::where('sticker_id',$stickerId)->first(); $structure = StickerStructureDetail::where('sticker_id',$stickerId)->first();
@@ -1015,7 +1015,8 @@ class StickerOrderReprint extends Page implements HasForms
$elements, $elements,
$itemCharacteristic, $itemCharacteristic,
$itemCode, $itemCode,
$plantId $plantId,
$machineId
); );
$pdfContent = $stickerService->generateBulkFromTemplate( $pdfContent = $stickerService->generateBulkFromTemplate(

2
resources/views/filament/pages/bulk-sticker-printing.blade.php
View File

@@ -16,7 +16,7 @@
wire:click="generateStickerId" wire:click="generateStickerId"
class="px-3 py-1 border border-primary-500 text-primary-600 rounded hover:bg-primary-50 hover:border-primary-700 transition text-sm" class="px-3 py-1 border border-primary-500 text-primary-600 rounded hover:bg-primary-50 hover:border-primary-700 transition text-sm"
> >
Generate Sticker ID Generate Sticker
</button> </button>
</div> </div>

2
resources/views/filament/pages/sticker-order-reprint.blade.php
View File

@@ -13,7 +13,7 @@
</button> --}} </button> --}}
<button <button
type="button" type="button"
wire:click="generateStickerId" wire:click="generateStickerId1"
class="px-3 py-1 border border-primary-500 text-primary-600 rounded hover:bg-primary-50 hover:border-primary-700 transition text-sm" class="px-3 py-1 border border-primary-500 text-primary-600 rounded hover:bg-primary-50 hover:border-primary-700 transition text-sm"
> >
Generate Sticker Generate Sticker