Fixes for observers

VERSION.txt

@@ -1 +1 @@
-5.5.58
+5.5.59

app/Observers/ClientContactObserver.php

@@ -57,7 +57,7 @@ class ClientContactObserver
 
         //ensure entity state is preserved
         
-        InvoiceInvitation::withTrashed()->where('client_contact_id', 1)->cursor()->each(function ($invite){
+        InvoiceInvitation::withTrashed()->where('client_contact_id', $client_contact_id)->cursor()->each(function ($invite){
 
           if($invite->invoice()->doesnthave('invitations'))
             $invite->invoice->service()->createInvitations();
@@ -65,14 +65,14 @@ class ClientContactObserver
         });
 
 
-        QuoteInvitation::withTrashed()->where('client_contact_id', 1)->cursor()->each(function ($invite){
+        QuoteInvitation::withTrashed()->where('client_contact_id', $client_contact_id)->cursor()->each(function ($invite){
 
           if($invite->invoice()->doesnthave('invitations'))
             $invite->quote->service()->createInvitations();
 
         });
 
-        RecurringInvoiceInvitation::withTrashed()->where('client_contact_id', 1)->cursor()->each(function ($invite){
+        RecurringInvoiceInvitation::withTrashed()->where('client_contact_id', $client_contact_id)->cursor()->each(function ($invite){
 
           if($invite->recurring_invoice()->doesnthave('invitations'))
             $invite->quote->service()->createInvitations();

app/Observers/VendorContactObserver.php

@@ -51,7 +51,7 @@ class VendorContactObserver
 
         $vendorContact->purchase_order_invitations()->delete();
        
-        PurchaseOrderInvitation::withTrashed()->where('vendor_contact_id', 1)->cursor()->each(function ($invite){
+        PurchaseOrderInvitation::withTrashed()->where('vendor_contact_id', $vendor_contact_id)->cursor()->each(function ($invite){
 
           if($invite->purchase_order()->doesnthave('invitations'))
             $invite->purchase_order->service()->createInvitations();

app/Services/Email/EmailDefaults.php

@@ -135,7 +135,13 @@ class EmailDefaults
      * Sets the FROM address
      */
     private function setFrom(): self
-    {
+    { 
+
+        if(Ninja::isHosted() && $this->email_object->settings->email_sending_method == 'default'){
+            $this->email_object->from = new Address(config('mail.from.address'), $this->email_service->company->owner()->name());
+            return $this;
+        }
+
         if($this->email_object->from)
             return $this;
 

app/Services/Email/EmailMailer.php

@@ -13,36 +13,28 @@ namespace App\Services\Email;
 
 use App\DataMapper\Analytics\EmailFailure;
 use App\DataMapper\Analytics\EmailSuccess;
-use App\DataMapper\EmailTemplateDefaults;
 use App\Events\Invoice\InvoiceWasEmailedAndFailed;
 use App\Events\Payment\PaymentWasEmailedAndFailed;
 use App\Jobs\Util\SystemLogger;
 use App\Libraries\Google\Google;
 use App\Libraries\MultiDB;
-use App\Models\Account;
 use App\Models\ClientContact;
-use App\Models\Company;
 use App\Models\InvoiceInvitation;
 use App\Models\Payment;
 use App\Models\SystemLog;
 use App\Models\User;
-use App\Services\Email\EmailObject;
 use App\Utils\Ninja;
 use App\Utils\Traits\MakesHash;
 use GuzzleHttp\Exception\ClientException;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Mail\Attachment;
 use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailer;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Mail;
-use League\CommonMark\CommonMarkConverter;
 use Turbo124\Beacon\Facades\LightLogs;
 
 class EmailMailer implements ShouldQueue
@@ -311,7 +303,7 @@ class EmailMailer implements ShouldQueue
 
         $user = $this->resolveSendingUser();
 
-            $this->mailable
+            $this->email_mailable
              ->from($user->email, $user->name());
     }
 
@@ -331,7 +323,7 @@ class EmailMailer implements ShouldQueue
 
         $user = $this->resolveSendingUser();
 
-            $this->mailable
+            $this->email_mailable
              ->from($user->email, $user->name());
     }
 
@@ -362,7 +354,7 @@ class EmailMailer implements ShouldQueue
         
         }
 
-        $this->mailable
+        $this->email_mailable
              ->from($user->email, $user->name())
              ->withSymfonyMessage(function ($message) use($token) {
                 $message->getHeaders()->addTextHeader('gmailtoken', $token);     
@@ -427,7 +419,7 @@ class EmailMailer implements ShouldQueue
             return $this->setMailDriver();
         }
 
-        $this->mailable
+        $this->email_mailable
              ->from($user->email, $user->name())
              ->withSymfonyMessage(function ($message) use($token) {
                 $message->getHeaders()->addTextHeader('gmailtoken', $token);     

config/ninja.php

@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.5.58',
-    'app_tag' => '5.5.58',
+    'app_version' => '5.5.59',
+    'app_tag' => '5.5.59',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),