From 427c5c3721b641b73efc9970cca5d2d443c8dc99 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 4 Feb 2018 23:50:57 +0200 Subject: [PATCH] Proposals --- app/Http/ViewComposers/ProposalComposer.php | 7 ++++++- app/Ninja/Datatables/ProposalDatatable.php | 6 ++++++ app/Ninja/Datatables/ProposalSnippetDatatable.php | 6 ++++++ app/Ninja/Datatables/ProposalTemplateDatatable.php | 6 ++++++ app/Ninja/Repositories/ProposalRepository.php | 1 + app/Ninja/Repositories/ProposalSnippetRepository.php | 1 + app/Ninja/Repositories/ProposalTemplateRepository.php | 1 + resources/views/proposals/grapesjs.blade.php | 2 +- resources/views/proposals/snippets/edit.blade.php | 3 ++- 9 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/Http/ViewComposers/ProposalComposer.php b/app/Http/ViewComposers/ProposalComposer.php index 047a741d41f6..40b5f13e9420 100644 --- a/app/Http/ViewComposers/ProposalComposer.php +++ b/app/Http/ViewComposers/ProposalComposer.php @@ -21,6 +21,11 @@ class ProposalComposer */ public function compose(View $view) { - $view->with('snippets', ProposalSnippet::scope()->with('proposal_category')->orderBy('name')->get()); + $snippets = ProposalSnippet::scope() + ->with('proposal_category') + ->orderBy('name') + ->get(); + + $view->with('snippets', $snippets); } } diff --git a/app/Ninja/Datatables/ProposalDatatable.php b/app/Ninja/Datatables/ProposalDatatable.php index ea1eafcef894..99d023fcbb6e 100644 --- a/app/Ninja/Datatables/ProposalDatatable.php +++ b/app/Ninja/Datatables/ProposalDatatable.php @@ -44,6 +44,12 @@ class ProposalDatatable extends EntityDatatable return link_to("proposals/{$model->public_id}/edit", Utils::timestampToDateString(strtotime($model->created_at)))->toHtml(); }, ], + [ + 'content', + function ($model) { + return $this->showWithTooltip(strip_tags($model->content)); + }, + ], [ 'private_notes', function ($model) { diff --git a/app/Ninja/Datatables/ProposalSnippetDatatable.php b/app/Ninja/Datatables/ProposalSnippetDatatable.php index b3186da8e114..f4c450a330a9 100644 --- a/app/Ninja/Datatables/ProposalSnippetDatatable.php +++ b/app/Ninja/Datatables/ProposalSnippetDatatable.php @@ -34,6 +34,12 @@ class ProposalSnippetDatatable extends EntityDatatable return link_to("proposals/categories/{$model->category_public_id}/edit", $model->category ?: ' ')->toHtml(); }, ], + [ + 'content', + function ($model) { + return $this->showWithTooltip(strip_tags($model->content)); + }, + ], [ 'private_notes', function ($model) { diff --git a/app/Ninja/Datatables/ProposalTemplateDatatable.php b/app/Ninja/Datatables/ProposalTemplateDatatable.php index ec9cf883916e..6597eaa3ace9 100644 --- a/app/Ninja/Datatables/ProposalTemplateDatatable.php +++ b/app/Ninja/Datatables/ProposalTemplateDatatable.php @@ -26,6 +26,12 @@ class ProposalTemplateDatatable extends EntityDatatable //return $this->addNote($str, $model->private_notes); }, ], + [ + 'content', + function ($model) { + return $this->showWithTooltip(strip_tags($model->content)); + }, + ], [ 'private_notes', function ($model) { diff --git a/app/Ninja/Repositories/ProposalRepository.php b/app/Ninja/Repositories/ProposalRepository.php index b9756011a50e..768655eb8441 100644 --- a/app/Ninja/Repositories/ProposalRepository.php +++ b/app/Ninja/Repositories/ProposalRepository.php @@ -39,6 +39,7 @@ class ProposalRepository extends BaseRepository 'proposals.created_at', 'proposals.is_deleted', 'proposals.private_notes', + 'proposals.html as content', DB::raw("COALESCE(NULLIF(clients.name,''), NULLIF(CONCAT(contacts.first_name, ' ', contacts.last_name),''), NULLIF(contacts.email,'')) client_name"), 'clients.user_id as client_user_id', 'clients.public_id as client_public_id', diff --git a/app/Ninja/Repositories/ProposalSnippetRepository.php b/app/Ninja/Repositories/ProposalSnippetRepository.php index d8527d4c3cad..f2a386d3777b 100644 --- a/app/Ninja/Repositories/ProposalSnippetRepository.php +++ b/app/Ninja/Repositories/ProposalSnippetRepository.php @@ -32,6 +32,7 @@ class ProposalSnippetRepository extends BaseRepository 'proposal_snippets.deleted_at', 'proposal_snippets.is_deleted', 'proposal_snippets.private_notes', + 'proposal_snippets.html as content', 'proposal_categories.name as category', 'proposal_categories.public_id as category_public_id', 'proposal_categories.user_id as category_user_id' diff --git a/app/Ninja/Repositories/ProposalTemplateRepository.php b/app/Ninja/Repositories/ProposalTemplateRepository.php index fcdae0a615e4..9470a98d37ae 100644 --- a/app/Ninja/Repositories/ProposalTemplateRepository.php +++ b/app/Ninja/Repositories/ProposalTemplateRepository.php @@ -29,6 +29,7 @@ class ProposalTemplateRepository extends BaseRepository 'proposal_templates.user_id', 'proposal_templates.deleted_at', 'proposal_templates.is_deleted', + 'proposal_templates.html as content', 'proposal_templates.private_notes' ); diff --git a/resources/views/proposals/grapesjs.blade.php b/resources/views/proposals/grapesjs.blade.php index 19d3c67653a8..fc539a898d7e 100644 --- a/resources/views/proposals/grapesjs.blade.php +++ b/resources/views/proposals/grapesjs.blade.php @@ -20,7 +20,7 @@ $(function() { var blockManager = grapesjsEditor.BlockManager; @foreach ($snippets as $snippet) - blockManager.add('h1-block', { + blockManager.add("h{{ ($loop->index + 1) }}-block", { label: '{{ $snippet->name }}', category: '{{ $snippet->proposal_category ? $snippet->proposal_category->name : trans('texts.custom') }}', content: '{!! $snippet->html !!}', diff --git a/resources/views/proposals/snippets/edit.blade.php b/resources/views/proposals/snippets/edit.blade.php index f890289ef03e..68fc78b0597b 100644 --- a/resources/views/proposals/snippets/edit.blade.php +++ b/resources/views/proposals/snippets/edit.blade.php @@ -52,11 +52,12 @@ ->addGroupClass('category-select') !!} {!! Former::select('icon') ->addGroupClass('icon-select') + ->addOption('', '') ->options($icons) !!}
{!! Former::textarea('private_notes') - ->style('height:98px') !!} + ->style('height:160px') !!}