Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7767 from turbo124/v5-develop

Browse Source 
v5.5.14
This commit is contained in:
David Bomba 2022-08-20 08:08:39 +10:00 committed by GitHub
commit f1601f6339
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/phpunit.yml vendored
View File

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

2
VERSION.txt
View File

@ -1 +1 @@
5.5.13 5.5.14

5
app/Listeners/Mail/MailSentListener.php
View File

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

6
app/Models/Account.php
View File

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

4
config/ninja.php
View File

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