refs #451 Invoice edit,

This commit is contained in:
cuneytsenturk 2018-08-17 17:17:56 +03:00
parent 17b582796d
commit 1e2f0127ac
2 changed files with 48 additions and 1 deletions

View File

@ -371,13 +371,15 @@ class Invoices extends Controller
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code'); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$currency = Currency::where('code', '=', setting('general.default_currency'))->first();
$items = Item::enabled()->orderBy('name')->pluck('name', 'id'); $items = Item::enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id'); $taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
$categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id'); $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');
return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'items', 'taxes', 'categories')); return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories'));
} }
/** /**

View File

@ -161,6 +161,19 @@
} }
}); });
var currency = json['data']['currency'];
$("#item-price-" + item_row).maskMoney({
thousands : currency.thousands_separator,
decimal : currency.decimal_mark,
precision : currency.precision,
allowZero : true,
prefix : (currency.symbol_first) ? currency.symbol : '',
suffix : (currency.symbol_first) ? '' : currency.symbol
});
$("#item-price-" + item_row).trigger('focusout');
item_row++; item_row++;
} }
} }
@ -168,6 +181,20 @@
}); });
$(document).ready(function(){ $(document).ready(function(){
$(".input-price").maskMoney({
thousands : '{{ $currency->thousands_separator }}',
decimal : '{{ $currency->decimal_mark }}',
precision : {{ $currency->precision }},
allowZero : true,
@if($currency->symbol_first)
prefix : '{{ $currency->symbol }}'
@else
suffix : '{{ $currency->symbol }}'
@endif
});
$('.input-price').trigger('focusout');
totalItem(); totalItem();
//Date picker //Date picker
@ -346,9 +373,27 @@
$('#customer_tax_number').val(data.tax_number); $('#customer_tax_number').val(data.tax_number);
$('#customer_phone').val(data.phone); $('#customer_phone').val(data.phone);
$('#customer_address').val(data.address); $('#customer_address').val(data.address);
$('#currency_code').val(data.currency_code); $('#currency_code').val(data.currency_code);
$('#currency_rate').val(data.currency_rate); $('#currency_rate').val(data.currency_rate);
$('.input-price').each(function(){
amount = $(this).maskMoney('unmasked')[0];
$(this).maskMoney({
thousands : data.thousands_separator,
decimal : data.decimal_mark,
precision : data.precision,
allowZero : true,
prefix : (data.symbol_first) ? data.symbol : '',
suffix : (data.symbol_first) ? '' : data.symbol
});
$(this).val(amount);
$(this).trigger('focusout');
});
// This event Select2 Stylesheet // This event Select2 Stylesheet
$('#currency_code').trigger('change'); $('#currency_code').trigger('change');
} }