Merge branch 'develop' of github.com:laravelcm/laravel.cm into develop

maximehery · May 8, 2023 · 3f4045e · 3f4045e
2 parents 3af16fe + 827e112
commit 3f4045e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/app/Http/Controllers/NotchPayCallBackController.php b/app/Http/Controllers/NotchPayCallBackController.php
@@ -4,6 +4,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Enums\TransactionStatus;
 use App\Models\Transaction;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -17,9 +18,14 @@ public function __invoke(Request $request): RedirectResponse
             ->firstOrFail();
         $transaction->update(['status' => $request->get('status')]);
 
-        // @ToDO Envoie de mail de notification de remerciement pour le sponsoring si l'utilisateur est dans la base de données
+        if ($request->get('status') === TransactionStatus::CANCELED->value) {
+            session()->flash('error', __('Votre paiement a été annulé veuillez relancer si vous souhaitez soutenir Laravel Cameroun, Merci.'));
+        } else {
+            // @ToDO Envoie de mail de notification de remerciement pour le sponsoring si l'utilisateur est dans la base de données
+            // @ToDo Envoie de la notification dans le channel de soumission pour un nouveau paiement
+            session()->flash('status', __('Votre paiement a été pris en compte merci de soutenir Laravel Cameroun.'));
+        }
 
-        session()->flash('status', __('Votre paiement a été pris en compte merci de soutenir Laravel Cameroun.'));
 
         return redirect(route('sponsors'));
     }

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
     "/js/app.js": "/js/app.js?id=0953d0b23f555fd811dda52086298222",
-    "/css/app.css": "/css/app.css?id=cc2b9dcde4d0597c340f9d8233546331"
+    "/css/app.css": "/css/app.css?id=8d5c4c1a62a59a2ffc28ea3c57562b38"
 }
diff --git a/resources/views/livewire/modals/anonymous-sponsors.blade.php b/resources/views/livewire/modals/anonymous-sponsors.blade.php
@@ -5,11 +5,11 @@
         </p>
         <div class="mt-3 grid gap-4 lg:grid-cols-2 lg:gap-6 lg:mt-5">
             <div>
-                <x-label for="name">{{ __('Votre nom') }}</x-label>
+                <x-label for="name">{{ __('Nom complet') }}</x-label>
                 <x-input container-class="mt-1" name="name" id="name" wire:model="name" />
             </div>
             <div>
-                <x-label for="email">{{ __('Votre E-mail') }}</x-label>
+                <x-label for="email">{{ __('Adresse E-mail') }}</x-label>
                 <x-email container-class="mt-1" name="email" id="email" wire:model="email" placeholder="[email protected]" />
             </div>
         </div>

diff --git a/resources/views/livewire/sponsor-subscription.blade.php b/resources/views/livewire/sponsor-subscription.blade.php
@@ -8,7 +8,7 @@
               type="button"
               @class([
                 'relative text-sm leading-5 inline-flex items-center rounded-r-none px-2.5 py-2 !ring-0 focus:z-10',
-                'bg-primary-500 text-white hover:!bg-primary-500 border-transparent' => $option === 'monthly',
+                '!bg-primary-500 text-white hover:!bg-primary-500 border-transparent' => $option === 'monthly',
                 '!bg-skin-body hover:!bg-skin-card' => $option !== 'monthly'
               ])
               wire:click="chooseOption('monthly')"
@@ -19,7 +19,7 @@
               type="button"
               @class([
                 'relative text-sm leading-5 -ml-px inline-flex items-center rounded-l-none px-2.5 py-2 !ring-0 focus:z-10',
-                'bg-primary-500 text-white hover:!bg-primary-500 border-transparent' => $option === 'one-time',
+                '!bg-primary-500 text-white hover:!bg-primary-500 border-transparent' => $option === 'one-time',
                 '!bg-skin-body hover:!bg-skin-card' => $option !== 'one-time'
              ])
               wire:click="chooseOption('one-time')"