diff --git a/app/Http/Controllers/RefundController.php b/app/Http/Controllers/RefundController.php new file mode 100644 index 00000000..a2fb165f --- /dev/null +++ b/app/Http/Controllers/RefundController.php @@ -0,0 +1,58 @@ +validate([ + 'reason_complaint' => 'required|string', + 'transfer_proof' => 'required|image', + ]); + + // Ambil data tambahan dari database berdasarkan order_id atau informasi lain + $order = Order::where('order_id', $request->input('order_id'))->first(); + + // Buat objek RefundUser + $refund = new RefundUser(); + $refund->order_id = $order->order_id; // Ambil data dari order + $refund->customer = $order->customer; + $refund->seller = $order->seller; + $refund->total = $order->total; + $refund->dueDate = $order->dueDate; + $refund->status = $order->status; + $refund->reason_complaint = $request->input('reason_complaint'); + + if ($request->hasFile('transfer_proof')) { + $image = $request->file('transfer_proof'); + $imageName = time() . '.' . $image->getClientOriginalExtension(); + $image->move(public_path('uploads'), $imageName); + $refund->transfer_proof = $imageName; + } + + // Simpan data ke dalam database + $refund->save(); + + return redirect('/refund')->with('success', 'Pengembalian Berhasil Diajukan'); + } + + // detail pengajuan berdasarkan id + public function show($id) + { + $refund = Refund::findOrFail($id); + return view('refund.show', ['refund' => $refund]); + } + + // menghapus pengajuan refund berdasarkan id + public function destroy($id) // Perbaikan pada penulisan "destroy" + { + $refund = Refund::findOrFail($id); + $refund->delete(); + + return redirect('/refund')->with('success', 'Pengembalian Berhasil Dihapus'); + } +} diff --git a/app/Http/Controllers/RefundUserController.php b/app/Http/Controllers/RefundUserController.php deleted file mode 100644 index ea3808fd..00000000 --- a/app/Http/Controllers/RefundUserController.php +++ /dev/null @@ -1,66 +0,0 @@ - " Rp.200.000", "dueDate"=>"29 juni 2023", "status"=>"diterima", - "uploadBukti" => "5.jpg" + ], [ - "orderId" => "INV-1234", - "Customer" => "hantu", - "seller" => "rayhan", - "Total" => " Rp.200.000", - "dueDate"=>"29 juni 2023", + "orderId" => "INV-1235", + "Customer" => "jilhan haura", + "seller" => "kevin", + "Total" => " Rp.500.000", + "dueDate"=>"29 Januari 2023", + "status"=>"diproses", + + ], + [ + "orderId" => "INV-1236", + "Customer" => "Raihan Surya", + "seller" => "Salsa", + "Total" => " Rp.400.000", + "dueDate"=>"20 Agustus 2023", "status"=>"ditolak", - "uploadBukti" => "5.jpg" + ], [ - "orderId" => "INV-1234", - "Customer" => "pocong", - "seller" => "rayhan", - "Total" => " Rp.200.000", - "dueDate"=>"29 juni 2023", - "status"=>"diterima", - "uploadBukti" => "5.jpg" + "orderId" => "INV-1237", + "Customer" => "Fatur Rahman", + "seller" => "Satria ", + "Total" => " Rp.100.000", + "dueDate"=>"2 Agustus 2023", + "status"=>"ditolak", + ], ]; public static function HistoryRefundUser(){ diff --git a/app/Models/TransactionPembeli.php b/app/Models/TransactionPembeli.php index d8b19678..68be2e7b 100644 --- a/app/Models/TransactionPembeli.php +++ b/app/Models/TransactionPembeli.php @@ -9,12 +9,39 @@ class TransactionPembeli { private static $history_transactionPembeli=[ [ + "userId" => "NPA-9876", "orderId" => "INV-1234", - "Customer" => "Nurul Prima", - "seller" => "Jilhan", + "seller" => "Jilhan Haura", "total" => "Rp.500.000", "dueDate"=>"29 juni 2023", - "status"=>"pending", + "status"=>"OnProgress", + "action" => "" + ], + [ + "userId" => "NPA-9877", + "orderId" => "INV-12345", + "seller" => "Rayhan Surya", + "total" => "Rp.900.000", + "dueDate"=>"30 juni 2023", + "status"=>"Failed", + "action" => "" + ], + [ + "userId" => "NPA-9878", + "orderId" => "INV-12346", + "seller" => "Satria Hikmaladi", + "total" => "Rp.900.000", + "dueDate"=>"31 juni 2023", + "status"=>"Success", + "action" => "" + ], + [ + "userId" => "NPA-9871", + "orderId" => "INV-12340", + "seller" => "Aliffian Septi", + "total" => "Rp.1.000.000", + "dueDate"=>"13 Maret 2023", + "status"=>"Failed", "action" => "" ], ]; diff --git a/app/Models/TransactionPenjual.php b/app/Models/TransactionPenjual.php index dbca18ef..8d22474a 100644 --- a/app/Models/TransactionPenjual.php +++ b/app/Models/TransactionPenjual.php @@ -9,24 +9,42 @@ class TransactionPenjual { private static $history_transactionPenjual=[ [ - "orderId" => "INV-1234", - "Customer" => "Nurul Prima", - "seller" => "Jilhan", + "userId" => "NPA-9876", + "orderId" => "INV-1235", + "customer" => "Viona Denopta", "total" => "Rp.500.000", "dueDate"=>"29 juni 2023", - "status"=>"pending", + "status"=>"OnProgress", "action" => "" ], - [ - "orderId" => "INV-1235", - "Customer" => "Nurul Annisa", - "seller" => "Rayhan", - "total" => "Rp.900.000", - "dueDate"=>"29 Juli 2023", - "status"=>"proses", + "userId" => "NPA-9877", + "orderId" => "INV-1236", + "customer" => "Intan Saudina Fitri", + "total" => "Rp.1.500.000", + "dueDate"=>"29 September 2023", + "status"=>"Success", "action" => "" ], + [ + "userId" => "NPA-9879", + "orderId" => "INV-1238", + "customer" => "Cindy Zahra", + "total" => "Rp.5.000.000", + "dueDate"=>"09 juni 2023", + "status"=>"Failed", + "action" => "" + ], + [ + "userId" => "NPA-9872", + "orderId" => "INV-1232", + "customer" => "Naufal Hady", + "total" => "Rp.500.000", + "dueDate"=>"05 Desember 2023", + "status"=>"Failed", + "action" => "" + ], + ]; public static function HistoryTransactionPenjual(){ return self::$history_transactionPenjual; diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index e5c70b5c..bf593251 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -93,7 +93,7 @@
-
+

INCOME

@@ -104,46 +104,99 @@
- -
-
-
-

Transaction

+ {{--
+
Item List Transaksi(4 Items)
+
    +
  • + + image + +
    +
    Rp.15.000
    +
    Anak Ayam
    +
    by Jefri Vernando
    Sunday
    -
    -
    - - - - - - - - - - - @foreach ($refundUserss as $HistoryRefundUser) - - - - - - - - - - @endforeach -
    Order IDCustomerSellerTotalDue DateStatusImage
    - {{ $HistoryRefundUser['orderId'] }} - {{ $HistoryRefundUser['Customer'] }} - {{ $HistoryRefundUser['seller'] }} - {{ $HistoryRefundUser['Total'] }}{{ $HistoryRefundUser['dueDate'] }} -
    Diterima
    -     		- {{ $HistoryRefundUser['uploadBukti'] }} - -
    +
    • +
  • + + image + +
    +
    Rp.10.000
    +
    Nokia Tenonet
    +
    by Ila Rahma
    Monday
    +
    +
    • +
  • + + image + +
    +
    Rp.2.000
    +
    Kotak Kacamata
    +
    by Enzi Marni
    Friday +
    +
    +
    • +
  • + + image + +
    +
    Rp.1.000
    +
    Aqua Botol
    +
    by Kurina Tusia
    Tuesday +
    +
    +
    • +
+
--}} + + +
+
+
+
+ +
+
+ + + + + + + + + + + + + @foreach ($TransactionPembeli as $HistoryTransactionPembeli) + + + + + + + + + @endforeach + +
User IDOrder IDSellerTotalDue DateStatus
{{ $HistoryTransactionPembeli['userId'] }}{{ $HistoryTransactionPembeli['orderId'] }}{{ $HistoryTransactionPembeli['seller'] }}{{ $HistoryTransactionPembeli['total'] }}{{ $HistoryTransactionPembeli['dueDate'] }} + @php + $statusClass=""; + if ($HistoryTransactionPembeli['status'] === 'OnProgress'){ + $statusClass = 'badge-warning'; + }elseif ($HistoryTransactionPembeli['status'] === 'Success'){ + $statusClass ='btn btn-info'; + }elseif ($HistoryTransactionPembeli['status'] === 'Failed'){ + $statusClass ='badge badge-danger'; + } + @endphp +
{{ $HistoryTransactionPembeli['status'] }}
+
+
diff --git a/resources/views/user/layout/main.blade.php b/resources/views/user/layout/main.blade.php index 8df34c4d..30699413 100644 --- a/resources/views/user/layout/main.blade.php +++ b/resources/views/user/layout/main.blade.php @@ -80,23 +80,9 @@ + - @@ -110,20 +96,11 @@ + + + - {{-- refund --}} - - + {{-- Profile --}} - @include('sweetalert::alert') + {{-- sweetalert payment --}} + + + + diff --git a/resources/views/user/profile/index.blade.php b/resources/views/user/profile/index.blade.php index 27cdfa26..2e5116a4 100644 --- a/resources/views/user/profile/index.blade.php +++ b/resources/views/user/profile/index.blade.php @@ -5,327 +5,328 @@

Profile

-
- - - Profile -

Nurul Prima Annisa

-
@npannisa
-
- -
-
- -
    - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
-
- -
-
About
-

Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul - prima - annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa - Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima annisa Nurul prima - annisa Nurul prima annisa -

- -
Profile Details
- -
-
Full Name
-
Nurul Prima Annisa
-
- -
-
Company
-
Ya apa yak
-
- -
-
Job
-
Frontend Web
-
- -
-
Country
-
Indonesia
-
- -
-
Address
-
Depok city broww
-
- -
-
Phone
-
(+62) 486-3538 29071
-
- -
-
Email
-
npannisa23@gmail.com
-
- -
- -
- - -
-
- -
- Profile -
- -
- -
- -
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- - {{--
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
--}} - -
- Save Changes -
-
- -
- -
- - -
- -
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- -
- -
-
- -
- -
- -
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
-
- -
- -
- +
+
+ +
+ + Profile +

Nurul Prima Annisa

+
@npannisa
+
-
+
+ +
+
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
+ +
+
About
+

"Saya adalah seorang Frontend Developer dengan lebih dari 3 + pengalaman dalam dunia pengembangan web. + Saya memiliki dedikasi yang kuat untuk menciptakan pengalaman pengguna yang luar + biasa melalui desain web yang menarik dan fungsional. + Pekerjaan saya melibatkan mengubah desain grafis dan konsep menjadi kode HTML, CSS, + dan JavaScript yang dapat diakses oleh pengguna di berbagai perangkat. + Saya memiliki pemahaman mendalam tentang HTML5, CSS3, dan JavaScript serta kerangka + kerja laravel frontend seperti React, Vue.js, atau Angular. + Kemampuan saya dalam memahami desain dan mengimplementasikannya secara responsif + memungkinkan saya untuk menciptakan situs web yang dapat diakses + dengan baik di perangkat seluler, tablet, dan desktop. + Selain itu, saya terbiasa bekerja sama dengan tim pengembang backend untuk + memastikan integrasi yang mulus antara frontend dan backend. + Saya juga senang mempelajari teknologi-teknologi baru dan mengikuti tren terkini + dalam desain web dan pengembangan frontend. + Kemampuan komunikasi dan kolaborasi saya yang baik memungkinkan saya untuk bekerja + sama dengan desainer UX/UI, manajer produk, dan tim lainnya + dalam proyek-proyek pengembangan web. Saya juga percaya bahwa tes dan pemeliharaan + adalah bagian integral dari pengembangan web, sehingga saya + selalu berusaha untuk memastikan kualitas dan keamanan kode saya. + Saya sangat antusias dalam menciptakan pengalaman pengguna yang menarik dan berfokus + pada performa yang baik. Saya siap untuk menghadapi + tantangan baru dalam dunia pengembangan web dan berkontribusi dalam menciptakan + produk-produk yang menginspirasi dan memenuhi kebutuhan pengguna." +

+ +
Profile Details
+ +
+
Full Name
+
Nurul Prima Annisa
+
+ +
+
Company
+
Ya apa yak
+
+ +
+
Job
+
Frontend Web
+
+ +
+
Country
+
Indonesia
+
+ +
+
Address
+
Depok city broww
+
+ +
+
Phone
+
(+62) 486-3538 29071
+
+ +
+
Email
+
npannisa23@gmail.com
+
+ +
+ +
+ + +
+
+ +
+ Profile +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + {{--
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
--}} + +
+ Save Changes +
+
+ +
+ +
+ + +
+ +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
@endsection diff --git a/resources/views/user/refund/refund.blade.php b/resources/views/user/refund/refund.blade.php index cfcc2068..409cb37a 100644 --- a/resources/views/user/refund/refund.blade.php +++ b/resources/views/user/refund/refund.blade.php @@ -29,7 +29,7 @@ total Due Date Status - upload Bukti + Action @@ -46,15 +46,19 @@ {{ $HistoryRefundUser['Total'] }} {{ $HistoryRefundUser['dueDate'] }} - - -
Ditolak
- {{-- {{ $HistoryRefundUser['status'] }} --}} - - - - {{ $HistoryRefundUser['uploadBukti'] }} + + @php + $statusClass=""; + if ($HistoryRefundUser['status'] === 'diproses'){ + $statusClass = 'badge-warning'; + }elseif($HistoryRefundUser['status'] === 'diterima'){ + $statusClass ='badge badge-success'; + }elseif($HistoryRefundUser['status'] === 'ditolak'){ + $statusClass ='badge badge-danger'; + } + @endphp +
{{ $HistoryRefundUser['status'] }}
+ diff --git a/resources/views/user/transaction/Pembeli/invoice-transaction.blade.php b/resources/views/user/transaction/Pembeli/invoice-transaction.blade.php index 58db9070..c05128a5 100644 --- a/resources/views/user/transaction/Pembeli/invoice-transaction.blade.php +++ b/resources/views/user/transaction/Pembeli/invoice-transaction.blade.php @@ -18,8 +18,7 @@
-

Invoice

-
Order #NVI-1234
+
Order #NPA-1234
@@ -116,7 +115,7 @@
- Process + Process Payment Cancel
diff --git a/resources/views/user/transaction/Pembeli/refund-transaction.blade.php b/resources/views/user/transaction/Pembeli/refund-transaction.blade.php index c31f9009..08dbbe03 100644 --- a/resources/views/user/transaction/Pembeli/refund-transaction.blade.php +++ b/resources/views/user/transaction/Pembeli/refund-transaction.blade.php @@ -8,25 +8,29 @@
+ style="border: 1px solid #ddd; border-radius: 8px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); position: relative; background: linear-gradient(45deg, #f3f3f3, #e0e0e0);">

Form Refund Pesanan

Reason Complaint
-
- - -
+
+ @csrf +
+ + +
-
Upload Image / Video
-
- - -
+
Upload Image / Video
+
+ + +
+
diff --git a/resources/views/user/transaction/Pembeli/transaction-pembeli.blade.php b/resources/views/user/transaction/Pembeli/transaction-pembeli.blade.php index c6705c13..a03ee57c 100644 --- a/resources/views/user/transaction/Pembeli/transaction-pembeli.blade.php +++ b/resources/views/user/transaction/Pembeli/transaction-pembeli.blade.php @@ -37,7 +37,6 @@ User ID Order ID - Customer Seller Total Due Date @@ -46,15 +45,25 @@ - @foreach ($TransactionUser as $HistoryTransaction) + @foreach ($TransactionPembeli as $HistoryTransactionPembeli) - {{ $HistoryTransaction['userId'] }} - {{ $HistoryTransaction['orderId'] }} - {{ $HistoryTransaction['Customer'] }} - {{ $HistoryTransaction['seller'] }} - {{ $HistoryTransaction['total'] }} - {{ $HistoryTransaction['dueDate'] }} - {{ $HistoryTransaction['status'] }} + {{ $HistoryTransactionPembeli['userId'] }} + {{ $HistoryTransactionPembeli['orderId'] }} + {{ $HistoryTransactionPembeli['seller'] }} + {{ $HistoryTransactionPembeli['total'] }} + {{ $HistoryTransactionPembeli['dueDate'] }} + + @php + $statusClass=""; + if ($HistoryTransactionPembeli['status'] === 'OnProgress'){ + $statusClass = 'badge-warning'; + }elseif ($HistoryTransactionPembeli['status'] === 'Success'){ + $statusClass ='btn btn-info'; + }elseif ($HistoryTransactionPembeli['status'] === 'Failed'){ + $statusClass ='badge badge-danger'; + } + @endphp +
{{ $HistoryTransactionPembeli['status'] }}