From eaeb47090a588ae913723ed1d370f661cdb0dd26 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 6 May 2021 08:42:18 +1000
Subject: [PATCH 1/2] Load designs for mini load

---
 app/Http/Controllers/BaseController.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 9b03936b5722..1b0e6cb78b6b 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -111,6 +111,7 @@ class BaseController extends Controller
           'company.tax_rates',
           'company.groups',
           'company.payment_terms',
+          'company.designs.company'
         ];
 
     public function __construct()
@@ -416,12 +417,12 @@ class BaseController extends Controller
                   $query->where('credits.user_id', $user->id)->orWhere('credits.assigned_user_id', $user->id);
 
             },
-            'company.designs'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('company');
+            // 'company.designs'=> function ($query) use ($created_at, $user) {
+            //     $query->where('created_at', '>=', $created_at)->with('company');
 
-                if(!$user->isAdmin())
-                  $query->where('designs.user_id', $user->id);
-            },
+            //     if(!$user->isAdmin())
+            //       $query->where('designs.user_id', $user->id);
+            // },
             'company.documents'=> function ($query) use ($created_at, $user) {
                 $query->where('created_at', '>=', $created_at);
             },

From 2805e1cc963b596d3694999c6d73757f524d3470 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 6 May 2021 13:22:55 +1000
Subject: [PATCH 2/2] email_receipt flag

---
 app/Http/Controllers/PaymentController.php |  3 +++
 app/Jobs/Util/Import.php                   | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 56bb7a939137..f96388245f59 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -208,6 +208,9 @@ class PaymentController extends BaseController
     {
         $payment = $this->payment_repo->save($request->all(), PaymentFactory::create(auth()->user()->company()->id, auth()->user()->id));
 
+        if($request->has('email_receipt') && $request->input('email_receipt') == 'true' && !$payment->client->getSetting('client_manual_payment_notification'))
+            $payment->service()->sendEmail();
+
         return $this->itemResponse($payment);
     }
 
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index fc8354cd4d3a..66d4897a8ef9 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -459,6 +459,19 @@ class Import implements ShouldQueue
         $user_repository = null;
     }
 
+    private function checkUniqueConstraint($model, $column, $value)
+    {
+        $model_query = (new $model())
+                            ->query()
+                            ->where($column, $value)
+                            ->exists();
+
+        if($model_query)
+            return $value.'_'. Str::random(5);
+
+        return $value;
+    }
+
     /**
      * @param array $data
      * @throws Exception
@@ -476,6 +489,7 @@ class Import implements ShouldQueue
             $modified['user_id'] = $this->processUserId($resource);
             $modified['balance'] = $modified['balance'] ?: 0;
             $modified['paid_to_date'] = $modified['paid_to_date'] ?: 0;
+            $modified['number'] = $this->checkUniqueConstraint(Client::class, 'number', $modified['number']);
 
             unset($modified['id']);
             unset($modified['contacts']);