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) {