- -
- -
-
- +
+
+
+
+
+ {{ trans('people.people_list_last_updated') }} +
+ @foreach($lastUpdatedContacts as $contact) +
+ +
+ @endforeach
- -
- -
- - - - - - -
- - -
- - {{-- REMINDERS --}} -
- -

{{ trans('dashboard.reminders_title') }}

- - @if ($upcomingReminders->count() != 0) -
    - @foreach ($upcomingReminders as $reminder) -
  • - - next_expected_date->diffInDays(Carbon\Carbon::now()) + 1 ?> - {{ trans_choice('dashboard.reminders_in_days', $reminder_day_diff, ['number' => $reminder_day_diff]) }} - ({{ \App\Helpers\DateHelper::getShortDate($reminder->getNextExpectedDate()) }}) - - @if ($reminder->contact->is_partial) - {{ $reminder->contact->getCompleteName(auth()->user()->name_order) }}: - @else - {{ $reminder->contact->getCompleteName(auth()->user()->name_order) }}: - @endif - @if ($reminder->is_birthday) - {{ trans('people.reminders_birthday', ['name' => $reminder->contact->firstname]) }} - @else - {{ $reminder->title }} - @endif -
  • - @endforeach -
- - @else - -

{{ trans('dashboard.reminders_blank_description') }}

- - @endif -
- - {{-- TASKS --}} -
- -

{{ trans('dashboard.tasks_title') }}

- - @if ($tasks->count() != 0) - @foreach ($tasks as $task) -
- -
- @endforeach - @else -

{{ trans('dashboard.tasks_blank') }}

- @endif -
- - {{-- DEBTS --}} -
- -

{{ trans('dashboard.section_debts') }}

- - @if ($debts->count() != 0) - @foreach ($debts as $debt) -
-
- - {{ App\Contact::find($debt->contact_id)->getCompleteName(auth()->user()->name_order) }}: - - @if ($debt->in_debt == 'yes') - {{ trans('dashboard.debts_you_owe') }} - @else - {{ trans('dashboard.debts_you_due') }} - @endif - - {{ MoneyHelper::format($debt->amount) }} - - @if (! is_null($debt->reason)) - {{ trans('dashboard.debts_for') }} - {{ $debt->reason }} - @endif -
-
- @endforeach - @else - -

{{ trans('dashboard.debts_blank') }}

- - @endif -
- -
-

{{ trans('dashboard.statistics_title') }}

-
    -
  • - {{ $number_of_contacts }} - {{ trans('dashboard.statistics_contacts') }} -
  • -
  • - {{ $number_of_reminders }} - {{ trans('dashboard.statistics_reminders') }} -
  • -
  • - {{ $number_of_notes }} - {{ trans('dashboard.statistics_notes') }} -
  • -
  • - {{ $number_of_activities }} - {{ trans('dashboard.statistics_activities') }} -
  • -
  • - {{ $number_of_gifts }} - {{ trans('dashboard.statistics_gifts') }} -
  • -
  • - {{ $number_of_tasks }} - {{ trans('dashboard.statistics_tasks') }} -
  • -
  • - {{ MoneyHelper::format($debt_owed) }} - {{ trans('dashboard.statistics_deb_owed') }} -
  • -
  • - {{ MoneyHelper::format($debt_due) }} - {{ trans('dashboard.statistics_debt_due') }} -
  • -
-
-
- - -
- @if ($notes->count() == 0) - @include('dashboard.blank_notes') - @endif - - @foreach($notes as $note) -
-
- {{ $note->body }} -
-
-
-
- {{ trans('app.for') }} {{ $note->contact->getCompleteName() }} -
- {{ $note->created_at }} -
-
-
- @endforeach -
- - -
-

{{ trans('dashboard.event_title') }}

-
    - @foreach($events as $event) -
  • - @include('dashboard.events._'.$event['object_type']) - - {{-- DATE --}} -
    - {{ $event['date']->diffForHumans() }} -
    -
  • - @endforeach -
-
+ +
+
+ + {{-- Main section --}} +
+
+
+
+
+

+ + Events in the next 3 months +

+
+ {{-- Current month --}} + @include('dashboard._monthReminder', ['month' => 0]) -
+ {{-- Current month + 1 --}} + @include('dashboard._monthReminder', ['month' => 1]) - {{-- Sidebar --}} - +
+
+
    - @foreach ($lastUpdatedContacts as $contact) -
  • {{ $contact->getCompleteName(auth()->user()->name_order) }}
  • - @endforeach +
  • + {{ $number_of_contacts }} + {{ trans('dashboard.statistics_contacts') }} +
  • +
  • + {{ $number_of_activities }} + {{ trans('dashboard.statistics_activities') }} +
  • +
  • + {{ $number_of_gifts }} + {{ trans('dashboard.statistics_gifts') }} +
-
+ +
- -
+
@endsection diff --git a/resources/views/journal/index.blade.php b/resources/views/journal/index.blade.php index d01b1100834..53fa80444f3 100644 --- a/resources/views/journal/index.blade.php +++ b/resources/views/journal/index.blade.php @@ -7,14 +7,14 @@ {{-- Breadcrumb --}}
- +
diff --git a/resources/views/layouts/skeleton.blade.php b/resources/views/layouts/skeleton.blade.php index b16c055fa1c..63c2421e434 100644 --- a/resources/views/layouts/skeleton.blade.php +++ b/resources/views/layouts/skeleton.blade.php @@ -31,7 +31,7 @@ ?>; - user()->account_id }}> + user()->account_id }} class="bg-gray-monica"> @include('partials.header') @@ -39,7 +39,9 @@ @yield('content')
- @include('partials.footer') +
+ @include('partials.footer') +
{{-- THE JS FILE OF THE APP --}} {{-- Load everywhere except on the Upgrade account page --}} diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php index 4dbf9266676..9d46a66a462 100644 --- a/resources/views/partials/footer.blade.php +++ b/resources/views/partials/footer.blade.php @@ -1,14 +1,26 @@ -