Merge pull request #8723 from turbo124/v5-stable

v5.6.31
invoiceninja · Aug 16, 2023 · 7d748c7 · 7d748c7
2 parents a66e668 + 5e95556
commit 7d748c7
Show file tree

Hide file tree

Showing 61 changed files with 1,428 additions and 803 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-5.6.30
+5.6.31
diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
@@ -35,6 +35,7 @@
 use App\Models\QuoteInvitation;
 use Illuminate\Console\Command;
 use App\Models\CreditInvitation;
+use App\Models\RecurringInvoice;
 use App\Models\InvoiceInvitation;
 use App\DataMapper\ClientSettings;
 use Illuminate\Support\Facades\DB;
@@ -471,7 +472,7 @@ private function checkEntityInvitations()
             $ii->saveQuietly();
         });
 
-        collect([Invoice::class, Quote::class, Credit::class, PurchaseOrder::class])->each(function ($entity) {
+        collect([Invoice::class, Quote::class, Credit::class, PurchaseOrder::class, RecurringInvoice::class])->each(function ($entity) {
             if ($entity::doesntHave('invitations')->count() > 0) {
                 $entity::doesntHave('invitations')->cursor()->each(function ($entity) {
                     $client_vendor_key = 'client_id';
@@ -694,7 +695,7 @@ private function checkInvoicePayments()
     {
         $this->wrong_balances = 0;
 
-        Client::cursor()->where('is_deleted', 0)->where('clients.updated_at', '>', now()->subDays(2))->each(function ($client) {
+        Client::query()->cursor()->where('is_deleted', 0)->where('clients.updated_at', '>', now()->subDays(2))->each(function ($client) {
             $client->invoices->where('is_deleted', false)->whereIn('status_id', '!=', Invoice::STATUS_DRAFT)->each(function ($invoice) use ($client) {
                 $total_paid = $invoice->payments()
                                     ->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED])
@@ -876,7 +877,7 @@ private function checkLedgerBalances()
         $this->wrong_balances = 0;
         $this->wrong_paid_to_dates = 0;
 
-        foreach (Client::where('is_deleted', 0)->where('clients.updated_at', '>', now()->subDays(2))->cursor() as $client) {
+        foreach (Client::query()->where('is_deleted', 0)->where('clients.updated_at', '>', now()->subDays(2))->cursor() as $client) {
             $invoice_balance = $client->invoices()->where('is_deleted', false)->whereIn('status_id', [2,3])->sum('balance');
             $ledger = CompanyLedger::where('client_id', $client->id)->orderBy('id', 'DESC')->first();
 

diff --git a/app/DataMapper/Analytics/RevenueTrack.php b/app/DataMapper/Analytics/RevenueTrack.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Analytics;
+
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class RevenueTrack extends GenericMixedMetric
+{
+    /**
+     * The type of Sample.
+     *
+     * Monotonically incrementing counter
+     *
+     * 	- counter
+     *
+     * @var string
+     */
+    public $type = 'mixed_metric';
+
+    /**
+     * The name of the counter.
+     * @var string
+     */
+    public $name = 'app.revenue';
+
+    /**
+     * The datetime of the counter measurement.
+     *
+     * date("Y-m-d H:i:s")
+     *
+     */
+    public $datetime;
+
+    /**
+     * The Client email
+     *
+     * @var string
+     */
+    public $string_metric5 = 'email';
+
+    /**
+     * The AccountKey email
+     *
+     * @var string
+     */
+    public $string_metric6 = 'key';
+
+    /**
+     * Product Type
+     *
+     * @var string
+     */
+    public $string_metric7 = 'product';
+
+    /**
+     * Gateway Reference
+     *
+     * @var string
+     */
+    public $string_metric8 = 'gateway_reference';
+
+    public $string_metric9 = 'entity_reference';
+
+    public $string_metric10 = 'gateway_type';
+
+    /**
+     * The counter
+     * set to 1.
+     *
+     * @var int
+     */
+    public $int_metric1 = 1;
+
+    /**
+     * Amount Received
+     *
+     * @var double
+     */
+    public $double_metric2 = 0;
+
+    public function __construct($string_metric5, $string_metric6, $int_metric1, $double_metric2, $string_metric7, $string_metric8, $string_metric9, $string_metric10)
+    {
+        $this->int_metric1 = $int_metric1;
+        $this->double_metric2 = $double_metric2;
+        $this->string_metric5 = $string_metric5;
+        $this->string_metric6 = $string_metric6;
+        $this->string_metric7 = $string_metric7;
+        $this->string_metric8 = $string_metric8;
+        $this->string_metric9 = $string_metric9;
+        $this->string_metric10 = $string_metric10;
+    }
+}
diff --git a/app/DataMapper/InvoiceItem.php b/app/DataMapper/InvoiceItem.php
@@ -61,8 +61,13 @@ class InvoiceItem
 
     public $tax_id = '';
 
+    public $task_id = '';
+
+    public $expense_id = '';
 
     public static $casts = [
+        'task_id' => 'string',
+        'expense_id' => 'string',
         'tax_id' => 'string',
         'type_id' => 'string',
         'quantity' => 'float',

diff --git a/app/Events/Account/StripeConnectFailure.php b/app/Events/Account/StripeConnectFailure.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Events\Account;
+
+use App\Models\Company;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+
+/**
+ * Class StripeConnectFailure.
+ */
+class StripeConnectFailure
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public function __construct(public Company $company, public string $db)
+    {
+    }
+
+    public function broadcastOn()
+    {
+        return [];
+    }
+}
diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php
@@ -88,6 +88,11 @@ public function filter(string $filter = ''): Builder
                           ->orWhere('credits.custom_value4', 'like', '%'.$filter.'%')
                           ->orWhereHas('client', function ($q) use ($filter) {
                               $q->where('name', 'like', '%'.$filter.'%');
+                          })
+                          ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
                           });
         });
     }

diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
@@ -116,6 +116,11 @@ public function filter(string $filter = ''): Builder
                           ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                           ->orWhereHas('client', function ($q) use ($filter) {
                               $q->where('name', 'like', '%'.$filter.'%');
+                          })
+                          ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
                           });
         });
     }

diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
@@ -44,7 +44,12 @@ public function filter(string $filter = ''): Builder
                           ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                           ->orWhereHas('client', function ($q) use ($filter) {
                                 $q->where('name', 'like', '%'.$filter.'%');
-                            });
+                            })
+                            ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
+                          });
         });
     }
 

diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php
@@ -40,7 +40,12 @@ public function filter(string $filter = ''): Builder
                   ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                   ->orWhereHas('client', function ($q) use ($filter) {
                       $q->where('name', 'like', '%'.$filter.'%');
-                  });
+                  })
+                  ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
+                          });
         });
     }
 

diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php
@@ -42,7 +42,12 @@ public function filter(string $filter = ''): Builder
                     ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                     ->orWhereHas('client', function ($q) use ($filter) {
                         $q->where('name', 'like', '%'.$filter.'%');
-                    });
+                    })
+                    ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
+                          });
         });
     }
 

diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
@@ -45,7 +45,12 @@ public function filter(string $filter = ''): Builder
                             })
                           ->orWhereHas('client', function ($q) use ($filter) {
                                 $q->where('name', 'like', '%'.$filter.'%');
-                            });
+                            })
+                            ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
+                          });
         });
     }
 

diff --git a/app/Filters/UserFilters.php b/app/Filters/UserFilters.php
@@ -127,8 +127,7 @@ public function without(string $user_id = ''): Builder
         $user_array = $this->transformKeys(explode(',', $user_id));
 
         return  $this->builder->where(function ($query) use ($user_array) {
-            $query->whereNotIn('id', $user_array)
-                  ->where('account_id', auth()->user()->account_id);
+            $query->whereNotIn('id', $user_array);
         });
     }
 }
diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -252,11 +252,20 @@ private function buildZip($invoices)
         // create new archive
         $zipFile = new \PhpZip\ZipFile();
         try {
+
             foreach ($invoices as $invoice) {
-                //add it to the zip
-                $zipFile->addFromString(basename($invoice->pdf_file_path()), file_get_contents($invoice->pdf_file_path(null, 'url', true)));
+
+                if ($invoice->client->getSetting('enable_e_invoice')) {
+                    $xml = $invoice->service()->getEInvoice();
+                    $zipFile->addFromString($invoice->getFileName("xml"), $xml);
+                }
+
+                $file = $invoice->service()->getRawInvoicePdf();
+                $zip_file_name = $invoice->getFileName();
+                $zipFile->addFromString($zip_file_name, $file);
             }
 
+
             $filename = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.invoices')).'.zip';
             $filepath = sys_get_temp_dir().'/'.$filename;