From 024a2190f205956d1390a426bf8823af6a030ecb Mon Sep 17 00:00:00 2001 From: pushuo Date: Wed, 15 Mar 2023 10:42:05 +0800 Subject: [PATCH] admin form add hook optimize brands Optimize page and category hook --- .../Http/Controllers/BrandController.php | 24 +++++++++++-------- .../Controllers/PageCategoryController.php | 5 ++-- .../Http/Controllers/PagesController.php | 6 +++-- .../admin/views/pages/brands/index.blade.php | 4 ++++ .../views/pages/categories/form.blade.php | 4 ++++ .../pages/page_categories/form.blade.php | 9 +++++-- .../admin/views/pages/pages/form.blade.php | 9 ++++--- .../views/pages/products/form/form.blade.php | 5 ++++ 8 files changed, 46 insertions(+), 20 deletions(-) diff --git a/beike/Admin/Http/Controllers/BrandController.php b/beike/Admin/Http/Controllers/BrandController.php index 23215710..46bbf362 100644 --- a/beike/Admin/Http/Controllers/BrandController.php +++ b/beike/Admin/Http/Controllers/BrandController.php @@ -44,10 +44,14 @@ class BrandController extends Controller */ public function store(Request $request): array { - $beforeData = $request->all(); - hook_action('admin.brand.store.before', $beforeData); - $brand = BrandRepo::create($request->all()); - hook_action('admin.brand.store.after', $brand); + $requestData = $request->all(); + $data = [ + 'request_data' => $requestData, + ]; + + hook_action('admin.brand.store.before', $data); + $brand = BrandRepo::create($requestData); + hook_action('admin.brand.store.after', ['brand' => $brand, 'request_data' => $requestData]); return json_success(trans('common.created_success'), $brand); } @@ -58,13 +62,13 @@ class BrandController extends Controller public function update(Request $request, int $id): array { $requestData = $request->all(); - $beforeData = [ - 'brand_id' => $id, - 'data' => $requestData, + $data = [ + 'brand_id' => $id, + 'request_data' => $requestData, ]; - hook_action('admin.brand.update.before', $beforeData); - $brand = BrandRepo::update($id, $request->all()); - hook_action('admin.brand.update.after', $brand); + hook_action('admin.brand.update.before', $data); + $brand = BrandRepo::update($id, $requestData); + hook_action('admin.brand.update.after', $data); return json_success(trans('common.updated_success'), $brand); } diff --git a/beike/Admin/Http/Controllers/PageCategoryController.php b/beike/Admin/Http/Controllers/PageCategoryController.php index 90a8b8fc..934da06c 100644 --- a/beike/Admin/Http/Controllers/PageCategoryController.php +++ b/beike/Admin/Http/Controllers/PageCategoryController.php @@ -58,12 +58,11 @@ class PageCategoryController extends Controller public function store(PageCategoryRequest $request) { try { - $requestData = $request->all(); hook_action('admin.page_category.store.before', $requestData); $pageCategory = PageCategoryRepo::createOrUpdate($requestData); - hook_action('admin.page_category.store.after', $pageCategory); + hook_action('admin.page_category.store.after', ['page_category' => $pageCategory, 'request_data' => $requestData]); return redirect(admin_route('page_categories.index')); } catch (\Exception $e) { @@ -105,7 +104,7 @@ class PageCategoryController extends Controller $requestData['id'] = $pageCategory->id; hook_action('admin.page_category.update.before', $requestData); $pageCategory = PageCategoryRepo::createOrUpdate($requestData); - hook_action('admin.page_category.store.after', $pageCategory); + hook_action('admin.page_category.update.after', ['page_category' => $pageCategory, 'request_data' => $requestData]); return redirect()->to(admin_route('page_categories.index')); } catch (\Exception $e) { diff --git a/beike/Admin/Http/Controllers/PagesController.php b/beike/Admin/Http/Controllers/PagesController.php index 87653257..5aa3fa47 100644 --- a/beike/Admin/Http/Controllers/PagesController.php +++ b/beike/Admin/Http/Controllers/PagesController.php @@ -57,7 +57,8 @@ class PagesController extends Controller { try { $requestData = $request->all(); - PageRepo::createOrUpdate($requestData); + $page = PageRepo::createOrUpdate($requestData); + hook_action('admin.page.store.after', ['request_data' => $requestData, 'page' => $page]); return redirect(admin_route('pages.index')); } catch (\Exception $e) { @@ -95,7 +96,8 @@ class PagesController extends Controller try { $requestData = $request->all(); $requestData['id'] = $pageId; - PageRepo::createOrUpdate($requestData); + $page = PageRepo::createOrUpdate($requestData); + hook_action('admin.page.update.after', ['request_data' => $requestData, 'page' => $page]); return redirect()->to(admin_route('pages.index')); } catch (\Exception $e) { diff --git a/resources/beike/admin/views/pages/brands/index.blade.php b/resources/beike/admin/views/pages/brands/index.blade.php index 3e301198..f2af946e 100644 --- a/resources/beike/admin/views/pages/brands/index.blade.php +++ b/resources/beike/admin/views/pages/brands/index.blade.php @@ -50,6 +50,8 @@ @close="closeDialog('form')" :close-on-click-modal="false"> + @hook('admin.brand.form.before') + @@ -66,6 +68,8 @@ + @hook('admin.brand.form.after') + diff --git a/resources/beike/admin/views/pages/categories/form.blade.php b/resources/beike/admin/views/pages/categories/form.blade.php index 412e0f4b..5c30d980 100644 --- a/resources/beike/admin/views/pages/categories/form.blade.php +++ b/resources/beike/admin/views/pages/categories/form.blade.php @@ -16,6 +16,8 @@ @endif + @hook('admin.category.form.before') + @@ -60,6 +62,8 @@ @endforeach + @hook('admin.category.form.after') + diff --git a/resources/beike/admin/views/pages/page_categories/form.blade.php b/resources/beike/admin/views/pages/page_categories/form.blade.php index 9221b4d7..ca252139 100644 --- a/resources/beike/admin/views/pages/page_categories/form.blade.php +++ b/resources/beike/admin/views/pages/page_categories/form.blade.php @@ -18,7 +18,7 @@ @@ -66,7 +66,9 @@ @endforeach -
+
+ @hook('admin.page_category.data.before') +
+ + @hook('admin.page_category.data.after') +
diff --git a/resources/beike/admin/views/pages/pages/form.blade.php b/resources/beike/admin/views/pages/pages/form.blade.php index 4da3b0d7..6c60e6b6 100644 --- a/resources/beike/admin/views/pages/pages/form.blade.php +++ b/resources/beike/admin/views/pages/pages/form.blade.php @@ -23,7 +23,7 @@ @@ -80,7 +80,9 @@ @endforeach
-
+
+ @hook('admin.page.data.before') +
@@ -135,8 +137,9 @@
- + @hook('admin.page.data.after') +
diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php index 9784dfde..8a916a34 100644 --- a/resources/beike/admin/views/pages/products/form/form.blade.php +++ b/resources/beike/admin/views/pages/products/form/form.blade.php @@ -350,6 +350,9 @@
SEO
+ + @hook('admin.product.seo.before') + @foreach ($languages as $language) @@ -367,6 +370,8 @@
@endforeach + + @hook('admin.product.seo.after')