From 1d278c10bace6de380687f9eb1fe64a9501627f7 Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Tue, 25 Jul 2023 11:12:53 +0100
Subject: [PATCH] feat: add card country while rattach card to users

---
 app/Http/Controllers/UserController.php       |  3 +-
 .../iLinkTransactionController.php            |  3 +-
 app/Models/User.php                           |  1 +
 ...25_093945_add_card_country_id_to_users.php | 35 +++++++++++++++++++
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 database/migrations/2023_07_25_093945_add_card_country_id_to_users.php

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index cf17246..3e9ca2d 100755
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -145,12 +145,13 @@ class UserController extends Controller
     public function rattachCard(Request $request, $id_user)
     {
         $this->validate($request, [
-//            'id_user' => 'required|integer|min:0|not_in:0',
             'numero_carte' => 'required',
             'expiration_date' => 'required_if:facade,front|date_format:m/y|after_or_equal:today',
+            'card_country_id' => 'required|integer|exists:countries,id',
         ]);
         $user = User::findOrFail($id_user);
         $user->numero_carte = $request->numero_carte;
+        $user->card_country_id = $request->card_country_id;
         $expiration_date = \DateTime::createFromFormat('m/y', $request->expiration_date);
         if (!$expiration_date)
             $expiration_date = new \DateTime();
diff --git a/app/Http/Controllers/iLinkTransactionController.php b/app/Http/Controllers/iLinkTransactionController.php
index 8bbc934..12c93f9 100755
--- a/app/Http/Controllers/iLinkTransactionController.php
+++ b/app/Http/Controllers/iLinkTransactionController.php
@@ -333,8 +333,9 @@ class iLinkTransactionController extends Controller
 
                         $walletHyperviseur->save();
                         $walletUser->save();
-                        if (isset($reseauPayeur))
+                        if(isset($reseauPayeur)){
                             $reseauPayeur->save();
+                        }
                         $transaction->date = $this->getCurrentTime($init_country);
                         $transaction->save();
                         $message = trans('messages.successful_user_send_to_wallet',
diff --git a/app/Models/User.php b/app/Models/User.php
index fb2ffb3..2376b46 100755
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -79,6 +79,7 @@ class User extends Model
         'user_code',
         'numero_carte',
         'expiration_date',
+        'card_country_id',
         'adresse',
         'solde',
         'encrypted_password',
diff --git a/database/migrations/2023_07_25_093945_add_card_country_id_to_users.php b/database/migrations/2023_07_25_093945_add_card_country_id_to_users.php
new file mode 100644
index 0000000..3edd119
--- /dev/null
+++ b/database/migrations/2023_07_25_093945_add_card_country_id_to_users.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddCardCountryIdToUsers extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->integer('card_country_id')->nullable()->after('expiration_date');
+
+            $table->foreign('card_country_id','users_card_country_id_foreign')->references('id')->on('countries')->restrictOnDelete();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropForeign('users_card_country_id_foreign');
+            $table->dropColumn('card_country_id');
+        });
+    }
+}