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

Fix for email templates

Browse Source
This commit is contained in:
Hillel Coren 2017-03-20 13:18:58 +02:00
parent 59dd3d8982
commit 546e1b56dc
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/AccountController.php
View File

@ -1386,18 +1386,17 @@ class AccountController extends BaseController
public function previewEmail(TemplateService $templateService) public function previewEmail(TemplateService $templateService)
{ {
$template = Input::get('template'); $template = Input::get('template');
$invoice = Invoice::scope() $invitation = \App\Models\Invitation::scope()
->invoices() ->with('invoice.client.contacts')
->withTrashed() ->first();
->first();
if (! $invoice) { if (! $invitation) {
return trans('texts.create_invoice_for_sample'); return trans('texts.create_invoice_for_sample');
} }
/** @var \App\Models\Account $account */ /** @var \App\Models\Account $account */
$account = Auth::user()->account; $account = Auth::user()->account;
$invitation = $invoice->invitations->first(); $invoice = $invitation->invoice;
// replace the variables with sample data // replace the variables with sample data
$data = [ $data = [

2
resources/lang/en/texts.php
View File

@ -2416,7 +2416,7 @@ $LANG = array(
'online_payment_surcharge' => 'Online Payment Surcharge', 'online_payment_surcharge' => 'Online Payment Surcharge',
'gateway_fees' => 'Gateway Fees', 'gateway_fees' => 'Gateway Fees',
'fees_disabled' => 'Fees are disabled', 'fees_disabled' => 'Fees are disabled',
'gateway_fees_help' => 'Automatically add an online payment surcharge or line item.<br/>Surcharges aren\'t affected by discounts, line item supports partial payments.', 'gateway_fees_help' => 'Automatically add an online payment surcharge or line item.<br/>Surcharges aren\'t affected by discounts, line items support partial payments.',
'gateway' => 'Gateway', 'gateway' => 'Gateway',
'gateway_fee_change_warning' => 'If there are unpaid invoices with fees they need to be removed to prevent duplicate fees from being charged.', 'gateway_fee_change_warning' => 'If there are unpaid invoices with fees they need to be removed to prevent duplicate fees from being charged.',
'fees_surcharge_help' => 'Customize surcharge :link.', 'fees_surcharge_help' => 'Customize surcharge :link.',