Merge pull request #7767 from turbo124/v5-develop

v5.5.14

.github/workflows/phpunit.yml

@@ -103,6 +103,7 @@ jobs:
     - name: Run Testsuite
       run: |
         cat .env
+        vendor/bin/snappdf download
         vendor/bin/phpunit --testdox
       env:
         DB_PORT: ${{ job.services.mysql.ports[3306] }}

VERSION.txt

@@ -1 +1 @@
-5.5.13
+5.5.14

app/Listeners/Mail/MailSentListener.php

@@ -17,6 +17,7 @@ use App\Models\InvoiceInvitation;
 use App\Models\PurchaseOrderInvitation;
 use App\Models\QuoteInvitation;
 use App\Models\RecurringInvoiceInvitation;
+use App\Utils\Ninja;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Events\MessageSent;
 use Illuminate\Support\Facades\Notification;
@@ -41,7 +42,9 @@ class MailSentListener implements ShouldQueue
      */
     public function handle(MessageSent $event)
     {
-
+        if(!Ninja::isHosted());
+            return;
+            
         $message_id = $event->sent->getMessageId();
 
         $message = MessageConverter::toEmail($event->sent->getOriginalMessage());

app/Models/Account.php

@@ -33,7 +33,7 @@ class Account extends BaseModel
     use PresentableTrait;
     use MakesHash;
 
-    private $free_plan_email_quota = 50;
+    private $free_plan_email_quota = 20;
 
     private $paid_plan_email_quota = 500;
     /**
@@ -390,11 +390,11 @@ class Account extends BaseModel
 
         if($this->isPaid()){
             $limit = $this->paid_plan_email_quota;
-            $limit += Carbon::createFromTimestamp($this->created_at)->diffInMonths() * 100;
+            $limit += Carbon::createFromTimestamp($this->created_at)->diffInMonths() * 50;
         }
         else{
             $limit = $this->free_plan_email_quota;
-            $limit += Carbon::createFromTimestamp($this->created_at)->diffInMonths() * 50;
+            $limit += Carbon::createFromTimestamp($this->created_at)->diffInMonths() * 10;
         }
 
         return min($limit, 5000);

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