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

Recurring expenses

Browse Source
This commit is contained in:
Hillel Coren 2017-06-26 16:25:11 +03:00
parent df6ec9af70
commit b694d35994
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Libraries/HistoryUtils.php
View File

@ -80,6 +80,7 @@ class HistoryUtils
ENTITY_QUOTE, ENTITY_QUOTE,
ENTITY_TASK, ENTITY_TASK,
ENTITY_EXPENSE, ENTITY_EXPENSE,
//ENTITY_RECURRING_EXPENSE,
]; ];
if (! in_array($entityType, $trackedTypes)) { if (! in_array($entityType, $trackedTypes)) {

1
app/Models/EntityModel.php
View File

@ -312,6 +312,7 @@ class EntityModel extends Eloquent
'invoices' => 'file-pdf-o', 'invoices' => 'file-pdf-o',
'payments' => 'credit-card', 'payments' => 'credit-card',
'recurring_invoices' => 'files-o', 'recurring_invoices' => 'files-o',
'recurring_expenses' => 'files-o',
'credits' => 'credit-card', 'credits' => 'credit-card',
'quotes' => 'file-text-o', 'quotes' => 'file-text-o',
'tasks' => 'clock-o', 'tasks' => 'clock-o',

4
app/Models/RecurringExpense.php
View File

@ -46,8 +46,8 @@ class RecurringExpense extends EntityModel
'tax_rate2', 'tax_rate2',
'tax_name2', 'tax_name2',
'should_be_invoiced', 'should_be_invoiced',
'start_date', //'start_date',
'end_date', //'end_date',
'frequency_id', 'frequency_id',
]; ];

3
app/Ninja/Repositories/RecurringExpenseRepository.php
View File

@ -114,6 +114,9 @@ class RecurringExpenseRepository extends BaseRepository
$expense->fill($input); $expense->fill($input);
if (isset($input['start_date'])) { if (isset($input['start_date'])) {
if ($expense->exists && $expense->start_date && $expense->start_date != Utils::toSqlDate($input['start_date'])) {
$expense->last_sent_date = null;
}
$expense->start_date = Utils::toSqlDate($input['start_date']); $expense->start_date = Utils::toSqlDate($input['start_date']);
} }
if (isset($input['end_date'])) { if (isset($input['end_date'])) {

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

@ -376,11 +376,20 @@
@if ($isRecurring) @if ($isRecurring)
$('#start_date, #end_date').datepicker(); $('#start_date, #end_date').datepicker();
@if ($expense && $expense->start_date) @if ($expense && $expense->start_date)
$('#start_date').datepicker('update', '{{ Utils::fromSqlDate($expense->start_date) }}'); $('#start_date').datepicker('update', '{{ $expense && $expense->start_date ? Utils::fromSqlDate($expense->start_date) : 'new Date()' }}');
@elseif (! $expense)
$('#start_date').datepicker('update', new Date());
@endif @endif
@if ($expense && $expense->end_date) @if ($expense && $expense->end_date)
$('#end_date').datepicker('update', '{{ Utils::fromSqlDate($expense->end_date) }}'); $('#end_date').datepicker('update', '{{ Utils::fromSqlDate($expense->end_date) }}');
@endif @endif
$('.start_date .input-group-addon').click(function() {
toggleDatePicker('start_date');
});
$('.end_date .input-group-addon').click(function() {
toggleDatePicker('end_date');
});
@elseif (Auth::user()->account->hasFeature(FEATURE_DOCUMENTS)) @elseif (Auth::user()->account->hasFeature(FEATURE_DOCUMENTS))
$('.main-form').submit(function(){ $('.main-form').submit(function(){
if($('#document-upload .fallback input').val())$(this).attr('enctype', 'multipart/form-data') if($('#document-upload .fallback input').val())$(this).attr('enctype', 'multipart/form-data')