mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 00:11:35 +02:00
Proposals
This commit is contained in:
parent
181094cbc1
commit
a59a59ebd2
@ -63,6 +63,7 @@ class ProposalController extends BaseController
|
|||||||
'invoices' => Invoice::scope()->with('client.contacts', 'client.country')->unapprovedQuotes()->orderBy('id')->get(),
|
'invoices' => Invoice::scope()->with('client.contacts', 'client.country')->unapprovedQuotes()->orderBy('id')->get(),
|
||||||
'templates' => ProposalTemplate::whereAccountId($account->id)->orWhereNull('account_id')->orderBy('name')->get(),
|
'templates' => ProposalTemplate::whereAccountId($account->id)->orWhereNull('account_id')->orderBy('name')->get(),
|
||||||
'invoicePublicId' => $request->invoice_id,
|
'invoicePublicId' => $request->invoice_id,
|
||||||
|
'templatePublicId' => $request->proposal_template_id,
|
||||||
];
|
];
|
||||||
|
|
||||||
return View::make('proposals.edit', $data);
|
return View::make('proposals.edit', $data);
|
||||||
|
@ -62,6 +62,15 @@ class ProposalTemplateDatatable extends EntityDatatable
|
|||||||
return Auth::user()->can('editByOwner', [ENTITY_PROPOSAL_TEMPLATE, $model->user_id]);
|
return Auth::user()->can('editByOwner', [ENTITY_PROPOSAL_TEMPLATE, $model->user_id]);
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
trans('texts.new_proposal'),
|
||||||
|
function ($model) {
|
||||||
|
return URL::to("proposals/create/0/{$model->public_id}");
|
||||||
|
},
|
||||||
|
function ($model) {
|
||||||
|
return Auth::user()->can('create', [ENTITY_PROPOSAL, $model->user_id]);
|
||||||
|
},
|
||||||
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -174,6 +174,7 @@
|
|||||||
@include('partials/entity_combobox', ['entityType' => ENTITY_PROPOSAL_TEMPLATE])
|
@include('partials/entity_combobox', ['entityType' => ENTITY_PROPOSAL_TEMPLATE])
|
||||||
if (templateId) {
|
if (templateId) {
|
||||||
var template = templateMap[templateId];
|
var template = templateMap[templateId];
|
||||||
|
$proposal_templateSelect.val(template.public_id);
|
||||||
setComboboxValue($('.template-select'), template.public_id, template.name);
|
setComboboxValue($('.template-select'), template.public_id, template.name);
|
||||||
}
|
}
|
||||||
$proposal_templateSelect.change(loadTemplate);
|
$proposal_templateSelect.change(loadTemplate);
|
||||||
@ -190,6 +191,10 @@
|
|||||||
var html = mergeTemplate(grapesjsEditor.getHtml());
|
var html = mergeTemplate(grapesjsEditor.getHtml());
|
||||||
grapesjsEditor.setComponents(html);
|
grapesjsEditor.setComponents(html);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@if (! $proposal && $templatePublicId)
|
||||||
|
loadTemplate();
|
||||||
|
@endif
|
||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
@ -62,6 +62,7 @@
|
|||||||
|
|
||||||
@if ($template)
|
@if ($template)
|
||||||
{!! Button::primary(trans('texts.new_proposal'))
|
{!! Button::primary(trans('texts.new_proposal'))
|
||||||
|
->appendIcon(Icon::create('plus-sign'))
|
||||||
->asLinkTo(url('/proposals/create/0/' . $template->public_id)) !!}
|
->asLinkTo(url('/proposals/create/0/' . $template->public_id)) !!}
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
@ -227,7 +227,7 @@ Route::group(['middleware' => ['lookup:user', 'auth:user']], function () {
|
|||||||
|
|
||||||
Route::post('proposals/proposals/bulk', 'ProposalController@bulk');
|
Route::post('proposals/proposals/bulk', 'ProposalController@bulk');
|
||||||
Route::get('proposals/{proposals}/edit', 'ProposalController@edit');
|
Route::get('proposals/{proposals}/edit', 'ProposalController@edit');
|
||||||
Route::get('proposals/create/{invoice_id?}', 'ProposalController@create');
|
Route::get('proposals/create/{invoice_id?}/{proposal_template_id?}', 'ProposalController@create');
|
||||||
Route::resource('proposals', 'ProposalController');
|
Route::resource('proposals', 'ProposalController');
|
||||||
Route::get('api/proposals', 'ProposalController@getDatatable');
|
Route::get('api/proposals', 'ProposalController@getDatatable');
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user