From 6095b5de23a7d82a80cd77aa3ce0a413c9b672cd Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Tue, 7 Feb 2023 11:19:17 +0800
Subject: [PATCH] =?UTF-8?q?hook=5Faction=20=E7=BB=9F=E4=B8=80=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Http/Controllers/PluginController.php  | 6 +++++-
 beike/Shop/Http/Controllers/CurrencyController.php | 2 +-
 beike/Shop/Http/Controllers/LanguageController.php | 2 +-
 beike/Shop/Services/AccountService.php             | 4 +++-
 beike/Shop/Services/CheckoutService.php            | 6 ++++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/beike/Admin/Http/Controllers/PluginController.php b/beike/Admin/Http/Controllers/PluginController.php
index 62c27ab8..83c30be1 100644
--- a/beike/Admin/Http/Controllers/PluginController.php
+++ b/beike/Admin/Http/Controllers/PluginController.php
@@ -102,8 +102,12 @@ class PluginController extends Controller
             }
         }
 
+        $data = ['plugin_code' => $code, 'fields' => $fields];
+        hook_action('plugin.update.before', $data);
+
         SettingRepo::update('plugin', $code, $fields);
-        hook_action('after_edit_plugin', ['plugin_code' => $code, 'fields' => $fields]);
+
+        hook_action('plugin.update.after', $data);
 
         return redirect($this->getRedirect())->with('success', trans('common.updated_success'));
     }
diff --git a/beike/Shop/Http/Controllers/CurrencyController.php b/beike/Shop/Http/Controllers/CurrencyController.php
index 6786a775..ea11d9dd 100644
--- a/beike/Shop/Http/Controllers/CurrencyController.php
+++ b/beike/Shop/Http/Controllers/CurrencyController.php
@@ -22,7 +22,7 @@ class CurrencyController extends Controller
             Session::put('currency', $currency);
         }
 
-        hook_action('currency.index', $currency);
+        hook_action('currency.index.after', $currency);
 
         return Redirect::back();
     }
diff --git a/beike/Shop/Http/Controllers/LanguageController.php b/beike/Shop/Http/Controllers/LanguageController.php
index 27426c82..2c8252b2 100644
--- a/beike/Shop/Http/Controllers/LanguageController.php
+++ b/beike/Shop/Http/Controllers/LanguageController.php
@@ -22,7 +22,7 @@ class LanguageController extends Controller
             Session::put('locale', $lang);
         }
 
-        hook_action('language.index', $lang);
+        hook_action('language.index.after', $lang);
 
         return Redirect::back();
     }
diff --git a/beike/Shop/Services/AccountService.php b/beike/Shop/Services/AccountService.php
index 17a07867..d1a46f84 100644
--- a/beike/Shop/Services/AccountService.php
+++ b/beike/Shop/Services/AccountService.php
@@ -37,10 +37,12 @@ class AccountService
         }
         $data['avatar'] = $data['avatar'] ?? '';
 
+        hook_action('service.account.register.before', $data);
+
         $customer = CustomerRepo::create($data);
         if ($customer) {
             $customer->notifyRegistration();
-            hook_action('after_register', $customer);
+            hook_action('service.account.register.after', $customer);
         }
 
         return $customer;
diff --git a/beike/Shop/Services/CheckoutService.php b/beike/Shop/Services/CheckoutService.php
index 7129ec2f..9ef039c5 100644
--- a/beike/Shop/Services/CheckoutService.php
+++ b/beike/Shop/Services/CheckoutService.php
@@ -73,6 +73,8 @@ class CheckoutService
         $guestShippingAddress = $requestData['guest_shipping_address'] ?? [];
         $guestPaymentAddress  = $requestData['guest_payment_address']  ?? [];
 
+        hook_action('service.checkout.update.before', ['request_data' => $requestData, 'cart' => $this->cart]);
+
         if ($shippingAddressId) {
             $this->updateShippingAddressId($shippingAddressId);
         }
@@ -93,7 +95,7 @@ class CheckoutService
             $this->updateGuestPaymentAddress($guestPaymentAddress);
         }
 
-        hook_action('after_checkout_update', ['request_data' => $requestData, 'cart' => $this->cart]);
+        hook_action('service.checkout.update.after', ['request_data' => $requestData, 'cart' => $this->cart]);
 
         return $this->checkoutData();
     }
@@ -181,7 +183,7 @@ class CheckoutService
             throw new \Exception(trans('shop/carts.invalid_payment_method'));
         }
 
-        hook_action('after_checkout_validate', $checkoutData);
+        hook_action('service.checkout.validate_confirm.after', $checkoutData);
     }
 
     private function updateShippingAddressId($shippingAddressId)