Merge pull request krayin#1226 from prabhat-webkul/fix-#1225

Fixed krayin#1225
suraj-webkul · Jun 19, 2024 · 8f35494 · 8f35494
2 parents 6d39eae + cbf1de1
commit 8f35494
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Contact/OrganizationController.php b/packages/Webkul/Admin/src/Http/Controllers/Contact/OrganizationController.php
@@ -115,8 +115,6 @@ public function update(AttributeForm $request, $id)
      */
     public function destroy($id)
     {
-        $this->organizationRepository->findOrFail($id);
-
         try {
             Event::dispatch('contact.organization.delete.before', $id);
 

diff --git a/packages/Webkul/Contact/src/Models/Organization.php b/packages/Webkul/Contact/src/Models/Organization.php
@@ -23,4 +23,14 @@ class Organization extends Model implements OrganizationContract
         'name',
         'address',
     ];
+
+    /**
+     * Get persons.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function persons()
+    {
+        return $this->hasMany(PersonProxy::modelClass());
+    }
 }
diff --git a/packages/Webkul/Contact/src/Repositories/OrganizationRepository.php b/packages/Webkul/Contact/src/Repositories/OrganizationRepository.php
@@ -3,6 +3,7 @@
 namespace Webkul\Contact\Repositories;
 
 use Illuminate\Container\Container;
+use Illuminate\Support\Facades\DB;
 use Webkul\Core\Eloquent\Repository;
 use Webkul\Attribute\Repositories\AttributeValueRepository;
 
@@ -69,4 +70,26 @@ public function update(array $data, $id, $attribute = "id")
 
         return $organization;
     }
+
+    /**
+     * Delete organization and it's persons.
+     * 
+     * @param int $id
+     * @return @void
+     */
+    public function delete($id)
+    {
+        $organization = $this->findOrFail($id);
+
+        DB::transaction(function() use($organization, $id) {
+            $organization->persons()->delete();
+
+            $this->attributeValueRepository->deleteWhere([
+                'entity_id'   => $id,
+                'entity_type' => 'organizations',
+            ]);
+
+            $organization->delete();
+        });
+    }
 }