mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 00:11:35 +02:00
Fix for Date in Expenses #731
This commit is contained in:
parent
65557fc0bd
commit
869febc1d3
@ -96,7 +96,7 @@ class ExpenseController extends BaseController
|
||||
{
|
||||
$expense = Expense::scope($publicId)->firstOrFail();
|
||||
$expense->expense_date = Utils::fromSqlDate($expense->expense_date);
|
||||
|
||||
|
||||
$actions = [];
|
||||
if ($expense->invoice) {
|
||||
$actions[] = ['url' => URL::to("invoices/{$expense->invoice->public_id}/edit"), 'label' => trans("texts.view_invoice")];
|
||||
|
@ -12,7 +12,7 @@ class Expense extends EntityModel
|
||||
use SoftDeletes;
|
||||
use PresentableTrait;
|
||||
|
||||
protected $dates = ['deleted_at','expense_date'];
|
||||
protected $dates = ['deleted_at'];
|
||||
protected $presenter = 'App\Ninja\Presenters\ExpensePresenter';
|
||||
|
||||
protected $fillable = [
|
||||
|
@ -160,7 +160,7 @@
|
||||
}
|
||||
$vendorSelect.combobox();
|
||||
|
||||
$('#expense_date').datepicker('update', new Date());
|
||||
$('#expense_date').datepicker('update', '{{ $expense ? $expense->expense_date : 'new Date()' }}');
|
||||
|
||||
$('.expense_date .input-group-addon').click(function() {
|
||||
toggleDatePicker('expense_date');
|
||||
|
Loading…
Reference in New Issue
Block a user