diff --git a/app/Ninja/Repositories/ActivityRepository.php b/app/Ninja/Repositories/ActivityRepository.php index 135e0da0acf5..7c94cf726597 100644 --- a/app/Ninja/Repositories/ActivityRepository.php +++ b/app/Ninja/Repositories/ActivityRepository.php @@ -87,7 +87,6 @@ class ActivityRepository 'activities.created_at', 'activities.contact_id', 'activities.activity_type_id', - 'activities.is_system', 'activities.balance', 'activities.adjustment', 'activities.notes', diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 181db4c2cef9..8ea37f043f1e 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2266,6 +2266,7 @@ $LANG = array( 'google_analytics' => 'Google Analytics', 'analytics_key' => 'Analytics Key', 'analytics_key_help' => 'Track payments using :link', + 'start_date_required' => 'The start date is required', ); diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php index 31090f491a23..23f8ac202ad7 100644 --- a/resources/views/invoices/edit.blade.php +++ b/resources/views/invoices/edit.blade.php @@ -1345,6 +1345,10 @@ function onMarkSentClick() { if (model.invoice().is_recurring()) { + if (! model.invoice().start_date()) { + swal("{{ trans('texts.start_date_required') }}"); + return false; + } if (!isSaveValid()) { model.showClientForm(); return false;