diff --git a/app/Filament/Resources/RfqTransporterBidResource/Pages/CreateRfqTransporterBid.php b/app/Filament/Resources/RfqTransporterBidResource/Pages/CreateRfqTransporterBid.php index 238d130..fa8470d 100644 --- a/app/Filament/Resources/RfqTransporterBidResource/Pages/CreateRfqTransporterBid.php +++ b/app/Filament/Resources/RfqTransporterBidResource/Pages/CreateRfqTransporterBid.php @@ -21,28 +21,29 @@ class CreateRfqTransporterBid extends CreateRecord $record = $this->record; // Calculate rank based on total_freight_charge - $rank = RfqTransporterBid::where('request_quotation_id', $record->request_quotation_id) + $rank = RfqTransporterBid::where('request_quotation_id', $this->record->request_quotation_id) ->orderBy('total_freight_charge') ->pluck('id') - ->search($record->id) + 1; + ->search($this->record->id) + 1; + $recipients = User::role(['Super Admin', 'Rfq Supervisor'])->get(); $currentUser = Filament::auth()->user(); - // Get recipients - $recipients = User::whereHas('roles', function ($q) { - $q->whereIn('name', ['Super Admin', 'Rfq Supervisor']) - ->where('guard_name', 'web'); - })->get(); - // Exclude creator - $recipients = $recipients->where('id', '!=', $currentUser->id); + if ($currentUser && ! $recipients->contains('id', $currentUser->id)) { + $recipients->push($currentUser); + } - $body = "{$currentUser->name} added a new bid. Current rank is #{$rank}"; + // $user1 = Filament::auth()->user(); + + + $body = "{$currentUser->name} current rank is #{$rank}"; + + $rfqNumber = $this->record->requestQuotation->rfq_number; - // Filament DB notification Notification::make() - ->title('New Bid Added') - ->body($body) + ->title('Rank Updated') + ->body("{$currentUser->name} has updated the bid for RFQ No '{$rfqNumber}'. The current rank is #{$rank}.") ->success() ->sendToDatabase($recipients);