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

Remove debug code and fix minor bugs

Browse Source
This commit is contained in:
Joshua Dwire 2016-03-24 19:55:56 -04:00
parent 5a6bd0d0d0
commit b5a948583e
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,7 +184,14 @@ class ExpenseController extends BaseController
public function store(CreateExpenseRequest $request) public function store(CreateExpenseRequest $request)
{ {
$expense = $this->expenseService->save($request->input()); $data = $request->input();
$data['documents'] = $request->file('documents');
if(!$this->checkUpdatePermission($data, $response)){
return $response;
}
$expense = $this->expenseService->save($data);
Session::flash('message', trans('texts.created_expense')); Session::flash('message', trans('texts.created_expense'));

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

@ -243,7 +243,6 @@ class InvoiceController extends BaseController
$invoice = $account->createInvoice($entityType, $clientId); $invoice = $account->createInvoice($entityType, $clientId);
$invoice->public_id = 0; $invoice->public_id = 0;
$invoice->expenses = Expense::scope([2])->with('documents')->get();
if(Session::get('expenses')){ if(Session::get('expenses')){
$invoice->expenses = Expense::scope(Session::get('expenses'))->with('documents')->get(); $invoice->expenses = Expense::scope(Session::get('expenses'))->with('documents')->get();
} }
@ -372,6 +371,7 @@ class InvoiceController extends BaseController
public function store(SaveInvoiceWithClientRequest $request) public function store(SaveInvoiceWithClientRequest $request)
{ {
$data = $request->input(); $data = $request->input();
$data['documents'] = $request->file('documents');
if(!$this->checkUpdatePermission($data, $response)){ if(!$this->checkUpdatePermission($data, $response)){
return $response; return $response;

4
app/Ninja/Repositories/ExpenseRepository.php
View File

@ -153,6 +153,8 @@ class ExpenseRepository extends BaseRepository
$expense->exchange_rate = round($rate, 4); $expense->exchange_rate = round($rate, 4);
$expense->amount = round(Utils::parseFloat($input['amount']), 2); $expense->amount = round(Utils::parseFloat($input['amount']), 2);
$expense->save();
// Documents // Documents
$document_ids = !empty($input['document_ids'])?array_map('intval', $input['document_ids']):array();; $document_ids = !empty($input['document_ids'])?array_map('intval', $input['document_ids']):array();;
foreach ($document_ids as $document_id){ foreach ($document_ids as $document_id){
@ -190,8 +192,6 @@ class ExpenseRepository extends BaseRepository
} }
} }
$expense->save();
return $expense; return $expense;
} }

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

@ -273,6 +273,7 @@
self.expense_currency_id = ko.observable(); self.expense_currency_id = ko.observable();
self.invoice_currency_id = ko.observable(); self.invoice_currency_id = ko.observable();
self.documents = ko.observableArray();
self.amount = ko.observable(); self.amount = ko.observable();
self.exchange_rate = ko.observable(1); self.exchange_rate = ko.observable(1);
self.should_be_invoiced = ko.observable(); self.should_be_invoiced = ko.observable();