From b5a948583e22aaed4ed43fc7230890edb28181eb Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Thu, 24 Mar 2016 19:55:56 -0400 Subject: [PATCH] Remove debug code and fix minor bugs --- app/Http/Controllers/ExpenseController.php | 9 ++++++++- app/Http/Controllers/InvoiceController.php | 2 +- app/Ninja/Repositories/ExpenseRepository.php | 4 ++-- resources/views/expenses/edit.blade.php | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php index 7e6b254f9d01..b4e083a3ad43 100644 --- a/app/Http/Controllers/ExpenseController.php +++ b/app/Http/Controllers/ExpenseController.php @@ -184,7 +184,14 @@ class ExpenseController extends BaseController 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')); diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 93d4a2a2432a..2f4c7c0923d9 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -243,7 +243,6 @@ class InvoiceController extends BaseController $invoice = $account->createInvoice($entityType, $clientId); $invoice->public_id = 0; - $invoice->expenses = Expense::scope([2])->with('documents')->get(); if(Session::get('expenses')){ $invoice->expenses = Expense::scope(Session::get('expenses'))->with('documents')->get(); } @@ -372,6 +371,7 @@ class InvoiceController extends BaseController public function store(SaveInvoiceWithClientRequest $request) { $data = $request->input(); + $data['documents'] = $request->file('documents'); if(!$this->checkUpdatePermission($data, $response)){ return $response; diff --git a/app/Ninja/Repositories/ExpenseRepository.php b/app/Ninja/Repositories/ExpenseRepository.php index 046b4a1cb943..aae7729c474d 100644 --- a/app/Ninja/Repositories/ExpenseRepository.php +++ b/app/Ninja/Repositories/ExpenseRepository.php @@ -152,6 +152,8 @@ class ExpenseRepository extends BaseRepository $rate = isset($input['exchange_rate']) ? Utils::parseFloat($input['exchange_rate']) : 1; $expense->exchange_rate = round($rate, 4); $expense->amount = round(Utils::parseFloat($input['amount']), 2); + + $expense->save(); // Documents $document_ids = !empty($input['document_ids'])?array_map('intval', $input['document_ids']):array();; @@ -189,8 +191,6 @@ class ExpenseRepository extends BaseRepository $document->delete(); } } - - $expense->save(); return $expense; } diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php index dcf081064e56..2b999114f5ac 100644 --- a/resources/views/expenses/edit.blade.php +++ b/resources/views/expenses/edit.blade.php @@ -273,6 +273,7 @@ self.expense_currency_id = ko.observable(); self.invoice_currency_id = ko.observable(); + self.documents = ko.observableArray(); self.amount = ko.observable(); self.exchange_rate = ko.observable(1); self.should_be_invoiced = ko.observable();