From 90fba987fa6f0aa244c437a7f47e5dc0932d8076 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Thu, 12 Oct 2017 18:32:14 +0300
Subject: [PATCH] another api fix #46

---
 app/Http/Controllers/Api/Incomes/Invoices.php | 8 ++++++--
 app/Http/Controllers/Incomes/Invoices.php     | 8 ++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Api/Incomes/Invoices.php b/app/Http/Controllers/Api/Incomes/Invoices.php
index 7fcdb1a8b..bee22df4e 100644
--- a/app/Http/Controllers/Api/Incomes/Invoices.php
+++ b/app/Http/Controllers/Api/Incomes/Invoices.php
@@ -51,6 +51,10 @@ class Invoices extends ApiController
      */
     public function store(Request $request)
     {
+        if (empty($request['amount'])) {
+            $request['amount'] = 0;
+        }
+
         $invoice = Invoice::create($request->all());
 
         $taxes = [];
@@ -119,7 +123,7 @@ class Invoices extends ApiController
         }
 
         if (empty($request['amount'])) {
-            $request['amount'] += $sub_total + $tax_total;
+            $request['amount'] = $sub_total + $tax_total;
         }
 
         $invoice->update($request->input());
@@ -219,7 +223,7 @@ class Invoices extends ApiController
         }
 
         if (empty($request['amount'])) {
-            $request['amount'] += $sub_total + $tax_total;
+            $request['amount'] = $sub_total + $tax_total;
         }
 
         $invoice->update($request->input());
diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php
index acd64c4e8..b09b454ec 100644
--- a/app/Http/Controllers/Incomes/Invoices.php
+++ b/app/Http/Controllers/Incomes/Invoices.php
@@ -331,7 +331,7 @@ class Invoices extends Controller
             }
         }
 
-        $request['amount'] += $sub_total + $tax_total;
+        $request['amount'] = $sub_total + $tax_total;
 
         $invoice->update($request->input());
 
@@ -402,8 +402,6 @@ class Invoices extends Controller
 
         $request['invoice_status_code'] = 'draft';
 
-        $request['amount'] = 0;
-
         // Upload attachment
         $attachment_path = $this->getUploadedFilePath($request->file('attachment'), 'invoices');
 
@@ -469,9 +467,7 @@ class Invoices extends Controller
             }
         }
 
-        if (empty($request['amount'])) {
-            $request['amount'] += $sub_total + $tax_total;
-        }
+        $request['amount'] = $sub_total + $tax_total;
 
         $invoice->update($request->input());