Skip to content

Commit 3f4045e

Browse files
committed
Merge branch 'develop' of github.com:laravelcm/laravel.cm into develop
2 parents 3af16fe + 827e112 commit 3f4045e

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

app/Http/Controllers/NotchPayCallBackController.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace App\Http\Controllers;
66

7+
use App\Enums\TransactionStatus;
78
use App\Models\Transaction;
89
use Illuminate\Http\RedirectResponse;
910
use Illuminate\Http\Request;
@@ -17,9 +18,14 @@ public function __invoke(Request $request): RedirectResponse
1718
->firstOrFail();
1819
$transaction->update(['status' => $request->get('status')]);
1920

20-
// @ToDO Envoie de mail de notification de remerciement pour le sponsoring si l'utilisateur est dans la base de données
21+
if ($request->get('status') === TransactionStatus::CANCELED->value) {
22+
session()->flash('error', __('Votre paiement a été annulé veuillez relancer si vous souhaitez soutenir Laravel Cameroun, Merci.'));
23+
} else {
24+
// @ToDO Envoie de mail de notification de remerciement pour le sponsoring si l'utilisateur est dans la base de données
25+
// @ToDo Envoie de la notification dans le channel de soumission pour un nouveau paiement
26+
session()->flash('status', __('Votre paiement a été pris en compte merci de soutenir Laravel Cameroun.'));
27+
}
2128

22-
session()->flash('status', __('Votre paiement a été pris en compte merci de soutenir Laravel Cameroun.'));
2329

2430
return redirect(route('sponsors'));
2531
}

public/css/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"/js/app.js": "/js/app.js?id=0953d0b23f555fd811dda52086298222",
3-
"/css/app.css": "/css/app.css?id=cc2b9dcde4d0597c340f9d8233546331"
3+
"/css/app.css": "/css/app.css?id=8d5c4c1a62a59a2ffc28ea3c57562b38"
44
}

resources/views/livewire/modals/anonymous-sponsors.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</p>
66
<div class="mt-3 grid gap-4 lg:grid-cols-2 lg:gap-6 lg:mt-5">
77
<div>
8-
<x-label for="name">{{ __('Votre nom') }}</x-label>
8+
<x-label for="name">{{ __('Nom complet') }}</x-label>
99
<x-input container-class="mt-1" name="name" id="name" wire:model="name" />
1010
</div>
1111
<div>
12-
<x-label for="email">{{ __('Votre E-mail') }}</x-label>
12+
<x-label for="email">{{ __('Adresse E-mail') }}</x-label>
1313
<x-email container-class="mt-1" name="email" id="email" wire:model="email" placeholder="[email protected]" />
1414
</div>
1515
</div>

resources/views/livewire/sponsor-subscription.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
type="button"
99
@class([
1010
'relative text-sm leading-5 inline-flex items-center rounded-r-none px-2.5 py-2 !ring-0 focus:z-10',
11-
'bg-primary-500 text-white hover:!bg-primary-500 border-transparent' => $option === 'monthly',
11+
'!bg-primary-500 text-white hover:!bg-primary-500 border-transparent' => $option === 'monthly',
1212
'!bg-skin-body hover:!bg-skin-card' => $option !== 'monthly'
1313
])
1414
wire:click="chooseOption('monthly')"
@@ -19,7 +19,7 @@
1919
type="button"
2020
@class([
2121
'relative text-sm leading-5 -ml-px inline-flex items-center rounded-l-none px-2.5 py-2 !ring-0 focus:z-10',
22-
'bg-primary-500 text-white hover:!bg-primary-500 border-transparent' => $option === 'one-time',
22+
'!bg-primary-500 text-white hover:!bg-primary-500 border-transparent' => $option === 'one-time',
2323
'!bg-skin-body hover:!bg-skin-card' => $option !== 'one-time'
2424
])
2525
wire:click="chooseOption('one-time')"

0 commit comments

Comments
 (0)