From d9e9a5a54004606f213eb8c5b3767acf06b9e114 Mon Sep 17 00:00:00 2001
From: raishvaria <raishvaria1996@gmail.com>
Date: Sat, 14 Dec 2019 18:29:46 +0530
Subject: [PATCH] fix estimate & invoice tax issue

---
 app/Estimate.php                             |  8 +++++---
 app/Http/Controllers/EstimatesController.php |  8 ++++----
 app/Http/Controllers/InvoicesController.php  | 11 ++++-------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/Estimate.php b/app/Estimate.php
index 4caf953b..24211795 100644
--- a/app/Estimate.php
+++ b/app/Estimate.php
@@ -49,9 +49,11 @@ class Estimate extends Model
     ];
 
     protected $casts = [
-        'total' => 'float',
-        'tax' => 'float',
-        'sub_total' => 'float'
+        'total' => 'integer',
+        'tax' => 'integer',
+        'sub_total' => 'integer',
+        'discount' => 'float',
+        'discount_val' => 'integer',
     ];
 
     public static function getNextEstimateNumber($value)
diff --git a/app/Http/Controllers/EstimatesController.php b/app/Http/Controllers/EstimatesController.php
index 19524a46..43328901 100644
--- a/app/Http/Controllers/EstimatesController.php
+++ b/app/Http/Controllers/EstimatesController.php
@@ -145,7 +145,7 @@ class EstimatesController extends Controller
 
             if (array_key_exists('taxes', $estimateItem) && $estimateItem['taxes']) {
                 foreach ($estimateItem['taxes'] as $tax) {
-                    if ($tax['amount']) {
+                    if (gettype($tax['amount']) !== "NULL") {
                         $tax['company_id'] = $request->header('company');
                         $item->taxes()->create($tax);
                     }
@@ -155,7 +155,7 @@ class EstimatesController extends Controller
 
         if ($request->has('taxes')) {
             foreach ($request->taxes as $tax) {
-                if ($tax['amount']) {
+                if (gettype($tax['amount']) !== "NULL") {
                     $tax['company_id'] = $request->header('company');
                     $estimate->taxes()->create($tax);
                 }
@@ -291,7 +291,7 @@ class EstimatesController extends Controller
 
             if (array_key_exists('taxes', $estimateItem) && $estimateItem['taxes']) {
                 foreach ($estimateItem['taxes'] as $tax) {
-                    if ($tax['amount']) {
+                    if (gettype($tax['amount']) !== "NULL") {
                         $tax['company_id'] = $request->header('company');
                         $item->taxes()->create($tax);
                     }
@@ -301,7 +301,7 @@ class EstimatesController extends Controller
 
         if ($request->has('taxes')) {
             foreach ($request->taxes as $tax) {
-                if ($tax['amount']) {
+                if (gettype($tax['amount']) !== "NULL") {
                     $tax['company_id'] = $request->header('company');
                     $estimate->taxes()->create($tax);
                 }
diff --git a/app/Http/Controllers/InvoicesController.php b/app/Http/Controllers/InvoicesController.php
index 6edf7460..31d820d7 100644
--- a/app/Http/Controllers/InvoicesController.php
+++ b/app/Http/Controllers/InvoicesController.php
@@ -145,8 +145,7 @@ class InvoicesController extends Controller
             if (array_key_exists('taxes', $invoiceItem) && $invoiceItem['taxes']) {
                 foreach ($invoiceItem['taxes'] as $tax) {
                     $tax['company_id'] = $request->header('company');
-
-                    if ($tax['amount']) {
+                    if (gettype($tax['amount']) !== "NULL") {
                         $item->taxes()->create($tax);
                     }
                 }
@@ -157,7 +156,7 @@ class InvoicesController extends Controller
             foreach ($request->taxes as $tax) {
                 $tax['company_id'] = $request->header('company');
 
-                if ($tax['amount']) {
+                if (gettype($tax['amount']) !== "NULL") {
                     $invoice->taxes()->create($tax);
                 }
             }
@@ -317,7 +316,6 @@ class InvoicesController extends Controller
         foreach ($oldTaxes as $oldTax) {
             Tax::destroy($oldTax['id']);
         }
-
         foreach ($invoiceItems as $invoiceItem) {
             $invoiceItem['company_id'] = $request->header('company');
             $item = $invoice->items()->create($invoiceItem);
@@ -325,8 +323,7 @@ class InvoicesController extends Controller
             if (array_key_exists('taxes', $invoiceItem) && $invoiceItem['taxes']) {
                 foreach ($invoiceItem['taxes'] as $tax) {
                     $tax['company_id'] = $request->header('company');
-
-                    if ($tax['amount']) {
+                    if (gettype($tax['amount']) !== "NULL") {
                         $item->taxes()->create($tax);
                     }
                 }
@@ -337,7 +334,7 @@ class InvoicesController extends Controller
             foreach ($request->taxes as $tax) {
                 $tax['company_id'] = $request->header('company');
 
-                if ($tax['amount']) {
+                if (gettype($tax['amount']) !== "NULL") {
                     $invoice->taxes()->create($tax);
                 }
             }