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

Minor tweaks

Browse Source
This commit is contained in:
Hillel Coren 2015-03-10 14:39:25 +02:00
parent 0ebf08c53d
commit ed3d779bf1
14 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/lang/da/texts.php
View File

@ -577,5 +577,6 @@ return array(
'password_recovery' => 'Password Recovery', 'password_recovery' => 'Password Recovery',
'send_email' => 'Send email', 'send_email' => 'Send email',
'set_password' => 'Set Password', 'set_password' => 'Set Password',
'converted' => 'Converted',
); );

2
app/lang/de/texts.php
View File

@ -568,5 +568,7 @@ return array(
'password_recovery' => 'Password Recovery', 'password_recovery' => 'Password Recovery',
'send_email' => 'Send email', 'send_email' => 'Send email',
'set_password' => 'Set Password', 'set_password' => 'Set Password',
'converted' => 'Converted',
); );

1
app/lang/en/texts.php
View File

@ -575,6 +575,7 @@ return array(
'password_recovery' => 'Password Recovery', 'password_recovery' => 'Password Recovery',
'send_email' => 'Send email', 'send_email' => 'Send email',
'set_password' => 'Set Password', 'set_password' => 'Set Password',
'converted' => 'Converted',
); );

2
app/lang/es/texts.php
View File

@ -547,6 +547,8 @@ return array(
'password_recovery' => 'Password Recovery', 'password_recovery' => 'Password Recovery',
'send_email' => 'Send email', 'send_email' => 'Send email',
'set_password' => 'Set Password', 'set_password' => 'Set Password',
'converted' => 'Converted',
); );

2
app/lang/fr/texts.php
View File

@ -568,5 +568,7 @@ return array(
'password_recovery' => 'Password Recovery', 'password_recovery' => 'Password Recovery',
'send_email' => 'Send email', 'send_email' => 'Send email',
'set_password' => 'Set Password', 'set_password' => 'Set Password',
'converted' => 'Converted',
); );

2
app/lang/it/texts.php
View File

@ -570,5 +570,7 @@ return array(
'password_recovery' => 'Password Recovery', 'password_recovery' => 'Password Recovery',
'send_email' => 'Send email', 'send_email' => 'Send email',
'set_password' => 'Set Password', 'set_password' => 'Set Password',
'converted' => 'Converted',
); );

2
app/lang/lt/texts.php
View File

@ -578,6 +578,8 @@ return array(
'password_recovery' => 'Password Recovery', 'password_recovery' => 'Password Recovery',
'send_email' => 'Send email', 'send_email' => 'Send email',
'set_password' => 'Set Password', 'set_password' => 'Set Password',
'converted' => 'Converted',
); );

2
app/lang/nb_NO/texts.php
View File

@ -576,5 +576,7 @@ return array(
'password_recovery' => 'Password Recovery', 'password_recovery' => 'Password Recovery',
'send_email' => 'Send email', 'send_email' => 'Send email',
'set_password' => 'Set Password', 'set_password' => 'Set Password',
'converted' => 'Converted',
); );

2
app/lang/nl/texts.php
View File

@ -571,6 +571,8 @@ return array(
'password_recovery' => 'Password Recovery', 'password_recovery' => 'Password Recovery',
'send_email' => 'Send email', 'send_email' => 'Send email',
'set_password' => 'Set Password', 'set_password' => 'Set Password',
'converted' => 'Converted',
); );

2
app/lang/pt_BR/texts.php
View File

@ -559,5 +559,7 @@ return array(
'password_recovery' => 'Password Recovery', 'password_recovery' => 'Password Recovery',
'send_email' => 'Send email', 'send_email' => 'Send email',
'set_password' => 'Set Password', 'set_password' => 'Set Password',
'converted' => 'Converted',
); );

1
app/ninja/mailers/Mailer.php
View File

@ -20,6 +20,7 @@ class Mailer
$fromEmail = NINJA_FROM_EMAIL; $fromEmail = NINJA_FROM_EMAIL;
} }
//$message->setEncoder(\Swift_Encoding::get8BitEncoding());
$message->to($toEmail)->from($fromEmail, $fromName)->replyTo($replyEmail, $fromName)->subject($subject); $message->to($toEmail)->from($fromEmail, $fromName)->replyTo($replyEmail, $fromName)->subject($subject);
}); });
} }

2
app/ninja/repositories/InvoiceRepository.php
View File

@ -126,7 +126,7 @@ class InvoiceRepository
} }
return $table->addColumn('due_date', function ($model) { return Utils::fromSqlDate($model->due_date); }) return $table->addColumn('due_date', function ($model) { return Utils::fromSqlDate($model->due_date); })
->addColumn('invoice_status_name', function ($model) { return $model->invoice_status_name; }) ->addColumn('invoice_status_name', function ($model) { return $model->quote_invoice_id ? link_to("invoices/{$model->quote_invoice_id}/edit", trans('texts.converted')) : $model->invoice_status_name; })
->addColumn('dropdown', function ($model) use ($entityType) { ->addColumn('dropdown', function ($model) use ($entityType) {
if ($model->is_deleted) { if ($model->is_deleted) {

45
app/views/emails/confirm_html.blade.php
View File

@ -1,33 +1,32 @@
<html> <html>
<body> <body>
<script type="application/ld+json"> <script type="application/ld+json">
{ {
"@context":"http://schema.org", "@context": "http://schema.org",
"@type":"EmailMessage", "@type": "EmailMessage",
"description":"Confirm your Invoice Ninja account", "action": {
"action": "@type": "ConfirmAction",
{ "name": "Approve Expense",
"@type":"ConfirmAction",
"name":"Confirm Account",
"handler": { "handler": {
"@type": "HttpActionHandler", "@type": "HttpActionHandler",
"url": "{{{ URL::to("user/confirm/{$user->confirmation_code}") }}}" "url": "https://myexpenses.com/approve?expenseId=abc123"
}
} }
} },
</script> "description": "Approval request for John's $10.13 expense for office supplies"
}
</script>
<h1>{{ trans('texts.confirmation_header') }}</h1> <h1>{{ trans('texts.confirmation_header') }}</h1>
<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/>
{{ trans('texts.email_signature') }}<br/> {{ trans('texts.email_signature') }}<br/>
{{ trans('texts.email_from') }} {{ trans('texts.email_from') }}
</body> </body>
</html> </html>

8
app/views/invoices/edit.blade.php
View File

@ -176,17 +176,17 @@
<div class="tab-content"> <div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="notes" style="padding-bottom:44px"> <div role="tabpanel" class="tab-pane active" id="notes" style="padding-bottom:44px">
{{ Former::textarea('public_notes')->data_bind("value: wrapped_notes, valueUpdate: 'afterkeydown'") {{ Former::textarea('public_notes')->data_bind("value: wrapped_notes, valueUpdate: 'afterkeydown'")
->label(null)->style('resize: none; min-width: 460px;')->rows(3) }} ->label(null)->style('resize: none; min-width: 450px;')->rows(3) }}
</div> </div>
<div role="tabpanel" class="tab-pane" id="terms"> <div role="tabpanel" class="tab-pane" id="terms">
{{ Former::textarea('terms')->data_bind("value:wrapped_terms, placeholder: default_terms, valueUpdate: 'afterkeydown'") {{ Former::textarea('terms')->data_bind("value:wrapped_terms, placeholder: default_terms, valueUpdate: 'afterkeydown'")
->label(false)->style('resize: none; min-width: 460px')->rows(3) ->label(false)->style('resize: none; min-width: 450px')->rows(3)
->help('<label class="checkbox" style="width: 200px"> ->help('<label class="checkbox" style="width: 200px">
<input type="checkbox" style="width: 24px" data-bind="checked: set_default_terms"/>'.trans('texts.save_as_default_terms').'</label>') }} <input type="checkbox" style="width: 24px" data-bind="checked: set_default_terms"/>'.trans('texts.save_as_default_terms').'</label>') }}
</div> </div>
<div role="tabpanel" class="tab-pane" id="footer"> <div role="tabpanel" class="tab-pane" id="footer">
{{ Former::textarea('invoice_footer')->data_bind("value:wrapped_footer, placeholder: default_footer, valueUpdate: 'afterkeydown'") {{ Former::textarea('invoice_footer')->data_bind("value:wrapped_footer, placeholder: default_footer, valueUpdate: 'afterkeydown'")
->label(false)->style('resize: none; min-width: 460px')->rows(3) ->label(false)->style('resize: none; min-width: 450px')->rows(3)
->help('<label class="checkbox" style="width: 200px"> ->help('<label class="checkbox" style="width: 200px">
<input type="checkbox" style="width: 24px" data-bind="checked: set_default_footer"/>'.trans('texts.save_as_default_footer').'</label>') }} <input type="checkbox" style="width: 24px" data-bind="checked: set_default_footer"/>'.trans('texts.save_as_default_footer').'</label>') }}
</div> </div>
@ -300,7 +300,7 @@
@if (!$invoice || (!$invoice->trashed() && !$invoice->client->trashed())) @if (!$invoice || (!$invoice->trashed() && !$invoice->client->trashed()))
@if ($invoice && $invoice->id) @if ($invoice && $invoice->id)
<div id="primaryActions" style="text-align:left" class="btn-group"> <div id="primaryActions" style="text-align:left" class="btn-group dropup">
<button class="btn-success btn" type="button">{{ trans("texts.save_{$entityType}") }}</button> <button class="btn-success btn" type="button">{{ trans("texts.save_{$entityType}") }}</button>
<button class="btn-success btn dropdown-toggle" type="button" data-toggle="dropdown"> <button class="btn-success btn dropdown-toggle" type="button" data-toggle="dropdown">
<span class="caret"></span> <span class="caret"></span>