diff --git a/app/Http/Controllers/CheckoutController.php b/app/Http/Controllers/CheckoutController.php index bb955f9..c7fbdc4 100644 --- a/app/Http/Controllers/CheckoutController.php +++ b/app/Http/Controllers/CheckoutController.php @@ -190,7 +190,11 @@ class CheckoutController extends Controller ->first(); $invoice_url = $payment ? @$payment->method->invoice_url: ""; - return redirect()->to($invoice_url); + return redirect()->to($invoice_url)->withHeaders([ + 'Cache-Control' => 'no-cache, no-store, must-revalidate', + 'Pragma' => 'no-cache', + 'Expires' => '0' + ]); diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php new file mode 100644 index 0000000..724ed12 --- /dev/null +++ b/app/Http/Controllers/OrderController.php @@ -0,0 +1,19 @@ +user()->id) + ->orderBy('id','desc') + ->paginate(); + + return view('account.orders', compact('orders')); + } +} diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 2563e98..db55da9 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -98,4 +98,10 @@ class Transaction extends Model return $this->belongsTo(PosInvoice::class, 'invoice_id', 'id'); } + + public function getStatusTitleAttribute() + { + return __('order.status.'.strtolower($this->attributes['status'])); + } + } diff --git a/lang/en/order.php b/lang/en/order.php new file mode 100644 index 0000000..9297d87 --- /dev/null +++ b/lang/en/order.php @@ -0,0 +1,9 @@ + [ + 'status' => [ + 'wait_payment' => 'Wait Payment', + ], + ], +]; \ No newline at end of file diff --git a/lang/id/order.php b/lang/id/order.php new file mode 100644 index 0000000..8a3670d --- /dev/null +++ b/lang/id/order.php @@ -0,0 +1,9 @@ + [ + 'status' => [ + 'wait_payment' => 'Menunggu Pembayaran', + ], + ], +]; \ No newline at end of file diff --git a/resources/views/account/orders.blade.php b/resources/views/account/orders.blade.php index 4eee6f3..8604fdf 100644 --- a/resources/views/account/orders.blade.php +++ b/resources/views/account/orders.blade.php @@ -78,283 +78,60 @@ - - - - - 78A6431D409 - - - - - Feb 6, 2025 - 25-02-06 - - - - - In progress - - - - $2,105.90 - 210590 - - - - Thumbnail - Thumbnail - Thumbnail - - - - - - - - - - - 47H76G09F33 - - - - - Dec 12, 2024 - 24-12-12 - - - - - Delivered - - - - $360.75 - 36075 - - - - Thumbnail - - - - - - - - - - - 502TR872W2 - - - - - Nov 7, 2024 - 24-11-07 - - - - - Delivered - - - - $4,268.00 - 426800 - - - - Thumbnail - Thumbnail - Thumbnail - +3 - - - - - - - - - - - 34VB5540K83 - - - - - Sep 15, 2024 - 24-09-15 - - - - - Canceled - - - - $987.50 - 98750 - - - - Thumbnail - Thumbnail - - - - - - - - - - - 112P45A90V2 - - - - - May 12, 2024 - 24-05-12 - - - - - Delivered - - - - $53.00 - 5300 - - - - Thumbnail - - - - - - - - - - - 28BA67U0981 - - - - - Apr 20, 2024 - 24-04-20 - - - - - Canceled - - - - $1,029.50 - 102950 - - - - Thumbnail - Thumbnail - - - - - - + {{ $order->status_title }} + + + + Rp {{ number_format($order->subtotal, 0, ',', '.') }} + + + + + + @foreach ($order->details->take(3) as $detail) + Thumbnail + @endforeach + @if ($order->details->count() > 3) + +{{ $order->details->count() - 3 }} + @endif + + + + + + + + + @endforeach + @@ -382,5 +159,5 @@ @endsection -@section('scripts') +@section('scripts') @endsection diff --git a/resources/views/components/order/details.blade.php b/resources/views/components/order/details.blade.php new file mode 100644 index 0000000..c6fbb44 --- /dev/null +++ b/resources/views/components/order/details.blade.php @@ -0,0 +1,149 @@ +@props(['order' => null]) + + diff --git a/resources/views/layouts/partials/account-sidebar.blade.php b/resources/views/layouts/partials/account-sidebar.blade.php index 1a42a2d..6934ae3 100644 --- a/resources/views/layouts/partials/account-sidebar.blade.php +++ b/resources/views/layouts/partials/account-sidebar.blade.php @@ -44,7 +44,7 @@