From ee131e7bc8aa2ed6e651af8369bb61e7ecf6b92a Mon Sep 17 00:00:00 2001
From: jilhanhaura <jilhanhaura7@gmail.com>
Date: Sun, 27 Aug 2023 15:21:20 +0700
Subject: [PATCH] dashboard admin

---
 app/Http/Controllers/SettingController.php    |  66 +++++
 app/Http/Requests/StoreSettingRequest.php     |  28 +++
 app/Http/Requests/UpdateSettingRequest.php    |  28 +++
 app/Models/Refund.php                         |   5 +
 app/Models/Setting.php                        |  50 ++++
 app/Models/Users.php                          |   5 +-
 app/Models/transaction.php                    |   5 +
 app/Policies/SettingPolicy.php                |  66 +++++
 database/factories/SettingFactory.php         |  23 ++
 ...023_08_27_074453_create_settings_table.php |  27 +++
 database/seeders/SettingSeeder.php            |  17 ++
 public/assets/css/style.css                   |   8 +-
 resources/views/Admin/profile/index.blade.php |  10 +-
 .../Admin/refund/history-refund.blade.php     | 211 +---------------
 resources/views/Admin/setting/index.blade.php | 154 ++----------
 .../Detail_History_Transaction.blade.php      | 178 --------------
 .../transaction/History_Transaction.blade.php | 212 +---------------
 .../transaction/List_Transaction.blade.php    |  93 -------
 .../views/Admin/users/list-user.blade.php     | 228 +++---------------
 resources/views/index.blade.php               | 178 +++-----------
 routes/web.php                                |  10 +-
 21 files changed, 439 insertions(+), 1163 deletions(-)
 create mode 100644 app/Http/Controllers/SettingController.php
 create mode 100644 app/Http/Requests/StoreSettingRequest.php
 create mode 100644 app/Http/Requests/UpdateSettingRequest.php
 create mode 100644 app/Models/Setting.php
 create mode 100644 app/Policies/SettingPolicy.php
 create mode 100644 database/factories/SettingFactory.php
 create mode 100644 database/migrations/2023_08_27_074453_create_settings_table.php
 create mode 100644 database/seeders/SettingSeeder.php
 delete mode 100644 resources/views/Admin/transaction/Detail_History_Transaction.blade.php
 delete mode 100644 resources/views/Admin/transaction/List_Transaction.blade.php

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
new file mode 100644
index 00000000..45a8ef75
--- /dev/null
+++ b/app/Http/Controllers/SettingController.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Setting;
+use App\Http\Requests\StoreSettingRequest;
+use App\Http\Requests\UpdateSettingRequest;
+
+class SettingController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(StoreSettingRequest $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show(Setting $setting)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit(Setting $setting)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(UpdateSettingRequest $request, Setting $setting)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(Setting $setting)
+    {
+        //
+    }
+}
diff --git a/app/Http/Requests/StoreSettingRequest.php b/app/Http/Requests/StoreSettingRequest.php
new file mode 100644
index 00000000..d599066b
--- /dev/null
+++ b/app/Http/Requests/StoreSettingRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreSettingRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Http/Requests/UpdateSettingRequest.php b/app/Http/Requests/UpdateSettingRequest.php
new file mode 100644
index 00000000..c131370f
--- /dev/null
+++ b/app/Http/Requests/UpdateSettingRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateSettingRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Models/Refund.php b/app/Models/Refund.php
index 91851e91..7aa59d94 100644
--- a/app/Models/Refund.php
+++ b/app/Models/Refund.php
@@ -9,6 +9,7 @@ class Refund
 {
     private static $history_refund=[
         [
+            "no"=>"1",
             "orderId" => "INV-1234",
             "customer" => "Okta",
             "seller" => "dodo",
@@ -17,6 +18,7 @@ class Refund
             "status"=>"Process Refund"
         ],
         [
+            "no"=>"2",
             "orderId" => "INV-0000",
             "customer" => "Selvi",
             "seller" => "dedo",
@@ -25,6 +27,7 @@ class Refund
             "status"=>"Refund Success"
         ],
         [
+            "no"=>"3",
             "orderId" => "INV-2313",
             "customer" => "Septa",
             "seller" => "dido",
@@ -33,6 +36,7 @@ class Refund
             "status"=>"Process Refund"
         ],
         [
+            "no"=>"4",
             "orderId" => "INV-5664",
             "customer" => "Padia",
             "seller" => "dedo",
@@ -41,6 +45,7 @@ class Refund
             "status"=>"Refunds Refused"
         ],
         [
+            "no"=>"5",
             "orderId" => "INV-9090",
             "customer" => "hantu",
             "seller" => "dado",
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
new file mode 100644
index 00000000..69ddea04
--- /dev/null
+++ b/app/Models/Setting.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Setting
+{
+    static $History_Setting=[
+        [
+            "no" => "1",
+            "month" => "January",
+            "year" =>"2021",
+            "persentase" =>"50%",
+            "status" =>"Active"
+        ],
+        [
+            "no" => "2",
+            "month" => "February",
+            "year" =>"2022",
+            "persentase" =>"40%",
+            "status" =>"Active"
+        ],
+        [
+            "no" => "3",
+            "month" => "March",
+            "year" =>"2023",
+            "persentase" =>"30%",
+            "status" =>"Non Active"
+        ],
+        [
+            "no" => "4",
+            "month" => "April",
+            "year" =>"2021",
+            "persentase" =>"60%",
+            "status" =>"Non Active"
+        ],
+        [
+            "no" => "5",
+            "month" => "May",
+            "year" =>"2023",
+            "persentase" =>"20%",
+            "status" =>"Active"
+        ]
+        ];
+        public static function HistorySetting(){
+            return self::$History_Setting;
+        }
+}
\ No newline at end of file
diff --git a/app/Models/Users.php b/app/Models/Users.php
index 3887a478..af244430 100644
--- a/app/Models/Users.php
+++ b/app/Models/Users.php
@@ -9,6 +9,7 @@ class Users
 {
     private static $list_users=[
         [
+            "no" => "1",
             "userId" => "U1290",
             "fullname" => "Tsalsabila Jilhan Haura",
             "email" => "jilhanhaura07@gmail.com",
@@ -17,13 +18,15 @@ class Users
             "status" => "Finished"
         ],
         [
+            "no" => "2",
             "userId" => "U4567",
             "fullname" => "Boncel",
             "email" => "boncel@gmail.com",
             "gender" => "Male",
             "date" => "August 22, 2023",
             "status" => "Progress"
-        ]
+        ],
+
         ];
         public static function listUsers(){
             return self::$list_users;
diff --git a/app/Models/transaction.php b/app/Models/transaction.php
index 62f65faa..b7bb85e7 100644
--- a/app/Models/transaction.php
+++ b/app/Models/transaction.php
@@ -9,6 +9,7 @@ class transaction
 {
    private static $list_transaction =[
         [
+            "no"=>"1",
             "orderId" => "INV-1234",
             "customer" => "Jilhan",
             "seller" => "dodo",
@@ -17,6 +18,7 @@ class transaction
             "status"=>"paid"
         ],
         [
+            "no"=>"2",
             "orderId" => "INV-0000",
             "customer" => "hmmm",
             "seller" => "dodo",
@@ -25,6 +27,7 @@ class transaction
             "status"=>"pending"
         ],
         [
+            "no"=>"3",
             "orderId" => "INV-2313",
             "customer" => "nurul",
             "seller" => "dido",
@@ -33,6 +36,7 @@ class transaction
             "status"=>"unpaid"
         ],
         [
+            "no"=>"4",
             "orderId" => "INV-5664",
             "customer" => "raihan",
             "seller" => "dedo",
@@ -41,6 +45,7 @@ class transaction
             "status"=>"pending"
         ],
         [
+            "no"=>"5",
             "orderId" => "INV-9090",
             "customer" => "testing",
             "seller" => "dado",
diff --git a/app/Policies/SettingPolicy.php b/app/Policies/SettingPolicy.php
new file mode 100644
index 00000000..96c2871e
--- /dev/null
+++ b/app/Policies/SettingPolicy.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Setting;
+use App\Models\User;
+use Illuminate\Auth\Access\Response;
+
+class SettingPolicy
+{
+    /**
+     * Determine whether the user can view any models.
+     */
+    public function viewAny(User $user): bool
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can view the model.
+     */
+    public function view(User $user, Setting $setting): bool
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can create models.
+     */
+    public function create(User $user): bool
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can update the model.
+     */
+    public function update(User $user, Setting $setting): bool
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can delete the model.
+     */
+    public function delete(User $user, Setting $setting): bool
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can restore the model.
+     */
+    public function restore(User $user, Setting $setting): bool
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can permanently delete the model.
+     */
+    public function forceDelete(User $user, Setting $setting): bool
+    {
+        //
+    }
+}
diff --git a/database/factories/SettingFactory.php b/database/factories/SettingFactory.php
new file mode 100644
index 00000000..eb11ef9b
--- /dev/null
+++ b/database/factories/SettingFactory.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Setting>
+ */
+class SettingFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/database/migrations/2023_08_27_074453_create_settings_table.php b/database/migrations/2023_08_27_074453_create_settings_table.php
new file mode 100644
index 00000000..3f09f882
--- /dev/null
+++ b/database/migrations/2023_08_27_074453_create_settings_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('settings', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('settings');
+    }
+};
diff --git a/database/seeders/SettingSeeder.php b/database/seeders/SettingSeeder.php
new file mode 100644
index 00000000..9a6d9b67
--- /dev/null
+++ b/database/seeders/SettingSeeder.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+
+class SettingSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        //
+    }
+}
diff --git a/public/assets/css/style.css b/public/assets/css/style.css
index 39254b3c..ff687118 100644
--- a/public/assets/css/style.css
+++ b/public/assets/css/style.css
@@ -2338,9 +2338,8 @@ h6 .badge {
     width: 100%;
     height: 115px;
     /* background-image: url('/public/assets/images/bg-web.png'); */
-    background: rgb(144, 12, 63);
-    /* background: linear-gradient(90deg, rgb(144, 12, 63) 0%, rgb(186, 39, 96) 100%, rgb(161, 9, 73) 100%); */
-
+    /* background: rgb(144, 12, 63); */
+    background-image: linear-gradient(to bottom right, rgb(144, 12, 63) 0%, rgb(186, 39, 96) 100%, rgb(161, 9, 73) 100%);
     z-index: -1;
 }
 
@@ -3475,7 +3474,8 @@ pre {
     top: 0;
     height: 100%;
     width: 250px;
-    background-color: #900C3F;
+    background-image: linear-gradient(to bottom right, rgb(144, 12, 63) 0%, rgb(186, 39, 96) 100%, rgb(161, 9, 73) 100%);
+    /* background-color: #900C3F; */
     z-index: 880;
     left: 0;
 }
diff --git a/resources/views/Admin/profile/index.blade.php b/resources/views/Admin/profile/index.blade.php
index 9d9c70c8..fb1efe86 100644
--- a/resources/views/Admin/profile/index.blade.php
+++ b/resources/views/Admin/profile/index.blade.php
@@ -33,17 +33,13 @@
                     <div class="col-xl-8">
                         <div class="card">
                             <div class="card-body pt-3">
-                                <!-- Bordered Tabs -->
                                 <ul class="nav nav-tabs nav-tabs-bordered">
-
                                     <li class="nav-item">
                                         <button class="nav-link active" data-bs-toggle="tab"
                                             data-bs-target="#profile-overview">Overview</button>
                                     </li>
-
                                 </ul>
                                 <div class="tab-content pt-2">
-
                                     <div class="tab-pane fade show active profile-overview" id="profile-overview">
                                         <h5 class="card-title">About</h5>
                                         <p class="font-weight-italic justified-text">Lorem, ipsum dolor sit amet consectetur
@@ -97,11 +93,7 @@
                                         </div>
 
                                     </div>
-
-
-
-                                </div><!-- End Bordered Tabs -->
-
+                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/resources/views/Admin/refund/history-refund.blade.php b/resources/views/Admin/refund/history-refund.blade.php
index 5642c6b6..7d4b6bf0 100644
--- a/resources/views/Admin/refund/history-refund.blade.php
+++ b/resources/views/Admin/refund/history-refund.blade.php
@@ -30,188 +30,9 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <tr>
-                                        <td>
-                                            1
-                                        </td>
-                                        <td>inv-0390</td>
-                                        <td>Tsalsabila Jilhan Haura</td>
-                                        <td>Boncel</td>
-                                        <td>Rp. 15000</td>
-                                        <td>29 july 2023</td>
-                                        <td>
-                                            <div class="badge badge-success">Refund Success</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail_refund">Details</a>
-                                                    {{-- <a class="dropdown-item" href="#" data-toggle="modal"
-                                                        data-target="#ModalTransaction">Tracking</a> --}}
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            2
-                                        </td>
-                                        <td>INV-9219</td>
-                                        <td>Koko</td>
-                                        <td>Memei</td>
-                                        <td>Rp. 50010</td>
-                                        <td>19 july 2023</td>
-                                        <td>
-                                            <div class="badge badge-warning">Process Refund</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail_refund">Details</a>
-                                                    {{-- <a class="dropdown-item" href="#" data-toggle="modal"
-                                                        data-target="#ModalTransaction">Tracking</a> --}}
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            3
-                                        </td>
-                                        <td>INV-6385</td>
-                                        <td>Memei</td>
-                                        <td>Snowy</td>
-                                        <td>Rp.900000</td>
-                                        <td>19 August 2023</td>
-                                        <td>
-                                            <div class="badge badge-danger">Refunds Refused</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail_refund">Details</a>
-                                                    {{-- <a class="dropdown-item" href="#" data-toggle="modal"
-                                                        data-target="#ModalTransaction">Tracking</a> --}}
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            4
-                                        </td>
-                                        <td>INV-6385</td>
-                                        <td>Black Panther</td>
-                                        <td>Koko</td>
-                                        <td>Rp.789000</td>
-                                        <td>19 January 2023</td>
-                                        <td>
-                                            <div class="badge badge-warning">Process Refund</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail_refund">Details</a>
-                                                    {{-- <a class="dropdown-item" href="#" data-toggle="modal"
-                                                        data-target="#ModalTransaction">Tracking</a> --}}
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            5
-                                        </td>
-                                        <td>INV-8327</td>
-                                        <td>Snowy</td>
-                                        <td>Black</td>
-                                        <td>Rp. 12910190</td>
-                                        <td>19 May 2023</td>
-                                        <td>
-                                            <div class="badge badge-success">Refund Success</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail_refund">Details</a>
-                                                    {{-- <a class="dropdown-item" href="#" data-toggle="modal"
-                                                        data-target="#ModalTransaction">Tracking</a> --}}
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            {{-- <div class="col-md-12">
-                <div class="card">
-                    <div class="d-flex justify-content-between align-items-center p-4">
-                        <div class="d-flex align-items-center">
-                            <span class="mb-0 ml-2">Show:</span>
-                            <select class="form-select ml-2">
-                                <option>10</option>
-                                <option>25</option>
-                                <option>50</option>
-                                <option>100</option>
-                            </select>
-                            <span class="ml-2">entries</span>
-                        </div>
-                        <div class="float-right">
-                            <form>
-                                <div class="input-group">
-                                    <input type="text" class="form-control" placeholder="Search">
-                                    <div class="input-group-append">
-                                        <button class="btn btn-primary"><i class="fas fa-search"></i></button>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table class="table table-bordered table-condensed table-striped" id="mytable">
-                                <thead>
-                                    <tr>
-                                        <th onclick="sortTable(0)">Order ID</th>
-                                        <th onclick="sortTable(1)">Customer</th>
-                                        <th onclick="sortTable(2)">Seller</th>
-                                        <th onclick="sortTable(3)">Total</th>
-                                        <th onclick="sortTable(4)">Due Date</th>
-                                        <th onclick="sortTable(5)">Status</th>
-                                        <th onclick="sortTable(6)">Action</th>
-                                    </tr>
-                                </thead>
-                                @foreach ($history_refund as $HistoryRefund)
-                                    <tbody>
+                                    @foreach ($history_refund as $HistoryRefund)
                                         <tr>
+                                            <td>{{ $HistoryRefund['no'] }}</td>
                                             <td class="font-weight-600">{{ $HistoryRefund['orderId'] }}</a></td>
                                             <td class="font-weight-600">{{ $HistoryRefund['customer'] }}</td>
                                             <td class="font-weight-600">{{ $HistoryRefund['seller'] }}</td>
@@ -244,33 +65,11 @@
                                                 </div>
                                             </td>
                                         </tr>
-                                    </tbody>
-                                @endforeach
+                                    @endforeach
+                                </tbody>
                             </table>
-                            <div class="card">
-                                <div class="card-body">
-                                    <div class="d-flex justify-content-end">
-                                        <nav aria-label="paginate">
-                                            <ul class="pagination">
-                                                <li class="page-item disabled">
-                                                    <a class="page-link" href="#" tabindex="-1">Previous</a>
-                                                </li>
-                                                <li class="page-item active"><a class="page-link" href="#">1</a></li>
-                                                <li class="page-item ">
-                                                    <a class="page-link" href="#">2 <span
-                                                            class="sr-only">(current)</span></a>
-                                                </li>
-                                                <li class="page-item"><a class="page-link" href="#">3</a></li>
-                                                <li class="page-item">
-                                                    <a class="page-link" href="#">Next</a>
-                                                </li>
-                                            </ul>
-                                        </nav>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                     </div>
                 </div>
-            </div> --}}
+            </div>
         @endsection
diff --git a/resources/views/Admin/setting/index.blade.php b/resources/views/Admin/setting/index.blade.php
index 8cfa95eb..d79bde63 100644
--- a/resources/views/Admin/setting/index.blade.php
+++ b/resources/views/Admin/setting/index.blade.php
@@ -29,141 +29,37 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <tr>
-                                        <td>1</td>
-                                        <td class="font-weight-600">July</td>
-                                        <td class="font-weight-600">2023</td>
-                                        <td class="font-weight-600">10%</td>
-                                        <td>
-                                            <div class="badge badge-success">Active</div>
-                                        </td>
-                                        <td>
-                                            <label class="switch">
-                                                <input type="checkbox" checked>
-                                                <span class="slider round" data-on-text="Yes" data-off-text="No"></span>
-                                            </label>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>2</td>
-                                        <td class="font-weight-600">August</td>
-                                        <td class="font-weight-600">2023</td>
-                                        <td class="font-weight-600">30%</td>
-                                        <td>
-                                            <div class="badge badge-success">Active</div>
-                                        </td>
-                                        <td>
-                                            <label class="switch">
-                                                <input type="checkbox" checked>
-                                                <span class="slider round" data-on-text="Yes" data-off-text="No"></span>
-                                            </label>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>3</td>
-                                        <td class="font-weight-600">January</td>
-                                        <td class="font-weight-600">2023</td>
-                                        <td class="font-weight-600">20%</td>
-                                        <td>
-                                            <div class="badge badge-success">Active</div>
-                                        </td>
-                                        <td>
-                                            <label class="switch">
-                                                <input type="checkbox" checked>
-                                                <span class="slider round" data-on-text="Yes" data-off-text="No"></span>
-                                            </label>
-                                        </td>
-                                    </tr>
+                                    @foreach ($setting as $settings)
+                                        <tr>
+                                            <td>{{ $settings['no'] }}</td>
+                                            <td>{{ $settings['month'] }}</td>
+                                            <td>{{ $settings['year'] }}</td>
+                                            <td>{{ $settings['persentase'] }}</td>
+                                            <td>
+                                                @php
+                                                    $statusClass = '';
+                                                    if ($settings['status'] === 'Active') {
+                                                        $statusClass = 'badge-success';
+                                                    } elseif ($settings['status'] === 'Non Active') {
+                                                        $statusClass = 'badge-danger';
+                                                    }
+                                                @endphp
+                                                <div class="badge {{ $statusClass }}">{{ $settings['status'] }}</div>
+                                            </td>
+                                            <td>
+                                                <label class="switch">
+                                                    <input type="checkbox" @if ($settings['status'] === 'Active') checked @endif>
+                                                    <span class="slider round" data-on-text="Yes" data-off-text="No"></span>
+                                                </label>
+                                            </td>
+                                        </tr>
+                                    @endforeach
                                 </tbody>
                             </table>
                         </div>
                     </div>
                 </div>
             </div>
-            {{-- <div class="col-md-12">
-                <div class="card">
-                    <div class="d-flex justify-content-between align-items-center p-4">
-                        <div class="d-flex align-items-center">
-                            <span class="mb-0 ml-2">Show:</span>
-                            <select class="form-select ml-2">
-                                <option>10</option>
-                                <option>25</option>
-                                <option>50</option>
-                                <option>100</option>
-                            </select>
-                            <span class="ml-2">entries</span>
-                        </div>
-                        <div class="float-right">
-                            <form>
-                                <div class="input-group">
-                                    <input type="text" class="form-control" placeholder="Search">
-                                    <div class="input-group-append">
-                                        <button class="btn btn-primary"><i class="fas fa-search"></i></button>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table class="table table-bordered table-condensed table-striped" id="mytable">
-                                <thead>
-                                    <center>
-                                        <tr>
-                                            <th>#</th>
-                                            <th>Bulan</th>
-                                            <th>Tahun</th>
-                                            <th>Persentase</th>
-                                            <th>Status</th>
-                                            <th>Action</th>
-                                        </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <td class="font-weight-600"> 1</td>
-                                        <td class="font-weight-600"> July</td>
-                                        <td class="font-weight-600">2023</td>
-                                        <td class="font-weight-600">10%</td>
-                                        <td>
-                                            <div class="badge badge-success">Active</div>
-                                        </td>
-                                        <td>
-                                            <label class="switch">
-                                                <input type="checkbox" checked>
-                                                <span class="slider round" data-on-text="Yes" data-off-text="No"></span>
-                                            </label>
-                                        </td>
-
-                                    </tr>
-                                </tbody>
-                                </center>
-                            </table>
-                            <div class="card">
-                                <div class="card-body">
-                                    <div class="d-flex justify-content-end">
-                                        <nav aria-label="paginate">
-                                            <ul class="pagination">
-                                                <li class="page-item disabled">
-                                                    <a class="page-link" href="#" tabindex="-1">Previous</a>
-                                                </li>
-                                                <li class="page-item active"><a class="page-link" href="#">1</a></li>
-                                                <li class="page-item ">
-                                                    <a class="page-link" href="#">2 <span
-                                                            class="sr-only">(current)</span></a>
-                                                </li>
-                                                <li class="page-item"><a class="page-link" href="#">3</a></li>
-                                                <li class="page-item">
-                                                    <a class="page-link" href="#">Next</a>
-                                                </li>
-                                            </ul>
-                                        </nav>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div> --}}
         </section>
     </div>
     @include('Admin.setting.add-Data')
diff --git a/resources/views/Admin/transaction/Detail_History_Transaction.blade.php b/resources/views/Admin/transaction/Detail_History_Transaction.blade.php
deleted file mode 100644
index 7c124f61..00000000
--- a/resources/views/Admin/transaction/Detail_History_Transaction.blade.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<!-- Modal -->
-<div class="modal fade" id="ModalTransaction" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle"
-    aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h2 class="modal-title" id="exampleModalLongTitle">Tracking Information</h2>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="section-body">
-                    <div class="row">
-                        <div class="col-12">
-                            <div class="activities">
-                                <div class="activity">
-                                    <div class="activity-icon bg-primary text-white shadow-primary">
-                                        <i class="fas fa-comment-alt"></i>
-                                    </div>
-                                    <div class="activity-detail">
-                                        <div class="mb-2">
-                                            <span class="text-job text-primary">2 min ago</span>
-                                            <span class="bullet"></span>
-                                            <a class="text-job" href="#">View</a>
-                                            <div class="float-right dropdown">
-                                                <a href="#" data-toggle="dropdown"><i
-                                                        class="fas fa-ellipsis-h"></i></a>
-                                                <div class="dropdown-menu">
-                                                    <div class="dropdown-title">Options</div>
-                                                    <a href="#" class="dropdown-item has-icon"><i
-                                                            class="fas fa-eye"></i> View</a>
-                                                    <a href="#" class="dropdown-item has-icon"><i
-                                                            class="fas fa-list"></i> Detail</a>
-                                                    <div class="dropdown-divider"></div>
-                                                    <a href="#" class="dropdown-item has-icon text-danger"
-                                                        data-confirm="Wait, wait, wait...|This action can't be undone. Want to take risks?"
-                                                        data-confirm-text-yes="Yes, IDC"><i
-                                                            class="fas fa-trash-alt"></i> Archive</a>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <p>Have commented on the task of "<a href="#">Responsive
-                                                design</a>".</p>
-                                    </div>
-                                </div>
-                                <div class="activity">
-                                    <div class="activity-icon bg-primary text-white shadow-primary">
-                                        <i class="fas fa-arrows-alt"></i>
-                                    </div>
-                                    <div class="activity-detail">
-                                        <div class="mb-2">
-                                            <span class="text-job">1 hour ago</span>
-                                            <span class="bullet"></span>
-                                            <a class="text-job" href="#">View</a>
-                                            <div class="float-right dropdown">
-                                                <a href="#" data-toggle="dropdown"><i
-                                                        class="fas fa-ellipsis-h"></i></a>
-                                                <div class="dropdown-menu">
-                                                    <div class="dropdown-title">Options</div>
-                                                    <a href="#" class="dropdown-item has-icon"><i
-                                                            class="fas fa-eye"></i> View</a>
-                                                    <a href="#" class="dropdown-item has-icon"><i
-                                                            class="fas fa-list"></i> Detail</a>
-                                                    <div class="dropdown-divider"></div>
-                                                    <a href="#" class="dropdown-item has-icon text-danger"
-                                                        data-confirm="Wait, wait, wait...|This action can't be undone. Want to take risks?"
-                                                        data-confirm-text-yes="Yes, IDC"><i
-                                                            class="fas fa-trash-alt"></i> Archive</a>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <p>Moved the task "<a href="#">Fix some features that are bugs in
-                                                the master module</a>" from Progress to Finish.</p>
-                                    </div>
-                                </div>
-                                <div class="activity">
-                                    <div class="activity-icon bg-primary text-white shadow-primary">
-                                        <i class="fas fa-unlock"></i>
-                                    </div>
-                                    <div class="activity-detail">
-                                        <div class="mb-2">
-                                            <span class="text-job">4 hour ago</span>
-                                            <span class="bullet"></span>
-                                            <a class="text-job" href="#">View</a>
-                                            <div class="float-right dropdown">
-                                                <a href="#" data-toggle="dropdown"><i
-                                                        class="fas fa-ellipsis-h"></i></a>
-                                                <div class="dropdown-menu">
-                                                    <div class="dropdown-title">Options</div>
-                                                    <a href="#" class="dropdown-item has-icon"><i
-                                                            class="fas fa-eye"></i> View</a>
-                                                    <a href="#" class="dropdown-item has-icon"><i
-                                                            class="fas fa-list"></i> Detail</a>
-                                                    <div class="dropdown-divider"></div>
-                                                    <a href="#" class="dropdown-item has-icon text-danger"
-                                                        data-confirm="Wait, wait, wait...|This action can't be undone. Want to take risks?"
-                                                        data-confirm-text-yes="Yes, IDC"><i
-                                                            class="fas fa-trash-alt"></i> Archive</a>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <p>Login to the system with ujang@maman.com email and location in Bogor.
-                                        </p>
-                                    </div>
-                                </div>
-
-                                <div class="activity">
-                                    <div class="activity-icon bg-primary text-white shadow-primary">
-                                        <i class="fas fa-trash"></i>
-                                    </div>
-                                    <div class="activity-detail">
-                                        <div class="mb-2">
-                                            <span class="text-job">Yesterday</span>
-                                            <span class="bullet"></span>
-                                            <a class="text-job" href="#">View</a>
-                                            <div class="float-right dropdown">
-                                                <a href="#" data-toggle="dropdown"><i
-                                                        class="fas fa-ellipsis-h"></i></a>
-                                                <div class="dropdown-menu">
-                                                    <div class="dropdown-title">Options</div>
-                                                    <a href="#" class="dropdown-item has-icon"><i
-                                                            class="fas fa-eye"></i> View</a>
-                                                    <a href="#" class="dropdown-item has-icon"><i
-                                                            class="fas fa-list"></i> Detail</a>
-                                                    <div class="dropdown-divider"></div>
-                                                    <a href="#" class="dropdown-item has-icon text-danger"
-                                                        data-confirm="Wait, wait, wait...|This action can't be undone. Want to take risks?"
-                                                        data-confirm-text-yes="Yes, IDC"><i
-                                                            class="fas fa-trash-alt"></i> Archive</a>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <p>Assign the task of "<a href="#">Redesigning website header and
-                                                make it responsive AF</a>" to <a href="#">Syahdan
-                                                Ubaidilah</a>.</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <a href="/history_transaction" class="btn btn-primary mx-1">Back</a>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-
-
-{{-- @extends('layout.main')
-@section('content')
-    @foreach ($detail_transaction as $detail_transactions)
-        <div class="main-content">
-            <section class="section">
-                <div class="tracking-container">
-                    <h2>Tracking Information</h2>
-                    <div class="tracking-info">
-                        <p>Tracking Number: <span
-                                class="tracking-status">{{ $detail_transactions['tracking_number'] }}</span></p>
-                        <p>Order ID: <span class="tracking-status">{{ $detail_transactions['orderId'] }}</span></p>
-                        <p>Status: <span class="tracking-status">{{ $detail_transactions['status'] }}</span></p>
-                        <p>Estimated: {{ $detail_transactions['estimated'] }}</p>
-                    </div>
-                    <h2>Tracking Details</h2>
-                    <ul>
-                        <li>{{ $detail_transactions['tracking_detail1'] }}</li>
-                        <li>{{ $detail_transactions['tracking_detail2'] }}</li>
-                        <li>{{ $detail_transactions['tracking_detail3'] }}</li>
-                    </ul>
-                </div>
-            </section>
-        </div>
-    @endforeach
-@endsection --}}
diff --git a/resources/views/Admin/transaction/History_Transaction.blade.php b/resources/views/Admin/transaction/History_Transaction.blade.php
index 2c1fd16a..76336b0f 100644
--- a/resources/views/Admin/transaction/History_Transaction.blade.php
+++ b/resources/views/Admin/transaction/History_Transaction.blade.php
@@ -30,188 +30,9 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <tr>
-                                        <td>
-                                            1
-                                        </td>
-                                        <td>inv-0390</td>
-                                        <td>Tsalsabila Jilhan Haura</td>
-                                        <td>Boncel</td>
-                                        <td>Rp. 15000</td>
-                                        <td>29 july 2023</td>
-                                        <td>
-                                            <div class="badge badge-success">Paid</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail_transaction">Details</a>
-                                                    <a class="dropdown-item" href="#" data-toggle="modal"
-                                                        data-target="#ModalTransaction">Tracking</a>
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            2
-                                        </td>
-                                        <td>INV-9219</td>
-                                        <td>Koko</td>
-                                        <td>Memei</td>
-                                        <td>Rp. 50010</td>
-                                        <td>19 july 2023</td>
-                                        <td>
-                                            <div class="badge badge-warning">Pending</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail_transaction">Details</a>
-                                                    <a class="dropdown-item" href="#" data-toggle="modal"
-                                                        data-target="#ModalTransaction">Tracking</a>
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            3
-                                        </td>
-                                        <td>INV-6385</td>
-                                        <td>Memei</td>
-                                        <td>Snowy</td>
-                                        <td>Rp.900000</td>
-                                        <td>19 August 2023</td>
-                                        <td>
-                                            <div class="badge badge-danger">Unpaid</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail_transaction">Details</a>
-                                                    <a class="dropdown-item" href="#" data-toggle="modal"
-                                                        data-target="#ModalTransaction">Tracking</a>
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            4
-                                        </td>
-                                        <td>INV-6385</td>
-                                        <td>Black Panther</td>
-                                        <td>Koko</td>
-                                        <td>Rp.789000</td>
-                                        <td>19 January 2023</td>
-                                        <td>
-                                            <div class="badge badge-warning">Pending</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail_transaction">Details</a>
-                                                    <a class="dropdown-item" href="#" data-toggle="modal"
-                                                        data-target="#ModalTransaction">Tracking</a>
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            5
-                                        </td>
-                                        <td>INV-8327</td>
-                                        <td>Snowy</td>
-                                        <td>Black</td>
-                                        <td>Rp. 12910190</td>
-                                        <td>19 May 2023</td>
-                                        <td>
-                                            <div class="badge badge-success">Paid</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail_transaction">Details</a>
-                                                    <a class="dropdown-item" href="#" data-toggle="modal"
-                                                        data-target="#ModalTransaction">Tracking</a>
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            {{-- <div class="col-md-12">
-                <div class="card">
-                    <div class="d-flex justify-content-between align-items-center p-4">
-                        <div class="d-flex align-items-center">
-                            <span class="mb-0 ml-2">Show:</span>
-                            <select class="form-select ml-2">
-                                <option>10</option>
-                                <option>25</option>
-                                <option>50</option>
-                                <option>100</option>
-                            </select>
-                            <span class="ml-2">entries</span>
-                        </div>
-                        <div class="float-right">
-                            <form>
-                                <div class="input-group">
-                                    <input type="text" class="form-control" placeholder="Search">
-                                    <div class="input-group-append">
-                                        <button class="btn btn-primary"><i class="fas fa-search"></i></button>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table class="table table-bordered table-condensed table-striped" id="mytable">
-                                <thead>
-                                    <tr>
-                                        <th>Order ID</th>
-                                        <th>Customer</th>
-                                        <th>Seller</th>
-                                        <th>Total</th>
-                                        <th>Due Date</th>
-                                        <th>Status</th>
-                                        <th>Action</th>
-                                    </tr>
-                                </thead>
-                                @foreach ($transaction as $transactions)
-                                    <tbody>
+                                    @foreach ($transaction as $transactions)
                                         <tr>
+                                            <td>{{ $transactions['no'] }}</td>
                                             <td><a href="#">{{ $transactions['orderId'] }}</a></td>
                                             <td class="font-weight-600">{{ $transactions['customer'] }}</td>
                                             <td class="font-weight-600">{{ $transactions['seller'] }}</td>
@@ -245,36 +66,13 @@
                                                 </div>
                                             </td>
                                         </tr>
-                                    </tbody>
-                                @endforeach
-
+                                    @endforeach
+                                </tbody>
                             </table>
-                            <div class="card">
-                                <div class="card-body">
-                                    <div class="d-flex justify-content-end">
-                                        <nav aria-label="paginate">
-                                            <ul class="pagination">
-                                                <li class="page-item disabled">
-                                                    <a class="page-link" href="#" tabindex="-1">Previous</a>
-                                                </li>
-                                                <li class="page-item active"><a class="page-link" href="#">1</a></li>
-                                                <li class="page-item ">
-                                                    <a class="page-link" href="#">2 <span
-                                                            class="sr-only">(current)</span></a>
-                                                </li>
-                                                <li class="page-item"><a class="page-link" href="#">3</a></li>
-                                                <li class="page-item">
-                                                    <a class="page-link" href="#">Next</a>
-                                                </li>
-                                            </ul>
-                                        </nav>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                     </div>
                 </div>
-            </div> --}}
+            </div>
     </div>
     @include('Admin.transaction.Tracking')
 @endsection
diff --git a/resources/views/Admin/transaction/List_Transaction.blade.php b/resources/views/Admin/transaction/List_Transaction.blade.php
deleted file mode 100644
index 09ca946f..00000000
--- a/resources/views/Admin/transaction/List_Transaction.blade.php
+++ /dev/null
@@ -1,93 +0,0 @@
-@extends('layout.main')
-
-@section('content')
-    <div class="main-content">
-        <section class="section">
-            <div class="col-md-12">
-                <div class="card">
-                    <div class="card-header">
-                        <h2 class="mb-4">List Transaction</h2>
-                    </div>
-                    <div class="d-flex justify-content-between align-items-center p-4">
-                        <div class="d-flex align-items-center">
-                            <span class="mb-0 ml-2">Show:</span>
-                            <select class="form-select ml-2">
-                                <option>10</option>
-                                <option>25</option>
-                                <option>50</option>
-                                <option>100</option>
-                            </select>
-                            <span class="ml-2">entries</span>
-                        </div>
-                        <div class="float-right">
-                            <form>
-                                <div class="input-group">
-                                    <input type="text" class="form-control" placeholder="Search">
-                                    <div class="input-group-append">
-                                        <button class="btn btn-primary"><i class="fas fa-search"></i></button>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table class="table table-bordered table-md">
-                                <tr>
-                                    <th>Order ID</th>
-                                    <th>Customer</th>
-                                    <th>Seller</th>
-                                    <th>Total</th>
-                                    <th>Due Date</th>
-                                    <th>Status</th>
-                                    <th>Action</th>
-                                </tr>
-                                @foreach ($transaction as $transactions)
-                                    <tr>
-                                        <td><a href="#">{{ $transactions['orderId'] }}</a></td>
-                                        <td class="font-weight-600">{{ $transactions['customer'] }}</td>
-                                        <td class="font-weight-600">{{ $transactions['seller'] }}</td>
-                                        <td class="font-weight-600">{{ $transactions['total'] }}</td>
-                                        <td>{{ $transactions['date'] }}</td>
-                                        <td>
-                                            <div class="badge badge-warning">{{ $transactions['status'] }}</div>
-                                        </td>
-                                        <td>
-                                            <a class="btn btn-primary btn-action mr-1" data-toggle="tooltip"
-                                                title="Edit"><i class="fas fa-pencil-alt"></i></a>
-                                            <a class="btn btn-danger btn-action" data-toggle="tooltip" title="Delete"
-                                                data-confirm="Are You Sure?|This action can not be undone. Do you want to continue?"
-                                                data-confirm-yes="alert('Deleted')"><i class="fas fa-trash"></i></a>
-                                        </td>
-                                    </tr>
-                                @endforeach
-                            </table>
-                            <div class="card">
-                                <div class="card-body">
-                                    <div class="d-flex justify-content-end">
-                                        <nav aria-label="paginate">
-                                            <ul class="pagination">
-                                                <li class="page-item disabled">
-                                                    <a class="page-link" href="#" tabindex="-1">Previous</a>
-                                                </li>
-                                                <li class="page-item active"><a class="page-link" href="#">1</a></li>
-                                                <li class="page-item ">
-                                                    <a class="page-link" href="#">2 <span
-                                                            class="sr-only">(current)</span></a>
-                                                </li>
-                                                <li class="page-item"><a class="page-link" href="#">3</a></li>
-                                                <li class="page-item">
-                                                    <a class="page-link" href="#">Next</a>
-                                                </li>
-                                            </ul>
-                                        </nav>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-@endsection
diff --git a/resources/views/Admin/users/list-user.blade.php b/resources/views/Admin/users/list-user.blade.php
index 4381420a..b3dd8e17 100644
--- a/resources/views/Admin/users/list-user.blade.php
+++ b/resources/views/Admin/users/list-user.blade.php
@@ -16,9 +16,7 @@
                             <table class="table table-striped" id="table-1">
                                 <thead>
                                     <tr>
-                                        <th class="text-center">
-                                            #
-                                        </th>
+                                        <th class="text-center">#</th>
                                         <th>User Id</th>
                                         <th>Avatar</th>
                                         <th>Fullname</th>
@@ -29,195 +27,47 @@
                                         <th>Action</th>
                                     </tr>
                                 </thead>
-                                {{-- @foreach ($list_users as $list_user) --}}
                                 <tbody>
-                                    <tr>
-                                        <td>
-                                            1
-                                        </td>
-                                        <td>U03901381080</td>
-                                        <td>
-                                            <img alt="image" src="assets/img/avatar/avatar-5.png" class="rounded-circle"
-                                                width="35" data-toggle="tooltip" title="Wildan Ahdian">
-                                        </td>
-                                        <td>Tsalsabila Jilhan Haura</td>
-                                        <td>jilhan@gmail.com</td>
-                                        <td>female</td>
-                                        <td>29 july 2023</td>
-                                        <td>
-                                            <div class="badge badge-success">Finished</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail-user">Details</a>
-                                                    <a class="dropdown-item" href="#">Edit</a>
-                                                    <a class="dropdown-item" href="#">Delete</a>
+                                    @foreach ($list_users as $list_user)
+                                        <tr>
+                                            <td>{{ $list_user['no'] }}</td>
+                                            <td>{{ $list_user['userId'] }}</td>
+                                            <td>
+                                                <figure class="avatar mr-2 avatar-xl">
+                                                    <img src="assets/img/avatar/avatar-6.png" alt="...">
+                                                </figure>
+                                            </td>
+                                            <td>{{ $list_user['fullname'] }}</td>
+                                            <td>{{ $list_user['email'] }}</td>
+                                            <td>{{ $list_user['gender'] }}</td>
+                                            <td>{{ $list_user['date'] }}</td>
+                                            <td>
+                                                @php
+                                                    $statusClass = '';
+                                                    if ($list_user['status'] === 'Finished') {
+                                                        $statusClass = 'badge-success';
+                                                    } elseif ($list_user['status'] === 'Progress') {
+                                                        $statusClass = 'badge-danger';
+                                                    }
+                                                @endphp
+                                                <div class="badge {{ $statusClass }}">{{ $list_user['status'] }}</div>
+                                            </td>
+                                            <td>
+                                                <div class="btn-group">
+                                                    <button type="button" class="btn btn-primary dropdown-toggle"
+                                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                        Action
+                                                    </button>
+                                                    <div class="dropdown-menu">
+                                                        <a class="dropdown-item" href="/detail-user">Details</a>
+                                                        <a class="dropdown-item" href="#">Edit</a>
+                                                        <a class="dropdown-item" href="#">Delete</a>
+                                                    </div>
                                                 </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            2
-                                        </td>
-                                        <td>U921983889</td>
-                                        <td>
-                                            <img alt="image" src="assets/img/avatar/avatar-5.png" class="rounded-circle"
-                                                width="35" data-toggle="tooltip" title="Wildan Ahdian">
-                                        </td>
-                                        <td>Koko</td>
-                                        <td>koko@gmail.com</td>
-                                        <td>male</td>
-                                        <td>19 july 2023</td>
-                                        <td>
-                                            <div class="badge badge-success">Finished</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail-user">Details</a>
-                                                    <a class="dropdown-item" href="#">Edit</a>
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            3
-                                        </td>
-                                        <td>U6385735334737</td>
-                                        <td>
-                                            <img alt="image" src="assets/img/avatar/avatar-3.png" class="rounded-circle"
-                                                width="35" data-toggle="tooltip" title="Wildan Ahdian">
-                                        </td>
-                                        <td>Memei</td>
-                                        <td>memei@gmail.com</td>
-                                        <td>female</td>
-                                        <td>19 August 2023</td>
-                                        <td>
-                                            <div class="badge badge-warning">Pending</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail-user">Details</a>
-                                                    <a class="dropdown-item" href="#">Edit</a>
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            4
-                                        </td>
-                                        <td>U6385735334737</td>
-                                        <td>
-                                            <img alt="image" src="assets/img/avatar/avatar-2.png" class="rounded-circle"
-                                                width="35" data-toggle="tooltip" title="Wildan Ahdian">
-                                        </td>
-                                        <td>Black Panther</td>
-                                        <td>black@gmail.com</td>
-                                        <td>male</td>
-                                        <td>19 January 2023</td>
-                                        <td>
-                                            <div class="badge badge-success">Finished</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail-user">Details</a>
-                                                    <a class="dropdown-item" href="#">Edit</a>
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            5
-                                        </td>
-                                        <td>U832746382477</td>
-                                        <td>
-                                            <img alt="image" src="assets/img/avatar/avatar-1.png" class="rounded-circle"
-                                                width="35" data-toggle="tooltip" title="Wildan Ahdian">
-                                        </td>
-                                        <td>Snowy</td>
-                                        <td>snowy@gmail.com</td>
-                                        <td>female</td>
-                                        <td>19 May 2023</td>
-                                        <td>
-                                            <div class="badge badge-warning">Pending</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail-user">Details</a>
-                                                    <a class="dropdown-item" href="#">Edit</a>
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    {{-- <tr>
-                                        <td> {{ $list_user['userId'] }}</td>
-                                        <td>
-                                            <figure class="avatar mr-2 avatar-xl">
-                                                <img src="assets/img/avatar/avatar-6.png" alt="...">
-                                            </figure>
-                                        </td>
-                                        <td>{{ $list_user['fullname'] }}</td>
-                                        <td>{{ $list_user['email'] }}</td>
-                                        <td>{{ $list_user['date'] }}</td>
-                                        <td>
-                                            @php
-                                                $statusClass = '';
-                                                if ($list_user['status'] === 'Finished') {
-                                                    $statusClass = 'badge-success';
-                                                } elseif ($list_user['status'] === 'Progress') {
-                                                    $statusClass = 'badge-danger';
-                                                }
-                                            @endphp
-                                            <div class="badge {{ $statusClass }}">{{ $list_user['status'] }}</div>
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-                                                <button type="button" class="btn btn-primary dropdown-toggle"
-                                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    Action
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="/detail-user">Details</a>
-                                                    <a class="dropdown-item" href="#">Edit</a>
-                                                    <a class="dropdown-item" href="#">Delete</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr> --}}
+                                            </td>
+                                        </tr>
+                                    @endforeach
                                 </tbody>
-                                {{-- @endforeach --}}
                             </table>
                         </div>
                     </div>
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 627c038d..928bf69c 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -321,155 +321,53 @@
                                             <th>Action</th>
                                         </tr>
                                     </thead>
-                                    {{-- @foreach ($list_users as $list_user) --}}
                                     <tbody>
-                                        <tr>
-                                            <td>
-                                                1
-                                            </td>
-                                            <td>inv-0390</td>
-                                            <td>Tsalsabila Jilhan Haura</td>
-                                            <td>Boncel</td>
-                                            <td>Rp. 15000</td>
-                                            <td>29 july 2023</td>
-                                            <td>
-                                                <div class="badge badge-success">Paid</div>
-                                            </td>
-                                            <td>
-                                                <div class="btn-group">
-                                                    <button type="button" class="btn btn-primary dropdown-toggle"
-                                                        data-toggle="dropdown" aria-haspopup="true"
-                                                        aria-expanded="false">
-                                                        Action
-                                                    </button>
-                                                    <div class="dropdown-menu">
-                                                        <a class="dropdown-item" href="/detail_transaction">Details</a>
-                                                        <a class="dropdown-item" href="#" data-toggle="modal"
-                                                            data-target="#ModalTransaction">Tracking</a>
-                                                        <a class="dropdown-item" href="#">Delete</a>
+                                        @foreach ($transaction as $transactions)
+                                            <tr>
+                                                <td>{{ $transactions['no'] }}</td>
+                                                <td><a href="#">{{ $transactions['orderId'] }}</a></td>
+                                                <td class="font-weight-600">{{ $transactions['customer'] }}</td>
+                                                <td class="font-weight-600">{{ $transactions['seller'] }}</td>
+                                                <td class="font-weight-600">{{ $transactions['total'] }}</td>
+                                                <td>{{ $transactions['date'] }}</td>
+                                                <td>
+                                                    @php
+                                                        $statusClass = '';
+                                                        if ($transactions['status'] === 'pending') {
+                                                            $statusClass = 'badge-warning';
+                                                        } elseif ($transactions['status'] === 'paid') {
+                                                            $statusClass = 'badge-success';
+                                                        } elseif ($transactions['status'] === 'unpaid') {
+                                                            $statusClass = 'badge-danger';
+                                                        }
+                                                    @endphp
+                                                    <div class="badge {{ $statusClass }}">{{ $transactions['status'] }}
                                                     </div>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                2
-                                            </td>
-                                            <td>INV-9219</td>
-                                            <td>Koko</td>
-                                            <td>Memei</td>
-                                            <td>Rp. 50010</td>
-                                            <td>19 july 2023</td>
-                                            <td>
-                                                <div class="badge badge-warning">Pending</div>
-                                            </td>
-                                            <td>
-                                                <div class="btn-group">
-                                                    <button type="button" class="btn btn-primary dropdown-toggle"
-                                                        data-toggle="dropdown" aria-haspopup="true"
-                                                        aria-expanded="false">
-                                                        Action
-                                                    </button>
-                                                    <div class="dropdown-menu">
-                                                        <a class="dropdown-item" href="/detail_transaction">Details</a>
-                                                        <a class="dropdown-item" href="#" data-toggle="modal"
-                                                            data-target="#ModalTransaction">Tracking</a>
-                                                        <a class="dropdown-item" href="#">Delete</a>
+                                                </td>
+                                                <td>
+                                                    <div class="btn-group">
+                                                        <button type="button" class="btn btn-primary dropdown-toggle"
+                                                            data-toggle="dropdown" aria-haspopup="true"
+                                                            aria-expanded="false">
+                                                            Action
+                                                        </button>
+                                                        <div class="dropdown-menu">
+                                                            <a class="dropdown-item"
+                                                                href="/detail_transaction">Details</a>
+                                                            <a class="dropdown-item" href="#" data-toggle="modal"
+                                                                data-target="#ModalTransaction">Tracking</a>
+                                                            <a class="dropdown-item" href="#">Delete</a>
+                                                        </div>
                                                     </div>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                3
-                                            </td>
-                                            <td>INV-6385</td>
-                                            <td>Memei</td>
-                                            <td>Snowy</td>
-                                            <td>Rp.900000</td>
-                                            <td>19 August 2023</td>
-                                            <td>
-                                                <div class="badge badge-danger">Unpaid</div>
-                                            </td>
-                                            <td>
-                                                <div class="btn-group">
-                                                    <button type="button" class="btn btn-primary dropdown-toggle"
-                                                        data-toggle="dropdown" aria-haspopup="true"
-                                                        aria-expanded="false">
-                                                        Action
-                                                    </button>
-                                                    <div class="dropdown-menu">
-                                                        <a class="dropdown-item" href="/detail_transaction">Details</a>
-                                                        <a class="dropdown-item" href="#" data-toggle="modal"
-                                                            data-target="#ModalTransaction">Tracking</a>
-                                                        <a class="dropdown-item" href="#">Delete</a>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                4
-                                            </td>
-                                            <td>INV-6385</td>
-                                            <td>Black Panther</td>
-                                            <td>Koko</td>
-                                            <td>Rp.789000</td>
-                                            <td>19 January 2023</td>
-                                            <td>
-                                                <div class="badge badge-warning">Pending</div>
-                                            </td>
-                                            <td>
-                                                <div class="btn-group">
-                                                    <button type="button" class="btn btn-primary dropdown-toggle"
-                                                        data-toggle="dropdown" aria-haspopup="true"
-                                                        aria-expanded="false">
-                                                        Action
-                                                    </button>
-                                                    <div class="dropdown-menu">
-                                                        <a class="dropdown-item" href="/detail_transaction">Details</a>
-                                                        <a class="dropdown-item" href="#" data-toggle="modal"
-                                                            data-target="#ModalTransaction">Tracking</a>
-                                                        <a class="dropdown-item" href="#">Delete</a>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                5
-                                            </td>
-                                            <td>INV-8327</td>
-                                            <td>Snowy</td>
-                                            <td>Black</td>
-                                            <td>Rp. 12910190</td>
-                                            <td>19 May 2023</td>
-                                            <td>
-                                                <div class="badge badge-success">Paid</div>
-                                            </td>
-                                            <td>
-                                                <div class="btn-group">
-                                                    <button type="button" class="btn btn-primary dropdown-toggle"
-                                                        data-toggle="dropdown" aria-haspopup="true"
-                                                        aria-expanded="false">
-                                                        Action
-                                                    </button>
-                                                    <div class="dropdown-menu">
-                                                        <a class="dropdown-item" href="/detail_transaction">Details</a>
-                                                        <a class="dropdown-item" href="#" data-toggle="modal"
-                                                            data-target="#ModalTransaction">Tracking</a>
-                                                        <a class="dropdown-item" href="#">Delete</a>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                        </tr>
+                                                </td>
+                                            </tr>
+                                        @endforeach
                                     </tbody>
                                 </table>
                             </div>
                         </div>
                     </div>
                 </div>
-
             </div>
         </section>
     </div>
diff --git a/routes/web.php b/routes/web.php
index 7dba682c..ca24bb95 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Support\Facades\Route;
 use App\Models\Refund;
+use App\Models\Setting;
 use App\Models\transaction;
 use App\Models\Users;
 use Illuminate\Foundation\Auth\User;
@@ -28,7 +29,7 @@ Route::get('/', function () {
 });
 Route::get('/detail_transaction', function () {
     return view('Admin/transaction/detail-transaction',[
-        'name'=>'Jilhan Haura',
+        'name'=>'Jilhn Haura',
         'detail_transaction' => transaction::allDetailTransactions()
     ]);
 });
@@ -38,12 +39,6 @@ Route::get('/history_transaction', function () {
         "transaction"=> transaction::allTransactions()
     ]);
 });
-// Route::get('/tracking_transaction', function () {
-//     return view('Admin/transaction/Tracking',[
-//         'name'=>'Jilhan Haura',
-//         "detail_transaction"=> transaction::allDetailTransactions()
-//     ]);
-// });
 Route::get('/history_refund', function () {
     return view('Admin/refund/history-refund',[
         'name'=>'Jilhan Haura',
@@ -81,6 +76,7 @@ Route::get('/profile',function() {
 Route::get('/setting',function() {
     return view('Admin/setting/index',[
         'name'=>"Jilhan Haura",
+        "setting" => Setting:: HistorySetting()
     ]);
 });