Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move new properties to account_email_settings

Browse Source
This commit is contained in:
David Bomba 2021-06-23 14:46:13 +10:00
parent 7dc4ecd209
commit 48cfe8cc6b
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Console/Commands/SendRecurringInvoices.php
View File

@ -71,7 +71,7 @@ class SendRecurringInvoices extends Command
foreach ($accounts as $account) { foreach ($accounts as $account) {
if(!$account->is_disabled) if(!$account->account_email_settings->is_disabled)
$account->checkCounterReset(); $account->checkCounterReset();
} }
} }
@ -97,7 +97,7 @@ class SendRecurringInvoices extends Command
$account = $recurInvoice->account; $account = $recurInvoice->account;
if($account->is_disabled){ if($account->account_email_settings->is_disabled){
continue; continue;
} }
@ -134,7 +134,7 @@ class SendRecurringInvoices extends Command
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$shouldSendToday = $expense->shouldSendToday(); $shouldSendToday = $expense->shouldSendToday();
if (! $shouldSendToday || $expense->account->is_disabled) { if (! $shouldSendToday || $expense->account->account_email_settings->is_disabled) {
continue; continue;
} }

6
app/Console/Commands/SendReminders.php
View File

@ -128,7 +128,7 @@ class SendReminders extends Command
$this->info(date('r ') . $accounts->count() . ' accounts found with fees enabled'); $this->info(date('r ') . $accounts->count() . ' accounts found with fees enabled');
foreach ($accounts as $account) { foreach ($accounts as $account) {
if (! $account->hasFeature(FEATURE_EMAIL_TEMPLATES_REMINDERS) || $account->is_disabled) { if (! $account->hasFeature(FEATURE_EMAIL_TEMPLATES_REMINDERS) || $account->account_email_settings->is_disabled) {
continue; continue;
} }
@ -155,7 +155,7 @@ class SendReminders extends Command
$this->info(date('r ') . count($accounts) . ' accounts found with reminders enabled'); $this->info(date('r ') . count($accounts) . ' accounts found with reminders enabled');
foreach ($accounts as $account) { foreach ($accounts as $account) {
if (! $account->hasFeature(FEATURE_EMAIL_TEMPLATES_REMINDERS) || $account->is_disabled) { if (! $account->hasFeature(FEATURE_EMAIL_TEMPLATES_REMINDERS) || $account->account_email_settings->is_disabled) {
continue; continue;
} }
@ -201,7 +201,7 @@ class SendReminders extends Command
$account = $scheduledReport->account; $account = $scheduledReport->account;
$account->loadLocalizationSettings(); $account->loadLocalizationSettings();
if (! $account->hasFeature(FEATURE_REPORTS) || $account->is_disabled) { if (! $account->hasFeature(FEATURE_REPORTS) || $account->account_email_settings->is_disabled) {
continue; continue;
} }

4
app/Http/Controllers/ClientPortalController.php
View File

@ -68,14 +68,14 @@ class ClientPortalController extends BaseController
$account = $invoice->account; $account = $invoice->account;
/* Forward requests from V4 to V5 if the domain is set */ /* Forward requests from V4 to V5 if the domain is set */
if(strlen($account->forward_url_for_v5) >1){ if(strlen($account->account_email_settings->forward_url_for_v5) >1){
if ($invoice->isType(INVOICE_TYPE_QUOTE)) if ($invoice->isType(INVOICE_TYPE_QUOTE))
$entity = 'quote'; $entity = 'quote';
else else
$entity = 'invoice'; $entity = 'invoice';
return redirect($account->forward_url_for_v5."/client/".$entity."/".$invitationKey); return redirect($account->account_email_settings->forward_url_for_v5."/client/".$entity."/".$invitationKey);
} }
if (request()->silent) { if (request()->silent) {

10
app/Http/Controllers/Migration/StepsController.php
View File

@ -101,17 +101,17 @@ class StepsController extends BaseController
->withInput(); ->withInput();
} }
$account = \Auth::user()->account; $account_settings = \Auth::user()->account->account_email_settings;
if(strlen($request->input('url')) == 0) { if(strlen($request->input('url')) == 0) {
$account->is_disabled = false; $account_settings->is_disabled = false;
} }
else { else {
$account->is_disabled = true; $account_settings->is_disabled = true;
} }
$account->forward_url_for_v5 = rtrim($request->input('url'),'/'); $account_settings->forward_url_for_v5 = rtrim($request->input('url'),'/');
$account->save(); $account_settings->save();
return back(); return back();
} }

2
database/migrations/2021_06_22_234707_add_forward_url_for_v5.php
View File

@ -13,7 +13,7 @@ class AddForwardUrlForV5 extends Migration
*/ */
public function up() public function up()
{ {
Schema::table('accounts', function ($table) { Schema::table('account_email_settings', function ($table) {
$table->text('forward_url_for_v5')->default(''); $table->text('forward_url_for_v5')->default('');
$table->boolean('is_disabled')->default(false); $table->boolean('is_disabled')->default(false);
}); });

2
resources/views/accounts/management.blade.php
View File

@ -285,7 +285,7 @@
<div class="form-group"> <div class="form-group">
<label for="url" class="control-label col-lg-4 col-sm-4 text-right">{!! trans('texts.url') !!}</label> <label for="url" class="control-label col-lg-4 col-sm-4 text-right">{!! trans('texts.url') !!}</label>
<div class="col-lg-8 col-sm-8"> <div class="col-lg-8 col-sm-8">
<input type="text" name="url" placeholder="https://subdomain.invoicing.co" class="form form-control" value="{{ $account->forward_url_for_v5}}"> <input type="text" name="url" placeholder="https://subdomain.invoicing.co" class="form form-control" value="{{ $account->account_email_settings->forward_url_for_v5}}">
@if($errors->has('url')) @if($errors->has('url'))
<div class="col-sm-5"> <div class="col-sm-5">
@foreach ($errors->get('url') as $message) @foreach ($errors->get('url') as $message)