diff --git a/app/ninja/mailers/ContactMailer.php b/app/ninja/mailers/ContactMailer.php index ae8337d888df..0a262aecba08 100755 --- a/app/ninja/mailers/ContactMailer.php +++ b/app/ninja/mailers/ContactMailer.php @@ -41,7 +41,9 @@ class ContactMailer extends Mailer ]; $data['body'] = str_replace(array_keys($variables), array_values($variables), $emailTemplate); - + $data['link'] = $invitation->getLink(); + $data['entityType'] = $entityType; + $fromEmail = $invitation->user->email; $this->sendTo($invitation->contact->email, $fromEmail, $accountName, $subject, $view, $data); diff --git a/app/views/dashboard.blade.php b/app/views/dashboard.blade.php index 84f7ab129019..8383e06c3a96 100644 --- a/app/views/dashboard.blade.php +++ b/app/views/dashboard.blade.php @@ -3,152 +3,156 @@ @section('content')
-
-
-
- -
- @foreach ($paidToDate as $item) - {{ Utils::formatMoney($item->value, $item->currency_id); }}
- @endforeach +
+
+
+ +
+ @if (count($paidToDate)) + @foreach ($paidToDate as $item) + {{ Utils::formatMoney($item->value, $item->currency_id); }}
+ @endforeach + @else + {{ Utils::formatMoney(0) }} + @endif +
+
+ {{ trans('texts.in_total_revenue') }} +
+
-
- {{ trans('texts.in_total_revenue') }} -
-
-
-
-
-
- -
- {{ $billedClients }} +
+
+
+ +
+ {{ $billedClients }} +
+
+ {{ Utils::pluralize('billed_client', $billedClients) }} +
+
-
- {{ Utils::pluralize('billed_client', $billedClients) }} -
-
-
-
-
-
- -
- {{ $invoicesSent }} +
+
+
+ +
+ {{ $invoicesSent }} +
+
+ {{ Utils::pluralize('invoice', $invoicesSent) }} {{ trans('texts.sent') }} +
+
-
- {{ Utils::pluralize('invoice', $invoicesSent) }} {{ trans('texts.sent') }} -
-
-

 

-
-
-
-

- {{ trans('texts.notifications') }} -

-
-
    - @foreach ($activities as $activity) -
  • - {{ Utils::timestampToDateString(strtotime($activity->created_at)) }}: - {{ Utils::decodeActivity($activity->message) }} -
    • - @endforeach -
-
-
-
-
-
-

- {{ trans('texts.invoices_past_due') }} -

-
-
- - - - - - - - - @foreach ($pastDue as $invoice) - @if (!$invoice->client->trashed()) - - - - - - - @endif - @endforeach - -
{{ trans('texts.invoice_number_short') }}{{ trans('texts.client') }}{{ trans('texts.due_date') }}{{ trans('texts.balance_due') }}
{{ $invoice->getLink() }}{{ $invoice->client->getDisplayName() }}{{ Utils::fromSqlDate($invoice->due_date) }}{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }}
-
-
-
+
+
+
+

+ {{ trans('texts.notifications') }} +

+
+
    + @foreach ($activities as $activity) +
  • + {{ Utils::timestampToDateString(strtotime($activity->created_at)) }}: + {{ Utils::decodeActivity($activity->message) }} +
    • + @endforeach +
+
+
+
+
+
+

+ {{ trans('texts.invoices_past_due') }} +

+
+
+ + + + + + + + + @foreach ($pastDue as $invoice) + @if (!$invoice->client->trashed()) + + + + + + + @endif + @endforeach + +
{{ trans('texts.invoice_number_short') }}{{ trans('texts.client') }}{{ trans('texts.due_date') }}{{ trans('texts.balance_due') }}
{{ $invoice->getLink() }}{{ $invoice->client->getDisplayName() }}{{ Utils::fromSqlDate($invoice->due_date) }}{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }}
+
+
+
-
-
-
-

- {{ trans('texts.upcoming_invoices') }} -

-
-
- - - - - - - - - @foreach ($upcoming as $invoice) - @if (!$invoice->client->trashed()) - - - - - - - @endif - @endforeach - -
{{ trans('texts.invoice_number_short') }}{{ trans('texts.client') }}{{ trans('texts.due_date') }}{{ trans('texts.balance_due') }}
{{ $invoice->getLink() }}{{ $invoice->client->getDisplayName() }}{{ Utils::fromSqlDate($invoice->due_date) }}{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }}
-
+
+
+
+

+ {{ trans('texts.upcoming_invoices') }} +

+
+
+ + + + + + + + + @foreach ($upcoming as $invoice) + @if (!$invoice->client->trashed()) + + + + + + + @endif + @endforeach + +
{{ trans('texts.invoice_number_short') }}{{ trans('texts.client') }}{{ trans('texts.due_date') }}{{ trans('texts.balance_due') }}
{{ $invoice->getLink() }}{{ $invoice->client->getDisplayName() }}{{ Utils::fromSqlDate($invoice->due_date) }}{{ Utils::formatMoney($invoice->balance, $invoice->client->currency_id) }}
+
+
-
-
-
-
{{ $activeClients }}
-
{{ Utils::pluralize('active_client', $activeClients) }}
-
-
-
-
{{ trans('texts.average_invoice') }}
-
- @foreach ($averageInvoice as $item) - {{ Utils::formatMoney($item->invoice_avg, $item->currency_id); }}
- @endforeach -
+
+
{{ $activeClients }}
+
{{ Utils::pluralize('active_client', $activeClients) }}
+
- -
+
+
+
{{ trans('texts.average_invoice') }}
+
+ @foreach ($averageInvoice as $item) + {{ Utils::formatMoney($item->invoice_avg, $item->currency_id); }}
+ @endforeach +
+
+ +
@stop diff --git a/app/views/emails/confirm_html.blade.php b/app/views/emails/confirm_html.blade.php index c482b0fa841a..bcd4ca4b1ed5 100755 --- a/app/views/emails/confirm_html.blade.php +++ b/app/views/emails/confirm_html.blade.php @@ -1,33 +1,41 @@ - - + +@endif -

{{ trans('texts.confirmation_header') }}

+

{{ trans('texts.confirmation_header') }}

-

- {{ $invitationMessage . trans('texts.confirmation_message') }}
- - {{{ URL::to("user/confirm/{$user->confirmation_code}") }}} - +

+ {{ $invitationMessage . trans('texts.confirmation_message') }}
+ + {{{ URL::to("user/confirm/{$user->confirmation_code}") }}} +

{{ trans('texts.email_signature') }}
{{ trans('texts.email_from') }} +

- + \ No newline at end of file diff --git a/app/views/emails/invoice_html.blade.php b/app/views/emails/invoice_html.blade.php index f96d52c7f918..362047cf6f25 100755 --- a/app/views/emails/invoice_html.blade.php +++ b/app/views/emails/invoice_html.blade.php @@ -1,7 +1,10 @@ - - - - {{ $body }} - + + + + + @include('emails.view_action', ['link' => $link, 'entityType' => $entityType]) + {{ $body }} + + \ No newline at end of file diff --git a/app/views/emails/invoice_paid_html.blade.php b/app/views/emails/invoice_paid_html.blade.php index 1b86890ea216..7cdd6932b73a 100755 --- a/app/views/emails/invoice_paid_html.blade.php +++ b/app/views/emails/invoice_paid_html.blade.php @@ -4,7 +4,7 @@ - + @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType]) {{ trans('texts.email_salutation', ['name' => $userName]) }}

{{ trans("texts.notification_{$entityType}_paid", ['amount' => $paymentAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }}

diff --git a/app/views/emails/invoice_sent_html.blade.php b/app/views/emails/invoice_sent_html.blade.php index e46c695e2a8f..8663def2fd1d 100755 --- a/app/views/emails/invoice_sent_html.blade.php +++ b/app/views/emails/invoice_sent_html.blade.php @@ -4,7 +4,7 @@ - + @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType]) {{ trans('texts.email_salutation', ['name' => $userName]) }}

{{ trans("texts.notification_{$entityType}_sent", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }}

diff --git a/app/views/emails/invoice_viewed_html.blade.php b/app/views/emails/invoice_viewed_html.blade.php index 5416b88b9cb1..78e0423e4b55 100755 --- a/app/views/emails/invoice_viewed_html.blade.php +++ b/app/views/emails/invoice_viewed_html.blade.php @@ -4,7 +4,7 @@ - + @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType]) {{ trans('texts.email_salutation', ['name' => $userName]) }}

{{ trans("texts.notification_{$entityType}_viewed", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }}

diff --git a/app/views/emails/view_action.blade.php b/app/views/emails/view_action.blade.php new file mode 100644 index 000000000000..718af5a5968d --- /dev/null +++ b/app/views/emails/view_action.blade.php @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/app/views/header.blade.php b/app/views/header.blade.php index 46fb8c750a39..c34a53c62667 100755 --- a/app/views/header.blade.php +++ b/app/views/header.blade.php @@ -366,6 +366,10 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice