Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 13:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on recurring expenses

Browse Source
This commit is contained in:
Hillel Coren 2017-06-26 21:36:58 +03:00
parent 68ec5291b7
commit ab06b72e66
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,10 @@ class ExpenseController extends BaseController
} }
} }
if ($expense->recurring_expense_id) {
$actions[] = ['url' => URL::to("recurring_expenses/{$expense->recurring_expense->public_id}/edit"), 'label' => trans('texts.view_recurring_expense')];
}
$actions[] = \DropdownButton::DIVIDER; $actions[] = \DropdownButton::DIVIDER;
if (! $expense->trashed()) { if (! $expense->trashed()) {
$actions[] = ['url' => 'javascript:submitAction("archive")', 'label' => trans('texts.archive_expense')]; $actions[] = ['url' => 'javascript:submitAction("archive")', 'label' => trans('texts.archive_expense')];

9
app/Models/Expense.php
View File

@ -142,6 +142,15 @@ class Expense extends EntityModel
return $this->belongsTo('App\Models\PaymentType'); return $this->belongsTo('App\Models\PaymentType');
} }
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function recurring_expense()
{
return $this->belongsTo('App\Models\RecurringExpense');
}
/** /**
* @return mixed * @return mixed
*/ */

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

@ -183,6 +183,7 @@ class RecurringExpenseRepository extends BaseRepository
$expense->expense_date = $account->getDateTime()->format('Y-m-d'); $expense->expense_date = $account->getDateTime()->format('Y-m-d');
$expense->exchange_rate = 1; $expense->exchange_rate = 1;
$expense->invoice_currency_id = $recurringExpense->expense_currency_id; $expense->invoice_currency_id = $recurringExpense->expense_currency_id;
$expense->recurring_expense_id = $recurringExpense->id;
$expense->save(); $expense->save();
$recurringExpense->last_sent_date = $account->getDateTime()->format('Y-m-d'); $recurringExpense->last_sent_date = $account->getDateTime()->format('Y-m-d');

1
resources/lang/en/texts.php
View File

@ -2287,6 +2287,7 @@ $LANG = array(
'delete_recurring_expense' => 'Delete Recurring Expense', 'delete_recurring_expense' => 'Delete Recurring Expense',
'deleted_recurring_expense' => 'Successfully deleted project', 'deleted_recurring_expense' => 'Successfully deleted project',
'deleted_recurring_expense' => 'Successfully deleted :count projects', 'deleted_recurring_expense' => 'Successfully deleted :count projects',
'view_recurring_expense' => 'View Recurring Expense',
); );