Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/Events/ConfirmDonation.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -32,15 +31,15 @@ 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
{
return [
'id' => $this->donation->id,
'status' => $this->donation->Status,
'confirmed_at' => $this->donation->Confirmed_at->toIso8601String()
'confirmed_at' => $this->donation->Confirmed_at->toIso8601String(),
];
}
}
6 changes: 3 additions & 3 deletions app/Http/Controllers/CampaignController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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');

Expand Down Expand Up @@ -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');

Expand Down
9 changes: 6 additions & 3 deletions app/Http/Controllers/DonationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down Expand Up @@ -45,15 +45,15 @@ 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);

$donation->qr_code = base64_encode($qrcode);

$donation->save();

return redirect('/donation/' . $donation->id);
return redirect('/donation/'.$donation->id);
}

public function show($id)
Expand Down Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@
Route::patch('/cpf', [ProfileController::class, 'registerCpf']);
});

require __DIR__ . '/auth.php';
require __DIR__.'/auth.php';