From 271732fa2b978ffec560b7a8527a8382e3bc5455 Mon Sep 17 00:00:00 2001 From: tanxiaoyong Date: Sat, 13 May 2023 14:43:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8status=5Fformat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/default/checkout/success.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/default/checkout/success.blade.php b/themes/default/checkout/success.blade.php index 3373306e..71a591ae 100644 --- a/themes/default/checkout/success.blade.php +++ b/themes/default/checkout/success.blade.php @@ -40,7 +40,7 @@ {{ $order->number }} {{ $order->created_at }} - {{ __("common.order.{$order->status}") }} + {{ $order->status_format }} {{ currency_format($order->total, $order->currency_code, $order->currency_value) }} @@ -103,4 +103,4 @@ } -@endsection \ No newline at end of file +@endsection From 6d85aac56150c5aa574ec6e6c1bf03d218c5eb21 Mon Sep 17 00:00:00 2001 From: tanxiaoyong Date: Mon, 5 Jun 2023 15:09:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E5=9D=97=E3=80=82=E5=BD=93?= =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E8=B4=AD=E4=B9=B0=E6=97=B6=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=80=9A=E8=BF=87=E8=AE=B0=E5=BD=95=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=9C=B0=E5=9D=80=E5=90=8E=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=87=AA=E5=B7=B1=E7=9A=84=E8=AE=A2=E5=8D=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=8A=E7=89=A9=E6=B5=81=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/default/checkout/success.blade.php | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/themes/default/checkout/success.blade.php b/themes/default/checkout/success.blade.php index 71a591ae..b9494cb1 100644 --- a/themes/default/checkout/success.blade.php +++ b/themes/default/checkout/success.blade.php @@ -93,6 +93,37 @@ + + @if ($order->orderShipments->count()) + @hookwrapper('checkout.order.shipments') +
+
{{ __('order.order_shipments') }}
+
+
+ + + + + + + + + + @foreach ($order->orderShipments as $ship) + + + + + + @endforeach + +
{{ __('order.express_company') }}{{ __('order.express_number') }}{{ __('order.history_created_at') }}
{{ $ship->express_company }}{{ $ship->express_number }}{{ $ship->created_at }}
+
+
+
+ @endhookwrapper + @endif + From b28712e2d5e92fd2393457a69da8bd316bc06ed5 Mon Sep 17 00:00:00 2001 From: tanxiaoyong Date: Wed, 14 Jun 2023 11:12:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0hook=20product.detail.qua?= =?UTF-8?q?ntity=20product.detail.add=5Fto=5Fcart=20product.detail.wishlis?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/default/product.blade.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php index d29a5e68..5bc67dca 100644 --- a/themes/default/product.blade.php +++ b/themes/default/product.blade.php @@ -122,6 +122,7 @@ @if ($product['active'])
@hook('product.detail.buy.before') + @hookwrapper('product.detail.quantity')
@@ -129,25 +130,32 @@
+ @endhookwrapper + @hookwrapper('product.detail.add_to_cart') + @endhookwrapper + @hookwrapper('product.detail.buy_now') + @endhookwrapper @hook('product.detail.buy.after')
+ @hookwrapper('product.detail.wishlist')
+ @endhookwrapper @else
{{ __('product.has_been_inactive') }}
@endif From e71a98e915c09852bb1f73ea885cfe177b852501 Mon Sep 17 00:00:00 2001 From: tanxiaoyong Date: Wed, 14 Jun 2023 11:33:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0hook=20product.detail.qua?= =?UTF-8?q?ntity.input=20product.detail.add=5Fto=5Fcart=20product.detail.w?= =?UTF-8?q?ishlist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/default/product/product.blade.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/themes/default/product/product.blade.php b/themes/default/product/product.blade.php index f903f0bd..918c4666 100644 --- a/themes/default/product/product.blade.php +++ b/themes/default/product/product.blade.php @@ -134,6 +134,7 @@ @if ($product['active'])
@hook('product.detail.buy.before') + @hookwrapper('product.detail.quantity.input')
@@ -141,6 +142,8 @@
+ @endhookwrapper + @hookwrapper('product.detail.add_to_cart') + @endhookwrapper + @hookwrapper('product.detail.buy_now') + @endhookwrapper @hook('product.detail.buy.after')
@if (current_customer() || !request('iframe')) -
- -
+ @hookwrapper('product.detail.wishlist') +
+ +
+ @endhookwrapper @endif @else
{{ __('product.has_been_inactive') }}
@endif + @hook('product.detail.after') From 0e9395b98ec20e4deff42a1e312a9db11ee21cf8 Mon Sep 17 00:00:00 2001 From: tanxiaoyong Date: Wed, 14 Jun 2023 11:37:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0hook=20product.detail.qua?= =?UTF-8?q?ntity.input=20product.detail.add=5Fto=5Fcart=20product.detail.w?= =?UTF-8?q?ishlist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/default/product/product.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/default/product/product.blade.php b/themes/default/product/product.blade.php index 918c4666..f51c4fb3 100644 --- a/themes/default/product/product.blade.php +++ b/themes/default/product/product.blade.php @@ -163,6 +163,7 @@ >{{ __('shop/products.buy_now') }} @endhookwrapper + @hook('product.detail.buy.after')