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

Proposals

Browse Source
This commit is contained in:
Hillel Coren 2018-02-05 21:04:49 +02:00
parent 1f813c47ca
commit 8f2ef38cc1
7 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Requests/CreateProposalRequest.php
View File

@ -23,7 +23,6 @@ class CreateProposalRequest extends ProposalRequest
{ {
return [ return [
'quote_id' => 'required', 'quote_id' => 'required',
'proposal_template_id' => 'required',
]; ];
} }
} }

1
app/Http/Requests/UpdateProposalRequest.php
View File

@ -27,7 +27,6 @@ class UpdateProposalRequest extends ProposalRequest
return [ return [
'quote_id' => 'required', 'quote_id' => 'required',
'proposal_template_id' => 'required',
]; ];
} }
} }

2
database/migrations/2018_01_10_073825_add_subscription_format.php
View File

@ -90,7 +90,7 @@ class AddSubscriptionFormat extends Migration
$table->boolean('is_deleted')->default(false); $table->boolean('is_deleted')->default(false);
$table->unsignedInteger('quote_id')->index(); $table->unsignedInteger('quote_id')->index();
$table->unsignedInteger('proposal_template_id')->index(); $table->unsignedInteger('proposal_template_id')->nullable()->index();
$table->text('private_notes'); $table->text('private_notes');
$table->mediumText('html'); $table->mediumText('html');
$table->mediumText('css'); $table->mediumText('css');

25
resources/views/proposals/edit.blade.php
View File

@ -3,17 +3,8 @@
@section('head') @section('head')
@parent @parent
<script src="{{ asset('js/grapesjs.min.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script> @include('money_script')
<link href="{{ asset('css/grapesjs.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/> @include('proposals.grapesjs_header')
<style>
.gjs-four-color {
color: white !important;
}
.gjs-block.fa {
font-size: 4em !important;
}
</style>
@stop @stop
@ -24,7 +15,6 @@
->id('mainForm') ->id('mainForm')
->rules([ ->rules([
'quote_id' => 'required', 'quote_id' => 'required',
'proposal_template_id' => 'required',
]) !!} ]) !!}
@if ($proposal) @if ($proposal)
@ -122,11 +112,22 @@
if (field == 'quote_number') { if (field == 'quote_number') {
field = 'invoice_number'; field = 'invoice_number';
} else if (field == 'valid_until') {
field = 'due_date';
} else if (field == 'quote_date') {
field = 'invoice_date';
} }
var value = getDescendantProp(quote, field) || ' '; var value = getDescendantProp(quote, field) || ' ';
value = doubleDollarSign(value) + ''; value = doubleDollarSign(value) + '';
value = value.replace(/\n/g, "\\n").replace(/\r/g, "\\r"); value = value.replace(/\n/g, "\\n").replace(/\r/g, "\\r");
if (field == 'amount' || field == 'partial') {
value = formatMoneyInvoice(value, quote);
} else if (['invoice_date', 'due_date'].indexOf(field) >= 0) {
value = moment.utc(value).format('{{ $account->getMomentDateFormat() }}');
}
html = html.replace(match, value); html = html.replace(match, value);
} }
} }

15
resources/views/proposals/grapesjs_header.blade.php Normal file
View File

@ -0,0 +1,15 @@
<script src="{{ asset('js/grapesjs.min.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
<link href="{{ asset('css/grapesjs.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
<style>
.gjs-four-color {
color: white !important;
}
.gjs-block-label,
.gjs-block-categories {
font-size: 12px !important;
}
.gjs-toolbar-item {
font-size: 2em !important;
}
</style>

15
resources/views/proposals/snippets/edit.blade.php
View File

@ -3,20 +3,7 @@
@section('head') @section('head')
@parent @parent
<script src="{{ asset('js/grapesjs.min.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script> @include('proposals.grapesjs_header')
<link href="{{ asset('css/grapesjs.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
<style>
.gjs-four-color {
color: white !important;
}
.gjs-block.fa {
font-size: 4em !important;
}
.icon-select {
font-family: sans-serif, 'FontAwesome';
}
</style>
@stop @stop

12
resources/views/proposals/templates/edit.blade.php
View File

@ -3,17 +3,7 @@
@section('head') @section('head')
@parent @parent
<script src="{{ asset('js/grapesjs.min.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script> @include('proposals.grapesjs_header')
<link href="{{ asset('css/grapesjs.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
<style>
.gjs-four-color {
color: white !important;
}
.gjs-block.fa {
font-size: 4em !important;
}
</style>
@stop @stop