!118 order detail for guest
* order ui * fixed guest order * add number filter * Add order detail for guest
This commit is contained in:
pushuo
Edward Yang
parent
8d165eadf8
commit
fb1c2e4c1c
|
|
@ -0,0 +1,31 @@
|
|||
<?php
|
||||
/**
|
||||
* OrderController.php
|
||||
*
|
||||
* @copyright 2023 beikeshop.com - All Rights Reserved
|
||||
* @link https://beikeshop.com
|
||||
* @author Edward Yang <yangjin@guangda.work>
|
||||
* @created 2023-06-06 10:47:27
|
||||
* @modified 2023-06-06 10:47:27
|
||||
*/
|
||||
|
||||
namespace Beike\Shop\Http\Controllers;
|
||||
|
||||
use Beike\Models\Order;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class OrderController extends Controller
|
||||
{
|
||||
public function show(Request $request, int $number)
|
||||
{
|
||||
$email = trim($request->get('email'));
|
||||
if (empty($email)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$order = Order::query()->where('number', $number)->where('email', $email)->firstOrFail();
|
||||
$data = hook_filter('order.show.data', ['order' => $order, 'html_items' => []]);
|
||||
|
||||
return view('order_info', $data);
|
||||
}
|
||||
}
|
||||
|
|
@ -56,6 +56,8 @@ Route::prefix('/')
|
|||
Route::post('login', [LoginController::class, 'store'])->name('login.store');
|
||||
Route::get('logout', [LogoutController::class, 'index'])->name('logout');
|
||||
|
||||
Route::get('orders/{number}', [\Beike\Shop\Http\Controllers\OrderController::class, 'show'])->name('orders.show');
|
||||
|
||||
Route::get('page_categories', [PageCategoryController::class, 'home'])->name('page_categories.home');
|
||||
Route::get('page_categories/{page_category}', [PageCategoryController::class, 'show'])->name('page_categories.show');
|
||||
Route::get('pages/{page}', [PageController::class, 'show'])->name('pages.show');
|
||||
|
|
|
|||
|
|
@ -10,235 +10,8 @@
|
|||
<x-shop-sidebar />
|
||||
|
||||
<div class="col-12 col-md-9">
|
||||
|
||||
@if ($errors->any())
|
||||
@foreach ($errors->all() as $error)
|
||||
<x-shop-alert type="danger" msg="{{ $error }}" class="mt-4" />
|
||||
@endforeach
|
||||
@endif
|
||||
|
||||
<div class="card mb-4 order-head">
|
||||
<div class="card-header d-flex align-items-center justify-content-between">
|
||||
<h6 class="card-title">{{ __('shop/account.order.order_info.order_details') }}</h6>
|
||||
<div>
|
||||
@if ($order->status == 'unpaid')
|
||||
<a href="{{ shop_route('orders.pay', $order->number) }}" class="btn btn-primary btn-sm nowrap">{{ __('shop/account.order.order_info.to_pay') }}</a>
|
||||
<button class="btn btn-outline-secondary btn-sm cancel-order" type="button">{{ __('shop/account.order.order_info.cancel') }}</button>
|
||||
@endif
|
||||
@if ($order->status == 'shipped')
|
||||
<button class="btn btn-primary btn-sm shipped-ed" type="button">{{ __('shop/account.order.order_info.confirm_receipt') }}</button>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="bg-light p-2 table-responsive">
|
||||
<table class="table table-borderless mb-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ __('shop/account.order.order_info.order_number') }}</th>
|
||||
<th class="nowrap">{{ __('shop/account.order.order_info.order_date') }}</th>
|
||||
<th>{{ __('shop/account.order.order_info.state') }}</th>
|
||||
<th>{{ __('shop/account.order.order_info.order_amount') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>{{ $order->number }}</td>
|
||||
<td>{{ $order->created_at }}</td>
|
||||
<td>
|
||||
{{$order->status_format}}
|
||||
</td>
|
||||
<td>{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card mb-4">
|
||||
<div class="card-header"><h6 class="card-title">{{ __('order.address_info') }}</h6></div>
|
||||
<div class="card-body">
|
||||
<table class="table ">
|
||||
<thead class="">
|
||||
<tr>
|
||||
<th>{{ __('order.shipping_address') }}</th>
|
||||
<th>{{ __('order.payment_address') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<div>{{ __('address.name') }}：{{ $order->shipping_customer_name }} ({{ $order->shipping_telephone }})</div>
|
||||
<div>
|
||||
{{ __('address.address') }}：
|
||||
{{ $order->shipping_address_1 }}
|
||||
{{ $order->shipping_address_2 }}
|
||||
{{ $order->shipping_city }}
|
||||
{{ $order->shipping_zone }}
|
||||
{{ $order->shipping_country }}
|
||||
</div>
|
||||
<div>{{ __('address.post_code') }}：{{ $order->shipping_zipcode }}</div>
|
||||
</td>
|
||||
<td>
|
||||
<div>{{ __('address.name') }}：{{ $order->payment_customer_name }} ({{ $order->payment_telephone }})</div>
|
||||
<div>
|
||||
{{ __('address.address') }}：
|
||||
{{ $order->payment_address_1 }}
|
||||
{{ $order->payment_address_2 }}
|
||||
{{ $order->payment_city }}
|
||||
{{ $order->payment_zone }}
|
||||
{{ $order->payment_country }}
|
||||
</div>
|
||||
<div>{{ __('address.post_code') }}：{{ $order->payment_zipcode }}</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<h6 class="card-title">{{ __('shop/account.order.order_info.order_items') }}</h6>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
@foreach ($order->orderProducts as $product)
|
||||
<div class="product-list">
|
||||
<div class="d-flex">
|
||||
<div class="left border d-flex justify-content-center align-items-center wh-80"><img src="{{ $product->image }}" class="img-fluid"></div>
|
||||
<div class="right">
|
||||
<div class="name">
|
||||
<a class="text-dark" href="{{ shop_route('products.show', ['product' => $product->product_id]) }}">{{ $product->name }}</a>
|
||||
</div>
|
||||
<div class="price">
|
||||
{{ currency_format($product->price, $order->currency_code, $order->currency_value) }}
|
||||
x {{ $product->quantity }}
|
||||
= {{ currency_format($product->price * $product->quantity, $order->currency_code, $order->currency_value) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if ($order->status == 'completed')
|
||||
<a href="{{ shop_route('account.rma.create', [$product->id]) }}" style="white-space: nowrap;"
|
||||
class="btn btn-outline-primary btn-sm">{{ __('shop/account.order.order_info.apply_after_sales') }}</a>
|
||||
@endif
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<h6 class="card-title">{{ __('shop/account.order.order_info.order_total') }}</h6>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<table class="table table-bordered border">
|
||||
<tbody>
|
||||
@foreach (array_chunk($order->orderTotals->all(), 2) as $totals)
|
||||
<tr>
|
||||
@foreach ($totals as $total)
|
||||
<td class="bg-light wp-200">{{ $total->title }}</td>
|
||||
<td><strong>{{ currency_format($total->value, $order->currency_code, $order->currency_value) }}</strong></td>
|
||||
@endforeach
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@foreach ($html_items as $item)
|
||||
{!! $item !!}
|
||||
@endforeach
|
||||
|
||||
@hook('account.order_info.after')
|
||||
|
||||
@if (0)
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<h6 class="card-title">{{ __('shop/account.order.order_info.logistics_status') }}</h6>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($order->orderShipments->count())
|
||||
@hookwrapper('account.order_info.shipments')
|
||||
<div class="card mb-4">
|
||||
<div class="card-header"><h6 class="card-title">{{ __('order.order_shipments') }}</h6></div>
|
||||
<div class="card-body">
|
||||
<div class="table-push">
|
||||
<table class="table ">
|
||||
<thead class="">
|
||||
<tr>
|
||||
<th>{{ __('order.express_company') }}</th>
|
||||
<th>{{ __('order.express_number') }}</th>
|
||||
<th>{{ __('order.history_created_at') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($order->orderShipments as $ship)
|
||||
<tr>
|
||||
<td>{{ $ship->express_company }}</td>
|
||||
<td>{{ $ship->express_number }}</td>
|
||||
<td>{{ $ship->created_at }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endhookwrapper
|
||||
@endif
|
||||
|
||||
@if ($order->orderHistories->count())
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<h6 class="card-title">{{ __('shop/account.order.order_info.order_status') }}</h6>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<table class="table ">
|
||||
<thead class="">
|
||||
<tr>
|
||||
<th>{{ __('shop/account.order.order_info.state') }}</th>
|
||||
<th>{{ __('shop/account.order.order_info.remark') }}</th>
|
||||
<th>{{ __('shop/account.order.order_info.update_time') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($order->orderHistories as $orderHistory)
|
||||
<tr>
|
||||
<td>{{ $orderHistory->status_format }}</td>
|
||||
<td><span class="fw-bold">{{ $orderHistory->comment }}</span></td>
|
||||
<td><span class="fw-bold">{{ $orderHistory->created_at }}</span></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@include('shared.order_info')
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
|
||||
@push('add-scripts')
|
||||
<script>
|
||||
$('.shipped-ed').click(function(event) {
|
||||
$http.post('orders/{{ $order->number }}/complete').then((res) => {
|
||||
layer.msg(res.message)
|
||||
window.location.reload()
|
||||
})
|
||||
});
|
||||
|
||||
$('.cancel-order').click(function(event) {
|
||||
$http.post('orders/{{ $order->number }}/cancel').then((res) => {
|
||||
layer.msg(res.message)
|
||||
window.location.reload()
|
||||
})
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
@extends('layout.master')
|
||||
@section('body-class', 'page-checkout-success')
|
||||
@section('body-class', 'page-account-order-info')
|
||||
@section('title', __('shop/checkout.checkout_success_title'))
|
||||
|
||||
@section('content')
|
||||
|
|
@ -22,6 +22,8 @@
|
|||
<h5 class="card-title">{{ __('shop/account.order.order_info.order_details') }}</h5>
|
||||
@if (current_customer())
|
||||
<a class="btn btn-sm btn-primary" href="{{ shop_route('account.order.show', $order->number) }}">{{ __('common.view_more') }}</a>
|
||||
@else
|
||||
<a class="btn btn-sm btn-primary" href="{{ shop_route('orders.show', ['number' => $order->number, 'email' => $order->email]) }}">{{ __('common.view_more') }}</a>
|
||||
@endif
|
||||
</div>
|
||||
<div class="card-body">
|
||||
|
|
@ -98,10 +100,4 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
body {
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
</style>
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
@extends('layout.master')
|
||||
|
||||
@section('body-class', 'page-account-order-info')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="card mt-5 w-max-1000 mx-auto">
|
||||
@include('shared.order_info')
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -0,0 +1,215 @@
|
|||
@if ($errors->any())
|
||||
@foreach ($errors->all() as $error)
|
||||
<x-shop-alert type="danger" msg="{{ $error }}" class="mt-4" />
|
||||
@endforeach
|
||||
@endif
|
||||
|
||||
<div class="card mb-4 order-head">
|
||||
<div class="card-header d-flex align-items-center justify-content-between">
|
||||
<h6 class="card-title">{{ __('shop/account.order.order_info.order_details') }}</h6>
|
||||
<div>
|
||||
@if ($order->status == 'unpaid')
|
||||
<a href="{{ shop_route('orders.pay', $order->number) }}" class="btn btn-primary btn-sm nowrap">{{ __('shop/account.order.order_info.to_pay') }}</a>
|
||||
<button class="btn btn-outline-secondary btn-sm cancel-order" type="button">{{ __('shop/account.order.order_info.cancel') }}</button>
|
||||
@endif
|
||||
@if ($order->status == 'shipped')
|
||||
<button class="btn btn-primary btn-sm shipped-ed" type="button">{{ __('shop/account.order.order_info.confirm_receipt') }}</button>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="bg-light p-2 table-responsive">
|
||||
<table class="table table-borderless mb-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ __('shop/account.order.order_info.order_number') }}</th>
|
||||
<th class="nowrap">{{ __('shop/account.order.order_info.order_date') }}</th>
|
||||
<th>{{ __('shop/account.order.order_info.state') }}</th>
|
||||
<th>{{ __('shop/account.order.order_info.order_amount') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>{{ $order->number }}</td>
|
||||
<td>{{ $order->created_at }}</td>
|
||||
<td>
|
||||
{{$order->status_format}}
|
||||
</td>
|
||||
<td>{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card mb-4">
|
||||
<div class="card-header"><h6 class="card-title">{{ __('order.address_info') }}</h6></div>
|
||||
<div class="card-body">
|
||||
<table class="table ">
|
||||
<thead class="">
|
||||
<tr>
|
||||
<th>{{ __('order.shipping_address') }}</th>
|
||||
<th>{{ __('order.payment_address') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<div>{{ __('address.name') }}：{{ $order->shipping_customer_name }} ({{ $order->shipping_telephone }})</div>
|
||||
<div>
|
||||
{{ __('address.address') }}：
|
||||
{{ $order->shipping_address_1 }}
|
||||
{{ $order->shipping_address_2 }}
|
||||
{{ $order->shipping_city }}
|
||||
{{ $order->shipping_zone }}
|
||||
{{ $order->shipping_country }}
|
||||
</div>
|
||||
<div>{{ __('address.post_code') }}：{{ $order->shipping_zipcode }}</div>
|
||||
</td>
|
||||
<td>
|
||||
<div>{{ __('address.name') }}：{{ $order->payment_customer_name }} ({{ $order->payment_telephone }})</div>
|
||||
<div>
|
||||
{{ __('address.address') }}：
|
||||
{{ $order->payment_address_1 }}
|
||||
{{ $order->payment_address_2 }}
|
||||
{{ $order->payment_city }}
|
||||
{{ $order->payment_zone }}
|
||||
{{ $order->payment_country }}
|
||||
</div>
|
||||
<div>{{ __('address.post_code') }}：{{ $order->payment_zipcode }}</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<h6 class="card-title">{{ __('shop/account.order.order_info.order_items') }}</h6>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
@foreach ($order->orderProducts as $product)
|
||||
<div class="product-list">
|
||||
<div class="d-flex">
|
||||
<div class="left border d-flex justify-content-center align-items-center wh-80"><img src="{{ $product->image }}" class="img-fluid"></div>
|
||||
<div class="right">
|
||||
<div class="name">
|
||||
<a class="text-dark" href="{{ shop_route('products.show', ['product' => $product->product_id]) }}">{{ $product->name }}</a>
|
||||
</div>
|
||||
<div class="price">
|
||||
{{ currency_format($product->price, $order->currency_code, $order->currency_value) }}
|
||||
x {{ $product->quantity }}
|
||||
= {{ currency_format($product->price * $product->quantity, $order->currency_code, $order->currency_value) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if ($order->status == 'completed')
|
||||
<a href="{{ shop_route('account.rma.create', [$product->id]) }}" style="white-space: nowrap;"
|
||||
class="btn btn-outline-primary btn-sm">{{ __('shop/account.order.order_info.apply_after_sales') }}</a>
|
||||
@endif
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<h6 class="card-title">{{ __('shop/account.order.order_info.order_total') }}</h6>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<table class="table table-bordered border">
|
||||
<tbody>
|
||||
@foreach (array_chunk($order->orderTotals->all(), 2) as $totals)
|
||||
<tr>
|
||||
@foreach ($totals as $total)
|
||||
<td class="bg-light wp-200">{{ $total->title }}</td>
|
||||
<td><strong>{{ currency_format($total->value, $order->currency_code, $order->currency_value) }}</strong></td>
|
||||
@endforeach
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@foreach ($html_items as $item)
|
||||
{!! $item !!}
|
||||
@endforeach
|
||||
|
||||
@hook('account.order_info.after')
|
||||
|
||||
@if ($order->orderShipments->count())
|
||||
@hookwrapper('account.order_info.shipments')
|
||||
<div class="card mb-4">
|
||||
<div class="card-header"><h6 class="card-title">{{ __('order.order_shipments') }}</h6></div>
|
||||
<div class="card-body">
|
||||
<div class="table-push">
|
||||
<table class="table ">
|
||||
<thead class="">
|
||||
<tr>
|
||||
<th>{{ __('order.express_company') }}</th>
|
||||
<th>{{ __('order.express_number') }}</th>
|
||||
<th>{{ __('order.history_created_at') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($order->orderShipments as $ship)
|
||||
<tr>
|
||||
<td>{{ $ship->express_company }}</td>
|
||||
<td>{{ $ship->express_number }}</td>
|
||||
<td>{{ $ship->created_at }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endhookwrapper
|
||||
@endif
|
||||
|
||||
@if ($order->orderHistories->count())
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
<h6 class="card-title">{{ __('shop/account.order.order_info.order_status') }}</h6>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<table class="table ">
|
||||
<thead class="">
|
||||
<tr>
|
||||
<th>{{ __('shop/account.order.order_info.state') }}</th>
|
||||
<th>{{ __('shop/account.order.order_info.remark') }}</th>
|
||||
<th>{{ __('shop/account.order.order_info.update_time') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($order->orderHistories as $orderHistory)
|
||||
<tr>
|
||||
<td>{{ $orderHistory->status_format }}</td>
|
||||
<td><span class="fw-bold">{{ $orderHistory->comment }}</span></td>
|
||||
<td><span class="fw-bold">{{ $orderHistory->created_at }}</span></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@push('add-scripts')
|
||||
<script>
|
||||
$('.shipped-ed').click(function(event) {
|
||||
$http.post('orders/{{ $order->number }}/complete').then((res) => {
|
||||
layer.msg(res.message)
|
||||
window.location.reload()
|
||||
})
|
||||
});
|
||||
|
||||
$('.cancel-order').click(function(event) {
|
||||
$http.post('orders/{{ $order->number }}/cancel').then((res) => {
|
||||
layer.msg(res.message)
|
||||
window.location.reload()
|
||||
})
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
Loading…
Reference in New Issue