Do not allow to merge customer with himself - closes #4986

Author: freescout-help-desk

app/Customer.php

@@ -1292,6 +1292,10 @@ public static function getPhotoUrlByFileName($file_name)
      */
     public function mergeWith(Customer $customer2)
     {
+        if ($this->id == $customer2->id) {
+            return false;
+        }
+        
         $user = auth()->user();
 
         $customer2->conversations()->update(['customer_id' => $this->id]);
@@ -1341,6 +1345,8 @@ public function mergeWith(Customer $customer2)
         \Eventy::action('customer.merged', $this, $customer2, $user);
 
         $customer2->delete();
+
+        return true;
     }
 
     public static function mergeTypeValueLists($list1, $list2)

app/Http/Controllers/CustomersController.php

@@ -498,8 +498,10 @@ public function merge(Request $request, $id)
     public function mergeSave(Request $request, $id)
     {
         $request->validate([
-            'customer2_id' => 'required|exists:customers,id',
+            'customer2_id' => 'required|exists:customers,id|not_in:'.$id,
             //'keep_attributes' => 'array'
+        ], [], [
+            'customer2_id' => __('Merge With')
         ]);
 
         $customer = Customer::findOrFail($id);