added more scopes

app/Http/Controllers/Common/Items.php

@@ -50,7 +50,7 @@ class Items extends Controller
      */
     public function create()
     {
-        $categories = Category::type('item')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
 
@@ -131,7 +131,7 @@ class Items extends Controller
      */
     public function edit(Item $item)
     {
-        $categories = Category::type('item')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
 

app/Http/Controllers/Common/Search.php

@@ -65,7 +65,7 @@ class Search extends Controller
             }
         }/*
 
-        $income_transactions = Transaction::type('income')->usingSearchString($keyword)->get();
+        $income_transactions = Transaction::income()->usingSearchString($keyword)->get();
 
         if ($income_transactions->count()) {
             foreach ($income_transactions as $transaction) {
@@ -107,7 +107,7 @@ class Search extends Controller
             }
         }
 /*
-        $payments = Transaction::type('expense')->usingSearchString($keyword)->get();
+        $payments = Transaction::expense()->usingSearchString($keyword)->get();
 
         if ($revenues->count()) {
             foreach ($revenues as $revenue) {

app/Http/Controllers/Modals/Items.php

@@ -30,7 +30,7 @@ class Items extends Controller
      */
     public function create(IRequest $request)
     {
-        $categories = Category::type('item')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
 

app/Http/Controllers/Portal/Invoices.php

@@ -27,7 +27,7 @@ class Invoices extends Controller
             ->accrued()->where('contact_id', user()->contact->id)
             ->collect(['invoice_number'=> 'desc']);
 
-        $categories = collect(Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id'));
+        $categories = collect(Category::income()->enabled()->orderBy('name')->pluck('name', 'id'));
 
         $statuses = $this->getInvoiceStatuses();
 

app/Http/Controllers/Portal/Payments.php

@@ -16,7 +16,7 @@ class Payments extends Controller
      */
     public function index()
     {
-        $payments = Transaction::type('income')->where('contact_id', '=', user()->contact->id)->paginate();
+        $payments = Transaction::income()->where('contact_id', '=', user()->contact->id)->paginate();
 
         $payment_methods = Modules::getPaymentMethods('all');
 

app/Http/Controllers/Purchases/Bills.php

@@ -41,7 +41,7 @@ class Bills extends Controller
 
         $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $statuses = $this->getBillStatuses();
 
@@ -67,7 +67,7 @@ class Bills extends Controller
 
         $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $payment_methods = Modules::getPaymentMethods();
 
@@ -106,7 +106,7 @@ class Bills extends Controller
 
         $taxes = Tax::enabled()->orderBy('name')->get();
 
-        $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $number = $this->getNextBillNumber();
 
@@ -202,7 +202,7 @@ class Bills extends Controller
 
         $taxes = Tax::enabled()->orderBy('name')->get();
 
-        $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
 
         return view('purchases.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
     }

app/Http/Controllers/Purchases/Payments.php

@@ -30,11 +30,11 @@ class Payments extends Controller
      */
     public function index()
     {
-        $payments = Transaction::type('expense')->with(['account', 'category', 'contact'])->isNotTransfer()->collect(['paid_at'=> 'desc']);
+        $payments = Transaction::expense()->with(['account', 'category', 'contact'])->isNotTransfer()->collect(['paid_at'=> 'desc']);
 
         $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
 
@@ -68,7 +68,7 @@ class Payments extends Controller
 
         $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $payment_methods = Modules::getPaymentMethods();
 
@@ -156,7 +156,7 @@ class Payments extends Controller
 
         $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $payment_methods = Modules::getPaymentMethods();
 

app/Http/Controllers/Purchases/Vendors.php

@@ -78,7 +78,7 @@ class Vendors extends Controller
         }
 
         // Handle payments
-        $transactions = Transaction::where('contact_id', $vendor->id)->type('expense')->get();
+        $transactions = Transaction::where('contact_id', $vendor->id)->expense()->get();
 
         $counts['transactions'] = $transactions->count();
 

app/Http/Controllers/Sales/Customers.php

@@ -76,7 +76,7 @@ class Customers extends Controller
         }
 
         // Handle transactions
-        $transactions = Transaction::where('contact_id', $customer->id)->type('income')->get();
+        $transactions = Transaction::where('contact_id', $customer->id)->income()->get();
 
         $counts['transactions'] = $transactions->count();
 

app/Http/Controllers/Sales/Invoices.php

@@ -42,7 +42,7 @@ class Invoices extends Controller
 
         $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $statuses = $this->getInvoiceStatuses();
 
@@ -68,7 +68,7 @@ class Invoices extends Controller
 
         $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $payment_methods = Modules::getPaymentMethods();
 
@@ -109,7 +109,7 @@ class Invoices extends Controller
 
         $taxes = Tax::enabled()->orderBy('name')->get();
 
-        $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $number = $this->getNextInvoiceNumber();
 
@@ -205,7 +205,7 @@ class Invoices extends Controller
 
         $taxes = Tax::enabled()->orderBy('name')->get();
 
-        $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
 
         return view('sales.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories'));
     }

app/Http/Controllers/Sales/Revenues.php

@@ -30,11 +30,11 @@ class Revenues extends Controller
      */
     public function index()
     {
-        $revenues = Transaction::type('income')->with(['account', 'category', 'contact'])->isNotTransfer()->collect(['paid_at'=> 'desc']);
+        $revenues = Transaction::income()->with(['account', 'category', 'contact'])->isNotTransfer()->collect(['paid_at'=> 'desc']);
 
         $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
 
@@ -68,7 +68,7 @@ class Revenues extends Controller
 
         $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $payment_methods = Modules::getPaymentMethods();
 
@@ -156,7 +156,7 @@ class Revenues extends Controller
 
         $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
 
-        $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
 
         $payment_methods = Modules::getPaymentMethods();