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

Fixes for proposals

Browse Source
This commit is contained in:
Hillel Coren 2018-03-19 21:18:04 +02:00
parent 57e2c93e85
commit 622de49c64
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,6 +201,7 @@ class ContactMailer extends Mailer
'notes' => $reminder, 'notes' => $reminder,
'bccEmail' => $isFirst ? $account->getBccEmail() : false, 'bccEmail' => $isFirst ? $account->getBccEmail() : false,
'fromEmail' => $account->getFromEmail(), 'fromEmail' => $account->getFromEmail(),
'proposal' => $proposal,
]; ];
if (! $proposal) { if (! $proposal) {

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

@ -2656,7 +2656,7 @@ $LANG = array(
'tax_amount' => 'Tax Amount', 'tax_amount' => 'Tax Amount',
'tax_paid' => 'Tax Paid', 'tax_paid' => 'Tax Paid',
'none' => 'None', 'none' => 'None',
'proposal_message_button' => 'To view your proposal for :amount, click the button below.',
'proposal' => 'Proposal', 'proposal' => 'Proposal',
'proposals' => 'Proposals', 'proposals' => 'Proposals',
'list_proposals' => 'List Proposals', 'list_proposals' => 'List Proposals',

12
resources/views/proposals/grapesjs.blade.php
View File

@ -4,8 +4,8 @@ $(function() {
window.grapesjsEditor = grapesjs.init({ window.grapesjsEditor = grapesjs.init({
container : '#gjs', container : '#gjs',
components: '{!! $entity ? $entity->html : '' !!}', components: {!! json_encode($entity ? $entity->html : '') !!},
style: '{!! $entity ? $entity->css : '' !!}', style: {!! json_encode($entity ? $entity->css : '') !!},
showDevices: false, showDevices: false,
plugins: ['gjs-preset-newsletter'], plugins: ['gjs-preset-newsletter'],
pluginsOpts: { pluginsOpts: {
@ -42,11 +42,11 @@ $(function() {
blockManager.add("h{{ ($loop->index + 1) }}-block", { blockManager.add("h{{ ($loop->index + 1) }}-block", {
label: '{{ $snippet->name }}', label: '{{ $snippet->name }}',
category: '{{ $snippet->proposal_category ? $snippet->proposal_category->name : trans('texts.custom') }}', category: '{{ $snippet->proposal_category ? $snippet->proposal_category->name : trans('texts.custom') }}',
content: '{!! $snippet->html !!}', content: {!! json_encode($snippet->html) !!},
style: '{!! $snippet->css !!}', style: {!! json_encode($snippet->css) !!},
attributes: { attributes: {
title: '{!! $snippet->private_notes !!}', title: {!! json_encode($snippet->private_notes) !!},
class:'fa fa-{!! $snippet->icon ?: 'font' !!}' class:'fa fa-{{ $snippet->icon ?: 'font' }}'
} }
}); });
@endforeach @endforeach