diff --git a/app/Events/ConfirmDonation.php b/app/Events/ConfirmDonation.php index 3df7a43..6320703 100644 --- a/app/Events/ConfirmDonation.php +++ b/app/Events/ConfirmDonation.php @@ -7,7 +7,6 @@ use Illuminate\Broadcasting\InteractsWithSockets; use Illuminate\Broadcasting\PrivateChannel; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; @@ -32,7 +31,7 @@ public function __construct(Donation $donation) */ public function broadcastOn(): Channel { - return new PrivateChannel('donation.' . $this->donation->id); + return new PrivateChannel('donation.'.$this->donation->id); } public function broadcastWith(): array @@ -40,7 +39,7 @@ public function broadcastWith(): array return [ 'id' => $this->donation->id, 'status' => $this->donation->Status, - 'confirmed_at' => $this->donation->Confirmed_at->toIso8601String() + 'confirmed_at' => $this->donation->Confirmed_at->toIso8601String(), ]; } } diff --git a/app/Http/Controllers/CampaignController.php b/app/Http/Controllers/CampaignController.php index 0f30a5f..d08d8fd 100644 --- a/app/Http/Controllers/CampaignController.php +++ b/app/Http/Controllers/CampaignController.php @@ -39,7 +39,7 @@ public function store(CampaignRequest $request) $address->Street = $validRequest['Street']; - $dateTime = $validRequest['Data'] . ' ' . $validRequest['Hour']; // concatenando data e hora + $dateTime = $validRequest['Data'].' '.$validRequest['Hour']; // concatenando data e hora $dateTime = \Carbon\Carbon::createFromFormat('Y-m-d H:i', $dateTime); // formatando com a biblioteca Carbon $address->Collection_date = $dateTime; @@ -64,7 +64,7 @@ public function store(CampaignRequest $request) $extension = $requestImage->extension(); - $imageName = md5($requestImage->getClientOriginalName() . strtotime('now')) . '.' . $extension; + $imageName = md5($requestImage->getClientOriginalName().strtotime('now')).'.'.$extension; $imagePath = $requestImage->storeAs('campaigns', $imageName, 'public'); @@ -140,7 +140,7 @@ public function update($id, Request $request) $extension = $requestImage->extension(); - $imageName = md5($requestImage->getClientOriginalName() . strtotime('now')) . '.' . $extension; + $imageName = md5($requestImage->getClientOriginalName().strtotime('now')).'.'.$extension; $imagePath = $requestImage->storeAs('campaigns', $imageName, 'public'); diff --git a/app/Http/Controllers/DonationController.php b/app/Http/Controllers/DonationController.php index ba1bad6..4db96d5 100644 --- a/app/Http/Controllers/DonationController.php +++ b/app/Http/Controllers/DonationController.php @@ -17,7 +17,7 @@ public function donate($id) if (Gate::allows('verify-cpf', auth()->user())) { $campaign = Campaign::findOrFail($id); if ($campaign->meta['current'] >= $campaign->meta['target']) { - return redirect('/campaign/' . $campaign->id); + return redirect('/campaign/'.$campaign->id); } return view('donations.donate', compact('campaign')); @@ -45,7 +45,7 @@ public function store(Request $request, $id) $donation->save(); - $url = url('/confirm/' . $donation->id); + $url = url('/confirm/'.$donation->id); $qrcode = QrCode::format('png')->size(200)->generate($url); @@ -53,7 +53,7 @@ public function store(Request $request, $id) $donation->save(); - return redirect('/donation/' . $donation->id); + return redirect('/donation/'.$donation->id); } public function show($id) @@ -93,6 +93,9 @@ public function verify($id) public function confirm($id) { $donation = Donation::findOrFail($id); + if ($donation->Status === 'confirmed') { + return redirect()->route('campaign.show', $donation->campaign_id); + } $donation->Status = 'confirmed'; diff --git a/routes/web.php b/routes/web.php index b7d4c4d..3623422 100644 --- a/routes/web.php +++ b/routes/web.php @@ -41,4 +41,4 @@ Route::patch('/cpf', [ProfileController::class, 'registerCpf']); }); -require __DIR__ . '/auth.php'; +require __DIR__.'/auth.php';