diff --git a/app/Models/transaction.php b/app/Models/transaction.php index d19c5748..1ee80ac1 100644 --- a/app/Models/transaction.php +++ b/app/Models/transaction.php @@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model; class transaction { + private static $list_transaction =[ [ "orderId" => "INV-1234", @@ -74,4 +75,4 @@ class transaction { return self::$detail_transaction; } -} +} \ No newline at end of file diff --git a/public/assets/css/style.css b/public/assets/css/style.css index f646474a..d71a43e6 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -931,7 +931,7 @@ select.form-control:not([size]):not([multiple]) { .card .card-header h4+.card-header-action .btn.active, .card .card-header h4+.card-header-form .btn.active { box-shadow: 0 2px 6px #acb5f6; - background-color: #900C3F; + background-color: #6777ef; color: #fff; } @@ -1022,7 +1022,7 @@ select.form-control:not([size]):not([multiple]) { } .card.card-primary { - border-top: 2px solid #900C3F; + border-top: 2px solid #6777ef; } .card.card-secondary { @@ -1051,7 +1051,7 @@ select.form-control:not([size]):not([multiple]) { .card.card-hero .card-header { padding: 40px; - background-image: linear-gradient(to bottom, #9f202f, #f4959a); + background-image: linear-gradient(to bottom, #6777ef, #95a0f4); color: #fff; overflow: hidden; height: auto; @@ -1081,6 +1081,7 @@ select.form-control:not([size]):not([multiple]) { .card.card-hero .card-header .card-icon .fab, .card.card-hero .card-header .card-icon .fal { font-size: 140px; + } .card.card-statistic-1 .card-header, diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index b0ebb9e5..e8e634a4 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -109,9 +109,31 @@

History Transaction

-
-
- +
+
+ Show: + + entries +
+
+
+
+ +
+ +
+
+ +
+
+
+
+
@@ -132,19 +154,18 @@
{{ $transactions['status'] }}
- @endforeach -
Order ID Customer - Detail + Detail
- + @include('transaction.Detail_History_Transaction') @endsection diff --git a/resources/views/refund/detail-refund.blade.php b/resources/views/refund/detail-refund.blade.php index aeaecfaa..a38c253d 100644 --- a/resources/views/refund/detail-refund.blade.php +++ b/resources/views/refund/detail-refund.blade.php @@ -11,19 +11,20 @@ @foreach ($detail_refund as $DetailRefund)
+

Image/Video:

+ Return Image + Return Image + Return Image

ID Order: {{ $DetailRefund['orderId'] }}

Customer Name: {{ $DetailRefund['customer'] }}

Seller Name: {{ $DetailRefund['seller'] }}

Total: {{ $DetailRefund['total'] }}

Due Date: {{ $DetailRefund['date'] }}

Reason Complaint: {{ $DetailRefund['complaint'] }}

-

Image/Video:

- Return Image

- - @@ -36,4 +37,5 @@
+ @include('refund.next-detail-refund') @endsection diff --git a/resources/views/refund/history-refund.blade.php b/resources/views/refund/history-refund.blade.php index f01057c5..c54237f7 100644 --- a/resources/views/refund/history-refund.blade.php +++ b/resources/views/refund/history-refund.blade.php @@ -7,9 +7,32 @@

History Refund

-
-
- +
+
+ Show: + + entries +
+
+
+
+ +
+ +
+
+ +
+
+ +
+
+
@@ -34,8 +57,29 @@ @endforeach -
Order ID Customer
+
+
+
+ +
+
+
diff --git a/resources/views/refund/next-detail-refund.blade.php b/resources/views/refund/next-detail-refund.blade.php index 69c0747e..3dbf3269 100644 --- a/resources/views/refund/next-detail-refund.blade.php +++ b/resources/views/refund/next-detail-refund.blade.php @@ -1,326 +1,30 @@ -@extends('layout.main') -@section('content') -
-
-
-
-
-
-

Tabel Manajemen Petugas

- -
-
-
-
- - - - - - - - - - - - - - -
NOUsernameEmailAlamatNo.TeleponAksi
-
-
-
+ +
+ + +
- - @push('css') - - @endpush -@endsection + diff --git a/resources/views/transaction/Detail_History_Transaction.blade.php b/resources/views/transaction/Detail_History_Transaction.blade.php index 34f40cd8..7c124f61 100644 --- a/resources/views/transaction/Detail_History_Transaction.blade.php +++ b/resources/views/transaction/Detail_History_Transaction.blade.php @@ -1,4 +1,157 @@ -@extends('layout.main') + + + + + + +{{-- @extends('layout.main') @section('content') @foreach ($detail_transaction as $detail_transactions)
@@ -22,4 +175,4 @@
@endforeach -@endsection +@endsection --}} diff --git a/resources/views/transaction/History_Transaction.blade.php b/resources/views/transaction/History_Transaction.blade.php index 48f11466..5b9a54f9 100644 --- a/resources/views/transaction/History_Transaction.blade.php +++ b/resources/views/transaction/History_Transaction.blade.php @@ -7,9 +7,31 @@

History Transaction

-
-
- +
+
+ Show: + + entries +
+
+
+
+ +
+ +
+
+ +
+
+
+
+
@@ -30,15 +52,38 @@
{{ $transactions['status'] }}
- @endforeach -
Order ID Customer - Detail + Detail
+
+
+
+ +
+
+
- @endsection + + @include('transaction.Detail_History_Transaction') +@endsection diff --git a/resources/views/transaction/List_Transaction.blade.php b/resources/views/transaction/List_Transaction.blade.php index 2554bab1..09ca946f 100644 --- a/resources/views/transaction/List_Transaction.blade.php +++ b/resources/views/transaction/List_Transaction.blade.php @@ -19,14 +19,20 @@ entries -
-
Search:
- +
+
+
+ +
+ +
+
+
-
- +
+
@@ -34,7 +40,7 @@ - + @foreach ($transaction as $transactions) @@ -44,17 +50,40 @@ @endforeach
Order ID CustomerTotal Due Date StatusActionAction
{{ $transactions['total'] }} {{ $transactions['date'] }} -
{{ $transactions['status'] }}
+
{{ $transactions['status'] }}
-
- Edit - Delete -
+ +
+
+
+
+ +
+
+
diff --git a/resources/views/users/list-user.blade.php b/resources/views/users/list-user.blade.php new file mode 100644 index 00000000..5bfd7c1e --- /dev/null +++ b/resources/views/users/list-user.blade.php @@ -0,0 +1,3 @@ +@extends('layout.main') +@section('content') +@endsection diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php new file mode 100644 index 00000000..63c6f56b --- /dev/null +++ b/resources/views/vendor/pagination/bootstrap-4.blade.php @@ -0,0 +1,46 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/bootstrap-5.blade.php b/resources/views/vendor/pagination/bootstrap-5.blade.php new file mode 100644 index 00000000..a1795a4d --- /dev/null +++ b/resources/views/vendor/pagination/bootstrap-5.blade.php @@ -0,0 +1,88 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/default.blade.php b/resources/views/vendor/pagination/default.blade.php new file mode 100644 index 00000000..0db70b56 --- /dev/null +++ b/resources/views/vendor/pagination/default.blade.php @@ -0,0 +1,46 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/semantic-ui.blade.php b/resources/views/vendor/pagination/semantic-ui.blade.php new file mode 100644 index 00000000..ef0dbb18 --- /dev/null +++ b/resources/views/vendor/pagination/semantic-ui.blade.php @@ -0,0 +1,36 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php new file mode 100644 index 00000000..4bb49174 --- /dev/null +++ b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php @@ -0,0 +1,27 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/simple-bootstrap-5.blade.php b/resources/views/vendor/pagination/simple-bootstrap-5.blade.php new file mode 100644 index 00000000..a89005ee --- /dev/null +++ b/resources/views/vendor/pagination/simple-bootstrap-5.blade.php @@ -0,0 +1,29 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/simple-default.blade.php b/resources/views/vendor/pagination/simple-default.blade.php new file mode 100644 index 00000000..36bdbc18 --- /dev/null +++ b/resources/views/vendor/pagination/simple-default.blade.php @@ -0,0 +1,19 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/simple-tailwind.blade.php b/resources/views/vendor/pagination/simple-tailwind.blade.php new file mode 100644 index 00000000..6872cca3 --- /dev/null +++ b/resources/views/vendor/pagination/simple-tailwind.blade.php @@ -0,0 +1,25 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/tailwind.blade.php b/resources/views/vendor/pagination/tailwind.blade.php new file mode 100644 index 00000000..5bf323b4 --- /dev/null +++ b/resources/views/vendor/pagination/tailwind.blade.php @@ -0,0 +1,106 @@ +@if ($paginator->hasPages()) + +@endif