From 4045b529aa7fcbe2a3484c7b5d3e0d00c64ad976 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 13 Mar 2017 11:15:05 +0200 Subject: [PATCH] Fix for expense client --- resources/views/expenses/edit.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php index 53b0422badf1..689150795558 100644 --- a/resources/views/expenses/edit.blade.php +++ b/resources/views/expenses/edit.blade.php @@ -103,7 +103,7 @@ ->fromQuery($currencies, 'name', 'id') !!} - {!! Former::plaintext('test') + {!! Former::plaintext('') ->value('') ->style('min-height:46px') ->label(trans('texts.invoice_currency')) !!} @@ -406,11 +406,6 @@ self.convert_currency = ko.observable({{ ($expense && $expense->isExchanged()) ? 'true' : 'false' }}); self.apply_taxes = ko.observable({{ ($expense && ($expense->tax_name1 || $expense->tax_name2)) ? 'true' : 'false' }}); - self.account_currency_id = ko.observable({{ $account->getCurrencyId() }}); - self.client_id = ko.observable({{ $clientPublicId }}); - //self.vendor_id = ko.observable({{ $vendorPublicId }}); - //self.expense_category_id = ko.observable({{ $categoryPublicId }}); - self.mapping = { 'documents': { create: function(options) { @@ -423,6 +418,11 @@ ko.mapping.fromJS(data, self.mapping, this); } + self.account_currency_id = ko.observable({{ $account->getCurrencyId() }}); + self.client_id = ko.observable({{ $clientPublicId }}); + //self.vendor_id = ko.observable({{ $vendorPublicId }}); + //self.expense_category_id = ko.observable({{ $categoryPublicId }}); + self.convertedAmount = ko.computed({ read: function () { return roundToTwo(self.amount() * self.exchange_rate()).toFixed(2);