From 65c65a11fb176369860950ff44c3ebb0e9e4ec3d Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Tue, 7 Feb 2023 09:51:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81hook?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Http/Controllers/OrderController.php        | 2 +-
 beike/Repositories/ProductRepo.php                      | 2 ++
 beike/Shop/Http/Controllers/Account/OrderController.php | 4 ++--
 beike/Shop/Http/Controllers/ProductController.php       | 3 ++-
 beike/Shop/Services/CheckoutService.php                 | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/beike/Admin/Http/Controllers/OrderController.php b/beike/Admin/Http/Controllers/OrderController.php
index f20d99d9..158cbf53 100644
--- a/beike/Admin/Http/Controllers/OrderController.php
+++ b/beike/Admin/Http/Controllers/OrderController.php
@@ -69,7 +69,7 @@ class OrderController extends Controller
     public function show(Request $request, Order $order)
     {
         $order->load(['orderTotals', 'orderHistories', 'orderShipments']);
-        $data             = hook_filter('admin_order_detail', ['order' => $order, 'html_items' => []]);
+        $data             = hook_filter('admin.order.show.data', ['order' => $order, 'html_items' => []]);
         $data['statuses'] = StateMachineService::getInstance($order)->nextBackendStatuses();
 
         return view('admin::pages.orders.form', $data);
diff --git a/beike/Repositories/ProductRepo.php b/beike/Repositories/ProductRepo.php
index 4ad9d474..14c6ef94 100644
--- a/beike/Repositories/ProductRepo.php
+++ b/beike/Repositories/ProductRepo.php
@@ -40,6 +40,8 @@ class ProductRepo
         }
         $product->load('description', 'skus', 'masterSku', 'brand', 'relations');
 
+        hook_filter('repo.product.get_detail', $product);
+
         return $product;
     }
 
diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php
index 18305451..7f29c4d9 100644
--- a/beike/Shop/Http/Controllers/Account/OrderController.php
+++ b/beike/Shop/Http/Controllers/Account/OrderController.php
@@ -52,9 +52,9 @@ class OrderController extends Controller
     {
         $customer = current_customer();
         $order    = OrderRepo::getOrderByNumber($number, $customer);
-        $html     = hook_filter('account_order_detail', ['order' => $order, 'html_items' => []]);
+        $data     = hook_filter('account.order.show.data', ['order' => $order, 'html_items' => []]);
 
-        return view('account/order_info', $html);
+        return view('account/order_info', $data);
     }
 
     /**
diff --git a/beike/Shop/Http/Controllers/ProductController.php b/beike/Shop/Http/Controllers/ProductController.php
index e1049392..3dfb0a4f 100644
--- a/beike/Shop/Http/Controllers/ProductController.php
+++ b/beike/Shop/Http/Controllers/ProductController.php
@@ -25,7 +25,8 @@ class ProductController extends Controller
             'product'   => (new ProductDetail($product))->jsonSerialize(),
             'relations' => ProductRepo::getProductsByIds($relationIds)->jsonSerialize(),
         ];
-        $data = hook_filter('product.show', $data);
+
+        $data = hook_filter('product.show.data', $data);
 
         return view('product', $data);
     }
diff --git a/beike/Shop/Services/CheckoutService.php b/beike/Shop/Services/CheckoutService.php
index 9fb755ca..7129ec2f 100644
--- a/beike/Shop/Services/CheckoutService.php
+++ b/beike/Shop/Services/CheckoutService.php
@@ -111,11 +111,12 @@ class CheckoutService
 
         try {
             DB::beginTransaction();
+
             $order = OrderRepo::create($checkoutData);
             StateMachineService::getInstance($order)->changeStatus(StateMachineService::UNPAID, '', true);
             CartRepo::clearSelectedCartProducts($customer);
 
-            hook_action('checkout.order.confirm.after', ['order' => $order, 'cart' => $this->cart]);
+            hook_action('service.checkout.confirm.after', ['order' => $order, 'cart' => $this->cart]);
 
             DB::commit();
         } catch (\Exception $e) {