wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单相关

This commit is contained in:
pushuo 2022-08-29 17:54:28 +08:00
parent 4643926768
commit 60122b82bc
9 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/build/beike/shop/default/css/app.css vendored
View File

@ -606,6 +606,7 @@ header .header-content .right-btn .cart-badge-quantity {
top: -3px; top: -3px;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
display: none;
width: 23px; width: 23px;
zoom: 0.9; zoom: 0.9;
height: 23px; height: 23px;

18
resources/beike/admin/views/pages/orders/form.blade.php
View File

@ -20,7 +20,7 @@
</tr> </tr>
<tr> <tr>
<td>{{ __('order.total') }}：</td> <td>{{ __('order.total') }}：</td>
<td>{{ $order->total_format }}</td> <td>{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -120,9 +120,10 @@
<tr> <tr>
<th>ID</th> <th>ID</th>
<th>{{ __('order.product_name') }}</th> <th>{{ __('order.product_name') }}</th>
<th class="">{{ __('order.product_sku') }}</th>
<th>{{ __('order.product_price') }}</th> <th>{{ __('order.product_price') }}</th>
<th class="text-end">{{ __('order.product_quantity') }}</th> <th class="">{{ __('order.product_quantity') }}</th>
<th class="text-end">{{ __('order.product_sku') }}</th> <th class="text-end">{{ __('order.product_sub_price') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -134,17 +135,18 @@
<div class="wh-60 me-2"><img src="{{ $product->image }}" class="img-fluid"></div>{{ $product->name }} <div class="wh-60 me-2"><img src="{{ $product->image }}" class="img-fluid"></div>{{ $product->name }}
</div> </div>
</td> </td>
<td>{{ $product->price_format }}</td> <td class="">{{ $product->product_sku }}</td>
<td class="text-end">{{ $product->quantity }}</td> <td>{{ currency_format($product->price, $order->currency_code, $order->currency_value) }}</td>
<td class="text-end">{{ $product->product_sku }}</td> <td class="">{{ $product->quantity }}</td>
<td class="text-end">{{ currency_format($product->price * $product->quantity, $order->currency_code, $order->currency_value) }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
<tfoot> <tfoot>
@foreach ($order->orderTotals as $orderTotal) @foreach ($order->orderTotals as $orderTotal)
<tr> <tr>
<td colspan="4" class="text-end">{{ $orderTotal->title }}</td> <td colspan="5" class="text-end">{{ $orderTotal->title }}</td>
<td class="text-end"><span class="fw-bold">{{ $orderTotal->value_format }}</span></td> <td class="text-end"><span class="fw-bold">{{ currency_format($orderTotal->value, $order->currency_code, $order->currency_value) }}</span></td>
</tr> </tr>
@endforeach @endforeach
</tfoot> </tfoot>

2
resources/beike/admin/views/pages/orders/index.blade.php
View File

@ -73,7 +73,7 @@
<td>{{ sub_string($order->customer_name, 14) }}</td> <td>{{ sub_string($order->customer_name, 14) }}</td>
<td>{{ $order->payment_method_name }}</td> <td>{{ $order->payment_method_name }}</td>
<td>{{ $order->status_format }}</td> <td>{{ $order->status_format }}</td>
<td>{{ $order->total_format }}</td> <td>{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
<td>{{ $order->created_at }}</td> <td>{{ $order->created_at }}</td>
<td>{{ $order->updated_at }}</td> <td>{{ $order->updated_at }}</td>
<td><a href="{{ admin_route('orders.show', [$order->id]) }}" <td><a href="{{ admin_route('orders.show', [$order->id]) }}"

1
resources/beike/shop/default/css/header.scss vendored
View File

@ -159,6 +159,7 @@ header {
top: -3px; top: -3px;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
display: none;
width: 23px; width: 23px;
zoom: 0.9; zoom: 0.9;
height: 23px; height: 23px;

1
resources/lang/en/order.php
View File

@ -26,6 +26,7 @@ return [
'shipping_address' => 'Shipping Address', 'shipping_address' => 'Shipping Address',
'payment_address' => 'Payment Address', 'payment_address' => 'Payment Address',
'order_status' => 'Order Status', 'order_status' => 'Order Status',
'product_sub_price' => 'Subtotal',
'current_status' => 'Current', 'current_status' => 'Current',
'change_to_status' => 'Change To', 'change_to_status' => 'Change To',
'comment' => 'Comment', 'comment' => 'Comment',

1
resources/lang/zh_cn/order.php
View File

@ -34,6 +34,7 @@ return [
'product_info' => '商品信息', 'product_info' => '商品信息',
'product_name' => '名称', 'product_name' => '名称',
'product_price' => '价格', 'product_price' => '价格',
'product_sub_price' => '小计',
'product_quantity' => '数量', 'product_quantity' => '数量',
'product_sku' => 'SKU', 'product_sku' => 'SKU',

2
themes/default/account/account.blade.php
View File

@ -79,7 +79,7 @@
<span class="ms-4 d-inline-block">{{ __('shop/account.state') }}：{{ $order->status_format }}</span> <span class="ms-4 d-inline-block">{{ __('shop/account.state') }}：{{ $order->status_format }}</span>
</td> </td>
<td> <td>
<span class="ms-3 d-inline-block">{{ __('shop/account.amount') }}：{{ $order->total_format }}</span> <span class="ms-3 d-inline-block">{{ __('shop/account.amount') }}：{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</span>
</td> </td>
<td> <td>

2
themes/default/account/order.blade.php
View File

@ -49,7 +49,7 @@
</div> </div>
</td> </td>
@if ($loop->first) @if ($loop->first)
<td rowspan="{{ $loop->count }}">{{ currency_format($order->total) }}</td> <td rowspan="{{ $loop->count }}">{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
<td rowspan="{{ $loop->count }}">{{ __("common.order.{$order->status}") }}</td> <td rowspan="{{ $loop->count }}">{{ __("common.order.{$order->status}") }}</td>
<td rowspan="{{ $loop->count }}" class="text-end"> <td rowspan="{{ $loop->count }}" class="text-end">
<a href="{{ shop_route('account.order.show', ['number' => $order->number]) }}" class="btn btn-outline-secondary btn-sm">{{ __('shop/account.order.check') }}</a> <a href="{{ shop_route('account.order.show', ['number' => $order->number]) }}" class="btn btn-outline-secondary btn-sm">{{ __('shop/account.order.check') }}</a>

12
themes/default/account/order_info.blade.php
View File

@ -43,7 +43,7 @@
<td> <td>
{{ __("common.order.{$order->status}") }} {{ __("common.order.{$order->status}") }}
</td> </td>
<td>{{ $order->total_format }}</td> <td>{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -62,9 +62,13 @@
<div class="left"><img src="{{ $product->image }}" class="img-fluid"></div> <div class="left"><img src="{{ $product->image }}" class="img-fluid"></div>
<div class="right"> <div class="right">
<div class="name"> <div class="name">
<a class="text-dark" href="{{ shop_route('products.show', ['product' => $product->product_id]) }}">{{ $product->name }}</a><br> x {{ $product->quantity }} <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 class="price">{{ $product->price_format }}</div>
</div> </div>
</div> </div>
@if ($order->status == 'completed') @if ($order->status == 'completed')
@ -87,7 +91,7 @@
<tr> <tr>
@foreach ($totals as $total) @foreach ($totals as $total)
<td class="bg-light wp-200">{{ $total->title }}</td> <td class="bg-light wp-200">{{ $total->title }}</td>
<td><strong>{{ $total->value_format }}</strong></td> <td><strong>{{ currency_format($total->value, $order->currency_code, $order->currency_value) }}</strong></td>
@endforeach @endforeach
</tr> </tr>
@endforeach @endforeach