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

Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja

Browse Source
This commit is contained in:
Hillel Coren 2015-05-27 19:52:14 +03:00
commit 3b90030059
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/PaymentController.php
View File

@ -325,6 +325,7 @@ class PaymentController extends BaseController
'countries' => Cache::get('countries'),
'currencyId' => $client->currency_id,
'account' => $client->account,
'hideLogo' => $account->isWhiteLabel(),
];
return View::make('payments.payment', $data);

4
resources/views/accounts/email_templates.blade.php
View File

@ -107,8 +107,8 @@
return '';
}
keys = ['footer', 'account', 'client', 'amount', 'link'];
vals = [{!! json_encode($emailFooter) !!}, '{!! Auth::user()->account->getDisplayName() !!}', 'Client Name', formatMoney(100), '{!! NINJA_WEB_URL !!}']
keys = ['footer', 'account', 'client', 'amount', 'link', 'contact'];
vals = [{!! json_encode($emailFooter) !!}, '{!! Auth::user()->account->getDisplayName() !!}', 'Client Name', formatMoney(100), '{!! NINJA_WEB_URL !!}', 'Contact Name']
for (var i=0; i<keys.length; i++) {
var regExp = new RegExp('\\$'+keys[i], 'g');