diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index d9f781b41797..07721a37c9e3 100644 --- a/.github/workflows/phpunit.yml +++ b/.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] }} diff --git a/VERSION.txt b/VERSION.txt index 3b4176428c48..9562ed5038cc 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.5.13 \ No newline at end of file +5.5.14 \ No newline at end of file diff --git a/app/Listeners/Mail/MailSentListener.php b/app/Listeners/Mail/MailSentListener.php index e1a620c0e770..f2cbcd736b8f 100644 --- a/app/Listeners/Mail/MailSentListener.php +++ b/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()); diff --git a/app/Models/Account.php b/app/Models/Account.php index b75a7ce327df..915a3ac979b8 100644 --- a/app/Models/Account.php +++ b/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); diff --git a/config/ninja.php b/config/ninja.php index 669d23100cc4..1f8ce1c6bd18 100644 --- a/config/ninja.php +++ b/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', ''),