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

app/Http/Controllers/AdminController.php

@@ -15,7 +15,10 @@
 class AdminController extends Controller
 {
     /*
-
+        *Admin_home
+        *Admin home page
+        *@author : Dachatorn Prajit 64160295
+        *Create Date : 2023-04-05
      */
     public function Admin_home(){
         $data['count'] =DB::table('Member')->count();
@@ -25,7 +28,10 @@ public function Admin_home(){
     }
 
     /* 
-
+        *Approve_tranfer
+        *Approve_tranfer for admin approve tranfer of member
+        *@author : Wilairak Prathummat 64160072
+        *@Create Date : 2023-04-05
      */
     public function Approve_tranfer(){
         $raw = new Receipt();
@@ -35,24 +41,44 @@ public function Approve_tranfer(){
     }
 
     /*
+        *Approve_member
+        *Approve_membber for admin approve 
+        *@author : Wilairak Prathummat 64160072
+        *@Create Date : 2023-04-08
     */
     public function Approve_member(){
-        return view('Admin/Manage_member/v_approve_member');
+        $raw = new Member();
+        $data['user_all'] = $raw->get_all_user();
+        //$data = Member::all();
+        //dd($data);
+        return view('Admin/Manage_member/v_approve_member', $data);
     }
 
     /*
+        *Report
+        *Report for admin report information
+        *@author : Dechatorn Prajit 64160295
+        *@Create Date : 2023-04-04
     */
     public function Report(){
         return view('Admin/v_admin_report');
     }
 
+    /*
+        *Cremation_charge
+        *Cremation_charge for admin calculate cremation charge
+        *@author : Dechatorn Prajit 64160295
+        *@Cremation Date : 2023-04-04
+    */
     public function Cremation_charge(){
         return view('Admin/Transection/v_cremation_charge');
     }
 
-
     /*
-
+        *Update_member
+        *Update_member for admin update member information
+        @author : Dechatorn Prajit 64160295
+        @Create Date : 2023-04-04
      */
     public function Update_member(){
         return view('Admin/Manage_member/v_update_member');

app/Http/Controllers/MemberController.php

@@ -79,4 +79,22 @@ public function Profile(Request $request){
     public function Transection(){
         return view('Member/v_member_transection_history');
     }
+
+    public function Get_member_ajax(Request $request) {
+        $member = new Member();
+        $data = $member->get_member_detail($request->mem_id);
+        echo json_encode($data[0]);
+    }
+
+    public function Approve_member_ajax(Request $request) {
+        $member = new Member();
+        $member->approve_member($request->mem_id);
+        echo json_encode("success");
+    }
+
+    public function Reject_member_ajax(Request $request) {
+        $member = new Member();
+        $member->reject_member($request->mem_id);
+        echo json_encode("success");
+    }
 }

app/Models/Member.php

@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\Request;
 
+
 class Member extends Model
 {
     use HasFactory;
@@ -48,4 +49,21 @@ public function insert_new_member(){
         DB::statement('INSERT INTO MEMBER(mem_id_card,mem_prefix_th, mem_prefix_en,mem_fname_th, mem_fname_en, mem_lname_th, mem_lname_en, mem_birthday, mem_lawyer_type, mem_license, mem_lawyer_affiliation, mem_lawyer_relation, mem_email, mem_phone_number, mem_balance, `password`, address_id) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)' , 
              [$this->mem_id_card, $this->mem_prefix_th, $this->mem_prefix_en, $this->mem_fname_th, $this->mem_fname_en, $this->mem_lname_th, $this->mem_lname_en, $this->mem_birthday, $this->mem_lawyer_type,$this->mem_license, $this->mem_lawyer_affiliation, $this->mem_lawyer_relation, $this->mem_email, $this->mem_phone_number, $this->mem_balance, $this->password, $this->address_id ]  );
     }
+
+    public function get_all_user(){
+        $user = DB::table('Member')->select()->get();
+        return $user;
+    }
+
+    public function get_member_detail($id) {
+        return DB::table('Member')->join('Address', 'Member.address_id', '=', 'Address.id')->where('Member.id', '=', $id)->get();
+    }
+
+    public function approve_member($id) {
+        DB::statement('UPDATE Member SET mem_status = 1 WHERE id = ?', [$id]);
+    }
+
+    public function reject_member($id) {
+        DB::statement('UPDATE Member SET mem_status = 2 WHERE id = ?', [$id]);
+    }
 }

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
 {
@@ -23,8 +25,27 @@ public function up()
             $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/approve_member.css

@@ -13,6 +13,7 @@ .col {
     height: auto;
     margin: 0 auto;
     background: #ffffff;
+
 }
 
 .container {
@@ -49,14 +50,92 @@ .table-bordered td {
     vertical-align: middle;
 }
 
-.col-2 input[type="text"] {
+.icon {
+    font-size: 30px;
+    color: #36618D;
+}
+
+.m-5 .title {
+    color: #36618D;
+    font-size: 20px;
+    font-weight: 400;
+}
+
+.col-mt-5 {
+    background: #ffffff;
+    border-radius: 10px;
+}
+
+thead {
+    background-color: #D9D9D966;
+    color: #0000004D;
+}
+
+table {
+    background-color: #ffffff;
+}
+
+.modal-content {
+    position: relative;
+    left: -50%;
+    top: -50%;
+    height: auto;
+    background: #36618D;
+
+
+}
+
+.modal-content-1 {
+    position: relative;
+    width: 1000px;
+    left: -50%;
+    top: -50%;
+    height: auto;
+    background: #ffffff;
+}
+
+.mpdal-body {
+    position: relative;
+
+}
+
+.col-6 input[type="text"] {
+    border: none;
+    border-bottom: 1px solid black;
+    border-radius: 0px;
+    color: rgb(222, 222, 222);
+}
+
+
+
+.form-control {
     border: none;
     border-bottom: 1px solid black;
     border-radius: 0px;
-    text-align: center;
+    color: black;
 }
 
 .form-control:disabled,
 .form-control[readonly] {
     background-color: #ffffff;
+    opacity: 1;
+}
+
+
+.row {
+
+    box-sizing: border-box;
+    height: 464px;
+    background: #ffffff;
+    border-radius: 10px;
+}
+
+.display-6 {
+    color: #ffffff;
+}
+
+.text-center {
+    width: 400px;
+    height: 300px;
+    border-radius: 10px;
 }
\ No newline at end of file

public/css/main_page.css

@@ -9,6 +9,9 @@ .container {
     width: 1000px;
     margin: auto;
     background: #E1E1E1;
+
+    display: flex;
+    flex-wrap: wrap;
 }
 nav {
     width: 1000px;
@@ -53,7 +56,7 @@ .bg {
     margin: 0 auto;
     object-fit:cover;
 }
-.memder-card-list {
+.memder-card-list,.memder-card-list2 {
     width: 250px;
     height: 200px;
     background: white;
@@ -61,43 +64,134 @@ .memder-card-list {
     box-shadow: 1px 1px 1px 1px rgba(50, 50, 50, .5);
     display: flex;
     flex-direction: column;
-    align-items: center;
-    font-size: 16px;
+    padding: 10px 20px;
+    font-size: 12px;
+    margin-left: 10px;
+
+    flex: 1;
+    margin-right: 20px;
+    
 }
 .memder-card-list ul {
     list-style: none;
     text-decoration: none;
     color: black;
-    padding: 10px 20px;
+    padding: 10px 10px;
+    margin: 0;
 }
-.memder-card-list ul li {
+/* .memder-card-list ul li {
     list-style: none;
+} */
+.memder-card-list li span {
+    float: right;
+    font-weight: bold;
   }
-.memder-card-list span {
-    padding: 0px 21px ;
 
-}
 .condition-card-list {
     width: 250px;
     height: 200px;
+    padding-left: 20px;
+    background: white;
+    border-radius: 5px;
+    box-shadow: 1px 1px 1px 1px rgba(50, 50, 50, .5);
+    display: flex;
+    padding: 10px 20px;
+    font-size: 12px;
+    margin-right: 10px;
+    margin-left: 10px;
+
+    margin-bottom: 10px;
+
+    flex: 1;
+
+}
+.condition-card-list2 {
+    width: 720px;
+    height: 410px;
     background: white;
     border-radius: 5px;
     box-shadow: 1px 1px 1px 1px rgba(50, 50, 50, .5);
     display: flex;
     flex-direction: column;
-    align-items: center;
+    padding: 10px 20px;
+    font-size: 12px;
+    
+    flex: 1;
+
+}
+span{
+    text-align: end;
+}
+.condition-card-list3 {
+    width: 250px;
+    height: 200px;
+    background: white;
+    border-radius: 5px;
+    box-shadow: 1px 1px 1px 1px rgba(50, 50, 50, .5);
+    display: flex;
+    flex-direction: column;
+    padding: 10px 20px;
     font-size: 12px;
+    margin-right: 10px;
+    margin-left: 10px;
+
+    flex: 1;
+
 }
+
+
 .condition-card-list ul {
     list-style: none;
     text-decoration: none;
     color: black;
-    padding: 10px 20px;
+    padding: 10px 10px;
+    margin: 0;
+width: 100%;
+    margin-top: 0;
+
 }
 .condition-card-list ul li {
     list-style: none;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }
 .condition-card-list span {
-    padding: 0px 21px ;
+    float: right;
+    font-weight: bold;
+    width: 100%;
+    margin-left: 20px;
+  }
+
+  .condition-card-list2 span {
+    float: right;
+    font-weight: bold;
+    width: 100%;
+
+    margin-left: 20px;
+  }
+
+  .condition-card-list3 span {
+    float: right;
+    font-weight: bold;
+
+    margin-left: 20px;
+  }
+span
+  .condition-card-list ul li:last-child {
+
+    margin-bottom: 0;
+}
 
+  h2 {
+        margin: 0;
+        font-size: 1.2rem;
     }
+
+    hr {
+        margin: 10px 0;
+        border: 0;
+        border-top: 1px solid #ccc;
+    }
+  
\ No newline at end of file

resources/views/v_welcome.blade.php

@@ -20,36 +20,102 @@
                 <li><a href="#">หน้าหลัก</a></li>
                 <li><a href="#">เกี่ยวกับ</a></li>
                 <li><a href="#">ระเบียบที่เกียวข้อง</a></li>
-                <li><a href="#">เอกสาร</a></li>
+                <li><a href="/file/regulations_of_the_lawyers_council.pdf" download>ข้อบังคับ</a></li>
                 <li><a href="{{route('Login')}}" class="btn-login">เข้าสู่ระบบสมาชิก</a></li>
             </ul>
 
         </nav>
+
+        <div>
+        </div>
         <div>
             <img class="bg" src="image\cremation.jpg">
         </div>
+        <div class="container">
 
-        <div class="memder-card-list">
+            <div class="colum">
+                <div class="row">
+                    <div class="condition-card-list">
                         <ul>
-                <h4><li>จำนวนสมาชิก</li></h4>
+                            <h2>
+                                <a>จำนวนสมาชิก</a>
+                            </h2>
                             <hr>
-                <li>สามัญ&nbsp;<span>1,000 ราย</span></li>
-                <li>สมทบ&emsp;<span>800 ราย</span></li>
-                <li>รวม &nbsp;&emsp;<span>1,800 ราย</span></li>
+                            <li>สามัญ<span>1,000 คน</span></li>
+                            <li>สมทบ<span>800 คน</span></li>
+                            <li>รวม<span>1,800 คน</span></li>
                         </ul>
                     </div>
-        <br>
-        <div class="condition-card-list">
+                </div>
+                <div class="row">
+                    <div class="condition-card-list3">
                         <ul>
-                <h2><li>เงื่อนไข</li></h2>
+                            <h2>
+                                <a>เงื่อนไข</a>
+                            </h2>
                             <hr>
-                <li>อัตราค่าสมัครสมาชิก&emsp;<span>100 บาท</span></li>
+                            <a>อัตราค่าสมัครสมาชิก<span>100 บาท</span></a>
+                            <a>อััตราเงินสงเคราะห์ต่อราย<span>20 บาท</span></a>
+                            <a>ค่าบำรุงรักษา<span>50 บาท</span></a>
+                            <a>เงินสงเคราะห์ล่วงหน้า<span>650 บาท</span></a>
+                            <a>อัตราหักเงินสงเคราะห์ ร้อยละ 20</a>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <div class="colum">
+                <div class="condition-card-list2">
+                    <ul>
+                        <h2>
+                            <a>เอกสาร</a>
+                        </h2>
+                        <hr>
+                        <li><a href="/file/register_form.pdf" download>ใบสมัครสมาชิก</a></li>
+                        <li><a href="/file/regulations_of_the_lawyers_council.pdf" download>ข้อบังคับสภาทนายความ</a></li>
+                    </ul>
+                </div>
+            </div>
+
+        </div>
+        <!-- <div class="condition-card-list">
+                <ul>
+                    <h2>
+                        <li>จำนวนสมาชิก</li>
+                    </h2>
+                    <hr>
+                    <li>สามัญ<span>1,000 คน</span></li>
+                    <li>สมทบ<span>800 คน</span></li>
+                    <li>รวม<span>1,800 คน</span></li>
+                </ul>
+            </div> -->
+
+        <!-- <div class="condition-card-list3">
+                <ul>
+                    <h2>
+                        <li>เงื่อนไข</li>
+                    </h2>
+                    <hr>
+                    <li>อัตราค่าสมัครสมาชิก<span>100 บาท</span></li>
                     <li>อััตราเงินสงเคราะห์ต่อราย<span>20 บาท</span></li>
-                <li>ค่าบำรุงรักษา&emsp;<span>50 บาท</span></li>
+                    <li>ค่าบำรุงรักษา<span>50 บาท</span></li>
                     <li>เงินสงเคราะห์ล่วงหน้า<span>650 บาท</span></li>
                     <li>อัตราหักเงินสงเคราะห์<span>ร้อยละ 20</span></li>
                 </ul>
+            </div> -->
     </div>
+    <!-- <div class="colum">
+            <div class="condition-card-list2">
+                <ul>
+                    <h2>
+                        <li>เอกสาร</li>
+                    </h2>
+                    <hr>
+                    <li><a href="/file/register_form.pdf" download>ใบสมัครสมาชิก</a></li>
+                    <li><a href="/file/regulations_of_the_lawyers_council.pdf" download>ข้อบังคับสภาทนายความ</a></li>
+                </ul>
+            </div>
+        </div> -->
+
     </div>
 
 </body>

routes/web.php

@@ -14,12 +14,15 @@
 |
 */
 
+/*
+*
+*/
 Route::get('/', function () {
     return view('welcome');
 });
 
 /*
-
+*
 */
 Route::get('/Login',function () {
     return view('Login/v_Login');
@@ -113,5 +116,12 @@
 Route::post('/Insert_transfer',[App\Http\Controllers\MemberController::class,
 'Insert_transfer'])->name('Insert_transfer');
 
-// Route::post()->name()
+Route::post('/Get_member_ajax',[App\Http\Controllers\MemberController::class,
+'Get_member_ajax'])->name('Get_member_ajax');
+
+
+Route::post('/Approve_member_ajax',[App\Http\Controllers\MemberController::class,
+'Approve_member_ajax'])->name('Approve_member_ajax');
 
+Route::post('/Reject_member_ajax',[App\Http\Controllers\MemberController::class,
+'Reject_member_ajax'])->name('Reject_member_ajax');