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

Resolved issue with expenses and multi-tenancy

Browse Source
This commit is contained in:
Hillel Coren 2016-01-27 20:31:08 +02:00
parent 2e17bac866
commit a7f2d3354c
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,7 @@ class ExpenseController extends BaseController
*/ */
public function update(UpdateExpenseRequest $request) public function update(UpdateExpenseRequest $request)
{ {
$expense = $this->expenseRepo->save($request->input()); $expense = $this->expenseService->save($request->input());
Session::flash('message', trans('texts.updated_expense')); Session::flash('message', trans('texts.updated_expense'));
@ -167,7 +167,7 @@ class ExpenseController extends BaseController
public function store(CreateExpenseRequest $request) public function store(CreateExpenseRequest $request)
{ {
$expense = $this->expenseRepo->save($request->input()); $expense = $this->expenseService->save($request->input());
Session::flash('message', trans('texts.created_expense')); Session::flash('message', trans('texts.created_expense'));

11
app/Services/ExpenseService.php
View File

@ -5,7 +5,8 @@ use Utils;
use URL; use URL;
use App\Services\BaseService; use App\Services\BaseService;
use App\Ninja\Repositories\ExpenseRepository; use App\Ninja\Repositories\ExpenseRepository;
use App\Models\Client;
use App\Models\Vendor;
class ExpenseService extends BaseService class ExpenseService extends BaseService
{ {
@ -26,6 +27,14 @@ class ExpenseService extends BaseService
public function save($data) public function save($data)
{ {
if (isset($data['client_id']) && $data['client_id']) {
$data['client_id'] = Client::getPrivateId($data['client_id']);
}
if (isset($data['vendor_id']) && $data['vendor_id']) {
$data['vendor_id'] = Vendor::getPrivateId($data['vendor_id']);
}
return $this->expenseRepo->save($data); return $this->expenseRepo->save($data);
} }

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

@ -174,18 +174,19 @@
var ViewModel = function(data) { var ViewModel = function(data) {
var self = this; var self = this;
self.client_id = ko.observable({{ $clientPublicId }});
self.vendor_id = ko.observable({{ $vendorPublicId }});
self.currency_id = ko.observable(); self.currency_id = ko.observable();
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();
self.account_currency_id = ko.observable({{ $account->getCurrencyId() }});
if (data) { if (data) {
ko.mapping.fromJS(data, {}, this); ko.mapping.fromJS(data, {}, this);
} }
self.account_currency_id = ko.observable({{ $account->getCurrencyId() }});
self.client_id = ko.observable({{ $clientPublicId }});
self.vendor_id = ko.observable({{ $vendorPublicId }});
self.convertedAmount = ko.computed({ self.convertedAmount = ko.computed({
read: function () { read: function () {
return roundToTwo(self.amount() * self.exchange_rate()).toFixed(2); return roundToTwo(self.amount() * self.exchange_rate()).toFixed(2);
@ -204,7 +205,6 @@
self.currencyName = ko.computed(function() { self.currencyName = ko.computed(function() {
var currencyId = self.currency_id() || self.account_currency_id(); var currencyId = self.currency_id() || self.account_currency_id();
var currency = currencyMap[currencyId]; var currency = currencyMap[currencyId];
console.log(currencyId);
return currency.name; return currency.name;
}); });