invoice and bill item price issue solved

akaunting · Sep 1, 2018 · e1b5f59 · e1b5f59
1 parent 4e2c428
commit e1b5f59
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 4 deletions.
diff --git a/app/Http/Middleware/Money.php b/app/Http/Middleware/Money.php
@@ -38,6 +38,10 @@ public function handle($request, Closure $next)
             if (isset($bill_number) || isset($invoice_number) || !empty($items)) {
                 if (!empty($items)) {
                     foreach ($items as $key => $item) {
+                        if (!isset($item['price'])) {
+                            continue;
+                        }
+
                         if (isset($item['currency']) && $item['currency'] != $currency_code) {
                             $items[$key]['price'] = money($item['price'], $item['currency'])->getAmount();
                         } else {

diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php
@@ -352,8 +352,24 @@
                 totalItem();
             });
 
+           var focus = false;
+    
+            $(document).on('focusin', '#items .input-price', function(){
+                focus = true;
+            });
+
+            $(document).on('blur', '#items .input-price', function(){
+                if (focus) {
+                    totalItem();
+
+                    focus = false;
+                }
+            });
+
             $(document).on('keyup', '#items tbody .form-control', function(){
-                totalItem();
+                if (!$(this).hasClass('input-price')) {
+                    totalItem();
+                }
             });
 
             $(document).on('change', '#vendor_id', function (e) {

diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php
@@ -360,8 +360,24 @@
                 totalItem();
             });
 
+           var focus = false;
+    
+            $(document).on('focusin', '#items .input-price', function(){
+                focus = true;
+            });
+
+            $(document).on('blur', '#items .input-price', function(){
+                if (focus) {
+                    totalItem();
+
+                    focus = false;
+                }
+            });
+
             $(document).on('keyup', '#items tbody .form-control', function(){
-                totalItem();
+                if (!$(this).hasClass('input-price')) {
+                    totalItem();
+                }
             });
 
             $(document).on('change', '#vendor_id', function (e) {

diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php
@@ -352,8 +352,24 @@
                 totalItem();
             });
 
+           var focus = false;
+    
+            $(document).on('focusin', '#items .input-price', function(){
+                focus = true;
+            });
+
+            $(document).on('blur', '#items .input-price', function(){
+                if (focus) {
+                    totalItem();
+
+                    focus = false;
+                }
+            });
+
             $(document).on('keyup', '#items tbody .form-control', function(){
-                totalItem();
+                if (!$(this).hasClass('input-price')) {
+                    totalItem();
+                }
             });
 
             $(document).on('change', '#customer_id', function (e) {

diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php
@@ -360,8 +360,24 @@
                 totalItem();
             });
 
+           var focus = false;
+    
+            $(document).on('focusin', '#items .input-price', function(){
+                focus = true;
+            });
+
+            $(document).on('blur', '#items .input-price', function(){
+                if (focus) {
+                    totalItem();
+
+                    focus = false;
+                }
+            });
+
             $(document).on('keyup', '#items tbody .form-control', function(){
-                totalItem();
+                if (!$(this).hasClass('input-price')) {
+                    totalItem();
+                }
             });
 
             $(document).on('change', '#customer_id', function (e) {