From d236dd6ff629c8c6352c0ff1cbd82160dec26a07 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 6 Jul 2020 21:42:42 +1000
Subject: [PATCH] Fixes for observers

---
 app/Console/Commands/DemoMode.php | 26 +++++++++++++++++---------
 app/Jobs/Util/WebhookHandler.php  |  3 +--
 app/Observers/ClientObserver.php  |  1 -
 app/Observers/ExpenseObserver.php |  1 -
 app/Observers/InvoiceObserver.php |  1 -
 app/Observers/PaymentObserver.php |  1 -
 app/Observers/QuoteObserver.php   |  1 -
 app/Observers/TaskObserver.php    |  1 -
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/Console/Commands/DemoMode.php b/app/Console/Commands/DemoMode.php
index c2ac9e0caa4f..286a121fe394 100644
--- a/app/Console/Commands/DemoMode.php
+++ b/app/Console/Commands/DemoMode.php
@@ -177,36 +177,44 @@ class DemoMode extends Command
             $client = $company->clients->random();
 
             $this->info('creating invoice for client #'.$client->id);
-            $this->createInvoice($client);
+
+            for($y=0; $y<($this->count); $y++){
+                $this->info("creating invoice #{$y} for client #".$client->id);
+                $this->createInvoice($client);
+            }
 
             $client = $company->clients->random();
 
-            $this->info('creating credit for client #'.$client->id);
-            $this->createCredit($client);
+            for($y=0; $y<($this->count); $y++){
+                $this->info("creating credit #{$y} for client #".$client->id);
+                $this->createCredit($client);
+            }
 
             $client = $company->clients->random();
 
-            $this->info('creating quote for client #'.$client->id);
-            $this->createQuote($client);
+            for($y=0; $y<($this->count); $y++){
+                $this->info("creating quote #{$y}  for client #".$client->id);
+                $this->createQuote($client);
+            }
 
             $client = $company->clients->random();
 
-            $this->info('creating expense for client #'.$client->id);
+            $this->info("creating expense for client #".$client->id);
             $this->createExpense($client);
 
             $client = $company->clients->random();
 
-            $this->info('creating vendor for client #'.$client->id);
+            $this->info("creating vendor for client #".$client->id);
             $this->createVendor($client);
 
             $client = $company->clients->random();
 
-            $this->info('creating task for client #'.$client->id);
+            $this->info("creating task for client #".$client->id);
             $this->createTask($client);
 
             $client = $company->clients->random();
 
-            $this->info('creating project for client #'.$client->id);
+            $this->info("creating project for client #".$client->id);
             $this->createProject($client);
         }
 
diff --git a/app/Jobs/Util/WebhookHandler.php b/app/Jobs/Util/WebhookHandler.php
index 537beff56a42..0212fc08a465 100644
--- a/app/Jobs/Util/WebhookHandler.php
+++ b/app/Jobs/Util/WebhookHandler.php
@@ -2,7 +2,6 @@
 
 namespace App\Jobs\Util;
 
-use App\Models\Subscription;
 use App\Transformers\ArraySerializer;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -45,7 +44,7 @@ class WebhookHandler implements ShouldQueue
 
         //info("i got past the check");
 
-        $subscriptions = Webhook::where('company_id', $this->entity->company_id)
+        $subscriptions = \App\Models\Webhook::where('company_id', $this->entity->company_id)
                                     ->where('event_id', $this->event_id)
                                     ->get();
 
diff --git a/app/Observers/ClientObserver.php b/app/Observers/ClientObserver.php
index d602083fc195..e13e1d7f1f0e 100644
--- a/app/Observers/ClientObserver.php
+++ b/app/Observers/ClientObserver.php
@@ -14,7 +14,6 @@ namespace App\Observers;
 use App\Events\Client\ClientWasCreated;
 use App\Jobs\Util\WebhookHandler;
 use App\Models\Client;
-use App\Models\Subscription;
 use App\Models\Webhook;
 
 class ClientObserver
diff --git a/app/Observers/ExpenseObserver.php b/app/Observers/ExpenseObserver.php
index 381f31ababcc..db34d1af7772 100644
--- a/app/Observers/ExpenseObserver.php
+++ b/app/Observers/ExpenseObserver.php
@@ -13,7 +13,6 @@ namespace App\Observers;
 
 use App\Jobs\Util\WebhookHandler;
 use App\Models\Expense;
-use App\Models\Subscription;
 use App\Models\Webhook;
 
 class ExpenseObserver
diff --git a/app/Observers/InvoiceObserver.php b/app/Observers/InvoiceObserver.php
index 0d0e369ac9aa..d3b2e773c23a 100644
--- a/app/Observers/InvoiceObserver.php
+++ b/app/Observers/InvoiceObserver.php
@@ -13,7 +13,6 @@ namespace App\Observers;
 
 use App\Jobs\Util\WebhookHandler;
 use App\Models\Invoice;
-use App\Models\Subscription;
 use App\Models\Webhook;
 
 class InvoiceObserver
diff --git a/app/Observers/PaymentObserver.php b/app/Observers/PaymentObserver.php
index 19859359be9f..27f57fc1b756 100644
--- a/app/Observers/PaymentObserver.php
+++ b/app/Observers/PaymentObserver.php
@@ -14,7 +14,6 @@ namespace App\Observers;
 use App\Events\Payment\PaymentWasCreated;
 use App\Jobs\Util\WebhookHandler;
 use App\Models\Payment;
-use App\Models\Subscription;
 use App\Models\Webhook;
 
 class PaymentObserver
diff --git a/app/Observers/QuoteObserver.php b/app/Observers/QuoteObserver.php
index 44e3fff0d923..616dae724a0a 100644
--- a/app/Observers/QuoteObserver.php
+++ b/app/Observers/QuoteObserver.php
@@ -13,7 +13,6 @@ namespace App\Observers;
 
 use App\Jobs\Util\WebhookHandler;
 use App\Models\Quote;
-use App\Models\Subscription;
 use App\Models\Webhook;
 
 class QuoteObserver
diff --git a/app/Observers/TaskObserver.php b/app/Observers/TaskObserver.php
index fe4d0f3fe7a3..fa2dafacc50b 100644
--- a/app/Observers/TaskObserver.php
+++ b/app/Observers/TaskObserver.php
@@ -12,7 +12,6 @@
 namespace App\Observers;
 
 use App\Jobs\Util\WebhookHandler;
-use App\Models\Subscription;
 use App\Models\Task;
 use App\Models\Webhook;