refs #451 Items

app/Http/Controllers/Common/Items.php

@@ -365,6 +365,19 @@ class Items extends Controller
 
         $json->grand_total = money($grand_total, $currency_code, true)->format();
 
+        // Get currency object
+        $currency = Currency::where('code', $currency_code)->first();
+
+        $json->currency_name = $currency->name;
+        $json->currency_code = $currency_code;
+        $json->currency_rate = $currency->rate;
+
+        $json->thousands_separator = $currency->thousands_separator;
+        $json->decimal_mark = $currency->decimal_mark;
+        $json->precision = (int) $currency->precision;
+        $json->symbol_first = $currency->symbol_first;
+        $json->symbol = $currency->symbol;
+
         return response()->json($json);
     }
 

app/Http/Middleware/Money.php

@@ -23,6 +23,7 @@ class Money
             $purchase_price = $request->get('purchase_price');
             $opening_balance = $request->get('opening_balance');
             $currency_code = $request->get('currency_code');
+            $items = $request->get('item');
 
             if (empty($currency_code)) {
                 $currency_code = setting('general.default_currency');
@@ -34,9 +35,7 @@ class Money
                 $request->request->set('amount', $amount);
             }
 
-            if (isset($bill_number) || isset($invoice_number)) {
+            if (isset($bill_number) || isset($invoice_number) || !empty($items)) {
-                $items = $request->get('item');
-
                 if (!empty($items)) {
                     foreach ($items as $key => $item) {
                         $items[$key]['price'] = money($item['price'], $currency_code)->getAmount();

resources/views/incomes/invoices/create.blade.php

@@ -285,6 +285,7 @@
                         $('#item-tax-' + item_id).val(data.tax_id);
 
                         // This event Select2 Stylesheet
+                        $('#item-price-' + item_id).trigger('focusout');
                         $('#item-tax-' + item_id).trigger('change');
 
                         $('#item-total-' + item_id).html(data.total);
@@ -400,6 +401,13 @@
                 dataType: 'JSON',
                 data: $('#currency_code, #discount input[type=\'number\'], #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'),
                 headers: { 'X-CSRF-TOKEN': '{{ csrf_token() }}' },
+                before: function () {
+                    $('.input-price').each(function(){
+                        amount = $(this).maskMoney('unmasked')[0];
+
+                        $(this).val(amount);
+                    });
+                },
                 success: function(data) {
                     if (data) {
                         $.each( data.items, function( key, value ) {
@@ -412,6 +420,23 @@
                         $('#discount-total').html(data.discount_total);
                         $('#tax-total').html(data.tax_total);
                         $('#grand-total').html(data.grand_total);
+
+                        $('.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');
+                        });
                     }
                 }
             });

resources/views/incomes/invoices/edit.blade.php

@@ -293,6 +293,7 @@
                         $('#item-tax-' + item_id).val(data.tax_id);
 
                         // This event Select2 Stylesheet
+                        $('#item-price-' + item_id).trigger('focusout');
                         $('#item-tax-' + item_id).trigger('change');
 
                         $('#item-total-' + item_id).html(data.total);
@@ -402,6 +403,7 @@
         });
 
         function totalItem() {
+
             $.ajax({
                 url: '{{ url("common/items/totalItem") }}',
                 type: 'POST',
@@ -420,6 +422,23 @@
                         $('#discount-total').html(data.discount_total);
                         $('#tax-total').html(data.tax_total);
                         $('#grand-total').html(data.grand_total);
+
+                        $('.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');
+                        });
                     }
                 }
             });

routes/web.php

@@ -22,7 +22,7 @@ Route::group(['middleware' => 'language'], function () {
                 Route::get('dashboard/cashflow', 'Common\Dashboard@cashFlow')->name('dashboard.cashflow');
                 Route::get('import/{group}/{type}', 'Common\Import@create')->name('import.create');
                 Route::get('items/autocomplete', 'Common\Items@autocomplete')->name('items.autocomplete');
-                Route::post('items/totalItem', 'Common\Items@totalItem')->name('items.total');
+                Route::post('items/totalItem', 'Common\Items@totalItem')->middleware(['money'])->name('items.total');
                 Route::get('items/{item}/duplicate', 'Common\Items@duplicate')->name('items.duplicate');
                 Route::post('items/import', 'Common\Items@import')->name('items.import');
                 Route::get('items/export', 'Common\Items@export')->name('items.export');