From 6c5edf89975cb125494ea9ced8a8d5a21903f0e4 Mon Sep 17 00:00:00 2001
From: Raihan Surya <raihansurya4000@gmail.com>
Date: Tue, 12 Dec 2023 16:43:39 +0700
Subject: [PATCH] Memperbaiki tampilan
---
.../Admin/Notification/AdminNotification.php | 2 +-
.../Admin/User/AdminUserController.php | 2 +-
.../Controllers/Invoice/InvoiceController.php | 12 +-
.../Dashboard/UserDashboardController.php | 2 +
.../User/Notification/UserNotification.php | 2 +-
resources/views/Admin/index.blade.php | 4 +-
.../views/Admin/notification/index.blade.php | 75 ++++++-----
resources/views/Admin/refund/index.blade.php | 56 +++++----
resources/views/Admin/setting/index.blade.php | 54 ++++----
.../transaction/detail-transaction.blade.php | 70 +++++++----
.../views/Admin/transaction/index.blade.php | 54 ++++----
resources/views/Admin/users/index.blade.php | 48 ++++---
resources/views/User/contact/index.blade.php | 8 ++
resources/views/User/index.blade.php | 25 ++--
.../views/User/notification/index.blade.php | 63 ++++++----
resources/views/User/refund/index.blade.php | 7 ++
.../Pembeli/detail-transaction.blade.php | 58 +++++----
.../User/transaction/Pembeli/index.blade.php | 4 +-
.../User/transaction/penjual/index.blade.php | 3 +-
.../views/invoice/export-invoice.blade.php | 119 +++++++++++++-----
.../invoice/invoice-transaction.blade.php | 16 ++-
resources/views/layouts/sidebar.blade.php | 2 +-
22 files changed, 435 insertions(+), 251 deletions(-)
diff --git a/app/Http/Controllers/Admin/Notification/AdminNotification.php b/app/Http/Controllers/Admin/Notification/AdminNotification.php
index 3bf6ad6..423b8e8 100644
--- a/app/Http/Controllers/Admin/Notification/AdminNotification.php
+++ b/app/Http/Controllers/Admin/Notification/AdminNotification.php
@@ -46,7 +46,7 @@ class AdminNotification extends Controller
public function listNotification(Request $request)
{
try {
- $subQuery = Notification::latest('notifications.updated_at')->select('notifications.id', 'notifications.title', 'notifications.teaser', 'notifications.created_at');
+ $subQuery = Notification::latest('notifications.updated_at')->select('notifications.id', 'notifications.title', 'notifications.teaser', 'notifications.created_at', 'notifications.updated_at');
if ($request->has('search') && !empty($request->search['value'])) {
$searchNotif = $request->search['value'];
diff --git a/app/Http/Controllers/Admin/User/AdminUserController.php b/app/Http/Controllers/Admin/User/AdminUserController.php
index d76cbb4..6d35290 100644
--- a/app/Http/Controllers/Admin/User/AdminUserController.php
+++ b/app/Http/Controllers/Admin/User/AdminUserController.php
@@ -130,7 +130,7 @@ class AdminUserController extends Controller
try {
$subQuery = User::where('role', 'User')
->orderByRaw("CASE WHEN status = 'Progress' THEN 1 WHEN status = 'Finished' THEN 2 WHEN status = 'Rejected' THEN 3 ELSE 4 END ASC")
- ->latest('transactions.updated_at')
+ ->latest('users.updated_at')
->select('users.id', DB::raw("CONCAT(users.nama_depan, ' ', users.nama_belakang) as nama_lengkap"), 'users.email', 'users.foto_profile', 'users.status', 'users.created_at as tanggal_daftar');
if ($request->has('search') && !empty($request->search['value'])) {
diff --git a/app/Http/Controllers/Invoice/InvoiceController.php b/app/Http/Controllers/Invoice/InvoiceController.php
index f7dd455..c5a0792 100644
--- a/app/Http/Controllers/Invoice/InvoiceController.php
+++ b/app/Http/Controllers/Invoice/InvoiceController.php
@@ -18,11 +18,11 @@ class InvoiceController extends Controller
public function exportInvoice(Request $request)
{
- // $transaction = Transaction::findOrFail($request->id);
- // $pdf = Pdf::loadView('invoice.export-invoice',compact('transaction'))->setPaper('A4','Portrait');
- // return $pdf->download("invoice-".uniqid().".pdf");
- return view('invoice.export-invoice', [
- 'transaction' => Transaction::findOrFail($request->id),
- ]);
+ $transaction = Transaction::findOrFail($request->id);
+ $pdf = Pdf::loadView('invoice.export-invoice',compact('transaction'))->setPaper('A4','Portrait');
+ return $pdf->download("invoice-".uniqid().".pdf");
+ // return view('invoice.export-invoice', [
+ // 'transaction' => Transaction::findOrFail($request->id),
+ // ]);
}
}
diff --git a/app/Http/Controllers/User/Dashboard/UserDashboardController.php b/app/Http/Controllers/User/Dashboard/UserDashboardController.php
index 9422db1..7ee00fb 100644
--- a/app/Http/Controllers/User/Dashboard/UserDashboardController.php
+++ b/app/Http/Controllers/User/Dashboard/UserDashboardController.php
@@ -110,6 +110,7 @@ class UserDashboardController extends Controller
$countBuyerRefundPending = Transaction::join('refunds', 'refunds.transaction_id', '=', 'transactions.id')
->where('refunds.status', 'pending')
+ ->where('transactions.status_transaksi', 'refund')
->whereDate('transactions.created_at', '>=', $startDate)
->whereDate('transactions.created_at', '<=', $todayDate)
->where('pembeli', auth()->user()->email)
@@ -117,6 +118,7 @@ class UserDashboardController extends Controller
$countBuyerRefundApproved = Transaction::join('refunds', 'refunds.transaction_id', '=', 'transactions.id')
->where('refunds.status', 'refund')
+ ->where('transactions.status_transaksi', 'refund')
->whereDate('transactions.created_at', '>=', $startDate)
->whereDate('transactions.created_at', '<=', $todayDate)
->where('pembeli', auth()->user()->email)
diff --git a/app/Http/Controllers/User/Notification/UserNotification.php b/app/Http/Controllers/User/Notification/UserNotification.php
index 5bf1eb1..932ae67 100644
--- a/app/Http/Controllers/User/Notification/UserNotification.php
+++ b/app/Http/Controllers/User/Notification/UserNotification.php
@@ -25,7 +25,7 @@ class UserNotification extends Controller
$subQuery = Notification::join('notification_receivers','notifications.id','=','notification_receivers.notification_id')
->where('notification_receivers.receiver','=',auth()->user()->email)
->latest('notification_receivers.updated_at')
- ->select('notifications.id', 'notifications.title', 'notifications.teaser', 'notification_receivers.created_at', 'notification_receivers.status');
+ ->select('notifications.id', 'notifications.title', 'notifications.teaser', 'notification_receivers.created_at', 'notification_receivers.status', 'notification_receivers.updated_at');
if ($request->has('search') && !empty($request->search['value'])) {
$searchNotif = $request->search['value'];
diff --git a/resources/views/Admin/index.blade.php b/resources/views/Admin/index.blade.php
index b991527..16cc885 100644
--- a/resources/views/Admin/index.blade.php
+++ b/resources/views/Admin/index.blade.php
@@ -4,7 +4,7 @@
<div class="main-content">
<section class="section">
<div class="row">
- <div class="col-lg-4 col-md-12 col-sm-12" style="height: 100%;">
+ <div class="col-lg-4 col-md-12 col-sm-12">
<div class="card card-statistic-2">
<div class="card-stats">
<div class="card-stats-title">
@@ -143,7 +143,7 @@
<h4>Pendapatan</h4>
</div>
<div class="card-body">
- <canvas id="myChart1"></canvas>
+ <canvas id="myChart1" height="175"></canvas>
</div>
</div>
</div>
diff --git a/resources/views/Admin/notification/index.blade.php b/resources/views/Admin/notification/index.blade.php
index f9e114c..a347097 100644
--- a/resources/views/Admin/notification/index.blade.php
+++ b/resources/views/Admin/notification/index.blade.php
@@ -78,41 +78,50 @@
<div class="breadcrumb-item">Notifikasi</div>
</div>
</div>
- <div class="col-12">
- <div class="card">
- <div class="card-body">
- <div class="d-flex justify-content-end mb-3">
- <a class="btn btn-success active" href="{{ route('admin-notification.create') }}">Tambah
- Notifikasi</a>
+ <div class="row">
+ <div class="col-12">
+ <div class="hero bg-primary text-white">
+ <div class="hero-inner">
+ <p class="lead">Kamu dapat mengatur notifikasi yang diterima oleh pengguna.</p>
</div>
- <div class="table-responsive">
- <table class="table table-striped" id="table-notifikasi" style="font-size: 16px;">
- <thead>
- <tr>
- <th class="text-center">
- #
- </th>
- <th>
- Judul
- </th>
- <th>
- Teaser
- </th>
- <th>
- Dibuat pada
- </th>
- <th>
- Diperbarui pada
- </th>
- <th>
- Aksi
- </th>
- </tr>
- </thead>
- <tbody>
+ </div>
+ </div>
+ <div class="col-12">
+ <div class="card">
+ <div class="card-body">
+ <div class="d-flex justify-content-end mb-3">
+ <a class="btn btn-success active" href="{{ route('admin-notification.create') }}">Tambah
+ Notifikasi</a>
+ </div>
+ <div class="table-responsive">
+ <table class="table table-striped" id="table-notifikasi" style="font-size: 16px;">
+ <thead>
+ <tr>
+ <th class="text-center">
+ #
+ </th>
+ <th>
+ Judul
+ </th>
+ <th>
+ Teaser
+ </th>
+ <th>
+ Dibuat pada
+ </th>
+ <th>
+ Diperbarui pada
+ </th>
+ <th>
+ Aksi
+ </th>
+ </tr>
+ </thead>
+ <tbody>
- </tbody>
- </table>
+ </tbody>
+ </table>
+ </div>
</div>
</div>
</div>
diff --git a/resources/views/Admin/refund/index.blade.php b/resources/views/Admin/refund/index.blade.php
index cccd8a5..9c69098 100644
--- a/resources/views/Admin/refund/index.blade.php
+++ b/resources/views/Admin/refund/index.blade.php
@@ -9,30 +9,40 @@
<div class="breadcrumb-item">Refund</div>
</div>
</div>
- <div class="col-12">
- <div class="card">
- <div class="card-body">
- <div class="table-responsive">
- <table class="table table-striped" id="table-refund" style="font-size: 16px;">
- <thead>
- <tr>
- <th class="text-center">
- #
- </th>
- <th>Pembeli</th>
- <th>Nama Barang</th>
- <th>Penjual</th>
- <th>Total</th>
- <th>Tanggal Pengajuan</th>
- <th>Batas Konfirmasi</th>
- <th>Status</th>
- <th>Aksi</th>
- </tr>
- </thead>
- <tbody>
+ <div class="row">
+ <div class="col-12">
+ <div class="hero bg-primary text-white">
+ <div class="hero-inner">
+ <p class="lead">Kamu dapat menyetujui atau menolak pengajuan refund berdasarkan alasan dan
+ buktinya.</p>
+ </div>
+ </div>
+ </div>
+ <div class="col-12">
+ <div class="card">
+ <div class="card-body">
+ <div class="table-responsive">
+ <table class="table table-striped" id="table-refund" style="font-size: 16px;">
+ <thead>
+ <tr>
+ <th class="text-center">
+ #
+ </th>
+ <th>Pembeli</th>
+ <th>Nama Barang</th>
+ <th>Penjual</th>
+ <th>Total</th>
+ <th>Tanggal Pengajuan</th>
+ <th>Batas Konfirmasi</th>
+ <th>Status</th>
+ <th>Aksi</th>
+ </tr>
+ </thead>
+ <tbody>
- </tbody>
- </table>
+ </tbody>
+ </table>
+ </div>
</div>
</div>
</div>
diff --git a/resources/views/Admin/setting/index.blade.php b/resources/views/Admin/setting/index.blade.php
index 2b37b72..329fdea 100644
--- a/resources/views/Admin/setting/index.blade.php
+++ b/resources/views/Admin/setting/index.blade.php
@@ -192,30 +192,40 @@
<div class="breadcrumb-item">Kebijakan Keuntungan</div>
</div>
</div>
- <div class="col-12">
- <div class="card">
- <div class="card-body">
- <div class="d-flex justify-content-end mb-3">
- <a class="btn btn-success active" href="#" id="tambahModal">Tambah Kebijakan</a>
+ <div class="row">
+ <div class="col-12">
+ <div class="hero bg-primary text-white">
+ <div class="hero-inner">
+ <p class="lead">Kamu dapat mengatur keuntungan yang didapatkan setiap transaksi yang
+ diselesaikan oleh pengguna.</p>
</div>
- <div class="table-responsive">
- <table class="table table-striped" id="table-setting" style="font-size: 16px;">
- <thead>
- <tr>
- <th class="text-center">
- #
- </th>
- <th>Bulan</th>
- <th>Tahun</th>
- <th>Persentase (%)</th>
- <th>Status</th>
- <th>Aksi</th>
- </tr>
- </thead>
- <tbody>
+ </div>
+ </div>
+ <div class="col-12">
+ <div class="card">
+ <div class="card-body">
+ <div class="d-flex justify-content-end mb-3">
+ <a class="btn btn-success active" href="#" id="tambahModal">Tambah Kebijakan</a>
+ </div>
+ <div class="table-responsive">
+ <table class="table table-striped" id="table-setting" style="font-size: 16px;">
+ <thead>
+ <tr>
+ <th class="text-center">
+ #
+ </th>
+ <th>Bulan</th>
+ <th>Tahun</th>
+ <th>Persentase (%)</th>
+ <th>Status</th>
+ <th>Aksi</th>
+ </tr>
+ </thead>
+ <tbody>
- </tbody>
- </table>
+ </tbody>
+ </table>
+ </div>
</div>
</div>
</div>
diff --git a/resources/views/Admin/transaction/detail-transaction.blade.php b/resources/views/Admin/transaction/detail-transaction.blade.php
index 0848923..769f701 100644
--- a/resources/views/Admin/transaction/detail-transaction.blade.php
+++ b/resources/views/Admin/transaction/detail-transaction.blade.php
@@ -85,6 +85,11 @@
{{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getCityName() . ', ' . $transaction->data_pembeli->getProvinceName())) }}
+ <br>
+ <strong>Email:</strong><br>
+ {{ $transaction->pembeli }} <br>
+ <strong>No. HP:</strong> <br>
+ {{ $transaction->data_pembeli->nohp }}
</address>
</div>
<div class="col-md-6 text-md-right">
@@ -94,6 +99,11 @@
{{ ucwords(strtolower($transaction->data_penjual->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getCityName() . ', ' . $transaction->data_penjual->getProvinceName())) }}
+ <br>
+ <strong>Email:</strong> <br>
+ {{ $transaction->penjual }} <br>
+ <strong>No. HP:</strong> <br>
+ {{ $transaction->data_penjual->nohp }}
</address>
</div>
</div>
@@ -106,21 +116,6 @@
</div>
</div>
{{-- batas pembayaran dan pengiriman --}}
- <div class="row">
- <div class="col-md-6">
- <address>
- <strong>Batas Pembayaran:</strong><br>
- {{ date('d F Y', strtotime($transaction->batas_pembayaran)) }}<br>
- </address>
- </div>
- <div class="col-md-6 text-md-right">
- <address>
- <strong>Batas Pengiriman:</strong><br>
- {{ date('d F Y', strtotime($transaction->batas_pengiriman_barang_akhir)) }}<br>
- </address>
- </div>
- </div>
- {{-- Keterangan Pembayaran --}}
<div class="row">
<div class="col-md-6">
<address>
@@ -128,12 +123,32 @@
{{ ucwords($transaction->status_transaksi) }}
</address>
</div>
- <div class="col-md-6 text-md-right">
- <address>
- <strong>Status Pembayaran:</strong><br>
- {{ ucwords($transaction->status_pembayaran) }}
- </address>
- </div>
+ @if ($transaction->tanggal_pembayaran != null)
+ <div class="col-md-6 text-md-right">
+ <address>
+ <strong>Status Pembayaran:</strong><br>
+ {{ ucwords($transaction->status_pembayaran) }}
+ </address>
+ </div>
+ @endif
+ </div>
+ <div class="row">
+ @if ($transaction->tanggal_pembayaran == null)
+ <div class="col-md-6">
+ <address>
+ <strong>Batas Pembayaran:</strong><br>
+ {{ date('d F Y', strtotime($transaction->batas_pembayaran)) }}<br>
+ </address>
+ </div>
+ @endif
+ @if (!in_array($transaction->status_transaksi, ['sent', 'finished', 'done', 'failure', 'refund']))
+ <div class="col-md-6 text-md-right">
+ <address>
+ <strong>Batas Pengiriman:</strong><br>
+ {{ date('d F Y', strtotime($transaction->batas_pengiriman_barang_akhir)) }}<br>
+ </address>
+ </div>
+ @endif
</div>
{{-- Keterangan --}}
<div class="row">
@@ -169,26 +184,29 @@
<tr>
<td>1</td>
<td>{{ $transaction->nama_barang }}</td>
- <td class="text-center">{{ $transaction->harga_barang }}</td>
+ <td class="text-center">
+ Rp {{ number_format($transaction->harga_barang, 2, ',', '.') }}
+ </td>
<td class="text-center">{{ $transaction->jumlah_barang }}</td>
<td class="text-right">
- {{ $transaction->harga_barang * $transaction->jumlah_barang }}
+ Rp
+ {{ number_format($transaction->harga_barang * $transaction->jumlah_barang, 2, ',', '.') }}
</td>
</tr>
</table>
</div>
<div class="row mt-4">
- <div class="col-lg-8">
+ <div class="col-lg-6">
<div class="section-title">Metode Pembayaran</div>
<div class="images">
@if ($transaction->metode_pembayaran != null)
- <img style="width: 20%; height: 20%;"
+ <img style="width: 40%; height: 40%;"
src="{{ asset('assets/img/metode_pembayaran/' . $transaction->metode_pembayaran . '.png') }}"
alt="{{ $transaction->metode_pembayaran }}">
@endif
</div>
</div>
- <div class="col-lg-4 text-right">
+ <div class="col-lg-6 text-right">
<div class="invoice-detail-item">
<div class="invoice-detail-name">Subtotal</div>
<div class="invoice-detail-value">Rp
diff --git a/resources/views/Admin/transaction/index.blade.php b/resources/views/Admin/transaction/index.blade.php
index d4bf61b..5a371ef 100644
--- a/resources/views/Admin/transaction/index.blade.php
+++ b/resources/views/Admin/transaction/index.blade.php
@@ -9,29 +9,39 @@
<div class="breadcrumb-item">Transaksi</div>
</div>
</div>
- <div class="col-12">
- <div class="card">
- <div class="card-body">
- <div class="table-responsive">
- <table class="table table-striped" id="table-transaction" style="font-size: 16px;">
- <thead>
- <tr>
- <th class="text-center">
- #
- </th>
- <th>Nama Barang</th>
- <th>Pembeli</th>
- <th>Penjual</th>
- <th>Total</th>
- <th>Tanggal Transaksi</th>
- <th>Status</th>
- <th>Aksi</th>
- </tr>
- </thead>
- <tbody>
+ <div class="row">
+ <div class="col-12">
+ <div class="hero bg-primary text-white">
+ <div class="hero-inner">
+ <p class="lead">Kamu dapat menyetujui atau menolak untuk melanjutkan transaksi apabila ada
+ transaksi yang terindikasi penipuan.</p>
+ </div>
+ </div>
+ </div>
+ <div class="col-12">
+ <div class="card">
+ <div class="card-body">
+ <div class="table-responsive">
+ <table class="table table-striped" id="table-transaction" style="font-size: 16px;">
+ <thead>
+ <tr>
+ <th class="text-center">
+ #
+ </th>
+ <th>Nama Barang</th>
+ <th>Pembeli</th>
+ <th>Penjual</th>
+ <th>Total</th>
+ <th>Tanggal Transaksi</th>
+ <th>Status</th>
+ <th>Aksi</th>
+ </tr>
+ </thead>
+ <tbody>
- </tbody>
- </table>
+ </tbody>
+ </table>
+ </div>
</div>
</div>
</div>
diff --git a/resources/views/Admin/users/index.blade.php b/resources/views/Admin/users/index.blade.php
index 47ac038..ab63c99 100644
--- a/resources/views/Admin/users/index.blade.php
+++ b/resources/views/Admin/users/index.blade.php
@@ -9,26 +9,36 @@
<div class="breadcrumb-item">User</div>
</div>
</div>
- <div class="col-12">
- <div class="card">
- <div class="card-body">
- <div class="table-responsive">
- <table class="table table-striped" id="table-user" style="font-size: 16px;">
- <thead>
- <tr>
- <th class="text-center">#</th>
- <th>Foto Profil</th>
- <th>Nama Lengkap</th>
- <th>Email</th>
- <th>Tanggal Daftar</th>
- <th>Status</th>
- <th>Aksi</th>
- </tr>
- </thead>
- <tbody>
+ <div class="row">
+ <div class="col-12">
+ <div class="hero bg-primary text-white">
+ <div class="hero-inner">
+ <p class="lead">Kamu dapat menyetujui atau menolak penggunaan baru berdasarkan informasi
+ dengan foto ktp.</p>
+ </div>
+ </div>
+ </div>
+ <div class="col-12">
+ <div class="card">
+ <div class="card-body">
+ <div class="table-responsive">
+ <table class="table table-striped" id="table-user" style="font-size: 16px;">
+ <thead>
+ <tr>
+ <th class="text-center">#</th>
+ <th>Foto Profil</th>
+ <th>Nama Lengkap</th>
+ <th>Email</th>
+ <th>Tanggal Daftar</th>
+ <th>Status</th>
+ <th>Aksi</th>
+ </tr>
+ </thead>
+ <tbody>
- </tbody>
- </table>
+ </tbody>
+ </table>
+ </div>
</div>
</div>
</div>
diff --git a/resources/views/User/contact/index.blade.php b/resources/views/User/contact/index.blade.php
index 8232a39..15fc765 100644
--- a/resources/views/User/contact/index.blade.php
+++ b/resources/views/User/contact/index.blade.php
@@ -13,6 +13,14 @@
{{-- tabel list kontak --}}
<div class="row">
+ <div class="col-12">
+ <div class="hero bg-primary text-white">
+ <div class="hero-inner">
+ <p class="lead">Kamu dapat mengatur kontak kamu disini. Kamu juga dapat menggunakan kontak ini
+ untuk digunakan untuk tambah transaksi.</p>
+ </div>
+ </div>
+ </div>
<div class="col-md-12">
<div class="card">
<div class="card-header">
diff --git a/resources/views/User/index.blade.php b/resources/views/User/index.blade.php
index b92e4bd..caa2918 100644
--- a/resources/views/User/index.blade.php
+++ b/resources/views/User/index.blade.php
@@ -53,7 +53,7 @@
<div class="card-stats">
<div class="card-stats-title">
<h4>
- Transaksi - <select class="input" style="width: 40%;" name="filterRole" id="filterRole">
+ Transaksi - <select class="input" style="width: 50%;" name="filterRole" id="filterRole">
<option value="1" selected>Semua</option>
<option value="2">Pembeli</option>
<option value="3">Penjual</option>
@@ -95,7 +95,7 @@
</div>
</div>
<div id="pembeli" hidden>
- <div class="card-stats-items mt-3">
+ <div class="card-stats-items">
<div class="card-stats-item">
<div class="card-stats-item-count" id="countBuyerFinished">{{ $countBuyerFinished }}
</div>
@@ -112,13 +112,13 @@
</div>
<div class="card-stats-item-label">Diproses</div>
</div>
+ </div>
+ <div class="card-stats-items">
<div class="card-stats-item">
<div class="card-stats-item-count" id="countBuyerPending">{{ $countBuyerPending }}
</div>
<div class="card-stats-item-label">Menunggu</div>
</div>
- </div>
- <div class="card-stats-items">
<div class="card-stats-item">
<div class="card-stats-item-count" id="countBuyerCancelled">
{{ $countBuyerCancelled }}</div>
@@ -130,6 +130,8 @@
</div>
<div class="card-stats-item-label">Tertunda</div>
</div>
+ </div>
+ <div class="card-stats-items">
<div class="card-stats-item">
<div class="card-stats-item-count" id="countBuyerRefundPending">
{{ $countBuyerRefundPending }}</div>
@@ -148,7 +150,7 @@
</div>
</div>
<div id="penjual" hidden>
- <div class="card-stats-items mt-3">
+ <div class="card-stats-items">
<div class="card-stats-item">
<div class="card-stats-item-count" id="countSellerFinished">
{{ $countSellerFinished }}</div>
@@ -200,7 +202,7 @@
</div>
<div class="card-wrap">
<div class="card-header">
- <h4>Jumlah Transaction</h4>
+ <h4>Jumlah Transaksi</h4>
</div>
<div class="card-body" id="totalTransaction">
{{ $totalTransaction }} Transaksi
@@ -218,7 +220,7 @@
<div class="col-lg-4 col-md-12 col-sm-12">
<div class="card card-statistic-2">
<div class="card-chart">
- <canvas id="pemasukan-chart" height="100"></canvas>
+ <canvas id="pemasukan-chart" height="130"></canvas>
</div>
<div class="card-icon shadow-primary bg-primary">
<i class="fas fa-dollar-sign"></i>
@@ -243,7 +245,7 @@
<div class="col-lg-4 col-md-12 col-sm-12">
<div class="card card-statistic-2">
<div class="card-chart">
- <canvas id="pengeluaran-chart" height="100"></canvas>
+ <canvas id="pengeluaran-chart" height="130"></canvas>
</div>
<div class="card-icon shadow-primary bg-primary">
<i class="fas fa-shopping-bag"></i>
@@ -292,7 +294,7 @@
<h4>Transaksi</h4>
</div>
<div class="card-body">
- <canvas id="myChart" height="120"></canvas>
+ <canvas id="myChart" height="100"></canvas>
</div>
</div>
</div>
@@ -602,11 +604,12 @@
myChartTransaksi.data.labels = response.dataLabel;
myChartTransaksi.update();
- myChartPemasukan.data.datasets[0].data = response.dataChartUser;
+ myChartPemasukan.data.datasets[0].data = response.dataChartPemasukan;
myChartPemasukan.data.labels = response.dataLabel;
myChartPemasukan.update();
- myChartPengeluaran.data.datasets[0].data = response.dataChartUser;
+ myChartPengeluaran.data.datasets[0].data = response
+ .dataChartPengeluaran;
myChartPengeluaran.data.labels = response.dataLabel;
myChartPengeluaran.update();
diff --git a/resources/views/User/notification/index.blade.php b/resources/views/User/notification/index.blade.php
index 4dbe768..78b5eed 100644
--- a/resources/views/User/notification/index.blade.php
+++ b/resources/views/User/notification/index.blade.php
@@ -72,34 +72,43 @@
<div class="breadcrumb-item">Notifikasi</div>
</div>
</div>
- <div class="col-12">
- <div class="card">
- <div class="card-body">
- <div class="table-responsive">
- <table class="table table-striped" id="table-notifikasi" style="font-size: 16px;">
- <thead>
- <tr>
- <th class="text-center">
- #
- </th>
- <th>
- Judul
- </th>
- <th>
- Teaser
- </th>
- <th>
- Tanggal Dibuat
- </th>
- <th>
- Aksi
- </th>
- </tr>
- </thead>
- <tbody>
+ <div class="row">
+ <div class="col-12">
+ <div class="hero bg-primary text-white">
+ <div class="hero-inner">
+ <p class="lead">Disini notifikasi yang kamu dapatkan. Jangan lupa cek terus ya!!!</p>
+ </div>
+ </div>
+ </div>
+ <div class="col-12">
+ <div class="card">
+ <div class="card-body">
+ <div class="table-responsive">
+ <table class="table table-striped" id="table-notifikasi" style="font-size: 16px;">
+ <thead>
+ <tr>
+ <th class="text-center">
+ #
+ </th>
+ <th>
+ Judul
+ </th>
+ <th>
+ Teaser
+ </th>
+ <th>
+ Tanggal Dibuat
+ </th>
+ <th>
+ Aksi
+ </th>
+ </tr>
+ </thead>
+ <tbody>
- </tbody>
- </table>
+ </tbody>
+ </table>
+ </div>
</div>
</div>
</div>
diff --git a/resources/views/User/refund/index.blade.php b/resources/views/User/refund/index.blade.php
index a62b9eb..5993578 100644
--- a/resources/views/User/refund/index.blade.php
+++ b/resources/views/User/refund/index.blade.php
@@ -11,6 +11,13 @@
</div>
<div class="row">
+ <div class="col-12">
+ <div class="hero bg-primary text-white">
+ <div class="hero-inner">
+ <p class="lead">Kamu dapat melihat refund yang kamu ajukan.</p>
+ </div>
+ </div>
+ </div>
<div class="col-md-12">
<div class="card">
<div class="card-body">
diff --git a/resources/views/User/transaction/Pembeli/detail-transaction.blade.php b/resources/views/User/transaction/Pembeli/detail-transaction.blade.php
index 343f60d..7a85ec9 100644
--- a/resources/views/User/transaction/Pembeli/detail-transaction.blade.php
+++ b/resources/views/User/transaction/Pembeli/detail-transaction.blade.php
@@ -89,6 +89,11 @@
{{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getCityName() . ', ' . $transaction->data_pembeli->getProvinceName())) }}
+ <br>
+ <strong>Email:</strong><br>
+ {{ $transaction->pembeli }} <br>
+ <strong>No. HP:</strong> <br>
+ {{ $transaction->data_pembeli->nohp }}
</address>
</div>
<div class="col-md-6 text-md-right">
@@ -98,6 +103,11 @@
{{ ucwords(strtolower($transaction->data_penjual->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getCityName() . ', ' . $transaction->data_penjual->getProvinceName())) }}
+ <br>
+ <strong>Email:</strong> <br>
+ {{ $transaction->penjual }} <br>
+ <strong>No. HP:</strong> <br>
+ {{ $transaction->data_penjual->nohp }}
</address>
</div>
</div>
@@ -109,20 +119,6 @@
</address>
</div>
</div>
- <div class="row">
- <div class="col-md-6">
- <address>
- <strong>Batas Pembayaran:</strong><br>
- {{ date('d F Y', strtotime($transaction->batas_pembayaran)) }}<br>
- </address>
- </div>
- <div class="col-md-6 text-md-right">
- <address>
- <strong>Batas Pengiriman:</strong><br>
- {{ date('d F Y', strtotime($transaction->batas_pengiriman_barang_akhir)) }}<br>
- </address>
- </div>
- </div>
<div class="row">
<div class="col-md-6">
<address>
@@ -130,12 +126,32 @@
{{ ucwords($transaction->status_transaksi) }}
</address>
</div>
- <div class="col-md-6 text-md-right">
- <address>
- <strong>Status Pembayaran:</strong><br>
- {{ ucwords($transaction->status_pembayaran) }}
- </address>
- </div>
+ @if ($transaction->tanggal_pembayaran != null)
+ <div class="col-md-6 text-md-right">
+ <address>
+ <strong>Status Pembayaran:</strong><br>
+ {{ ucwords($transaction->status_pembayaran) }}
+ </address>
+ </div>
+ @endif
+ </div>
+ <div class="row">
+ @if ($transaction->tanggal_pembayaran == null)
+ <div class="col-md-6">
+ <address>
+ <strong>Batas Pembayaran:</strong><br>
+ {{ date('d F Y', strtotime($transaction->batas_pembayaran)) }}<br>
+ </address>
+ </div>
+ @endif
+ @if (!in_array($transaction->status_transaksi, ['sent', 'finished', 'done', 'failure', 'refund']))
+ <div class="col-md-6 text-md-right">
+ <address>
+ <strong>Batas Pengiriman:</strong><br>
+ {{ date('d F Y', strtotime($transaction->batas_pengiriman_barang_akhir)) }}<br>
+ </address>
+ </div>
+ @endif
</div>
@if ($transaction->fraud_status != null)
<div class="row">
@@ -156,7 +172,7 @@
</div>
</div>
- <div class="row mt-4">
+ <div class="row">
<div class="col-md-12">
<div class="section-title">Rangkuman Transaksi</div>
<p class="section-lead">Semua barang yang didaftarkan dalam transaksi.</p>
diff --git a/resources/views/User/transaction/Pembeli/index.blade.php b/resources/views/User/transaction/Pembeli/index.blade.php
index 678302d..8caea6d 100644
--- a/resources/views/User/transaction/Pembeli/index.blade.php
+++ b/resources/views/User/transaction/Pembeli/index.blade.php
@@ -15,8 +15,8 @@
<div class="col-12 mb-4">
<div class="hero bg-primary text-white">
<div class="hero-inner">
- <h1>Halo!!!</h1>
- <p class="lead">Selamat Datang {{ Auth::user()->nama_depan }}!</p>
+ <p class="lead">Selamat Datang {{ Auth::user()->nama_depan }}! Kamu bisa memulai transaksi mu
+ disini.</p>
</div>
</div>
</div>
diff --git a/resources/views/User/transaction/penjual/index.blade.php b/resources/views/User/transaction/penjual/index.blade.php
index f8ae588..6ba06ea 100644
--- a/resources/views/User/transaction/penjual/index.blade.php
+++ b/resources/views/User/transaction/penjual/index.blade.php
@@ -16,7 +16,8 @@
<div class="hero bg-primary text-white">
<div class="hero-inner">
<h1>Halo!!!</h1>
- <p class="lead">Selamat Datang {{ Auth::user()->nama_depan }}!</p>
+ <p class="lead">Selamat Datang {{ Auth::user()->nama_depan }}! Disini kamu dapat melihat
+ transaksi yang masuk ke kamu. Jangan lupa cek terus ya!!!</p>
</div>
</div>
</div>
diff --git a/resources/views/invoice/export-invoice.blade.php b/resources/views/invoice/export-invoice.blade.php
index 105248e..d2fd8e9 100644
--- a/resources/views/invoice/export-invoice.blade.php
+++ b/resources/views/invoice/export-invoice.blade.php
@@ -25,6 +25,7 @@
width: 100%;
height: auto;
border-radius: 0.5rem;
+ margin-top: 20px;
}
.info-user,
@@ -89,8 +90,13 @@
width: 50%;
}
+ .info-user td:nth-child(2) {
+ text-align: right;
+ }
+
.info-pembayaran {
margin-top: 25px;
+ margin-bottom: 25px;
}
.info-pembayaran label {
@@ -114,19 +120,19 @@
.data-pesanan {
background: whitesmoke;
- margin: 15px 0;
+ /* margin: 15px 0; */
}
.data-pesanan th {
text-transform: capitalize;
font-size: 0.85rem;
- padding: 15px 30px 5px 30px;
+ /* padding: 15px 30px 5px 30px; */
}
.data-pesanan td {
text-align: center;
font-size: 0.8rem;
- padding: 20px 25px;
+ /* padding: 20px 25px; */
}
.rincian-pesanan thead {
@@ -175,57 +181,111 @@
<body>
<div class="card">
- <h3>Nota Pesanan</h3>
+ <h3>Invoice</h3>
<table class="info-user">
<tr>
- <td class="pt-0">
+ <td class="pt-0" colspan="2">
<p>Pembeli :</p>
</td>
- <td class="pt-0">
+ <td class="pt-0" colspan="2">
<p>Penjual :</p>
</td>
</tr>
<tr>
- <td><span>Septea</span></td>
- <td><span>Takapedia Top Up</span></td>
- </tr>
- <tr>
- <td>
- <p>Email :</p>
+ <td colspan="2">
+ <span>{{ ucwords(strtolower($transaction->data_pembeli->nama_depan . ' ' . $transaction->data_pembeli->nama_belakang)) }}</span>
+ </td>
+ <td colspan="2">
+ <span>{{ ucwords(strtolower($transaction->data_penjual->nama_depan . ' ' . $transaction->data_penjual->nama_belakang)) }}</span>
</td>
</tr>
<tr>
- <td><span>darwin@gmail.com</span></td>
+ <td colspan="2">
+ <p>Email :</p>
+ </td>
+ <td colspan="2">
+ <p>Email : </p>
+ </td>
</tr>
<tr>
- <td>
+ <td colspan="2"><span>{{ $transaction->pembeli }}</span></td>
+ <td colspan="2">
+ <span>{{ $transaction->penjual }}</span>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <p>Alamat :</p>
+ </td>
+ <td colspan="2">
<p>Alamat :</p>
</td>
</tr>
<tr>
- <td class="pr-1"><span>Pondok ponogoro jl.raya bogor no.26 rt 2/2Pondok ponogoro jl.raya bogor no.26 rt
- 2/2</span></td>
+ <td colspan="2" class="pr-1">
+ <span>{{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}</span>
+ </td>
+ <td colspan="2">
+ <span>{{ ucwords(strtolower($transaction->data_penjual->alamat)) }}</span>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="pr-1">
+ <span>{{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}</span>
+ </td>
+ <td colspan="2">
+ <span>{{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}</span>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="pr-1">
+ <span>{{ ucwords(strtolower($transaction->data_pembeli->getCityName() . ', ' . $transaction->data_pembeli->getProvinceName())) }}</span>
+ </td>
+ <td colspan="2">
+ <span>{{ ucwords(strtolower($transaction->data_penjual->getCityName() . ', ' . $transaction->data_penjual->getProvinceName())) }}</span>
+ </td>
</tr>
<tr>
<td colspan="2">
<p>no. HP :</p>
</td>
+ <td colspan="2">
+ <p>no. HP :</p>
+ </td>
</tr>
<tr>
- <td colspan="2"><span>6285753478458</span></td>
+ <td colspan="2">
+ <span>{{ $transaction->data_pembeli->nohp }}</span>
+ </td>
+ <td colspan="2">
+ <span>{{ $transaction->data_penjual->nohp }}</span>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>Deskripsi :</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <span>{{ $transaction->deskripsi == null ? '---' : $transaction->deskripsi }}</span>
+ </td>
</tr>
</table>
- <table class="data-pesanan">
+ <table class="data-pesanan" style="margin-top: 10px;">
<thead>
<th>No. Pesanan</th>
- <th>Tgl Pesanan</th>
+ <th>Tanggal Pembayaran</th>
<th>Metode Pembayaran</th>
</thead>
<tbody>
<tr>
- <td><span>#8shd87ugd-18bg-273v</span></td>
- <td><span>18/02/2024</span></td>
- <td><span>Visa ending ***</span></td>
+ <td><span>#{{ $transaction->id }}</span></td>
+ <td><span>{{ $transaction->tanggal_pembayaran == null ? '---' : date('d F Y', strtotime($transaction->tanggal_pembayaran)) }}</span>
+ </td>
+ <td>
+ <span>{{ $transaction->metode_pembayaran == null ? '---' : $transaction->metode_pembayaran }}</span>
+ </td>
</tr>
</tbody>
</table>
@@ -251,22 +311,23 @@
<tbody>
<tr>
<td>1</td>
- <td>Iphone 17 Pro Max</td>
- <td>Rp.17.994.592,00</td>
+ <td>{{ $transaction->nama_barang }}</td>
+ <td>Rp {{ number_format($transaction->harga_barang, 2, ',', '.') }}</td>
<td>2</td>
- <td>Rp.35.989.184,00</td>
+ <td>Rp {{ number_format($transaction->harga_barang * $transaction->jumlah_barang, 2, ',', '.') }}
+ </td>
</tr>
</tbody>
</table>
<table class="info-pembayaran">
<tr>
<td>[ini kosong]</td>
- <td style="width: 45%;" class="pt-2"><label>subtotal :</label></td>
+ <td style="width: 45%;" class="pt-2"><label>subtotal</label></td>
</tr>
<tr>
<td>[kosong]</td>
<td style="width: 45%;" colspan="2">
- <p>Rp.35.989.184,00</p>
+ <p>Rp {{ number_format($transaction->total_harga, 2, ',', '.') }}</p>
</td>
</tr>
<tr>
@@ -276,7 +337,7 @@
<tr>
<td>[kosong]</td>
<td style="width: 45%;" colspan="2">
- <p>Rp.30.000,00</p>
+ <p>Rp {{ number_format($transaction->total_keuntungan, 2, ',', '.') }}</p>
</td>
</tr>
<tr>
@@ -292,7 +353,7 @@
<tr>
<td>[kosong]</td>
<td style="width: 45%;" class="pb-2" colspan="2">
- <p>Rp.30.000,00</p>
+ <p>Rp {{ number_format($transaction->total_bayar, 2, ',', '.') }}</p>
</td>
</tr>
</table>
diff --git a/resources/views/invoice/invoice-transaction.blade.php b/resources/views/invoice/invoice-transaction.blade.php
index fff684f..f3a4008 100644
--- a/resources/views/invoice/invoice-transaction.blade.php
+++ b/resources/views/invoice/invoice-transaction.blade.php
@@ -20,6 +20,11 @@
{{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getCityName() . ', ' . $transaction->data_pembeli->getProvinceName())) }}
+ <br>
+ <strong>Email:</strong><br>
+ {{ $transaction->pembeli }} <br>
+ <strong>No. HP:</strong> <br>
+ {{ $transaction->data_pembeli->nohp }}
</address>
</div>
<div class="col-md-6 text-md-right">
@@ -29,6 +34,11 @@
{{ ucwords(strtolower($transaction->data_penjual->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getCityName() . ', ' . $transaction->data_penjual->getProvinceName())) }}
+ <br>
+ <strong>Email:</strong> <br>
+ {{ $transaction->penjual }} <br>
+ <strong>No. HP:</strong> <br>
+ {{ $transaction->data_penjual->nohp }}
</address>
</div>
</div>
@@ -59,7 +69,7 @@
</div>
</div>
- <div class="row mt-4">
+ <div class="row">
<div class="col-md-12">
<div class="section-title">Rangkuman Transaksi</div>
<p class="section-lead">Semua barang yang didaftarkan dalam transaksi.</p>
@@ -85,7 +95,7 @@
</table>
</div>
<div class="row mt-4">
- <div class="col-lg-8">
+ <div class="col-lg-6">
<div class="section-title">Metode Pembayaran</div>
<div class="images">
@if ($transaction->metode_pembayaran != null)
@@ -95,7 +105,7 @@
@endif
</div>
</div>
- <div class="col-lg-4 text-right">
+ <div class="col-lg-6 text-right">
<div class="invoice-detail-item">
<div class="invoice-detail-name">Subtotal</div>
<div class="invoice-detail-value">
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index 389b0ee..cc074ec 100644
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -28,7 +28,7 @@
</li>
<li><a class="nav-link {{ request()->routeIs('admin-setting.index') ? 'active' : '' }}"
href="{{ route('admin-setting.index') }}"><i class="fas fa-cog"></i>
- <span>Setting</span></a></li>
+ <span>Kebijakan</span></a></li>
<li><a class="nav-link {{ request()->routeIs('admin-notification.index') ? 'active' : '' }}"
href="{{ route('admin-notification.index') }}"><i class="fas fa-bell"></i>
<span>Notifikasi</span></a></li>