MAGANG_TB_dan_PNP_2023/Aplikasi_Rekber
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Memperbaiki tampilan

Browse Source
This commit is contained in:
Muhammad Raihan Surya 2023-12-12 16:43:39 +07:00
parent ec95715177
commit 6c5edf8997
22 changed files with 435 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/Notification/AdminNotification.php
View File

@ -46,7 +46,7 @@ class AdminNotification extends Controller
public function listNotification(Request $request) public function listNotification(Request $request)
{ {
try { 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'])) { if ($request->has('search') && !empty($request->search['value'])) {
$searchNotif = $request->search['value']; $searchNotif = $request->search['value'];

2
app/Http/Controllers/Admin/User/AdminUserController.php
View File

@ -130,7 +130,7 @@ class AdminUserController extends Controller
try { try {
$subQuery = User::where('role', 'User') $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") ->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'); ->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'])) { if ($request->has('search') && !empty($request->search['value'])) {

12
app/Http/Controllers/Invoice/InvoiceController.php
View File

@ -18,11 +18,11 @@ class InvoiceController extends Controller
public function exportInvoice(Request $request) public function exportInvoice(Request $request)
{ {
// $transaction = Transaction::findOrFail($request->id); $transaction = Transaction::findOrFail($request->id);
// $pdf = Pdf::loadView('invoice.export-invoice',compact('transaction'))->setPaper('A4','Portrait'); $pdf = Pdf::loadView('invoice.export-invoice',compact('transaction'))->setPaper('A4','Portrait');
// return $pdf->download("invoice-".uniqid().".pdf"); return $pdf->download("invoice-".uniqid().".pdf");
return view('invoice.export-invoice', [ // return view('invoice.export-invoice', [
'transaction' => Transaction::findOrFail($request->id), // 'transaction' => Transaction::findOrFail($request->id),
]); // ]);
} }
} }

2
app/Http/Controllers/User/Dashboard/UserDashboardController.php
View File

@ -110,6 +110,7 @@ class UserDashboardController extends Controller
$countBuyerRefundPending = Transaction::join('refunds', 'refunds.transaction_id', '=', 'transactions.id') $countBuyerRefundPending = Transaction::join('refunds', 'refunds.transaction_id', '=', 'transactions.id')
->where('refunds.status', 'pending') ->where('refunds.status', 'pending')
->where('transactions.status_transaksi', 'refund')
->whereDate('transactions.created_at', '>=', $startDate) ->whereDate('transactions.created_at', '>=', $startDate)
->whereDate('transactions.created_at', '<=', $todayDate) ->whereDate('transactions.created_at', '<=', $todayDate)
->where('pembeli', auth()->user()->email) ->where('pembeli', auth()->user()->email)
@ -117,6 +118,7 @@ class UserDashboardController extends Controller
$countBuyerRefundApproved = Transaction::join('refunds', 'refunds.transaction_id', '=', 'transactions.id') $countBuyerRefundApproved = Transaction::join('refunds', 'refunds.transaction_id', '=', 'transactions.id')
->where('refunds.status', 'refund') ->where('refunds.status', 'refund')
->where('transactions.status_transaksi', 'refund')
->whereDate('transactions.created_at', '>=', $startDate) ->whereDate('transactions.created_at', '>=', $startDate)
->whereDate('transactions.created_at', '<=', $todayDate) ->whereDate('transactions.created_at', '<=', $todayDate)
->where('pembeli', auth()->user()->email) ->where('pembeli', auth()->user()->email)

2
app/Http/Controllers/User/Notification/UserNotification.php
View File

@ -25,7 +25,7 @@ class UserNotification extends Controller
$subQuery = Notification::join('notification_receivers','notifications.id','=','notification_receivers.notification_id') $subQuery = Notification::join('notification_receivers','notifications.id','=','notification_receivers.notification_id')
->where('notification_receivers.receiver','=',auth()->user()->email) ->where('notification_receivers.receiver','=',auth()->user()->email)
->latest('notification_receivers.updated_at') ->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'])) { if ($request->has('search') && !empty($request->search['value'])) {
$searchNotif = $request->search['value']; $searchNotif = $request->search['value'];

4
resources/views/Admin/index.blade.php
View File

@ -4,7 +4,7 @@
<div class="main-content"> <div class="main-content">
<section class="section"> <section class="section">
<div class="row"> <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 card-statistic-2">
<div class="card-stats"> <div class="card-stats">
<div class="card-stats-title"> <div class="card-stats-title">
@ -143,7 +143,7 @@
<h4>Pendapatan</h4> <h4>Pendapatan</h4>
</div> </div>
<div class="card-body"> <div class="card-body">
<canvas id="myChart1"></canvas> <canvas id="myChart1" height="175"></canvas>
</div> </div>
</div> </div>
</div> </div>

9
resources/views/Admin/notification/index.blade.php
View File

@ -78,6 +78,14 @@
<div class="breadcrumb-item">Notifikasi</div> <div class="breadcrumb-item">Notifikasi</div>
</div> </div>
</div> </div>
<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>
</div>
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -117,6 +125,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</section> </section>
</div> </div>
@endsection @endsection

10
resources/views/Admin/refund/index.blade.php
View File

@ -9,6 +9,15 @@
<div class="breadcrumb-item">Refund</div> <div class="breadcrumb-item">Refund</div>
</div> </div>
</div> </div>
<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="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -37,6 +46,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</section> </section>
</div> </div>
@include('admin.refund.modal-keterangan-status') @include('admin.refund.modal-keterangan-status')

10
resources/views/Admin/setting/index.blade.php
View File

@ -192,6 +192,15 @@
<div class="breadcrumb-item">Kebijakan Keuntungan</div> <div class="breadcrumb-item">Kebijakan Keuntungan</div>
</div> </div>
</div> </div>
<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>
</div>
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -220,6 +229,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</section> </section>
</div> </div>
@include('admin.setting.modal-add-setting') @include('admin.setting.modal-add-setting')

58
resources/views/Admin/transaction/detail-transaction.blade.php
View File

@ -85,6 +85,11 @@
{{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}<br> {{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}<br> {{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getCityName() . ', ' . $transaction->data_pembeli->getProvinceName())) }} {{ 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> </address>
</div> </div>
<div class="col-md-6 text-md-right"> <div class="col-md-6 text-md-right">
@ -94,6 +99,11 @@
{{ ucwords(strtolower($transaction->data_penjual->alamat)) }}<br> {{ ucwords(strtolower($transaction->data_penjual->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}<br> {{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getCityName() . ', ' . $transaction->data_penjual->getProvinceName())) }} {{ 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> </address>
</div> </div>
</div> </div>
@ -106,21 +116,6 @@
</div> </div>
</div> </div>
{{-- batas pembayaran dan pengiriman --}} {{-- 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="row">
<div class="col-md-6"> <div class="col-md-6">
<address> <address>
@ -128,12 +123,32 @@
{{ ucwords($transaction->status_transaksi) }} {{ ucwords($transaction->status_transaksi) }}
</address> </address>
</div> </div>
@if ($transaction->tanggal_pembayaran != null)
<div class="col-md-6 text-md-right"> <div class="col-md-6 text-md-right">
<address> <address>
<strong>Status Pembayaran:</strong><br> <strong>Status Pembayaran:</strong><br>
{{ ucwords($transaction->status_pembayaran) }} {{ ucwords($transaction->status_pembayaran) }}
</address> </address>
</div> </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> </div>
{{-- Keterangan --}} {{-- Keterangan --}}
<div class="row"> <div class="row">
@ -169,26 +184,29 @@
<tr> <tr>
<td>1</td> <td>1</td>
<td>{{ $transaction->nama_barang }}</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-center">{{ $transaction->jumlah_barang }}</td>
<td class="text-right"> <td class="text-right">
{{ $transaction->harga_barang * $transaction->jumlah_barang }} Rp
{{ number_format($transaction->harga_barang * $transaction->jumlah_barang, 2, ',', '.') }}
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="row mt-4"> <div class="row mt-4">
<div class="col-lg-8"> <div class="col-lg-6">
<div class="section-title">Metode Pembayaran</div> <div class="section-title">Metode Pembayaran</div>
<div class="images"> <div class="images">
@if ($transaction->metode_pembayaran != null) @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') }}" src="{{ asset('assets/img/metode_pembayaran/' . $transaction->metode_pembayaran . '.png') }}"
alt="{{ $transaction->metode_pembayaran }}"> alt="{{ $transaction->metode_pembayaran }}">
@endif @endif
</div> </div>
</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-item">
<div class="invoice-detail-name">Subtotal</div> <div class="invoice-detail-name">Subtotal</div>
<div class="invoice-detail-value">Rp <div class="invoice-detail-value">Rp

10
resources/views/Admin/transaction/index.blade.php
View File

@ -9,6 +9,15 @@
<div class="breadcrumb-item">Transaksi</div> <div class="breadcrumb-item">Transaksi</div>
</div> </div>
</div> </div>
<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="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -36,6 +45,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</section> </section>
</div> </div>
@include('admin.transaction.modal-tracking') @include('admin.transaction.modal-tracking')

10
resources/views/Admin/users/index.blade.php
View File

@ -9,6 +9,15 @@
<div class="breadcrumb-item">User</div> <div class="breadcrumb-item">User</div>
</div> </div>
</div> </div>
<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="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -33,6 +42,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</section> </section>
</div> </div>
@endsection @endsection

8
resources/views/User/contact/index.blade.php
View File

@ -13,6 +13,14 @@
{{-- tabel list kontak --}} {{-- tabel list kontak --}}
<div class="row"> <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="col-md-12">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">

25
resources/views/User/index.blade.php
View File

@ -53,7 +53,7 @@
<div class="card-stats"> <div class="card-stats">
<div class="card-stats-title"> <div class="card-stats-title">
<h4> <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="1" selected>Semua</option>
<option value="2">Pembeli</option> <option value="2">Pembeli</option>
<option value="3">Penjual</option> <option value="3">Penjual</option>
@ -95,7 +95,7 @@
</div> </div>
</div> </div>
<div id="pembeli" hidden> <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">
<div class="card-stats-item-count" id="countBuyerFinished">{{ $countBuyerFinished }} <div class="card-stats-item-count" id="countBuyerFinished">{{ $countBuyerFinished }}
</div> </div>
@ -112,13 +112,13 @@
</div> </div>
<div class="card-stats-item-label">Diproses</div> <div class="card-stats-item-label">Diproses</div>
</div> </div>
</div>
<div class="card-stats-items">
<div class="card-stats-item"> <div class="card-stats-item">
<div class="card-stats-item-count" id="countBuyerPending">{{ $countBuyerPending }} <div class="card-stats-item-count" id="countBuyerPending">{{ $countBuyerPending }}
</div> </div>
<div class="card-stats-item-label">Menunggu</div> <div class="card-stats-item-label">Menunggu</div>
</div> </div>
</div>
<div class="card-stats-items">
<div class="card-stats-item"> <div class="card-stats-item">
<div class="card-stats-item-count" id="countBuyerCancelled"> <div class="card-stats-item-count" id="countBuyerCancelled">
{{ $countBuyerCancelled }}</div> {{ $countBuyerCancelled }}</div>
@ -130,6 +130,8 @@
</div> </div>
<div class="card-stats-item-label">Tertunda</div> <div class="card-stats-item-label">Tertunda</div>
</div> </div>
</div>
<div class="card-stats-items">
<div class="card-stats-item"> <div class="card-stats-item">
<div class="card-stats-item-count" id="countBuyerRefundPending"> <div class="card-stats-item-count" id="countBuyerRefundPending">
{{ $countBuyerRefundPending }}</div> {{ $countBuyerRefundPending }}</div>
@ -148,7 +150,7 @@
</div> </div>
</div> </div>
<div id="penjual" hidden> <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">
<div class="card-stats-item-count" id="countSellerFinished"> <div class="card-stats-item-count" id="countSellerFinished">
{{ $countSellerFinished }}</div> {{ $countSellerFinished }}</div>
@ -200,7 +202,7 @@
</div> </div>
<div class="card-wrap"> <div class="card-wrap">
<div class="card-header"> <div class="card-header">
<h4>Jumlah Transaction</h4> <h4>Jumlah Transaksi</h4>
</div> </div>
<div class="card-body" id="totalTransaction"> <div class="card-body" id="totalTransaction">
{{ $totalTransaction }} Transaksi {{ $totalTransaction }} Transaksi
@ -218,7 +220,7 @@
<div class="col-lg-4 col-md-12 col-sm-12"> <div class="col-lg-4 col-md-12 col-sm-12">
<div class="card card-statistic-2"> <div class="card card-statistic-2">
<div class="card-chart"> <div class="card-chart">
<canvas id="pemasukan-chart" height="100"></canvas> <canvas id="pemasukan-chart" height="130"></canvas>
</div> </div>
<div class="card-icon shadow-primary bg-primary"> <div class="card-icon shadow-primary bg-primary">
<i class="fas fa-dollar-sign"></i> <i class="fas fa-dollar-sign"></i>
@ -243,7 +245,7 @@
<div class="col-lg-4 col-md-12 col-sm-12"> <div class="col-lg-4 col-md-12 col-sm-12">
<div class="card card-statistic-2"> <div class="card card-statistic-2">
<div class="card-chart"> <div class="card-chart">
<canvas id="pengeluaran-chart" height="100"></canvas> <canvas id="pengeluaran-chart" height="130"></canvas>
</div> </div>
<div class="card-icon shadow-primary bg-primary"> <div class="card-icon shadow-primary bg-primary">
<i class="fas fa-shopping-bag"></i> <i class="fas fa-shopping-bag"></i>
@ -292,7 +294,7 @@
<h4>Transaksi</h4> <h4>Transaksi</h4>
</div> </div>
<div class="card-body"> <div class="card-body">
<canvas id="myChart" height="120"></canvas> <canvas id="myChart" height="100"></canvas>
</div> </div>
</div> </div>
</div> </div>
@ -602,11 +604,12 @@
myChartTransaksi.data.labels = response.dataLabel; myChartTransaksi.data.labels = response.dataLabel;
myChartTransaksi.update(); myChartTransaksi.update();
myChartPemasukan.data.datasets[0].data = response.dataChartUser; myChartPemasukan.data.datasets[0].data = response.dataChartPemasukan;
myChartPemasukan.data.labels = response.dataLabel; myChartPemasukan.data.labels = response.dataLabel;
myChartPemasukan.update(); myChartPemasukan.update();
myChartPengeluaran.data.datasets[0].data = response.dataChartUser; myChartPengeluaran.data.datasets[0].data = response
.dataChartPengeluaran;
myChartPengeluaran.data.labels = response.dataLabel; myChartPengeluaran.data.labels = response.dataLabel;
myChartPengeluaran.update(); myChartPengeluaran.update();

9
resources/views/User/notification/index.blade.php
View File

@ -72,6 +72,14 @@
<div class="breadcrumb-item">Notifikasi</div> <div class="breadcrumb-item">Notifikasi</div>
</div> </div>
</div> </div>
<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="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -104,6 +112,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</section> </section>
</div> </div>
@endsection @endsection

7
resources/views/User/refund/index.blade.php
View File

@ -11,6 +11,13 @@
</div> </div>
<div class="row"> <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="col-md-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">

46
resources/views/User/transaction/Pembeli/detail-transaction.blade.php
View File

@ -89,6 +89,11 @@
{{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}<br> {{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}<br> {{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getCityName() . ', ' . $transaction->data_pembeli->getProvinceName())) }} {{ 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> </address>
</div> </div>
<div class="col-md-6 text-md-right"> <div class="col-md-6 text-md-right">
@ -98,6 +103,11 @@
{{ ucwords(strtolower($transaction->data_penjual->alamat)) }}<br> {{ ucwords(strtolower($transaction->data_penjual->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}<br> {{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getCityName() . ', ' . $transaction->data_penjual->getProvinceName())) }} {{ 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> </address>
</div> </div>
</div> </div>
@ -109,20 +119,6 @@
</address> </address>
</div> </div>
</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="row">
<div class="col-md-6"> <div class="col-md-6">
<address> <address>
@ -130,12 +126,32 @@
{{ ucwords($transaction->status_transaksi) }} {{ ucwords($transaction->status_transaksi) }}
</address> </address>
</div> </div>
@if ($transaction->tanggal_pembayaran != null)
<div class="col-md-6 text-md-right"> <div class="col-md-6 text-md-right">
<address> <address>
<strong>Status Pembayaran:</strong><br> <strong>Status Pembayaran:</strong><br>
{{ ucwords($transaction->status_pembayaran) }} {{ ucwords($transaction->status_pembayaran) }}
</address> </address>
</div> </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> </div>
@if ($transaction->fraud_status != null) @if ($transaction->fraud_status != null)
<div class="row"> <div class="row">
@ -156,7 +172,7 @@
</div> </div>
</div> </div>
<div class="row mt-4"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="section-title">Rangkuman Transaksi</div> <div class="section-title">Rangkuman Transaksi</div>
<p class="section-lead">Semua barang yang didaftarkan dalam transaksi.</p> <p class="section-lead">Semua barang yang didaftarkan dalam transaksi.</p>

4
resources/views/User/transaction/Pembeli/index.blade.php
View File

@ -15,8 +15,8 @@
<div class="col-12 mb-4"> <div class="col-12 mb-4">
<div class="hero bg-primary text-white"> <div class="hero bg-primary text-white">
<div class="hero-inner"> <div class="hero-inner">
<h1>Halo!!!</h1> <p class="lead">Selamat Datang {{ Auth::user()->nama_depan }}! Kamu bisa memulai transaksi mu
<p class="lead">Selamat Datang {{ Auth::user()->nama_depan }}!</p> disini.</p>
</div> </div>
</div> </div>
</div> </div>

3
resources/views/User/transaction/penjual/index.blade.php
View File

@ -16,7 +16,8 @@
<div class="hero bg-primary text-white"> <div class="hero bg-primary text-white">
<div class="hero-inner"> <div class="hero-inner">
<h1>Halo!!!</h1> <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> </div>
</div> </div>

113
resources/views/invoice/export-invoice.blade.php
View File

@ -25,6 +25,7 @@
width: 100%; width: 100%;
height: auto; height: auto;
border-radius: 0.5rem; border-radius: 0.5rem;
margin-top: 20px;
} }
.info-user, .info-user,
@ -89,8 +90,13 @@
width: 50%; width: 50%;
} }
.info-user td:nth-child(2) {
text-align: right;
}
.info-pembayaran { .info-pembayaran {
margin-top: 25px; margin-top: 25px;
margin-bottom: 25px;
} }
.info-pembayaran label { .info-pembayaran label {
@ -114,19 +120,19 @@
.data-pesanan { .data-pesanan {
background: whitesmoke; background: whitesmoke;
margin: 15px 0; /* margin: 15px 0; */
} }
.data-pesanan th { .data-pesanan th {
text-transform: capitalize; text-transform: capitalize;
font-size: 0.85rem; font-size: 0.85rem;
padding: 15px 30px 5px 30px; /* padding: 15px 30px 5px 30px; */
} }
.data-pesanan td { .data-pesanan td {
text-align: center; text-align: center;
font-size: 0.8rem; font-size: 0.8rem;
padding: 20px 25px; /* padding: 20px 25px; */
} }
.rincian-pesanan thead { .rincian-pesanan thead {
@ -175,57 +181,111 @@
<body> <body>
<div class="card"> <div class="card">
<h3>Nota Pesanan</h3> <h3>Invoice</h3>
<table class="info-user"> <table class="info-user">
<tr> <tr>
<td class="pt-0"> <td class="pt-0" colspan="2">
<p>Pembeli :</p> <p>Pembeli :</p>
</td> </td>
<td class="pt-0"> <td class="pt-0" colspan="2">
<p>Penjual :</p> <p>Penjual :</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><span>Septea</span></td> <td colspan="2">
<td><span>Takapedia Top Up</span></td> <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>
<tr> <tr>
<td> <td colspan="2">
<p>Email :</p>
</td>
<td colspan="2">
<p>Email : </p> <p>Email : </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><span>darwin@gmail.com</span></td> <td colspan="2"><span>{{ $transaction->pembeli }}</span></td>
<td colspan="2">
<span>{{ $transaction->penjual }}</span>
</td>
</tr> </tr>
<tr> <tr>
<td> <td colspan="2">
<p>Alamat :</p>
</td>
<td colspan="2">
<p>Alamat :</p> <p>Alamat :</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pr-1"><span>Pondok ponogoro jl.raya bogor no.26 rt 2/2Pondok ponogoro jl.raya bogor no.26 rt <td colspan="2" class="pr-1">
2/2</span></td> <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>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<p>no. HP :</p> <p>no. HP :</p>
</td> </td>
<td colspan="2">
<p>no. HP :</p>
</td>
</tr> </tr>
<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> </tr>
</table> </table>
<table class="data-pesanan"> <table class="data-pesanan" style="margin-top: 10px;">
<thead> <thead>
<th>No. Pesanan</th> <th>No. Pesanan</th>
<th>Tgl Pesanan</th> <th>Tanggal Pembayaran</th>
<th>Metode Pembayaran</th> <th>Metode Pembayaran</th>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td><span>#8shd87ugd-18bg-273v</span></td> <td><span>#{{ $transaction->id }}</span></td>
<td><span>18/02/2024</span></td> <td><span>{{ $transaction->tanggal_pembayaran == null ? '---' : date('d F Y', strtotime($transaction->tanggal_pembayaran)) }}</span>
<td><span>Visa ending ***</span></td> </td>
<td>
<span>{{ $transaction->metode_pembayaran == null ? '---' : $transaction->metode_pembayaran }}</span>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -251,22 +311,23 @@
<tbody> <tbody>
<tr> <tr>
<td>1</td> <td>1</td>
<td>Iphone 17 Pro Max</td> <td>{{ $transaction->nama_barang }}</td>
<td>Rp.17.994.592,00</td> <td>Rp {{ number_format($transaction->harga_barang, 2, ',', '.') }}</td>
<td>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> </tr>
</tbody> </tbody>
</table> </table>
<table class="info-pembayaran"> <table class="info-pembayaran">
<tr> <tr>
<td>[ini kosong]</td> <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>
<tr> <tr>
<td>[kosong]</td> <td>[kosong]</td>
<td style="width: 45%;" colspan="2"> <td style="width: 45%;" colspan="2">
<p>Rp.35.989.184,00</p> <p>Rp {{ number_format($transaction->total_harga, 2, ',', '.') }}</p>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -276,7 +337,7 @@
<tr> <tr>
<td>[kosong]</td> <td>[kosong]</td>
<td style="width: 45%;" colspan="2"> <td style="width: 45%;" colspan="2">
<p>Rp.30.000,00</p> <p>Rp {{ number_format($transaction->total_keuntungan, 2, ',', '.') }}</p>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -292,7 +353,7 @@
<tr> <tr>
<td>[kosong]</td> <td>[kosong]</td>
<td style="width: 45%;" class="pb-2" colspan="2"> <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> </td>
</tr> </tr>
</table> </table>

16
resources/views/invoice/invoice-transaction.blade.php
View File

@ -20,6 +20,11 @@
{{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}<br> {{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}<br> {{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_pembeli->getCityName() . ', ' . $transaction->data_pembeli->getProvinceName())) }} {{ 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> </address>
</div> </div>
<div class="col-md-6 text-md-right"> <div class="col-md-6 text-md-right">
@ -29,6 +34,11 @@
{{ ucwords(strtolower($transaction->data_penjual->alamat)) }}<br> {{ ucwords(strtolower($transaction->data_penjual->alamat)) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}<br> {{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}<br>
{{ ucwords(strtolower($transaction->data_penjual->getCityName() . ', ' . $transaction->data_penjual->getProvinceName())) }} {{ 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> </address>
</div> </div>
</div> </div>
@ -59,7 +69,7 @@
</div> </div>
</div> </div>
<div class="row mt-4"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="section-title">Rangkuman Transaksi</div> <div class="section-title">Rangkuman Transaksi</div>
<p class="section-lead">Semua barang yang didaftarkan dalam transaksi.</p> <p class="section-lead">Semua barang yang didaftarkan dalam transaksi.</p>
@ -85,7 +95,7 @@
</table> </table>
</div> </div>
<div class="row mt-4"> <div class="row mt-4">
<div class="col-lg-8"> <div class="col-lg-6">
<div class="section-title">Metode Pembayaran</div> <div class="section-title">Metode Pembayaran</div>
<div class="images"> <div class="images">
@if ($transaction->metode_pembayaran != null) @if ($transaction->metode_pembayaran != null)
@ -95,7 +105,7 @@
@endif @endif
</div> </div>
</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-item">
<div class="invoice-detail-name">Subtotal</div> <div class="invoice-detail-name">Subtotal</div>
<div class="invoice-detail-value"> <div class="invoice-detail-value">

2
resources/views/layouts/sidebar.blade.php
View File

@ -28,7 +28,7 @@
</li> </li>
<li><a class="nav-link {{ request()->routeIs('admin-setting.index') ? 'active' : '' }}" <li><a class="nav-link {{ request()->routeIs('admin-setting.index') ? 'active' : '' }}"
href="{{ route('admin-setting.index') }}"><i class="fas fa-cog"></i> 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' : '' }}" <li><a class="nav-link {{ request()->routeIs('admin-notification.index') ? 'active' : '' }}"
href="{{ route('admin-notification.index') }}"><i class="fas fa-bell"></i> href="{{ route('admin-notification.index') }}"><i class="fas fa-bell"></i>
<span>Notifikasi</span></a></li> <span>Notifikasi</span></a></li>