Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-02 18:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for frequencyforkey

Browse Source
This commit is contained in:
David Bomba 2022-03-29 08:04:04 +11:00
parent 4c2c62bd85
commit 2f744c6969
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.3.76 5.3.77

8
app/DataMapper/EmailTemplateDefaults.php
View File

@ -180,7 +180,7 @@ class EmailTemplateDefaults
public static function emailReminder1Subject() public static function emailReminder1Subject()
{ {
return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']); return ctrans('texts.reminder_subject', ['invoice'=>'$number', 'account'=>'$company.name']);
} }
public static function emailReminder1Template() public static function emailReminder1Template()
@ -190,7 +190,7 @@ class EmailTemplateDefaults
public static function emailReminder2Subject() public static function emailReminder2Subject()
{ {
return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']); return ctrans('texts.reminder_subject', ['invoice'=>'$number', 'account'=>'$company.name']);
} }
public static function emailReminder2Template() public static function emailReminder2Template()
@ -200,7 +200,7 @@ class EmailTemplateDefaults
public static function emailReminder3Subject() public static function emailReminder3Subject()
{ {
return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']); return ctrans('texts.reminder_subject', ['invoice'=>'$number', 'account'=>'$company.name']);
} }
public static function emailReminder3Template() public static function emailReminder3Template()
@ -210,7 +210,7 @@ class EmailTemplateDefaults
public static function emailReminderEndlessSubject() public static function emailReminderEndlessSubject()
{ {
return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']); return ctrans('texts.reminder_subject', ['invoice'=>'$number', 'account'=>'$company.name']);
} }
public static function emailReminderEndlessTemplate() public static function emailReminderEndlessTemplate()

2
app/Http/Controllers/ClientPortal/NinjaPlanController.php
View File

@ -198,7 +198,7 @@ class NinjaPlanController extends Controller
if($account) if($account)
{ {
//offer the option to have a free trial //offer the option to have a free trial
if(!$account->trial_started) if(!$account->trial_started && !$account->plan)
return $this->trial(); return $this->trial();
if(Carbon::parse($account->plan_expires)->lt(now())){ if(Carbon::parse($account->plan_expires)->lt(now())){

5
app/Models/RecurringInvoice.php
View File

@ -383,8 +383,11 @@ class RecurringInvoice extends BaseModel
case self::FREQUENCY_TWO_YEARS: case self::FREQUENCY_TWO_YEARS:
return ctrans('texts.freq_two_years'); return ctrans('texts.freq_two_years');
break; break;
case self::FREQUENCY_THREE_YEARS:
return ctrans('texts.freq_three_years');
break;
default: default:
// code... return '';
break; break;
} }
} }

6
app/Observers/QuoteObserver.php
View File

@ -33,7 +33,7 @@ class QuoteObserver
if ($subscriptions) { if ($subscriptions) {
$quote->load('client'); $quote->load('client');
WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company); WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company, 'client');
} }
} }
@ -53,7 +53,7 @@ class QuoteObserver
if ($subscriptions) { if ($subscriptions) {
$quote->load('client'); $quote->load('client');
WebhookHandler::dispatch(Webhook::EVENT_UPDATE_QUOTE, $quote, $quote->company); WebhookHandler::dispatch(Webhook::EVENT_UPDATE_QUOTE, $quote, $quote->company, 'client');
} }
} }
@ -72,7 +72,7 @@ class QuoteObserver
if ($subscriptions) { if ($subscriptions) {
$quote->load('client'); $quote->load('client');
WebhookHandler::dispatch(Webhook::EVENT_DELETE_QUOTE, $quote, $quote->company); WebhookHandler::dispatch(Webhook::EVENT_DELETE_QUOTE, $quote, $quote->company, 'client');
} }
} }

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.3.76', 'app_version' => '5.3.77',
'app_tag' => '5.3.76', 'app_tag' => '5.3.77',
'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', ''),