Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-09-14 21:57:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

L5 Updates

Browse Source
This commit is contained in:
Jeramy Simpson 2015-04-06 16:58:47 +10:00
parent 9d5d3f4277
commit 05b120e449
12 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Listeners/HandleInvoiceSent.php
View File

@ -29,12 +29,12 @@ class HandleInvoiceSent {
public function handle(InvoiceSent $event) public function handle(InvoiceSent $event)
{ {
$invoice = $event->invoice; $invoice = $event->invoice;
foreach ($invoice->account->users as $user) foreach ($invoice->account->users as $user)
{ {
if ($user->{'notify_sent'}) if ($user->{'notify_sent'})
{ {
$this->userMailer->sendNotification($user, $invoice, 'sent', $payment); $this->userMailer->sendNotification($user, $invoice, 'sent');
} }
} }
} }

4
app/Ninja/Mailers/ContactMailer.php
View File

@ -1,12 +1,10 @@
<?php namespace App\Ninja\Mailers; <?php namespace App\Ninja\Mailers;
use Utils; use Utils;
use Events; use Event;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\Payment; use App\Models\Payment;
use App\Models\Contact;
use App\Models\Invitation;
use App\Models\Activity; use App\Models\Activity;
use App\Events\InvoiceSent; use App\Events\InvoiceSent;

2
app/Ninja/Mailers/Mailer.php
View File

@ -2,7 +2,7 @@
use Mail; use Mail;
use Utils; use Utils;
use Invoice; use App\Models\Invoice;
class Mailer class Mailer
{ {

4
resources/views/emails/confirm_html.blade.php
View File

@ -28,8 +28,8 @@
<p> <p>
{{ $invitationMessage . trans('texts.confirmation_message') }}<br/> {{ $invitationMessage . trans('texts.confirmation_message') }}<br/>
<a href='{{ URL::to("user/confirm/{$user->confirmation_code}") }}'> <a href='{!! URL::to("user/confirm/{$user->confirmation_code}") !!}'>
{{ URL::to("user/confirm/{$user->confirmation_code}") }} {!! URL::to("user/confirm/{$user->confirmation_code}")!!}
</a> </a>
<p/> <p/>

2
resources/views/emails/confirm_text.blade.php
View File

@ -1,7 +1,7 @@
{{ trans('texts.confirmation_header') }} {{ trans('texts.confirmation_header') }}
{{ $invitationMessage . trans('texts.confirmation_message') }} {{ $invitationMessage . trans('texts.confirmation_message') }}
{{ URL::to("user/confirm/{$user->confirmation_code}") }} {!! URL::to("user/confirm/{$user->confirmation_code}") !!}
{{ trans('texts.email_signature') }} {{ trans('texts.email_signature') }}
{{ trans('texts.email_from') }} {{ trans('texts.email_from') }}

2
resources/views/emails/contact_html.blade.php
View File

@ -1 +1 @@
{{ nl2br($text) }} {!! nl2br($text) !!}

2
resources/views/emails/invoice_html.blade.php
View File

@ -5,6 +5,6 @@
</head> </head>
<body> <body>
@include('emails.view_action', ['link' => $link, 'entityType' => $entityType]) @include('emails.view_action', ['link' => $link, 'entityType' => $entityType])
{{ $body }} {!! $body !!}
</body> </body>
</html> </html>

2
resources/views/emails/invoice_text.blade.php
View File

@ -1 +1 @@
{{ strip_tags($body) }} {!! strip_tags($body) !!}

2
resources/views/emails/payment_confirmation_html.blade.php
View File

@ -3,5 +3,5 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
</head> </head>
<body>{{ $body }}</body> <body>{!! $body !!}</body>
</html> </html>

2
resources/views/emails/payment_confirmation_text.blade.php
View File

@ -1 +1 @@
{{ strip_tags($body) }} {!! strip_tags($body) !!}

14
resources/views/public/header.blade.php
View File

@ -175,13 +175,13 @@ table.table thead .sorting_desc_disabled:after { content: '' !important }
@if (!isset($hideHeader) || !$hideHeader) @if (!isset($hideHeader) || !$hideHeader)
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li {{ Request::is('*client/quotes') ? 'class="active"' : '' }}> <li {{ Request::is('*client/quotes') ? 'class="active"' : '' }}>
{{ link_to('/client/quotes', trans('texts.quotes') ) }} {!! link_to('/client/quotes', trans('texts.quotes') ) !!}
</li> </li>
<li {{ Request::is('*client/invoices') ? 'class="active"' : '' }}> <li {{ Request::is('*client/invoices') ? 'class="active"' : '' }}>
{{ link_to('/client/invoices', trans('texts.invoices') ) }} {!! link_to('/client/invoices', trans('texts.invoices') ) !!}
</li> </li>
<li {{ Request::is('*client/payments') ? 'class="active"' : '' }}> <li {{ Request::is('*client/payments') ? 'class="active"' : '' }}>
{{ link_to('/client/payments', trans('texts.payments') ) }} {!! link_to('/client/payments', trans('texts.payments') ) !!}
</li> </li>
</ul> </ul>
@endif @endif
@ -213,16 +213,16 @@ table.table thead .sorting_desc_disabled:after { content: '' !important }
<div id="footer-menu" class="menu-wrap"> <div id="footer-menu" class="menu-wrap">
<ul id="menu-footer-menu" class="menu"> <ul id="menu-footer-menu" class="menu">
<li id="menu-item-30" class="menu-item-30"> <li id="menu-item-30" class="menu-item-30">
{{ link_to(NINJA_WEB_URL . '/contact', trans('texts.support')) }} {!! link_to(NINJA_WEB_URL . '/contact', trans('texts.support')) !!}
</li> </li>
<li id="menu-item-31" class="menu-item-31"> <li id="menu-item-31" class="menu-item-31">
{{ link_to('#', 'Facebook', ['target' => '_blank', 'onclick' => 'openUrl("https://www.facebook.com/invoiceninja", "/footer/social/facebook")']) }} {!! link_to('#', 'Facebook', ['target' => '_blank', 'onclick' => 'openUrl("https://www.facebook.com/invoiceninja", "/footer/social/facebook")']) !!}
</li> </li>
<li id="menu-item-32" class="menu-item-32"> <li id="menu-item-32" class="menu-item-32">
{{ link_to('#', 'Twitter', ['target' => '_blank', 'onclick' => 'openUrl("https://twitter.com/invoiceninja", "/footer/social/twitter")']) }} {!! link_to('#', 'Twitter', ['target' => '_blank', 'onclick' => 'openUrl("https://twitter.com/invoiceninja", "/footer/social/twitter")']) !!}
</li> </li>
<li id="menu-item-33" class="menu-item-33"> <li id="menu-item-33" class="menu-item-33">
{{ link_to('#', 'GitHub', ['target' => '_blank', 'onclick' => 'openUrl("https://github.com/hillelcoren/invoice-ninja", "/footer/social/github")']) }} {!! link_to('#', 'GitHub', ['target' => '_blank', 'onclick' => 'openUrl("https://github.com/hillelcoren/invoice-ninja", "/footer/social/github")']) !!}
</li> </li>
</ul> </ul>
</div> </div>

4
resources/views/public_list.blade.php
View File

@ -92,11 +92,11 @@
<h2>{{ $title }}</h2> <h2>{{ $title }}</h2>
{{ Datatable::table() {!! Datatable::table()
->addColumn($columns) ->addColumn($columns)
->setUrl(route('api.client.' . $entityType . 's')) ->setUrl(route('api.client.' . $entityType . 's'))
->setOptions('sPaginationType', 'bootstrap') ->setOptions('sPaginationType', 'bootstrap')
->render('datatable') }} ->render('datatable') !!}
</div> </div>