From 3b3379833d81ad5282e1a24d163171f83da54e43 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Fri, 9 Nov 2018 12:27:27 +0300
Subject: [PATCH] close #612 Fixed: Invoice/Bill use item quantity (double)
 stock changes issue

---
 app/Jobs/Expense/CreateBillItem.php   |   2 +-
 app/Jobs/Expense/UpdateBill.php       | 125 --------------------------
 app/Jobs/Income/CreateInvoiceItem.php |   2 +-
 3 files changed, 2 insertions(+), 127 deletions(-)

diff --git a/app/Jobs/Expense/CreateBillItem.php b/app/Jobs/Expense/CreateBillItem.php
index 695f2ae8d..07ff2d0dc 100644
--- a/app/Jobs/Expense/CreateBillItem.php
+++ b/app/Jobs/Expense/CreateBillItem.php
@@ -60,7 +60,7 @@ class CreateBillItem
             $item_sku = $item_object->sku;
 
             // Increase stock (item bought)
-            $item_object->quantity += $this->data['quantity'];
+            $item_object->quantity += (double) $this->data['quantity'];
             $item_object->save();
         } elseif (!empty($this->data['sku'])) {
             $item_sku = $this->data['sku'];
diff --git a/app/Jobs/Expense/UpdateBill.php b/app/Jobs/Expense/UpdateBill.php
index 435cf72be..759aa2a2b 100644
--- a/app/Jobs/Expense/UpdateBill.php
+++ b/app/Jobs/Expense/UpdateBill.php
@@ -193,129 +193,4 @@ class UpdateBill
             }
         }
     }
-    
-    function test() {
-
-        $taxes = [];
-
-        $tax_total = 0;
-        $sub_total = 0;
-        $discount_total = 0;
-        $discount = $request['discount'];
-
-        $bill_item = [];
-        $bill_item['company_id'] = $request['company_id'];
-        $bill_item['bill_id'] = $bill->id;
-
-        if ($request['item']) {
-            $this->deleteRelationships($bill, 'items');
-
-            foreach ($request['item'] as $item) {
-                unset($tax_object);
-                $item_sku = '';
-
-                if (!empty($item['item_id'])) {
-                    $item_object = Item::find($item['item_id']);
-
-                    $item['name'] = $item_object->name;
-                    $item_sku = $item_object->sku;
-                }
-
-                $item_tax = 0;
-                $item_taxes = [];
-                $bill_item_taxes = [];
-
-                if (!empty($item['tax_id'])) {
-                    foreach ($item['tax_id'] as $tax_id) {
-                        $tax_object = Tax::find($tax_id);
-
-                        $item_taxes[] = $tax_id;
-
-                        $tax = (((double) $item['price'] * (double) $item['quantity']) / 100) * $tax_object->rate;
-
-                        // Apply discount to tax
-                        if ($discount) {
-                            $tax = $tax - ($tax * ($discount / 100));
-                        }
-
-                        $bill_item_taxes[] = [
-                            'company_id' => $request['company_id'],
-                            'bill_id' => $bill->id,
-                            'tax_id' => $tax_id,
-                            'name' => $tax_object->name,
-                            'amount' => $tax,
-                        ];
-
-                        $item_tax += $tax;
-                    }
-                }
-
-                $bill_item['item_id'] = $item['item_id'];
-                $bill_item['name'] = str_limit($item['name'], 180, '');
-                $bill_item['sku'] = $item_sku;
-                $bill_item['quantity'] = (double) $item['quantity'];
-                $bill_item['price'] = (double) $item['price'];
-                $bill_item['tax'] = $item_tax;
-                $bill_item['tax_id'] = 0;//$tax_id;
-                $bill_item['total'] = (double) $item['price'] * (double) $item['quantity'];
-
-                $tax_total += $item_tax;
-                $sub_total += $bill_item['total'];
-
-                $bill_item_created = BillItem::create($bill_item);
-
-                if ($bill_item_taxes) {
-                    foreach ($bill_item_taxes as $bill_item_tax) {
-                        $bill_item_tax['bill_item_id'] = $bill_item_created->id;
-
-                        BillItemTax::create($bill_item_tax);
-
-                        // Set taxes
-                        if (isset($taxes) && array_key_exists($bill_item_tax['tax_id'], $taxes)) {
-                            $taxes[$bill_item_tax['tax_id']]['amount'] += $bill_item_tax['amount'];
-                        } else {
-                            $taxes[$bill_item_tax['tax_id']] = [
-                                'name' => $bill_item_tax['name'],
-                                'amount' => $bill_item_tax['amount']
-                            ];
-                        }
-                    }
-                }
-            }
-        }
-
-        $s_total = $sub_total;
-
-        // Apply discount to total
-        if ($discount) {
-            $s_discount = $s_total * ($discount / 100);
-            $discount_total += $s_discount;
-            $s_total = $s_total - $s_discount;
-        }
-
-        $amount = $s_total + $tax_total;
-
-        $request['amount'] = money($amount, $request['currency_code'])->getAmount();
-
-        $bill->update($request->input());
-
-        // Upload attachment
-        if ($request->file('attachment')) {
-            $media = $this->getMedia($request->file('attachment'), 'bills');
-
-            $bill->attachMedia($media, 'attachment');
-        }
-
-        // Delete previous bill totals
-        $this->deleteRelationships($bill, 'totals');
-
-        // Add bill totals
-        $this->addTotals($bill, $request, $taxes, $sub_total, $discount_total, $tax_total);
-
-        // Recurring
-        $bill->updateRecurring();
-
-        // Fire the event to make it extendible
-        event(new BillUpdated($bill));
-    }
 }
diff --git a/app/Jobs/Income/CreateInvoiceItem.php b/app/Jobs/Income/CreateInvoiceItem.php
index d6e5fc953..16269abac 100644
--- a/app/Jobs/Income/CreateInvoiceItem.php
+++ b/app/Jobs/Income/CreateInvoiceItem.php
@@ -60,7 +60,7 @@ class CreateInvoiceItem
             $item_sku = $item_object->sku;
 
             // Decrease stock (item sold)
-            $item_object->quantity -= $this->data['quantity'];
+            $item_object->quantity -= (double) $this->data['quantity'];
             $item_object->save();
 
             if (setting('general.send_item_reminder')) {