diff --git a/app/Http/Controllers/Admin/AdminTransactionController.php b/app/Http/Controllers/Admin/AdminTransactionController.php index 2be473da..a596fc4a 100644 --- a/app/Http/Controllers/Admin/AdminTransactionController.php +++ b/app/Http/Controllers/Admin/AdminTransactionController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Models\Transaction; use App\Http\Controllers\Controller; +use App\Models\TransactionDescription; use Illuminate\Http\Request; class AdminTransactionController extends Controller @@ -14,17 +15,21 @@ class AdminTransactionController extends Controller public function index() { return view('admin.transaction.index', [ - 'transactions' => Transaction::all(), + 'transactions' => Transaction::latest() + ->get(), ]); } /** * Display the specified resource. */ - public function show(Transaction $transaction) + public function show($id) { - return view('admin.transaction.detail-transaction',[ - 'transaction' => $transaction + return view('admin.transaction.detail-transaction', [ + 'transaction' => Transaction::findOrFail($id), + 'trackings' => TransactionDescription::where('order_id', $id) + ->latest() + ->get(), ]); } } diff --git a/app/Http/Controllers/Login/LoginController.php b/app/Http/Controllers/Login/LoginController.php index 59f3b265..985a7724 100644 --- a/app/Http/Controllers/Login/LoginController.php +++ b/app/Http/Controllers/Login/LoginController.php @@ -98,7 +98,7 @@ class LoginController extends Controller $alamat = $request->get('alamat'); $foto_ktp = ''; $foto_wajah = ''; - $persentase_kemiripan = '0%'; + $persentase_kemiripan = 0; $gender = $request->get('gender'); $kode_kelurahan = $request->get('kode-kelurahan'); @@ -185,7 +185,7 @@ class LoginController extends Controller 'alamat' => $alamat, 'foto_ktp' => $foto_ktp, 'foto_wajah' => $foto_wajah, - 'foto_profil' => null, + 'foto_profile' => null, 'persentase_kemiripan' => $persentase_kemiripan, 'gender' => $gender, 'kode_kelurahan' => $kode_kelurahan, diff --git a/app/Http/Controllers/User/UserTransactionController.php b/app/Http/Controllers/User/UserTransactionController.php index 13245094..6241f855 100644 --- a/app/Http/Controllers/User/UserTransactionController.php +++ b/app/Http/Controllers/User/UserTransactionController.php @@ -41,7 +41,6 @@ class UserTransactionController extends Controller { return view('user.transaction.pembeli.index', [ 'transactions' => Transaction::where('pembeli', Auth::user()->email) - // ->orderByRaw("CASE WHEN status = 'pending' THEN 1 WHEN status = 'Finished' THEN 2 WHEN status = 'Rejected' THEN 3 ELSE 4 END ASC") ->latest() ->get(), ]); @@ -54,7 +53,6 @@ class UserTransactionController extends Controller { return view('user.transaction.penjual.index', [ 'transactions' => Transaction::where('penjual', Auth::user()->email) - // ->orderByRaw("CASE WHEN status = 'Progress' THEN 1 WHEN status = 'Finished' THEN 2 WHEN status = 'Rejected' THEN 3 ELSE 4 END ASC") ->latest() ->get(), ]); diff --git a/app/Models/User.php b/app/Models/User.php index b55267fe..f6b5cc21 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -32,7 +32,7 @@ class User extends Authenticatable 'alamat', 'foto_ktp', 'foto_wajah', - 'foto_profil', + 'foto_profile', 'persentase_kemiripan', 'status', 'gender', diff --git a/public/assets/js/page/modules-datatables.js b/public/assets/js/page/modules-datatables.js index 072f540b..5adc4c9b 100644 --- a/public/assets/js/page/modules-datatables.js +++ b/public/assets/js/page/modules-datatables.js @@ -52,7 +52,7 @@ $("#table-2").dataTable({ // Transaksi pembeli $("#table-3").dataTable({ - columnDefs: [{ sortable: false, targets: [7] }], + columnDefs: [{ sortable: false, targets: [6] }], searchable: true, }); @@ -67,3 +67,9 @@ $("#table-5").dataTable({ columnDefs: [{ sortable: false, targets: [0, 4, 5] }], searchable: true, }); + +// Transaction Admin +$("#table-6").dataTable({ + columnDefs: [{ sortable: false, targets: [8] }], + searchable: true, +}); diff --git a/resources/views/Admin/refund/index.blade.php b/resources/views/Admin/refund/index.blade.php index c8d71553..150cef01 100644 --- a/resources/views/Admin/refund/index.blade.php +++ b/resources/views/Admin/refund/index.blade.php @@ -19,13 +19,13 @@ # - Order ID + ID Pembeli Penjual Total - Status Tanggal Pengajuan Batas Konfirmasi + Status Aksi @@ -33,17 +33,17 @@ @foreach ($refunds as $refund) {{ $loop->iteration }} - {{ $refund->orderId }} + {{ $transaction->id }} {{ $refund->orders->pembeli }} {{ $refund->orders->penjual }} {{ $refund->total }} + {{ $refund->created_at }} + {{ $refund->due_date }}
{{ $refund->status }}
- {{ $refund->created_at }} - {{ $refund->due_date }}
diff --git a/resources/views/Admin/transaction/detail-transaction.blade.php b/resources/views/Admin/transaction/detail-transaction.blade.php index 7f2512f0..f5c0c6d4 100644 --- a/resources/views/Admin/transaction/detail-transaction.blade.php +++ b/resources/views/Admin/transaction/detail-transaction.blade.php @@ -2,154 +2,165 @@ @section('content')
-
-

Detail Transaction

-
-
Dashboard
-
Transaction
-
Details
+
+
+
+
+

Informasi Pesanan

+
+
-

Jilhan

+

+ Admin

+

+ {{ $transaction->data_pembeli->nama_depan . ' ' . $transaction->data_pembeli->nama_belakang }}

+

+ {{ $transaction->data_penjual->nama_depan . ' ' . $transaction->data_penjual->nama_belakang }}

Timeline

-
+
-
-
- -
-
-
- August 21, 2023, 8:30:15 am + {{-- Awal --}} + @forelse ($trackings as $tracking) +
+
+
-

User Created Trade

-
-
-
-
- -
-
-
- August 22, 2023, 8:30:15 am +
+
+ {{ date('F j, Y, g:i:s a', strtotime($tracking->created_at)) }} +
+

{{ $tracking->deskripsi }}

-

System Notified Admin

-
-
-
- -
-
-
- August 23, 2023, 8:30:15 am + @empty +
+
+
-

Admin Accepted Trade

-
-
-
-
- -
-
-
- August 24, 2023, 8:30:15 am +
+
+ -- +
+

Tidak ada histori

-

Trade in system

-
-
-
- -
-
-
- August 24, 2023, 8:30:15 am -
-

Transaction Success

-
-
+ @endforelse + {{-- Akhir --}}
-
-
-
-
-

Transaction Detail

+
+
+
+
+

REKBER

+
+
+
+
Keterangan
+
+
+
+ Pembeli:
+ {{ ucwords(strtolower($transaction->data_pembeli->nama_depan . ' ' . $transaction->data_pembeli->nama_belakang)) }}
+ {{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}
+ {{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}
+ {{ ucwords(strtolower($transaction->data_pembeli->getCityName() . ', ' . $transaction->data_pembeli->getProvinceName())) }} +
+
+
+
+ Penjual:
+ {{ ucwords(strtolower($transaction->data_penjual->nama_depan . ' ' . $transaction->data_penjual->nama_belakang)) }}
+ {{ ucwords(strtolower($transaction->data_penjual->alamat)) }}
+ {{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}
+ {{ ucwords(strtolower($transaction->data_penjual->getCityName() . ', ' . $transaction->data_penjual->getProvinceName())) }} +
+
+
+
+
+ +
+
+
Rangkuman Transaksi
+

Semua barang yang didaftarkan dalam transaksi.

+
+ + + + + + + + + + + + + + + +
#Nama BarangHargaJumlahTotal
1{{ $transaction->nama_barang }}{{ $transaction->harga_barang }}{{ $transaction->jumlah_barang }} + {{ $transaction->harga_barang * $transaction->jumlah_barang }} +
+
+
+
+
Payment Method
+
+ @if ($transaction->metode_pembayaran != null) + {{ $transaction->metode_pembayaran }} + @endif +
+
+
+
+
Subtotal
+
Rp + {{ number_format($transaction->total_harga, 2, ',', '.') }} +
+
+
+
Biaya Admin
+
+ Rp + {{ number_format($transaction->total_keuntungan, 2, ',', '.') }} +
+
+
+
+
Total
+
+ Rp {{ number_format($transaction->total_bayar, 2, ',', '.') }} +
+
+
+
+
+
- @foreach ($detail_transaction as $detailTransaction) -
-
- Order Details - -
-
- ID Transaction - {{ $detailTransaction['idTransaction'] }} -
-
-
- Side - {{ $detailTransaction['side'] }} -
-
- Market Pair - {{ $detailTransaction['marketPair'] }} -
-
- Email - {{ $detailTransaction['email'] }} -
-
- Amount Transaction - {{ $detailTransaction['amountTransaction'] }} -
-
- Fee Transaction - {{ $detailTransaction['feeTransaction'] }} -
-
- Total - {{ $detailTransaction['total'] }} -
-
-
-
-
-
Payment
-
-
- -
- Payment Detail - {{ $detailTransaction['paymentDetail'] }} -
-
- Bank Name - {{ $detailTransaction['bankName'] }} -
-
- Account Number - {{ $detailTransaction['accountNumber'] }} -
-
- Status Transaction - {{ $detailTransaction['statusTransaction'] }} -
- @endforeach +
- @endsection +
+
+@endsection diff --git a/resources/views/Admin/transaction/index.blade.php b/resources/views/Admin/transaction/index.blade.php index 4eaddf55..1f160cd4 100644 --- a/resources/views/Admin/transaction/index.blade.php +++ b/resources/views/Admin/transaction/index.blade.php @@ -13,17 +13,18 @@
- +
- - - + + + - + + @@ -31,25 +32,17 @@ @foreach ($transactions as $transaction) - - - - - - - + + + + + + + @@ -76,4 +75,59 @@ @include('admin.transaction.modal-tracking') + @extends('admin.transaction.modal-keterangan-status') + @endsection diff --git a/resources/views/Admin/transaction/modal-keterangan-status.blade.php b/resources/views/Admin/transaction/modal-keterangan-status.blade.php new file mode 100644 index 00000000..353ba267 --- /dev/null +++ b/resources/views/Admin/transaction/modal-keterangan-status.blade.php @@ -0,0 +1,72 @@ + diff --git a/resources/views/Admin/users/index.blade.php b/resources/views/Admin/users/index.blade.php index b302810f..936ce982 100644 --- a/resources/views/Admin/users/index.blade.php +++ b/resources/views/Admin/users/index.blade.php @@ -53,7 +53,7 @@
Keterangan + href="{{ route('admin-user.show', $user->id) }}">Detail Hapus
diff --git a/resources/views/User/index.blade.php b/resources/views/User/index.blade.php index 34f7676b..73e06be5 100644 --- a/resources/views/User/index.blade.php +++ b/resources/views/User/index.blade.php @@ -20,7 +20,7 @@
  • May
  • June
  • July
    • -
  • August
    • +
  • August
  • September
  • October
  • November
    • diff --git a/resources/views/User/transaction/Pembeli/index.blade.php b/resources/views/User/transaction/Pembeli/index.blade.php index 028777e4..cca6d477 100644 --- a/resources/views/User/transaction/Pembeli/index.blade.php +++ b/resources/views/User/transaction/Pembeli/index.blade.php @@ -23,7 +23,7 @@
    - + @@ -34,7 +34,6 @@
    - @@ -47,7 +46,6 @@ @forelse ($transactions as $transaction) - @@ -141,7 +139,7 @@ }); $.ajax({ - url: "{{ route('payment-transaction.pembeli', ':id') }}" + url: "{{ route('user-pembeli.pay', ':id') }}" .replace(':id', id), type: "POST", contentType: false, @@ -178,7 +176,7 @@ }); $.ajax({ - url: "{{ route('payment-transaction.pembeli', ':id') }}" + url: "{{ route('user-pembeli.pay', ':id') }}" .replace(':id', id), type: "POST", contentType: false, @@ -211,7 +209,7 @@ }); $.ajax({ - url: "{{ route('payment-transaction.pembeli', ':id') }}" + url: "{{ route('user-pembeli.pay', ':id') }}" .replace(':id', id), type: "POST", contentType: false, @@ -271,7 +269,7 @@ }); $.ajax({ - url: "{{ route('cancel-transaction.pembeli', ':id') }}" + url: "{{ route('user-pembeli.cancel', ':id') }}" .replace(':id', id), type: "POST", contentType: false, @@ -318,34 +316,34 @@ // Iterasi melalui data transaksi dan tambahkan ke activitiesHtml $.each(transactionDatas, function(index, transactionDescription) { activitiesHtml += ` -
    -
    - -
    -
    -
    - ${new Date(transactionDescription.created_at).toLocaleString()} +
    +
    + +
    +
    +
    + ${new Date(transactionDescription.created_at).toLocaleString()} +
    +

    ${transactionDescription.deskripsi}

    +
    -

    ${transactionDescription.deskripsi}

    -
    -
    - `; + `; }); } else { // Tidak ada data transaksi, tambahkan pesan kosong activitiesHtml += ` -
    -
    - -
    -
    -
    - --, --:--:-- -- +
    +
    + +
    +
    +
    + --, --:--:-- -- +
    +

    Kosong

    +
    -

    Kosong

    -
    -
    - `; + `; } // Menampilkan data dalam modal diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index a418cac3..2b6fe78d 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -76,7 +76,7 @@ @csrf -

    Sign In

    +

    Login

    Selamat datang kembali, silakan isi form login di bawah ini untuk masuk ke akun anda.

    @@ -99,7 +99,7 @@ @csrf -

    Sign Up

    +

    Daftar

    Selamat datang kembali, silakan isi form login di bawah ini untuk masuk ke akun anda.

    @@ -335,7 +335,7 @@
    @@ -355,7 +355,7 @@ Daftarkan akun anda sekarang untuk nikmatin Aplikasi RekBer. Daftar di sini.

    kembali

    @@ -369,9 +369,9 @@ Silakan masuk ke dalam RekBar menggunakan akun yang telah Anda buat sebelumnya di sini.

    -

    kembali

    +

    kembali

    diff --git a/resources/views/layouts/js-bawah.blade.php b/resources/views/layouts/js-bawah.blade.php new file mode 100644 index 00000000..b303a1dd --- /dev/null +++ b/resources/views/layouts/js-bawah.blade.php @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/views/layouts/js.blade.php b/resources/views/layouts/js.blade.php index 57523c13..e5710941 100644 --- a/resources/views/layouts/js.blade.php +++ b/resources/views/layouts/js.blade.php @@ -12,29 +12,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index e11abeca..8477d7f0 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -29,7 +29,7 @@ @include('layouts.footer') - + @include('layouts.js-bawah') diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index d93cc551..87b05f29 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -31,7 +31,7 @@ Setting @else
  • -
    • # Order IdCustomerSellerIDPembeliPenjual TotalStatusTanggal TransaksiTanggal Update Status Action
    {{ $transaction['no'] }}{{ $transaction['orderId'] }}{{ $transaction['customer'] }}{{ $transaction['seller'] }}{{ $transaction['total'] }}{{ $transaction['date'] }} - @php - $statusClass = ''; - if ($transaction['status'] === 'pending') { - $statusClass = 'badge-warning'; - } elseif ($transaction['status'] === 'paid') { - $statusClass = 'badge-success'; - } elseif ($transaction['status'] === 'unpaid') { - $statusClass = 'badge-danger'; - } - @endphp -
    {{ $transaction['status'] }} -
    +     		{{ $loop->iteration }}{{ $transaction->id }}{{ $transaction->data_pembeli->nama_depan . ' ' . $transaction->data_pembeli->nama_belakang }} + {{ $transaction->data_penjual->nama_depan . ' ' . $transaction->data_penjual->nama_belakang }} + Rp {{ number_format($transaction->total_bayar, 2, ',', '.') }}{{ $transaction->created_at }}{{ $transaction->updated_at }}{{ ucwords($transaction->status) }}
    @@ -57,13 +50,19 @@ data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Action -
    - Details - Tracking - Delete -
    + +
      +
    • Detail +
      • + + @if (!$transaction->transactionDescription->isEmpty()) +
    • Tracking +
      • + @endif +
    NoOrder ID Penjual Total Tanggal Pembuatan
    {{ $loop->iteration }}{{ $transaction->id }} {{ $transaction->data_penjual->nama_depan . ' ' . $transaction->data_penjual->nama_belakang }} Rp {{ number_format($transaction->total_bayar, 2, ',', '.') }}