Merge branch 'main' of https://git.informatics.buu.ac.th/64160174/ossd11_c0

.env

+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=base64:gQzXB7rZBsdhKhuvPxA/8TydVmdAF1RMnee/5X58liI=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=db
+DB_PORT=3306
+DB_DATABASE=mycamp_db
+DB_USERNAME=se_camp
+DB_PASSWORD=p@ssw0rd
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailhog
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="hello@example.com"
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
+
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.gitignore

@@ -4,8 +4,6 @@
 /public/storage
 /storage/*.key
 /vendor
-.env
-.env.backup
 .env.production
 .phpunit.result.cache
 Homestead.json

app/Http/Controllers/AdminController.php

@@ -5,6 +5,7 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use App\Models\Member;
+use App\Models\Receipt;
 use Illuminate\Support\Facades\DB;
 
 
@@ -30,7 +31,9 @@ public function Admin_home(){
         *@Create Date : 2023-04-05
      */
     public function Approve_tranfer(){
-        return view('Admin/Transection/v_approve_tranfer');
+        $raw = new Receipt();
+        $data['user_receipt'] = $raw->get_recipt();
+        return view('Admin/Transection/v_approve_tranfer', $data);
     }
 
     /*

app/Http/Controllers/LoginController.php

@@ -62,6 +62,7 @@ public function login(Request $request)
         //ดึง Class Function จาก Model Member
         $auth = new Member();
         $user = $auth->login_auth($id_card, $pass); //เรียกใช้ Function จาก Model Member
+        $request->session()->put('mem_id', $user->id);
         $request->session()->put('mem_type', $user->mem_type);
         $request->session()->put('mem_id_card', $user->mem_id_card);
         // $aa['aaa']= $request->session()->get('mem_type');

app/Http/Controllers/MemberController.php

@@ -4,14 +4,17 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Member;
+use App\Models\Receipt;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+
 
 use App\Models\Address;
 
 class MemberController extends Controller
 {
-    public function Member_home(Request $request){
+    public function Member_home(){
         // $m = new Member();
         // $m->mem_id_card = "123456";
         // $m->mem_prefix_th = 'นาย';
@@ -31,6 +34,38 @@ public function Tranfer(){
         return view('Member/v_member_proof_tranfer');
     }
 
+    public function Insert_transfer(Request $request) {
+        $request->validate([
+            'rec_img' => 'required|image|mimes:jpeg,png,jpg|max:2048',
+        ]);
+        $rec_img = time() . '.' . $request->rec_img->extension();  
+        $request->rec_img->move(public_path('receipt'), $rec_img);
+
+
+        $receipt = new Receipt();
+        $receipt->rec_name = $request->session()->get('mem_fname_th') . " " . $request->session()->get('mem_lname_th');
+        $receipt->rec_amount = $request->input('rec_amount');
+        $receipt->rec_date = $request->input('rec_date');
+        $receipt->rec_time = $request->input('rec_time') . ":00";
+        $receipt->rec_img = $rec_img;
+        $receipt->mem_id = $request->session()->get('mem_id');
+
+        echo $receipt->rec_name;
+        echo "<br>";
+        echo $receipt->rec_amount;
+        echo "<br>";
+        echo $receipt->rec_date;
+        echo "<br>";
+        echo $receipt->rec_time;
+        echo "<br>";
+        echo $receipt->rec_img;
+        echo "<br>";
+        echo $receipt->mem_id;
+
+        $receipt->Insert_receipt();
+
+    }
+
     public function Profile(Request $request){
         $mem_id_card = $request->session()->get('mem_id_card');
         $data['member'] = DB::table('Member')

app/Http/Controllers/UserController.php

@@ -17,4 +17,8 @@ public function Tranfer(){
     public function Transection(){
         return view('User/v_user_transection_history');
     }
+
+    public function welcome(){
+        return view('v_welcome');
+    }
 }

app/Models/Member.php

@@ -38,7 +38,7 @@ class Member extends Model
 
     public function login_auth($id_card, $pass){
 
-        $user = DB::table('Member')->select('mem_id_card','mem_type', 'mem_fname_th', 'mem_lname_th', 'mem_status') // Query ข้อมูลจาก Database
+        $user = DB::table('Member')->select('id', 'mem_id_card','mem_type', 'mem_fname_th', 'mem_lname_th', 'mem_status') // Query ข้อมูลจาก Database
         ->where('mem_id_card', $id_card)->where('password', $pass)->first();
 
 

app/Models/Receipt.php

@@ -2,7 +2,9 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
 
 /**
  * @property integer $id
@@ -24,5 +26,27 @@ class Receipt extends Model
     /**
      * @var array
      */
-    protected $fillable = ['rec_name', 'rec_amount', 'rec_date_and_time', 'rec_img', 'mem_id'];
+    protected $fillable = ['rec_name', 'rec_amount', 'rec_date', 'rec_time', 'rec_img', 'mem_id'];
+
+    public function Insert_receipt() {
+        // echo $this->rec_date_and_time;
+        DB::statement('INSERT INTO Receipt(rec_name, rec_amount, rec_date, rec_time, rec_img, rec_status, mem_id)
+                        VALUES(?,?,?,?,?,?,?)',
+                        [
+                            $this->rec_name,
+                            $this->rec_amount,
+                            $this->rec_date,
+                            $this->rec_time,
+                            $this->rec_img,
+                            0,
+                            $this->mem_id
+                        ]);
+    }
+
+
+    public function get_recipt()
+    {
+        $data = DB::table('Receipt')->select()->get();
+        return $data;
+    }
 }

database/migrations/2023_04_06_033755_member.php

@@ -16,7 +16,7 @@ public function up()
     {
         Schema::create('Member', function (Blueprint $table){
             $table->id();
-            $table->string('mem_id_card');
+            $table->string('mem_id_card')->nullable();
             $table->string('mem_prefix_th')->nullable();
             $table->string('mem_prefix_en')->nullable();
             $table->string('mem_fname_th')->nullable();
@@ -30,7 +30,7 @@ public function up()
             $table->string('mem_lawyer_relation')->nullable();
             $table->string('mem_email')->unique()->nullable();
             $table->string('mem_phone_number', 10)->nullable();
-            $table->integer('mem_type')->default(1);
+            $table->integer('mem_type')->default(1)->nullable();
             $table->integer('mem_status')->default(0);
             $table->integer('mem_balance')->nullable();
             $table->string('password')->nullable();

database/migrations/2023_04_06_075048_receipt.php

@@ -3,6 +3,8 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
 
 return new class extends Migration
 {
@@ -15,14 +17,35 @@ public function up()
     {
         Schema::create('Receipt', function (Blueprint $table){
             $table->id();
-            $table->string('rec_name');
-            $table->integer('rec_amount');
-            $table->date('rec_date_and_time');
-            $table->binary('rec_img');
-            $table->integer('mem_id');
+            $table->string('rec_name')->nullable();
+            $table->integer('rec_amount')->nullable();
+            $table->date('rec_date')->nullable();
+            $table->time('rec_time')->nullable();
+            $table->string('rec_img')->nullable();
+            $table->integer('rec_status')->nullable();
+            $table->integer('mem_id')->nullable();
         });
+        DB::table('Receipt')->insert([
+                [
+                    'rec_name' =>'user user',
+                    'rec_amount'=>'500',
+                    'rec_date'=>'2023-04-09',
+                    'rec_time'=>'15:00:00',
+                    'rec_img'=>'1.png',
+                    'rec_status'=>'2'
+                ],
+                [
+                    'rec_name' =>'user user',
+                    'rec_amount'=>'500',
+                    'rec_date'=>'2023-04-08',
+                    'rec_time'=>'15:00:00',
+                    'rec_img'=>'2.png',
+                    'rec_status'=>'2'
+                ],
+            ]);
         }
 
+
     /**
      * Reverse the migrations.
      *

public/css/Admin/Manage_member/Register/page_1.css

-h1 {
-    font-family: 'Kanit', sans-serif;
-    margin-left: 15%;
-    margin-top: 5%;
-    color: #36618D;
+.change_display {
+    display: contents;
 }
 
-input[type="text"],
-select.form-control {
-    background: transparent;
-    border: none;
-    border-bottom: 1px solid #CCCCCC;
-    -webkit-box-shadow: none;
-    box-shadow: none;
-    border-radius: 0;
-    outline: none;
+input[type="date"]::-webkit-datetime-edit,
+input[type="date"]::-webkit-inner-spin-button,
+input[type="date"]::-webkit-clear-button {
+    color: #fff;
+    position: relative;
 }
 
-input[type="button"],
-select.form-select {
-    color: #000000;
-    background-color: #ffffff;
-    border-color: #ffffff;
+input[type="date"]::-webkit-datetime-edit-year-field {
+    position: absolute !important;
+    padding: 2px;
+    color: #000;
+    left: 56px;
 }
 
-input[type="text"]:focus,
-select.form-control:focus {
-    -webkit-box-shadow: none;
-    box-shadow: none;
+input[type="date"]::-webkit-datetime-edit-month-field {
+    position: absolute !important;
+    padding: 2px;
+    color: #000;
+    left: 26px;
 }
 
-.container {
-    font-family: 'Kanit', sans-serif;
-    color: #808080;
-}
-
-prefix.form-label {
-    color: #808080;
+input[type="date"]::-webkit-datetime-edit-day-field {
+    position: absolute !important;
+    color: #000;
+    padding: 2px;
+    left: 4px;
 }
\ No newline at end of file