Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Working on email markup

Browse Source
This commit is contained in:
Hillel Coren 2015-12-16 13:49:26 +02:00
parent f4863d3ec0
commit 4dc7a8d5f1
20 changed files with 79 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Events/QuoteInvitationWasApproved.php
View File

@ -9,6 +9,7 @@ class QuoteInvitationWasApproved extends Event {
use SerializesModels;
public $quote;
public $invoice;
public $invitation;
/**
@ -16,9 +17,10 @@ class QuoteInvitationWasApproved extends Event {
*
* @return void
*/
public function __construct($quote, $invitation)
public function __construct($quote, $invoice, $invitation)
{
$this->quote = $quote;
$this->invoice = $invoice;
$this->invitation = $invitation;
}

1
app/Http/Middleware/StartupCheck.php
View File

@ -34,7 +34,6 @@ class StartupCheck
// Ensure all request are over HTTPS in production
if (Utils::requireHTTPS() && !Request::secure()) {
//return Redirect::secure(Request::getRequestUri());
return Redirect::secure(Request::path());
}

2
app/Http/routes.php
View File

@ -445,7 +445,7 @@ if (!defined('CONTACT_EMAIL')) {
define('PHANTOMJS_CLOUD', 'http://api.phantomjscloud.com/api/browser/v2/');
define('PHP_DATE_FORMATS', 'http://php.net/manual/en/function.date.php');
define('REFERRAL_PROGRAM_URL', 'https://www.invoiceninja.com/referral-program/');
define('EMAIL_MARKUP_URL', 'https://developers.google.com/gmail/markup/overview');
define('EMAIL_MARKUP_URL', 'https://developers.google.com/gmail/markup');
define('COUNT_FREE_DESIGNS', 4);
define('COUNT_FREE_DESIGNS_SELF_HOST', 5); // include the custom design

9
app/Models/Invoice.php
View File

@ -313,6 +313,15 @@ class Invoice extends EntityModel implements BalanceAffecting
return $this->invoice_status_id >= INVOICE_STATUS_PAID;
}
public function isOverdue()
{
if ( ! $this->due_date) {
return false;
}
return time() > strtotime($this->due_date);
}
public function getRequestedAmount()
{
return $this->partial > 0 ? $this->partial : $this->balance;

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

@ -172,7 +172,12 @@ class ContactMailer extends Mailer
$data = [
'body' => $this->processVariables($emailTemplate, $variables),
'link' => $invitation->getLink(),
'invoice' => $invoice,
'client' => $client,
'account' => $account,
'payment' => $payment,
'entityType' => ENTITY_INVOICE,
];
if ($account->attatchPDF()) {

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

@ -53,6 +53,7 @@ class UserMailer extends Mailer
'invoiceAmount' => $account->formatMoney($invoice->getRequestedAmount(), $client),
'invoiceNumber' => $invoice->invoice_number,
'invoiceLink' => SITE_URL."/{$entityType}s/{$invoice->public_id}",
'account' => $account,
];
if ($payment) {
@ -70,6 +71,7 @@ class UserMailer extends Mailer
public function sendEmailBounced(Invitation $invitation)
{
$user = $invitation->user;
$account = $user->account;
$invoice = $invitation->invoice;
$entityType = $invoice->getEntityType();

12
app/Ninja/Presenters/InvoicePresenter.php
View File

@ -26,6 +26,18 @@ class InvoicePresenter extends Presenter {
}
}
// https://schema.org/PaymentStatusType
public function paymentStatus()
{
if ( ! $this->entity->balance) {
return 'PaymentComplete';
} elseif ($this->entity->isOverdue()) {
return 'PaymentPastDue';
} else {
return 'PaymentDue';
}
}
public function status()
{
$status = $this->entity->invoice_status ? $this->entity->invoice_status->name : 'draft';

2
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -627,6 +627,8 @@ class InvoiceRepository extends BaseRepository
if ($recurInvoice->auto_bill) {
if ($this->paymentService->autoBillInvoice($invoice)) {
// update the invoice reference to match its actual state
// this is to ensure a 'payment received' email is sent
$invoice->invoice_status_id = INVOICE_STATUS_PAID;
}
}

2
app/Services/InvoiceService.php
View File

@ -74,7 +74,7 @@ class InvoiceService extends BaseService
return $invoice;
}
event(new QuoteInvitationWasApproved($invoice, $invitation));
event(new QuoteInvitationWasApproved($quote, $invoice, $invitation));
foreach ($invoice->invitations as $invoiceInvitation) {
if ($invitation->contact_id == $invoiceInvitation->contact_id) {

20
resources/views/accounts/email_settings.blade.php
View File

@ -15,9 +15,20 @@
</div>
<div class="panel-body form-padding-right">
{!! Former::checkbox('pdf_email_attachment')->text(trans('texts.enable')) !!}
&nbsp;
{{-- Former::select('recurring_hour')->options($recurringHours) --}}
{!! Former::select('email_design_id')
->style('width: 200px')
->addOption(trans('texts.plain'), 1)
->addOption(trans('texts.light'), 2)
->addOption(trans('texts.dark'), 3)
->help(trans('texts.email_design_help')) !!}
&nbsp;
{!! Former::inline_radios('custom_invoice_link')
->onchange('onCustomLinkChange()')
->label(trans('texts.invoice_link'))
@ -26,7 +37,7 @@
trans('texts.website') => ['value' => 'website', 'name' => 'custom_link'],
])->check($account->iframe_url ? 'website' : 'subdomain') !!}
{{ Former::setOption('capitalize_translations', false) }}
{!! Former::text('subdomain')
->placeholder(trans('texts.www'))
->onchange('onSubdomainChange()')
@ -41,13 +52,6 @@
->label(' ')
->help(trans('texts.subdomain_help')) !!}
&nbsp;
{!! Former::select('email_design_id')
->style('width: 200px')
->addOption(trans('texts.plain'), 1)
->addOption(trans('texts.light'), 2)
->addOption(trans('texts.dark'), 3)
->help(trans('texts.email_design_help')) !!}
&nbsp;
@if (Utils::isNinja())
{!! Former::checkbox('enable_email_markup')
->text(trans('texts.enable') .

3
resources/views/emails/email_bounced_html.blade.php
View File

@ -4,9 +4,6 @@
<meta charset="utf-8">
</head>
<body>
@if (false)
@include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
@endif
{{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>
{{ trans("texts.notification_{$entityType}_bounced", ['contact' => $contactName, 'invoice' => $invoiceNumber]) }} <p/>

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

@ -5,7 +5,7 @@
</head>
<body>
@if ($account->enable_email_markup)
@include('emails.view_action', ['link' => $link, 'entityType' => $entityType])
@include('emails.partials.client_view_action')
@endif
{!! $body !!}
</body>

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

@ -4,8 +4,8 @@
<meta charset="utf-8">
</head>
<body>
@if (false)
@include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
@if ($account->enable_email_markup)
@include('emails.partials.user_view_action')
@endif
{{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>

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

@ -4,8 +4,8 @@
<meta charset="utf-8">
</head>
<body>
@if (false)
@include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
@if ($account->enable_email_markup)
@include('emails.partials.user_view_action')
@endif
{{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>

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

@ -4,8 +4,8 @@
<meta charset="utf-8">
</head>
<body>
@if (false)
@include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
@if ($account->enable_email_markup)
@include('emails.partials.user_view_action')
@endif
{{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>

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

@ -7,7 +7,7 @@
<body style="min-height: 700px; color: #000000; font-family: Arial, Helvetica, sans-serif; font-size: 12px; -webkit-text-size-adjust: none; -ms-text-size-adjust: none; background: #F4F5F5; margin: 0; padding: 0;"
alink="#FF0000" link="#FF0000" bgcolor="#F4F5F5" text="#000000" yahoo="fix">
@if ($account->enable_email_markup)
@include('emails.view_action', ['link' => $link, 'entityType' => $entityType])
@include('emails.partials.client_view_action')
@endif
<style type="text/css">

4
resources/views/emails/view_action.blade.php → resources/views/emails/partials/client_view_action.blade.php
View File

@ -4,7 +4,7 @@
{
"@context": "http://schema.org",
"@type": "Invoice",
"paymentStatus": "PaymentDue",
"paymentStatus": "{{ $invoice->present()->paymentStatus }}",
@if ($invoice->due_date)
"paymentDue": "{{ $invoice->due_date }}T00:00:00+00:00",
@endif
@ -19,7 +19,7 @@
},
"totalPaymentDue": {
"@type": "PriceSpecification",
"price": "{{ $account->formatMoney($invoice->getRequestedAmount(), $client) }}"
"price": "{{ $account->formatMoney(isset($payment) ? $payment->amount : $invoice->getRequestedAmount(), $client) }}"
},
"action": {
"@type": "ViewAction",

13
resources/views/emails/partials/user_view_action.blade.php Normal file
View File

@ -0,0 +1,13 @@
<script type="application/ld+json">
[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"action": {
"@type": "ViewAction",
"url": "{!! $invoiceLink !!}",
"name": "{{ trans("texts.view_{$entityType}") }}"
}
}
]
</script>

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

@ -3,5 +3,10 @@
<head>
<meta charset="utf-8">
</head>
<body>{!! $body !!}</body>
<body>
@if ($account->enable_email_markup)
@include('emails.partials.client_view_action', ['link' => $link])
@endif
{!! $body !!}
</body>
</html>

6
resources/views/emails/quote_approved_html.blade.php
View File

@ -4,12 +4,12 @@
<meta charset="utf-8">
</head>
<body>
@if (false)
@include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
@if ($account->enable_email_markup)
@include('emails.partials.user_view_action')
@endif
{{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>
{{ trans("texts.notification_{$entityType}_approved", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} <p/>
{{ trans("texts.notification_quote_approved", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} <p/>
{{ trans('texts.email_signature') }} <br/>
{{ trans('texts.email_from') }} <p/>