diff --git a/app/Http/Controllers/RefundController.php b/app/Http/Controllers/RefundController.php
index dc8fe468..f28ed3ca 100644
--- a/app/Http/Controllers/RefundController.php
+++ b/app/Http/Controllers/RefundController.php
@@ -13,7 +13,8 @@ class RefundController extends Controller
*/
public function index()
{
- //
+ $refundData = Refund::all();
+ return view('Admin.refund.history-refund', ['history_refund' => $refundData]);
}
/**
@@ -63,4 +64,4 @@ class RefundController extends Controller
{
//
}
-}
+}
\ No newline at end of file
diff --git a/app/Models/Refund.php b/app/Models/Refund.php
index 7aa59d94..ad26a0d5 100644
--- a/app/Models/Refund.php
+++ b/app/Models/Refund.php
@@ -5,6 +5,10 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
+// class Refund extends Model{
+// protected $table = 'refund';
+// use HasFactory;
+// }
class Refund
{
private static $history_refund=[
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index 69ddea04..f4249eab 100644
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -20,7 +20,7 @@ class Setting
"month" => "February",
"year" =>"2022",
"persentase" =>"40%",
- "status" =>"Active"
+ "status" =>"Non Active"
],
[
"no" => "3",
@@ -41,7 +41,7 @@ class Setting
"month" => "May",
"year" =>"2023",
"persentase" =>"20%",
- "status" =>"Active"
+ "status" =>"Non Active"
]
];
public static function HistorySetting(){
diff --git a/config/database.php b/config/database.php
index 137ad18c..c30601e7 100644
--- a/config/database.php
+++ b/config/database.php
@@ -148,4 +148,4 @@ return [
],
-];
+];
\ No newline at end of file
diff --git a/database/migrations/2023_08_16_044527_create_refunds_table.php b/database/migrations/2023_08_16_044527_create_refunds_table.php
index 6bf6a300..4dbb28f5 100644
--- a/database/migrations/2023_08_16_044527_create_refunds_table.php
+++ b/database/migrations/2023_08_16_044527_create_refunds_table.php
@@ -13,11 +13,11 @@ return new class extends Migration
{
Schema::create('refunds', function (Blueprint $table) {
$table->id();
- $table->int('orderId');
+ $table->integer('orderId');
$table->string('customerName');
$table->string('sellerName');
$table->string('total');
- $table->timestamps('dueDate');
+ $table->timestamp('dueDate');
$table->string('status');
});
}
@@ -29,4 +29,4 @@ return new class extends Migration
{
Schema::dropIfExists('refunds');
}
-};
+};
\ No newline at end of file
diff --git a/public/assets/css/style.css b/public/assets/css/style.css
index ff687118..d23859dc 100644
--- a/public/assets/css/style.css
+++ b/public/assets/css/style.css
@@ -838,8 +838,39 @@ select.form-control:not([size]):not([multiple]) {
border: none;
position: relative;
margin-bottom: 30px;
+ margin-top: 20px; /* Adjust the value to your preference */
+ padding: 20px;
+}
+.card-head{
+ /* background-image: linear-gradient(to bottom right, rgb(144, 12, 63) 0%, rgb(186, 39, 96) 100%, rgb(161, 9, 73) 100%); */
+ text-align: center;
+ width: 100%;
+ background-color: #E6EBEE;
+ border-radius: 10px 10px 10px 10px ;
+ color: #393B45;
+ height: 250px;
+ font-weight: 800;
+}
+#card_head {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ border-radius: 10px 10px 10px 10px ;
+}
+.image-crop {
+ display: block;
+ position: relative;
+ background-color: #E6EBEE;
+ width: 120px;
+ height: 120px;
+ margin: 0 auto;
+ margin-top: -70px;
+ margin-right: 950px;
+ overflow: hidden;
+ border-radius: 50%;
+ box-shadow:2px 2px 5px rgba(0, 0, 0, 0.5);
+ border:3px solid #fff;
}
-
.card .card-header,
.card .card-body,
.card .card-footer {
@@ -3938,7 +3969,7 @@ body.layout-3 .main-footer {
}
.main-sidebar .sidebar-menu li a:hover {
- background-color: #dfe4ea;
+ background-color: rgb(186, 39, 96);
}
.main-sidebar .sidebar-menu li.active a {
diff --git a/public/assets/images/sampul.jpg b/public/assets/images/sampul.jpg
new file mode 100644
index 00000000..3d648348
Binary files /dev/null and b/public/assets/images/sampul.jpg differ
diff --git a/resources/views/Admin/profile/index.blade.php b/resources/views/Admin/profile/index.blade.php
index fb1efe86..9ea64fda 100644
--- a/resources/views/Admin/profile/index.blade.php
+++ b/resources/views/Admin/profile/index.blade.php
@@ -2,96 +2,54 @@
@section('content')
-
-
-
-
-
-

- {{--
{{ Auth::user()->get_name() }}
--}}
-
Super-Admin
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
About
-
Lorem, ipsum dolor sit amet consectetur
- adipisicing
- elit. Ipsum
- aspernatur recusandae sapiente praesentium laboriosam reiciendis unde, tempora,
- veniam
- asperiores vel omnis ratione corrupti consequatur officia laudantium commodi
- enim, eum
- officiis. In earum non vero facere, obcaecati, repudiandae eaque dignissimos ut
- iure
- tempora libero ea. Omnis eius sit neque aliquam, sequi corrupti soluta itaque
- laborum
- non qui nisi nobis dicta, aperiam corporis voluptates! Ad dolore ipsam quo
- molestias
- neque consectetur at ipsa perspiciatis. Unde non possimus voluptas a, minus
- voluptatem
- iure inventore fugiat officia iste vitae beatae odit architecto laborum amet
- voluptates
- dolorum ut perspiciatis nulla nihil odio! Consequuntur, neque delectus!
-
Profile Details
+ {{--
--}}
+
+

+
+
+
+
+
+
+ Tsalsabila Jilhan
+ Haura
+ Super Admin
+
+
+
+
-
ID Number
+
94894893848
-
Full Name
-
JIlhan Haura
+
+
jilhan Haura
-
-
Role
-
- Super-Admin
-
+
+
Super Admin
-
-
Address
+
Jl simpang komplek polda
-
-
Phone
-
0345893853
+
+
+62 1209 0120 02
-
-
Email
-
jilhanhaura07@gmail.com
+
+
jilhan@gmail.com
-
@@ -99,4 +57,6 @@
- @endsection
+
+
+@endsection
diff --git a/resources/views/Admin/refund/history-refund.blade.php b/resources/views/Admin/refund/history-refund.blade.php
index 7d4b6bf0..6d57602d 100644
--- a/resources/views/Admin/refund/history-refund.blade.php
+++ b/resources/views/Admin/refund/history-refund.blade.php
@@ -59,7 +59,6 @@
diff --git a/resources/views/Admin/users/list-user.blade.php b/resources/views/Admin/users/list-user.blade.php
index b3dd8e17..3553a0e4 100644
--- a/resources/views/Admin/users/list-user.blade.php
+++ b/resources/views/Admin/users/list-user.blade.php
@@ -60,7 +60,6 @@
diff --git a/routes/web.php b/routes/web.php
index ca24bb95..5f6bc1fc 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,6 @@
Refund::HistoryRefund()
]);
});
+Route::get('/refund',[RefundController::class,'index']);
+
+
+
Route::get('/detail_refund',function() {
return view('Admin/refund/detail-refund',[
'name'=>'Jilhan Haura',