Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

VERSION.txt

@@ -1 +1 @@
-5.2.14
+5.2.15

app/DataMapper/Analytics/LivePreview.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Analytics;
+
+use Turbo124\Beacon\ExampleMetric\GenericCounter;
+
+class LivePreview extends GenericCounter
+{
+    /**
+     * The type of Sample.
+     *
+     * Monotonically incrementing counter
+     *
+     * 	- counter
+     *
+     * @var string
+     */
+    public $type = 'counter';
+
+    /**
+     * The name of the counter.
+     * @var string
+     */
+    public $name = 'live_preview.created';
+
+    /**
+     * The datetime of the counter measurement.
+     *
+     * date("Y-m-d H:i:s")
+     *
+     * @var DateTime
+     */
+    public $datetime;
+
+    /**
+     * The increment amount... should always be
+     * set to 0.
+     *
+     * @var int
+     */
+    public $metric = 0;
+}

app/Exceptions/Handler.php

@@ -187,7 +187,7 @@ class Handler extends ExceptionHandler
         } elseif ($exception instanceof NotFoundHttpException && $request->expectsJson()) {
             return response()->json(['message'=>'Route does not exist'], 404);
         } elseif ($exception instanceof MethodNotAllowedHttpException && $request->expectsJson()) {
-            return response()->json(['message'=>'Method not support for this route'], 404);
+            return response()->json(['message'=>'Method not supported for this route'], 404);
         } elseif ($exception instanceof ValidationException && $request->expectsJson()) {
             nlog($exception->validator->getMessageBag());
             return response()->json(['message' => 'The given data was invalid.', 'errors' => $exception->validator->getMessageBag()], 422);

app/Http/Controllers/ConnectedAccountController.php

@@ -107,7 +107,7 @@ class ConnectedAccountController extends BaseController
             $email = $google->harvestEmail($user);
 
             if(auth()->user()->email != $email && MultiDB::checkUserEmailExists($email))
-                return response()->json(['message' => ctrans('texts.email_already_register')], 400)
+                return response()->json(['message' => ctrans('texts.email_already_register')], 400);
 
             $connected_account = [
                 'email' => $email,

app/Http/Controllers/PreviewController.php

@@ -11,15 +11,25 @@
 
 namespace App\Http\Controllers;
 
+use App\DataMapper\Analytics\LivePreview;
+use App\Factory\CreditFactory;
 use App\Factory\InvoiceFactory;
+use App\Factory\QuoteFactory;
+use App\Factory\RecurringInvoiceFactory;
 use App\Http\Requests\Invoice\StoreInvoiceRequest;
 use App\Http\Requests\Preview\PreviewInvoiceRequest;
 use App\Jobs\Util\PreviewPdf;
 use App\Models\Client;
 use App\Models\ClientContact;
+use App\Models\Credit;
 use App\Models\Invoice;
 use App\Models\InvoiceInvitation;
+use App\Models\Quote;
+use App\Models\RecurringInvoice;
+use App\Repositories\CreditRepository;
 use App\Repositories\InvoiceRepository;
+use App\Repositories\QuoteRepository;
+use App\Repositories\RecurringInvoiceRepository;
 use App\Services\PdfMaker\Design as PdfMakerDesign;
 use App\Services\PdfMaker\Design;
 use App\Services\PdfMaker\PdfMaker;
@@ -33,6 +43,7 @@ use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Response;
+use Turbo124\Beacon\Facades\LightLogs;
 
 class PreviewController extends BaseController
 {
@@ -156,20 +167,48 @@ class PreviewController extends BaseController
 
     public function live(PreviewInvoiceRequest $request)
     {
-        if(request()->input('entity') == 'invoice'){
+        if($request->input('entity') == 'invoice'){
             $repo = new InvoiceRepository();
             $factory = InvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id);
+            $class = Invoice::class;
         }
+        elseif($request->input('entity') == 'quote'){
+            $repo = new QuoteRepository();
+            $factory = QuoteFactory::create(auth()->user()->company()->id, auth()->user()->id);
+            $class = Quote::class;
+
+        }
+        elseif($request->input('entity') == 'credit'){
+            $repo = new CreditRepository();
+            $factory = CreditFactory::create(auth()->user()->company()->id, auth()->user()->id);
+            $class = Credit::class;
+        }
+        elseif($request->input('entity') == 'recurring_invoice'){
+            $repo = new RecurringInvoiceRepository();
+            $factory = RecurringInvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id);
+            $class = RecurringInvoice::class;
+        }
+            
+
+        try {
 
             DB::connection(config('database.default'))->beginTransaction();
 
-            $entity = ucfirst(request()->input('entity'));
-            $entity_obj = $repo->save(request()->all(), $factory);
+            if($request->has('entity_id')){
+
+                $entity_obj = $class::withTrashed()->whereId($this->decodePrimaryKey($request->input('entity_id')))->company()->first();
+                $entity_obj = $repo->save($request->all(), $entity_obj);
+
+            }
+            else {
+                $entity_obj = $repo->save($request->all(), $factory);
+            }
+
             $entity_obj->load('client');
 
             App::forgetInstance('translator');
             $t = app('translator');
-            App::setLocale($entity_obj->client->primary_contact()->first()->preferredLocale());
+            App::setLocale($entity_obj->client->contacts()->first()->preferredLocale());
             $t->replace(Ninja::transformTranslations($entity_obj->client->getMergedSettings()));
 
             $html = new HtmlEngine($entity_obj->invitations()->first());
@@ -213,11 +252,20 @@ class PreviewController extends BaseController
                 ->design($template)
                 ->build();
 
+            DB::connection(config('database.default'))->rollBack();
+
             if (request()->query('html') == 'true') {
                 return $maker->getCompiledHTML;
             }
 
+
+        }
+        catch(\Exception $e){
+
             DB::connection(config('database.default'))->rollBack();
+            return;
+        }
+
 
             //if phantom js...... inject here..
             if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {
@@ -231,6 +279,14 @@ class PreviewController extends BaseController
             $file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), auth()->user()->company());
 
 
+            if(Ninja::isHosted())
+            {
+                LightLogs::create(new LivePreview())
+                         ->increment()
+                         ->batch();
+            }
+
+
         $response = Response::make($file_path, 200);
         $response->header('Content-Type', 'application/pdf');
 

app/Http/Requests/Preview/PreviewInvoiceRequest.php

@@ -53,7 +53,7 @@ class PreviewInvoiceRequest extends Request
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         $input['amount'] = 0;
         $input['balance'] = 0;
-        $input['number'] = null;
+        $input['number'] = ctrans('texts.live_preview') . " #". rand(0,1000);
         
         $this->replace($input);
     }

app/Listeners/Activity/CreatedSubscriptionActivity.php

@@ -43,7 +43,7 @@ class CreatedSubscriptionActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
 
         $fields->subscription_id = $event->subscription->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/CreatedTaskActivity.php

@@ -43,7 +43,7 @@ class CreatedTaskActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
 
         $fields->task_id = $event->task->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/CreatedVendorActivity.php

@@ -43,7 +43,7 @@ class CreatedVendorActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
 
         $fields->vendor_id = $event->vendor->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/CreditArchivedActivity.php

@@ -43,7 +43,7 @@ class CreditArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
 
         $fields->payment_id = $event->credit->id;
         $fields->client_id = $event->credit->client_id;

app/Listeners/Activity/DeleteClientActivity.php

@@ -43,7 +43,7 @@ class DeleteClientActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->client->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->client->user_id;
 
         $fields->client_id = $event->client->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/DeleteCreditActivity.php

@@ -43,7 +43,7 @@ class DeleteCreditActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
 
         $fields->client_id = $event->credit->client_id;
         $fields->credit_id = $event->credit->id;

app/Listeners/Activity/PaymentDeletedActivity.php

@@ -43,7 +43,7 @@ class PaymentDeletedActivity implements ShouldQueue
 
         $payment = $event->payment;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $invoices = $payment->invoices;
 

app/Listeners/Activity/PaymentRefundedActivity.php

@@ -43,7 +43,7 @@ class PaymentRefundedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->client_id = $event->payment->id;
         $fields->client_id = $event->payment->client_id;

app/Listeners/Activity/PaymentVoidedActivity.php

@@ -43,7 +43,7 @@ class PaymentVoidedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->client_id = $event->payment->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/QuoteUpdatedActivity.php

@@ -45,7 +45,7 @@ class QuoteUpdatedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->quote_id = $quote->id;
         $fields->client_id = $quote->client_id;

app/Listeners/Activity/SubscriptionArchivedActivity.php

@@ -45,7 +45,7 @@ class SubscriptionArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
 
         $fields->subscription_id = $subscription->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/SubscriptionDeletedActivity.php

@@ -43,7 +43,7 @@ class SubscriptionDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
 
         $fields->subscription_id = $event->subscription->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/SubscriptionRestoredActivity.php

@@ -43,7 +43,7 @@ class SubscriptionRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
 
         $fields->subscription_id = $event->subscription->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/SubscriptionUpdatedActivity.php

@@ -45,7 +45,7 @@ class SubscriptionUpdatedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
 
         $fields->subscription_id = $subscription->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/TaskArchivedActivity.php

@@ -45,7 +45,7 @@ class TaskArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
 
         $fields->task_id = $task->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/TaskRestoredActivity.php

@@ -43,7 +43,7 @@ class TaskRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
 
         $fields->task_id = $event->task->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/TaskUpdatedActivity.php

@@ -45,7 +45,7 @@ class TaskUpdatedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
 
         $fields->task_id = $task->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/UpdatedCreditActivity.php

@@ -43,7 +43,7 @@ class UpdatedCreditActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
 
         $fields->credit_id = $event->credit->id;
         $fields->client_id = $event->credit->client_id;

app/Listeners/Activity/VendorArchivedActivity.php

@@ -45,7 +45,7 @@ class VendorArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
 
         $fields->vendor_id = $vendor->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/VendorDeletedActivity.php

@@ -43,7 +43,7 @@ class VendorDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
 
         $fields->vendor_id = $event->vendor->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/VendorRestoredActivity.php

@@ -43,7 +43,7 @@ class VendorRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
 
         $fields->vendor_id = $event->vendor->id;
         $fields->user_id = $user_id;

app/Listeners/Credit/CreditRestoredActivity.php

@@ -43,9 +43,11 @@ class CreditRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
+
         $fields->credit_id = $event->credit->id;
         $fields->client_id = $event->credit->client_id;
-        $fields->user_id = $event->credit->user_id;
+        $fields->user_id = $user_id;
         $fields->company_id = $event->credit->company_id;
         $fields->activity_type_id = Activity::RESTORE_CREDIT;
 

app/Listeners/Credit/CreditViewedActivity.php

@@ -43,7 +43,9 @@ class CreditViewedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $fields->user_id = $event->invitation->user_id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->user_id;
+
+        $fields->user_id = $user_id;
         $fields->company_id = $event->invitation->company_id;
         $fields->activity_type_id = Activity::VIEW_CREDIT;
         $fields->client_id = $event->invitation->credit->client_id;

app/Listeners/Invoice/CreateInvoiceActivity.php

@@ -43,9 +43,11 @@ class CreateInvoiceActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+
+        $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
         $fields->client_id = $event->invoice->client_id;
-        $fields->user_id = $event->invoice->user_id;
         $fields->company_id = $event->invoice->company_id;
         $fields->activity_type_id = Activity::CREATE_INVOICE;
 

app/Listeners/Invoice/InvoiceArchivedActivity.php

@@ -45,9 +45,12 @@ class InvoiceArchivedActivity implements ShouldQueue
         
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+
+        $fields->user_id = $user_id;
+
         $fields->invoice_id = $event->invoice->id;
         $fields->client_id = $event->invoice->client_id;
-        $fields->user_id = $event->invoice->user_id;
         $fields->company_id = $event->invoice->company_id;
         $fields->activity_type_id = Activity::ARCHIVE_INVOICE;
 

app/Listeners/Invoice/InvoiceCancelledActivity.php

@@ -43,9 +43,11 @@ class InvoiceCancelledActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+
+        $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
         $fields->client_id = $event->invoice->client_id;
-        $fields->user_id = $event->invoice->user_id;
         $fields->company_id = $event->invoice->company_id;
         $fields->activity_type_id = Activity::CANCELLED_INVOICE;
 

app/Listeners/Invoice/InvoiceDeletedActivity.php

@@ -43,9 +43,11 @@ class InvoiceDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+
+        $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
         $fields->client_id = $event->invoice->client_id;
-        $fields->user_id = $event->invoice->user_id;
         $fields->company_id = $event->invoice->company_id;
         $fields->activity_type_id = Activity::DELETE_INVOICE;
 

app/Listeners/Invoice/InvoiceEmailActivity.php

@@ -43,8 +43,10 @@ class InvoiceEmailActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+
+        $fields->user_id = $user_id;
         $fields->invoice_id = $event->invitation->invoice->id;
-        $fields->user_id = $event->invitation->invoice->user_id;
         $fields->company_id = $event->invitation->invoice->company_id;
         $fields->client_contact_id = $event->invitation->invoice->client_contact_id;
         $fields->client_id = $event->invitation->invoice->client_id;

app/Listeners/Invoice/InvoiceEmailFailedActivity.php

@@ -48,9 +48,12 @@ class InvoiceEmailFailedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+
+        $fields->user_id = $user_id;
+
         $fields->invoice_id = $event->invitation->invoice->id;
         $fields->client_id = $event->invitation->invoice->client_id;
-        $fields->user_id = $event->invitation->invoice->user_id;
         $fields->company_id = $event->invitation->invoice->company_id;
         $fields->activity_type_id = Activity::EMAIL_INVOICE_FAILED;
         $fields->notes = $event->message;

app/Listeners/Invoice/InvoicePaidActivity.php

@@ -44,8 +44,10 @@ class InvoicePaidActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+
+        $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
-        $fields->user_id = $event->invoice->user_id;
         $fields->company_id = $event->invoice->company_id;
         $fields->activity_type_id = Activity::PAID_INVOICE;
         $fields->payment_id = $event->payment->id;

app/Listeners/Invoice/InvoiceReminderEmailActivity.php

@@ -42,8 +42,10 @@ class InvoiceReminderEmailActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+
+        $fields->user_id = $user_id;
         $fields->invoice_id = $event->invitation->invoice->id;
-        $fields->user_id = $event->invitation->invoice->user_id;
         $fields->company_id = $event->invitation->invoice->company_id;
         $fields->client_contact_id = $event->invitation->invoice->client_contact_id;
         $fields->activity_type_id = $event->reminder;

app/Listeners/Invoice/InvoiceRestoredActivity.php

@@ -43,9 +43,11 @@ class InvoiceRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+
+        $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
         $fields->client_id = $event->invoice->client_id;
-        $fields->user_id = $event->invoice->user_id;
         $fields->company_id = $event->invoice->company_id;
         $fields->activity_type_id = Activity::RESTORE_INVOICE;
 

app/Listeners/Invoice/InvoiceReversedActivity.php

@@ -43,9 +43,11 @@ class InvoiceReversedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+
+        $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
         $fields->client_id = $event->invoice->client_id;
-        $fields->user_id = $event->invoice->user_id;
         $fields->company_id = $event->invoice->company_id;
         $fields->activity_type_id = Activity::REVERSED_INVOICE;
 

app/Listeners/Invoice/InvoiceViewedActivity.php

@@ -43,7 +43,10 @@ class InvoiceViewedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $fields->user_id = $event->invitation->user_id;
+
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+
+        $fields->user_id = $user_id;
         $fields->company_id = $event->invitation->company_id;
         $fields->activity_type_id = Activity::VIEW_INVOICE;
         $fields->client_id = $event->invitation->invoice->client_id;

app/Listeners/Invoice/UpdateInvoiceActivity.php

@@ -43,8 +43,10 @@ class UpdateInvoiceActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+
+        $fields->user_id = $user_id;
         $fields->client_id = $event->invoice->client_id;
-        $fields->user_id = $event->invoice->user_id;
         $fields->company_id = $event->invoice->company_id;
         $fields->activity_type_id = Activity::UPDATE_INVOICE;
         $fields->invoice_id = $event->invoice->id;

app/Listeners/Payment/PaymentRestoredActivity.php

@@ -43,9 +43,11 @@ class PaymentRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+
+        $fields->user_id = $user_id;
         $fields->payment_id = $event->payment->id;
         $fields->client_id = $event->payment->client_id;
-        $fields->user_id = $event->payment->user_id;
         $fields->company_id = $event->payment->company_id;
         $fields->activity_type_id = Activity::RESTORE_PAYMENT;
 

app/Listeners/Quote/QuoteApprovedActivity.php

@@ -43,9 +43,11 @@ class QuoteApprovedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
+
+        $fields->user_id = $user_id;
         $fields->quote_id = $event->quote->id;
         $fields->client_id = $event->quote->client_id;
-        $fields->user_id = $event->quote->user_id;
         $fields->client_contact_id = $event->contact->id;
         $fields->company_id = $event->quote->company_id;
         $fields->activity_type_id = Activity::APPROVE_QUOTE;

app/Listeners/Quote/QuoteArchivedActivity.php

@@ -43,9 +43,11 @@ class QuoteArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
+
+        $fields->user_id = $user_id;
         $fields->quote_id = $event->quote->id;
         $fields->client_id = $event->quote->client_id;
-        $fields->user_id = $event->quote->user_id;
         $fields->company_id = $event->quote->company_id;
         $fields->activity_type_id = Activity::ARCHIVE_QUOTE;
 

app/Listeners/Quote/QuoteDeletedActivity.php

@@ -43,9 +43,11 @@ class QuoteDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
+
+        $fields->user_id = $user_id;
         $fields->quote_id = $event->quote->id;
         $fields->client_id = $event->quote->client_id;
-        $fields->user_id = $event->quote->user_id;
         $fields->company_id = $event->quote->company_id;
         $fields->activity_type_id = Activity::DELETE_QUOTE;
 

app/Listeners/Quote/QuoteEmailActivity.php

@@ -43,9 +43,13 @@ class QuoteEmailActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->quote->user_id;
+
+        $fields->user_id = $user_id;
+
         $fields->quote_id = $event->invitation->quote->id;
         $fields->client_id = $event->invitation->quote->client_id;
-        $fields->user_id = $event->invitation->quote->user_id;
         $fields->company_id = $event->invitation->quote->company_id;
         $fields->client_contact_id = $event->invitation->quote->client_contact_id;
         $fields->client_id = $event->invitation->quote->client_id;

app/Listeners/Quote/QuoteRestoredActivity.php

@@ -43,7 +43,10 @@ class QuoteRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $fields->quote_id = $event->quote->id;
+
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
+
+        $fields->user_id = $user_id;
         $fields->client_id = $event->quote->client_id;
         $fields->user_id = $event->quote->user_id;
         $fields->company_id = $event->quote->company_id;

app/Listeners/RecurringInvoice/CreateRecurringInvoiceActivity.php

@@ -43,9 +43,11 @@ class CreateRecurringInvoiceActivity implements ShouldQueue
 
         $fields = new stdClass;
 
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
+
+        $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;
         $fields->client_id = $event->recurring_invoice->client_id;
-        $fields->user_id = $event->recurring_invoice->user_id;
         $fields->company_id = $event->recurring_invoice->company_id;
         $fields->activity_type_id = Activity::CREATE_RECURRING_INVOICE;
 

app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php

@@ -44,10 +44,11 @@ class RecurringInvoiceArchivedActivity implements ShouldQueue
         $event->recurring_invoice->service()->deletePdf();
         
         $fields = new stdClass;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
+        $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;
         $fields->client_id = $event->recurring_invoice->client_id;
-        $fields->user_id = $event->recurring_invoice->user_id;
         $fields->company_id = $event->recurring_invoice->company_id;
         $fields->activity_type_id = Activity::ARCHIVE_RECURRING_INVOICE;
 

app/Listeners/RecurringInvoice/RecurringInvoiceDeletedActivity.php

@@ -42,10 +42,11 @@ class RecurringInvoiceDeletedActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $fields = new stdClass;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
+        $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;
         $fields->client_id = $event->recurring_invoice->client_id;
-        $fields->user_id = $event->recurring_invoice->user_id;
         $fields->company_id = $event->recurring_invoice->company_id;
         $fields->activity_type_id = Activity::DELETE_RECURRING_INVOICE;
 

app/Listeners/RecurringInvoice/RecurringInvoiceRestoredActivity.php

@@ -42,10 +42,11 @@ class RecurringInvoiceRestoredActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $fields = new stdClass;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
+        $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;
         $fields->client_id = $event->recurring_invoice->client_id;
-        $fields->user_id = $event->recurring_invoice->user_id;
         $fields->company_id = $event->recurring_invoice->company_id;
         $fields->activity_type_id = Activity::RESTORE_RECURRING_INVOICE;
 

app/Listeners/RecurringInvoice/UpdateRecurringInvoiceActivity.php

@@ -42,9 +42,10 @@ class UpdateRecurringInvoiceActivity implements ShouldQueue
         MultiDB::setDB($event->company->db);
 
         $fields = new stdClass;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
+        $fields->user_id = $user_id;
         $fields->client_id = $event->recurring_invoice->client_id;
-        $fields->user_id = $event->recurring_invoice->user_id;
         $fields->company_id = $event->recurring_invoice->company_id;
         $fields->activity_type_id = Activity::UPDATE_RECURRING_INVOICE;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;

app/Listeners/User/ArchivedUserActivity.php

@@ -43,7 +43,9 @@ class ArchivedUserActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $fields->user_id = $event->creating_user->id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+
+        $fields->user_id = $user_id;
         $fields->notes = $event->creating_user->present()->name . " Archived User " . $event->user->present()->name();
 
         $fields->company_id = $event->company->id;

app/Listeners/User/CreatedUserActivity.php

@@ -43,7 +43,9 @@ class CreatedUserActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $fields->user_id = $event->creating_user->id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+
+        $fields->user_id = $user_id;
         $fields->notes = $event->creating_user->present()->name() . " Created the user " . $event->user->present()->name();
         $fields->company_id = $event->company->id;
         $fields->activity_type_id = Activity::CREATE_USER;

app/Listeners/User/DeletedUserActivity.php

@@ -48,7 +48,10 @@ class DeletedUserActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $fields->user_id = $event->creating_user->id;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+
+        $fields->user_id = $user_id;
+
         $fields->notes = $event->creating_user->present()->name() . " Deleted the user " . $event->user->present()->name();
         $fields->company_id = $event->company->id;
         $fields->activity_type_id = Activity::DELETE_USER;

app/Listeners/User/RestoredUserActivity.php

@@ -42,8 +42,9 @@ class RestoredUserActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $fields = new stdClass;
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
-        $fields->user_id = $event->user->id;
+        $fields->user_id = $user_id;
         $fields->notes = $event->creating_user->present()->name() . " Restored user " . $event->user->present()->name();
 
         $fields->company_id = $event->company->id;

app/Listeners/User/UpdatedUserActivity.php

@@ -42,7 +42,9 @@ class UpdatedUserActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $fields = new stdClass;
-        $fields->user_id = $event->creating_user->id;    
+        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+
+        $fields->user_id = $user_id;   
         $fields->notes = $event->creating_user->present()->name() . " Updated user " . $event->user->present()->name();
 
         $fields->company_id = $event->company->id;

app/Models/Invoice.php

@@ -452,7 +452,7 @@ class Invoice extends BaseModel
                 return false;
                 break;
             case 'when_sent':
-                return $this->status_id == self::STATUS_DRAFT;
+                return $this->status_id == self::STATUS_SENT;
                 break;
             case 'when_paid':
                 return $this->status_id == self::STATUS_PAID || $this->status_id == self::STATUS_PARTIAL;

app/PaymentDrivers/WePay/ACH.php

@@ -142,6 +142,9 @@ class ACH
         }
         catch(\Exception $e){
 
+            nlog("we pay exception");
+            nlog($e->getMessage());
+            
             return redirect()->route('client.payment_methods.verification', ['payment_method' => $token->hashed_id, 'method' => GatewayType::BANK_TRANSFER])
                       ->with('error', $e->getMessage());
         

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.2.14',
-    'app_tag' => '5.2.14',
+    'app_version' => '5.2.15',
+    'app_tag' => '5.2.15',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

public/flutter_service_worker.js

@@ -4,7 +4,7 @@ const TEMP = 'flutter-temp-cache';
 const CACHE_NAME = 'flutter-app-cache';
 const RESOURCES = {
   "favicon.png": "dca91c54388f52eded692718d5a98b8b",
-"main.dart.js": "d4e208e045668f5093d46a8c876a2b73",
+"main.dart.js": "c3ca362d549201394b5c4301af639ddb",
 "/": "23224b5e03519aaa87594403d54412cf",
 "manifest.json": "ce1b79950eb917ea619a0a30da27c6a3",
 "assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "174c02fc4609e8fc4389f5d21f16a296",