removed invoice/bill status tables

akaunting · Jan 11, 2020 · 08eb8e7 · 08eb8e7
1 parent b551900
commit 08eb8e7
Show file tree

Hide file tree

Showing 69 changed files with 250 additions and 470 deletions.
diff --git a/app/Abstracts/Widget.php b/app/Abstracts/Widget.php
@@ -47,17 +47,13 @@ public function calculateDocumentTotals($model)
 
         $today = Date::today()->toDateString();
 
-        $type = ($model instanceof Invoice) ? 'invoice' : 'bill';
-
-        $status_field = $type . '_status_code';
-
-        if ($model->$status_field == 'paid') {
+        if ($model->status == 'paid') {
             return [$open, $overdue];
         }
 
         $payments = 0;
 
-        if ($model->$status_field == 'partial') {
+        if ($model->status == 'partial') {
             foreach ($model->transactions as $transaction) {
                 $payments += $transaction->getAmountConvertedToDefault();
             }

diff --git a/app/BulkActions/Purchases/Bills.php b/app/BulkActions/Purchases/Bills.php
@@ -34,7 +34,7 @@ public function received($request)
         $bills = $this->getSelectedRecords($request);
 
         foreach ($bills as $bill) {
-            $bill->bill_status_code = 'received';
+            $bill->status = 'received';
             $bill->save();
 
             $description = trans('bills.mark_recevied');

diff --git a/app/Exports/Purchases/Sheets/BillHistories.php b/app/Exports/Purchases/Sheets/BillHistories.php
@@ -33,7 +33,7 @@ public function map($model): array
     {
         return [
             $model->bill_id,
-            $model->status_code,
+            $model->status,
             $model->notify,
             $model->description,
         ];
@@ -43,7 +43,7 @@ public function headings(): array
     {
         return [
             'bill_id',
-            'status_code',
+            'status',
             'notify',
             'description',
         ];
@@ -53,4 +53,4 @@ public function title(): string
     {
         return 'bill_histories';
     }
-}
+}
diff --git a/app/Exports/Purchases/Sheets/Bills.php b/app/Exports/Purchases/Sheets/Bills.php
@@ -34,7 +34,7 @@ public function map($model): array
         return [
             $model->bill_number,
             $model->order_number,
-            $model->bill_status_code,
+            $model->status,
             $model->billed_at,
             $model->due_at,
             $model->amount,
@@ -57,7 +57,7 @@ public function headings(): array
         return [
             'bill_number',
             'order_number',
-            'bill_status_code',
+            'status',
             'billed_at',
             'due_at',
             'amount',

diff --git a/app/Exports/Sales/Sheets/InvoiceHistories.php b/app/Exports/Sales/Sheets/InvoiceHistories.php
@@ -33,7 +33,7 @@ public function map($model): array
     {
         return [
             $model->invoice_id,
-            $model->status_code,
+            $model->status,
             $model->notify,
             $model->description,
         ];
@@ -43,7 +43,7 @@ public function headings(): array
     {
         return [
             'invoice_id',
-            'status_code',
+            'status',
             'notify',
             'description',
         ];
@@ -53,4 +53,4 @@ public function title(): string
     {
         return 'invoice_histories';
     }
-}
+}
diff --git a/app/Exports/Sales/Sheets/Invoices.php b/app/Exports/Sales/Sheets/Invoices.php
@@ -34,7 +34,7 @@ public function map($model): array
         return [
             $model->invoice_number,
             $model->order_number,
-            $model->invoice_status_code,
+            $model->status,
             $model->invoiced_at,
             $model->due_at,
             $model->amount,
@@ -57,7 +57,7 @@ public function headings(): array
         return [
             'invoice_number',
             'order_number',
-            'invoice_status_code',
+            'status',
             'invoiced_at',
             'due_at',
             'amount',

diff --git a/app/Http/Controllers/Portal/Dashboard.php b/app/Http/Controllers/Portal/Dashboard.php
@@ -40,7 +40,7 @@ public function index()
         $unpaid = $paid = $overdue = $partial_paid = [];
 
         foreach ($invoices as $invoice) {
-            switch ($invoice->invoice_status_code) {
+            switch ($invoice->status) {
                 case 'paid':
                     $paid[] = $invoice;
                     break;

diff --git a/app/Http/Controllers/Portal/Invoices.php b/app/Http/Controllers/Portal/Invoices.php
@@ -6,18 +6,18 @@
 use App\Models\Banking\Account;
 use App\Models\Common\Contact;
 use App\Models\Sale\Invoice;
-use App\Models\Sale\InvoiceStatus;
 use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
+use App\Traits\Sales;
 use App\Traits\Uploads;
 use App\Utilities\Modules;
 use Illuminate\Support\Facades\URL;
 
 class Invoices extends Controller
 {
-    use DateTime, Currencies, Uploads;
+    use DateTime, Currencies, Sales, Uploads;
 
     /**
      * Display a listing of the resource.
@@ -32,10 +32,7 @@ public function index()
 
         $categories = collect(Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id'));
 
-        $statuses = collect(InvoiceStatus::get()->each(function ($item) {
-            $item->name = trans('invoices.status.' . $item->code);
-            return $item;
-        })->pluck('name', 'code'));
+        $statuses = $this->getInvoiceStatuses();
 
         return view('portal.invoices.index', compact('invoices', 'categories', 'statuses'));
     }

diff --git a/app/Http/Controllers/Purchases/Bills.php b/app/Http/Controllers/Purchases/Bills.php
@@ -15,7 +15,6 @@
 use App\Models\Banking\Account;
 use App\Models\Common\Contact;
 use App\Models\Common\Item;
-use App\Models\Purchase\BillStatus;
 use App\Models\Purchase\Bill;
 use App\Models\Purchase\BillHistory;
 use App\Models\Setting\Category;
@@ -24,12 +23,13 @@
 use App\Traits\Contacts;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
+use App\Traits\Purchases;
 use App\Traits\Uploads;
 use App\Utilities\Modules;
 
 class Bills extends Controller
 {
-    use Contacts, Currencies, DateTime, Uploads;
+    use Contacts, Currencies, DateTime, Purchases, Uploads;
 
     /**
      * Display a listing of the resource.
@@ -44,10 +44,7 @@ public function index()
 
         $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $statuses = collect(BillStatus::get()->each(function ($item) {
-            $item->name = trans('bills.status.' . $item->code);
-            return $item;
-        })->pluck('name', 'code'));
+        $statuses = $this->getBillStatuses();
 
         return view('purchases.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
     }
@@ -270,14 +267,14 @@ public function export()
      */
     public function markReceived(Bill $bill)
     {
-        $bill->bill_status_code = 'received';
+        $bill->status = 'received';
         $bill->save();
 
         // Add bill history
         BillHistory::create([
             'company_id' => $bill->company_id,
             'bill_id' => $bill->id,
-            'status_code' => 'received',
+            'status' => 'received',
             'notify' => 0,
             'description' => trans('bills.mark_received'),
         ]);

diff --git a/app/Http/Controllers/Purchases/Vendors.php b/app/Http/Controllers/Purchases/Vendors.php
@@ -59,7 +59,7 @@ public function show(Contact $vendor)
 
         foreach ($bills as $item) {
             // Already in transactions
-            if ($item->bill_status_code == 'paid') {
+            if ($item->status == 'paid') {
                 continue;
             }
 

diff --git a/app/Http/Controllers/Sales/Customers.php b/app/Http/Controllers/Sales/Customers.php
@@ -60,7 +60,7 @@ public function show(Contact $customer)
 
         foreach ($invoices as $item) {
             // Already in transactions
-            if ($item->invoice_status_code == 'paid') {
+            if ($item->status == 'paid') {
                 continue;
             }
 

diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php
@@ -16,7 +16,6 @@
 use App\Models\Common\Contact;
 use App\Models\Common\Item;
 use App\Models\Sale\Invoice;
-use App\Models\Sale\InvoiceStatus;
 use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Models\Setting\Tax;
@@ -46,10 +45,7 @@ public function index()
 
         $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $statuses = collect(InvoiceStatus::get()->each(function ($item) {
-            $item->name = trans('invoices.status.' . $item->code);
-            return $item;
-        })->pluck('name', 'code'));
+        $statuses = $this->getInvoiceStatuses();
 
         return view('sales.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
     }

diff --git a/app/Http/Requests/Purchase/Bill.php b/app/Http/Requests/Purchase/Bill.php
@@ -42,7 +42,7 @@ public function rules()
 
         return [
             'bill_number' => 'required|string|unique:bills,NULL,' . $id . ',id,company_id,' . $company_id . ',deleted_at,NULL',
-            'bill_status_code' => 'required|string',
+            'status' => 'required|string',
             'billed_at' => 'required|date_format:Y-m-d H:i:s',
             'due_at' => 'required|date_format:Y-m-d H:i:s',
             'amount' => 'required',

diff --git a/app/Http/Requests/Purchase/BillHistory.php b/app/Http/Requests/Purchase/BillHistory.php
@@ -25,7 +25,7 @@ public function rules()
     {
         return [
             'bill_id' => 'required|integer',
-            'status_code' => 'required|string',
+            'status' => 'required|string',
             'notify' => 'required|integer',
         ];
     }

diff --git a/app/Http/Requests/Sale/Invoice.php b/app/Http/Requests/Sale/Invoice.php
@@ -42,7 +42,7 @@ public function rules()
 
         return [
             'invoice_number' => 'required|string|unique:invoices,NULL,' . $id . ',id,company_id,' . $company_id . ',deleted_at,NULL',
-            'invoice_status_code' => 'required|string',
+            'status' => 'required|string',
             'invoiced_at' => 'required|date_format:Y-m-d H:i:s',
             'due_at' => 'required|date_format:Y-m-d H:i:s',
             'amount' => 'required',

diff --git a/app/Http/Requests/Sale/InvoiceHistory.php b/app/Http/Requests/Sale/InvoiceHistory.php
@@ -25,7 +25,7 @@ public function rules()
     {
         return [
             'invoice_id' => 'required|integer',
-            'status_code' => 'required|string',
+            'status' => 'required|string',
             'notify' => 'required|integer',
         ];
     }

diff --git a/app/Jobs/Banking/CreateDocumentTransaction.php b/app/Jobs/Banking/CreateDocumentTransaction.php
@@ -144,7 +144,7 @@ protected function checkAmount()
 
             throw new \Exception($message);
         } else {
-            $this->setStatusCode($amount_check, $total_amount_check);
+            $this->model->status = ($amount_check == $total_amount_check) ? 'paid' : 'partial';
         }
 
         return true;
@@ -189,17 +189,6 @@ protected function getPaidAmount()
         return $paid;
     }
 
-    protected function setStatusCode($amount_check, $total_amount_check)
-    {
-        $column = ($this->model instanceof Invoice) ? 'invoice_status_code' : 'bill_status_code';
-
-        if ($amount_check == $total_amount_check) {
-            $this->model->$column = 'paid';
-        } else {
-            $this->model->$column = 'partial';
-        }
-    }
-
     protected function createHistory($transaction)
     {
         $history_desc = money((double) $transaction->amount, (string) $transaction->currency_code, true)->format() . ' ' . trans_choice('general.payments', 1);

diff --git a/app/Jobs/Common/DeleteCompany.php b/app/Jobs/Common/DeleteCompany.php
@@ -32,9 +32,9 @@ public function handle()
         $this->authorize();
 
         $this->deleteRelationships($this->company, [
-            'accounts', 'bills', 'bill_histories', 'bill_items', 'bill_item_taxes', 'bill_statuses', 'bill_totals', 'categories',
+            'accounts', 'bills', 'bill_histories', 'bill_items', 'bill_item_taxes', 'bill_totals', 'categories',
             'contacts', 'currencies', 'dashboards', 'email_templates', 'invoices', 'invoice_histories', 'invoice_items',
-            'invoice_item_taxes', 'invoice_statuses', 'invoice_totals', 'items', 'modules', 'module_histories', 'reconciliations',
+            'invoice_item_taxes', 'invoice_totals', 'items', 'modules', 'module_histories', 'reconciliations',
             'recurring', 'reports', 'settings', 'taxes', 'transactions', 'transfers', 'widgets',
         ]);
 

diff --git a/app/Jobs/Purchase/CreateBillHistory.php b/app/Jobs/Purchase/CreateBillHistory.php
@@ -39,7 +39,7 @@ public function handle()
         $bill_history = BillHistory::create([
             'company_id' => $this->bill->company_id,
             'bill_id' => $this->bill->id,
-            'status_code' => $this->bill->bill_status_code,
+            'status' => $this->bill->status,
             'notify' => $this->notify,
             'description' => $description,
         ]);

diff --git a/app/Jobs/Purchase/DuplicateBill.php b/app/Jobs/Purchase/DuplicateBill.php
@@ -33,7 +33,7 @@ public function handle()
         BillHistory::create([
             'company_id' => session('company_id'),
             'bill_id' => $clone->id,
-            'status_code' => 'draft',
+            'status' => 'draft',
             'notify' => 0,
             'description' => trans('messages.success.added', ['type' => $clone->bill_number]),
         ]);

diff --git a/app/Jobs/Purchase/UpdateBill.php b/app/Jobs/Purchase/UpdateBill.php
@@ -57,7 +57,7 @@ public function handle()
         unset($this->bill->reconciled);
 
         if (($bill_paid) && $this->request['amount'] > $bill_paid) {
-            $this->request['bill_status_code'] = 'partial';
+            $this->request['status'] = 'partial';
         }
 
         $this->bill->update($this->request->input());

diff --git a/app/Jobs/Sale/CreateInvoiceHistory.php b/app/Jobs/Sale/CreateInvoiceHistory.php
@@ -39,7 +39,7 @@ public function handle()
         $invoice_history = InvoiceHistory::create([
             'company_id' => $this->invoice->company_id,
             'invoice_id' => $this->invoice->id,
-            'status_code' => $this->invoice->invoice_status_code,
+            'status' => $this->invoice->status,
             'notify' => $this->notify,
             'description' => $description,
         ]);

diff --git a/app/Jobs/Sale/UpdateInvoice.php b/app/Jobs/Sale/UpdateInvoice.php
@@ -57,7 +57,7 @@ public function handle()
         unset($this->invoice->reconciled);
 
         if (($invoice_paid) && $this->request['amount'] > $invoice_paid) {
-            $this->request['invoice_status_code'] = 'partial';
+            $this->request['status'] = 'partial';
         }
 
         $this->invoice->update($this->request->all());

diff --git a/app/Listeners/Sale/MarkInvoiceSent.php b/app/Listeners/Sale/MarkInvoiceSent.php
@@ -16,8 +16,8 @@ class MarkInvoiceSent
     public function handle(Event $event)
     {
         // Mark invoice as sent
-        if ($event->invoice->invoice_status_code != 'partial') {
-            $event->invoice->invoice_status_code = 'sent';
+        if ($event->invoice->status != 'partial') {
+            $event->invoice->status = 'sent';
 
             $event->invoice->save();
         }
@@ -26,7 +26,7 @@ public function handle(Event $event)
         InvoiceHistory::create([
             'company_id' => $event->invoice->company_id,
             'invoice_id' => $event->invoice->id,
-            'status_code' => 'sent',
+            'status' => 'sent',
             'notify' => 0,
             'description' => trans('invoices.mark_sent'),
         ]);