diff --git a/app/Console/Commands/SendReminders.php b/app/Console/Commands/SendReminders.php index cd640a8969ac..69d3bbc945c4 100644 --- a/app/Console/Commands/SendReminders.php +++ b/app/Console/Commands/SendReminders.php @@ -74,7 +74,7 @@ class SendReminders extends Command } $this->chargeLateFees(); - $this->setReminderEmails(); + $this->sendReminderEmails(); $this->sendScheduledReports(); $this->loadExchangeRates(); @@ -116,7 +116,7 @@ class SendReminders extends Command } } - private function setReminderEmails() + private function sendReminderEmails() { $accounts = $this->accountRepo->findWithReminders(); $this->info(count($accounts) . ' accounts found with reminders'); diff --git a/app/Constants.php b/app/Constants.php index 8cc4909b332c..509fed2cd59a 100644 --- a/app/Constants.php +++ b/app/Constants.php @@ -444,6 +444,7 @@ if (! defined('APP_NAME')) { define('TEMPLATE_REMINDER1', 'reminder1'); define('TEMPLATE_REMINDER2', 'reminder2'); define('TEMPLATE_REMINDER3', 'reminder3'); + define('TEMPLATE_REMINDER4', 'reminder4'); define('RESET_FREQUENCY_DAILY', 1); define('RESET_FREQUENCY_WEEKLY', 2); diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index eb7ab3be919a..f1b3041de441 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -845,6 +845,9 @@ class AccountController extends BaseController $account->account_email_settings->{"late_fee{$number}_percent"} = Input::get("late_fee{$number}_percent"); } + $account->enable_reminder4 = Input::get('enable_reminder4') ? true : false; + $account->account_email_settings->frequency_id_reminder4 = Input::get('frequency_id_reminder4'); + $account->save(); $account->account_email_settings->save(); diff --git a/app/Models/Account.php b/app/Models/Account.php index 22a605d75aeb..9d590fea65ea 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -108,6 +108,7 @@ class Account extends Eloquent 'enable_reminder1', 'enable_reminder2', 'enable_reminder3', + 'enable_reminder4', 'num_days_reminder1', 'num_days_reminder2', 'num_days_reminder3', @@ -178,6 +179,7 @@ class Account extends Eloquent 'credit_number_pattern', 'task_rate', 'inclusive_taxes', + 'convert_products', ]; /** @@ -1016,7 +1018,7 @@ class Account extends Eloquent return false; } - return $this->enable_reminder1 || $this->enable_reminder2 || $this->enable_reminder3; + return $this->enable_reminder1 || $this->enable_reminder2 || $this->enable_reminder3 || $this->enable_reminder4; } /** diff --git a/app/Models/AccountEmailSettings.php b/app/Models/AccountEmailSettings.php index 5fafc0d7a608..e949127710ef 100644 --- a/app/Models/AccountEmailSettings.php +++ b/app/Models/AccountEmailSettings.php @@ -43,6 +43,7 @@ class AccountEmailSettings extends Eloquent TEMPLATE_REMINDER1, TEMPLATE_REMINDER2, TEMPLATE_REMINDER3, + TEMPLATE_REMINDER4, ]; } diff --git a/app/Ninja/Transformers/AccountEmailSettingsTransformer.php b/app/Ninja/Transformers/AccountEmailSettingsTransformer.php index dd09fb011b86..22d3a14ff423 100644 --- a/app/Ninja/Transformers/AccountEmailSettingsTransformer.php +++ b/app/Ninja/Transformers/AccountEmailSettingsTransformer.php @@ -40,9 +40,11 @@ class AccountEmailSettingsTransformer extends EntityTransformer 'email_subject_reminder1' => $settings->email_subject_reminder1, 'email_subject_reminder2' => $settings->email_subject_reminder2, 'email_subject_reminder3' => $settings->email_subject_reminder3, + 'email_subject_reminder4' => $settings->email_subject_reminder4, 'email_template_reminder1' => $settings->email_template_reminder1, 'email_template_reminder2' => $settings->email_template_reminder2, 'email_template_reminder3' => $settings->email_template_reminder3, + 'email_template_reminder4' => $settings->email_template_reminder4, 'late_fee1_amount' => $settings->late_fee1_amount, 'late_fee1_percent' => $settings->late_fee1_percent, 'late_fee2_amount' => $settings->late_fee2_amount, diff --git a/app/Ninja/Transformers/AccountTransformer.php b/app/Ninja/Transformers/AccountTransformer.php index 69c084691af0..c0f06c892fc8 100644 --- a/app/Ninja/Transformers/AccountTransformer.php +++ b/app/Ninja/Transformers/AccountTransformer.php @@ -211,6 +211,7 @@ class AccountTransformer extends EntityTransformer 'enable_reminder1' => $account->enable_reminder1, 'enable_reminder2' => $account->enable_reminder2, 'enable_reminder3' => $account->enable_reminder3, + 'enable_reminder4' => $account->enable_reminder4, 'num_days_reminder1' => $account->num_days_reminder1, 'num_days_reminder2' => $account->num_days_reminder2, 'num_days_reminder3' => $account->num_days_reminder3, @@ -276,6 +277,7 @@ class AccountTransformer extends EntityTransformer 'custom_contact_label2' => $account->custom_contact_label2, 'task_rate' => (float) $account->task_rate, 'inclusive_taxes' => (bool) $account->inclusive_taxes, + 'convert_products' => (bool) $account->convert_products, ]; } } diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 71172e5c8929..f034faf799fd 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2627,6 +2627,7 @@ $LANG = array( 'progress' => 'Progress', 'view_project' => 'View Project', 'summary' => 'Summary', + 'endless_reminder' => 'Endless Reminder', ); diff --git a/resources/views/accounts/template.blade.php b/resources/views/accounts/template.blade.php index 11cb0b3d5c5b..f45734158f22 100644 --- a/resources/views/accounts/template.blade.php +++ b/resources/views/accounts/template.blade.php @@ -13,23 +13,34 @@
- {!! Former::plaintext('schedule') - ->value( - Former::input('num_days_' . $field) - ->style('float:left;width:20%') - ->raw() . - Former::select('direction_' . $field) - ->addOption(trans('texts.days_before'), REMINDER_DIRECTION_BEFORE) - ->addOption(trans('texts.days_after'), REMINDER_DIRECTION_AFTER) - ->style('float:left;width:40%') - ->raw() . - '' . - Former::select('field_' . $field) - ->addOption(trans('texts.field_due_date'), REMINDER_FIELD_DUE_DATE) - ->addOption(trans('texts.field_invoice_date'), REMINDER_FIELD_INVOICE_DATE) - ->style('float:left;width:40%') - ->raw() - ) !!} + @if ($field == 'reminder4') + {!! Former::populateField('frequency_id_reminder4', $account->account_email_settings->frequency_id_reminder4) !!} + {!! Former::plaintext('frequency') + ->value( + Former::select('frequency_id_reminder4') + ->options(\App\Models\Frequency::selectOptions()) + ->style('float:left;') + ->raw() + ) !!} + @else + {!! Former::plaintext('schedule') + ->value( + Former::input('num_days_' . $field) + ->style('float:left;width:20%') + ->raw() . + Former::select('direction_' . $field) + ->addOption(trans('texts.days_before'), REMINDER_DIRECTION_BEFORE) + ->addOption(trans('texts.days_after'), REMINDER_DIRECTION_AFTER) + ->style('float:left;width:40%') + ->raw() . + '' . + Former::select('field_' . $field) + ->addOption(trans('texts.field_due_date'), REMINDER_FIELD_DUE_DATE) + ->addOption(trans('texts.field_invoice_date'), REMINDER_FIELD_INVOICE_DATE) + ->style('float:left;width:40%') + ->raw() + ) !!} + @endif
@@ -40,21 +51,23 @@
-
-
- {!! Former::text('late_fee' . $number . '_amount') - ->label('late_fee_amount') - ->type('number') - ->step('any') !!} + @if ($field != 'reminder4') +
+
+ {!! Former::text('late_fee' . $number . '_amount') + ->label('late_fee_amount') + ->type('number') + ->step('any') !!} +
+
+ {!! Former::text('late_fee' . $number . '_percent') + ->label('late_fee_percent') + ->type('number') + ->step('any') + ->append('%') !!} +
-
- {!! Former::text('late_fee' . $number . '_percent') - ->label('late_fee_percent') - ->type('number') - ->step('any') - ->append('%') !!} -
-
+ @endif

diff --git a/resources/views/accounts/templates_and_reminders.blade.php b/resources/views/accounts/templates_and_reminders.blade.php index 2f729ac760a8..9b640b64a9f4 100644 --- a/resources/views/accounts/templates_and_reminders.blade.php +++ b/resources/views/accounts/templates_and_reminders.blade.php @@ -73,11 +73,13 @@
  • {{ trans('texts.second_reminder') }}
  • {{ trans('texts.third_reminder') }}
    • +
  • {{ trans('texts.endless_reminder') }}
    • @include('accounts.template', ['field' => 'reminder1', 'number' => 1, 'isReminder' => true, 'active' => true]) @include('accounts.template', ['field' => 'reminder2', 'number' => 2, 'isReminder' => true]) @include('accounts.template', ['field' => 'reminder3', 'number' => 3, 'isReminder' => true]) + @include('accounts.template', ['field' => 'reminder4', 'number' => 4, 'isReminder' => true])