diff --git a/packages/Webkul/Admin/src/Config/acl.php b/packages/Webkul/Admin/src/Config/acl.php
index c5e246bab..36b94c191 100644
--- a/packages/Webkul/Admin/src/Config/acl.php
+++ b/packages/Webkul/Admin/src/Config/acl.php
@@ -181,7 +181,12 @@
'name' => 'admin::app.acl.delete',
'route' => ['admin.contacts.organizations.delete', 'admin.contacts.organizations.mass_delete'],
'sort' => 3,
- ], [
+ ], [
+ 'key' => 'contacts.organizations.view',
+ 'name' => 'admin::app.acl.edit',
+ 'route' => ['admin.contacts.organizations.view'],
+ 'sort' => 4,
+ ], [
'key' => 'products',
'name' => 'admin::app.acl.products',
'route' => 'admin.products.index',
diff --git a/packages/Webkul/Admin/src/DataGrids/Contact/OrganizationDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Contact/OrganizationDataGrid.php
index 240d71b44..51406d7f1 100644
--- a/packages/Webkul/Admin/src/DataGrids/Contact/OrganizationDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/Contact/OrganizationDataGrid.php
@@ -90,6 +90,17 @@ public function prepareColumns(): void
*/
public function prepareActions(): void
{
+ if (bouncer()->hasPermission('contacts.organizations.view')) {
+ $this->addAction([
+ 'icon' => 'icon-eye',
+ 'title' => trans('admin::app.contacts.organizations.index.datagrid.view'),
+ 'method' => 'GET',
+ 'url' => function ($row) {
+ return route('admin.contacts.organizations.view', $row->id);
+ },
+ ]);
+ }
+
if (bouncer()->hasPermission('contacts.organizations.edit')) {
$this->addAction([
'icon' => 'icon-edit',
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Contact/Organizations/ActivityController.php b/packages/Webkul/Admin/src/Http/Controllers/Contact/Organizations/ActivityController.php
new file mode 100644
index 000000000..2238a6547
--- /dev/null
+++ b/packages/Webkul/Admin/src/Http/Controllers/Contact/Organizations/ActivityController.php
@@ -0,0 +1,45 @@
+activityRepository
+ ->leftJoin('organization_activities', 'activities.id', '=', 'organization_activities.activity_id')
+ ->where('organization_activities.organization_id', $id)
+ ->get();
+
+ return ActivityResource::collection($this->concatEmail($activities));
+ }
+
+ /**
+ * Store a newly created resource in storage.
+ */
+ public function concatEmail($activities)
+ {
+ return $activities->sortByDesc('id')->sortByDesc('created_at');
+ }
+}
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Contact/OrganizationController.php b/packages/Webkul/Admin/src/Http/Controllers/Contact/Organizations/OrganizationController.php
similarity index 92%
rename from packages/Webkul/Admin/src/Http/Controllers/Contact/OrganizationController.php
rename to packages/Webkul/Admin/src/Http/Controllers/Contact/Organizations/OrganizationController.php
index 6845a6c16..697a6f2b6 100644
--- a/packages/Webkul/Admin/src/Http/Controllers/Contact/OrganizationController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Contact/Organizations/OrganizationController.php
@@ -1,6 +1,6 @@
route('admin.contacts.organizations.index');
}
+ /**
+ * Display the specified resource.
+ */
+ public function show(int $id): View
+ {
+ $organization = $this->organizationRepository->findOrFail($id);
+
+ return view('admin::contacts.organizations.view', compact('organization'));
+ }
+
/**
* Show the form for editing the specified resource.
*/
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index a8f50bbe9..77053a4f2 100644
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -640,12 +640,18 @@
'datagrid' => [
'delete' => 'Delete',
'edit' => 'Edit',
+ 'view' => 'View',
'id' => 'ID',
'name' => 'Name',
'persons-count' => 'Person Count',
],
],
+ 'view' => [
+ 'title' => ':name',
+ 'about-organization' => 'About Organization',
+ ],
+
'create' => [
'title' => 'Create Organization',
'save-btn' => 'Save Organization',
diff --git a/packages/Webkul/Admin/src/Resources/views/contacts/organizations/view.blade.php b/packages/Webkul/Admin/src/Resources/views/contacts/organizations/view.blade.php
new file mode 100644
index 000000000..64fa5c876
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/contacts/organizations/view.blade.php
@@ -0,0 +1,85 @@
+
+ {{ $organization->job_title }}
+
+ {{ $organization->name }}
+
+
+