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

Fix for Date in Expenses #731

Browse Source
This commit is contained in:
Hillel Coren 2016-02-18 12:02:30 +02:00
parent 65557fc0bd
commit 869febc1d3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ExpenseController.php
View File

@ -96,7 +96,7 @@ class ExpenseController extends BaseController
{ {
$expense = Expense::scope($publicId)->firstOrFail(); $expense = Expense::scope($publicId)->firstOrFail();
$expense->expense_date = Utils::fromSqlDate($expense->expense_date); $expense->expense_date = Utils::fromSqlDate($expense->expense_date);
$actions = []; $actions = [];
if ($expense->invoice) { if ($expense->invoice) {
$actions[] = ['url' => URL::to("invoices/{$expense->invoice->public_id}/edit"), 'label' => trans("texts.view_invoice")]; $actions[] = ['url' => URL::to("invoices/{$expense->invoice->public_id}/edit"), 'label' => trans("texts.view_invoice")];

2
app/Models/Expense.php
View File

@ -12,7 +12,7 @@ class Expense extends EntityModel
use SoftDeletes; use SoftDeletes;
use PresentableTrait; use PresentableTrait;
protected $dates = ['deleted_at','expense_date']; protected $dates = ['deleted_at'];
protected $presenter = 'App\Ninja\Presenters\ExpensePresenter'; protected $presenter = 'App\Ninja\Presenters\ExpensePresenter';
protected $fillable = [ protected $fillable = [

2
resources/views/expenses/edit.blade.php
View File

@ -160,7 +160,7 @@
} }
$vendorSelect.combobox(); $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() { $('.expense_date .input-group-addon').click(function() {
toggleDatePicker('expense_date'); toggleDatePicker('expense_date');