renamed income/expense

app/Abstracts/Http/PaymentController.php

@@ -2,9 +2,9 @@
 
 namespace App\Abstracts\Http;
 
-use App\Events\Income\PaymentReceived;
+use App\Events\Sale\PaymentReceived;
 use App\Http\Requests\Portal\InvoicePayment as PaymentRequest;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\URL;
 use Monolog\Logger;

app/Abstracts/Widget.php

@@ -2,7 +2,7 @@
 
 namespace App\Abstracts;
 
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Traits\Charts;
 use Date;
 

app/BulkActions/Purchases/Bills.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\BulkActions\Expenses;
+namespace App\BulkActions\Purchases;
 
 use App\Abstracts\BulkAction;
-use App\Exports\Expenses\Bills as Export;
+use App\Exports\Purchases\Bills as Export;
-use App\Jobs\Expense\CreateBillHistory;
+use App\Jobs\Purchase\CreateBillHistory;
-use App\Jobs\Expense\DeleteBill;
+use App\Jobs\Purchase\DeleteBill;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
 
 class Bills extends BulkAction
 {
@@ -16,12 +16,12 @@ class Bills extends BulkAction
         'received' => [
             'name' => 'bills.mark_received',
             'message' => 'bulk_actions.message.received',
-            'permission' => 'update-expenses-bills',
+            'permission' => 'update-purchases-bills',
         ],
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-expenses-bills',
+            'permission' => 'delete-purchases-bills',
         ],
         'export' => [
             'name' => 'general.export',

app/BulkActions/Purchases/Payments.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\BulkActions\Expenses;
+namespace App\BulkActions\Purchases;
 
 use App\Abstracts\BulkAction;
-use App\Exports\Expenses\Payments as Export;
+use App\Exports\Purchases\Payments as Export;
 use App\Models\Banking\Transaction;
 
 class Payments extends BulkAction
@@ -18,7 +18,7 @@ class Payments extends BulkAction
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-expenses-payments',
+            'permission' => 'delete-purchases-payments',
         ],
     ];
 

app/BulkActions/Purchases/Vendors.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\BulkActions\Expenses;
+namespace App\BulkActions\Purchases;
 
 use App\Abstracts\BulkAction;
-use App\Exports\Expenses\Vendors as Export;
+use App\Exports\Purchases\Vendors as Export;
 use App\Models\Common\Contact;
 
 class Vendors extends BulkAction
@@ -14,17 +14,17 @@ class Vendors extends BulkAction
         'enable' => [
             'name' => 'general.enable',
             'message' => 'bulk_actions.message.enable',
-            'permission' => 'update-expenses-vendors',
+            'permission' => 'update-purchases-vendors',
         ],
         'disable' => [
             'name' => 'general.disable',
             'message' => 'bulk_actions.message.disable',
-            'permission' => 'update-expenses-vendors',
+            'permission' => 'update-purchases-vendors',
         ],
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-expenses-vendors',
+            'permission' => 'delete-purchases-vendors',
         ],
         'export' => [
             'name' => 'general.export',

app/BulkActions/Sales/Customers.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\BulkActions\Incomes;
+namespace App\BulkActions\Sales;
 
 use App\Abstracts\BulkAction;
-use App\Exports\Incomes\Customers as Export;
+use App\Exports\Sales\Customers as Export;
 use App\Models\Common\Contact;
 
 class Customers extends BulkAction
@@ -14,17 +14,17 @@ class Customers extends BulkAction
         'enable' => [
             'name' => 'general.enable',
             'message' => 'bulk_actions.message.enable',
-            'permission' => 'update-incomes-customers',
+            'permission' => 'update-sales-customers',
         ],
         'disable' => [
             'name' => 'general.disable',
             'message' => 'bulk_actions.message.disable',
-            'permission' => 'update-incomes-customers',
+            'permission' => 'update-sales-customers',
         ],
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-incomes-customers',
+            'permission' => 'delete-sales-customers',
         ],
         'export' => [
             'name' => 'general.export',

app/BulkActions/Sales/Invoices.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace App\BulkActions\Incomes;
+namespace App\BulkActions\Sales;
 
 use App\Abstracts\BulkAction;
-use App\Events\Income\InvoiceCreated;
+use App\Events\Sale\InvoiceCreated;
-use App\Events\Income\InvoiceSent;
+use App\Events\Sale\InvoiceSent;
-use App\Events\Income\PaymentReceived;
+use App\Events\Sale\PaymentReceived;
-use App\Exports\Incomes\Invoices as Export;
+use App\Exports\Sales\Invoices as Export;
-use App\Jobs\Income\DeleteInvoice;
+use App\Jobs\Sale\DeleteInvoice;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 
 class Invoices extends BulkAction
 {
@@ -18,17 +18,17 @@ class Invoices extends BulkAction
         'paid' => [
             'name' => 'invoices.mark_paid',
             'message' => 'bulk_actions.message.paid',
-            'permission' => 'update-incomes-invoices',
+            'permission' => 'update-sales-invoices',
         ],
         'sent' => [
             'name' => 'invoice.mark_sent',
             'message' => 'bulk_actions.message.sent',
-            'permission' => 'update-incomes-invoices',
+            'permission' => 'update-sales-invoices',
         ],
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-incomes-invoices',
+            'permission' => 'delete-sales-invoices',
         ],
         'export' => [
             'name' => 'general.export',

app/BulkActions/Sales/Revenues.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\BulkActions\Incomes;
+namespace App\BulkActions\Sales;
 
 use App\Abstracts\BulkAction;
-use App\Exports\Incomes\Revenues as Export;
+use App\Exports\Sales\Revenues as Export;
 use App\Models\Banking\Transaction;
 
 class Revenues extends BulkAction
@@ -14,7 +14,7 @@ class Revenues extends BulkAction
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_actions.message.delete',
-            'permission' => 'delete-incomes-revenues',
+            'permission' => 'delete-sales-revenues',
         ],
         'export' => [
             'name' => 'general.export',

app/Console/Commands/BillReminder.php

@@ -3,8 +3,8 @@
 namespace App\Console\Commands;
 
 use App\Models\Common\Company;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
-use App\Notifications\Expense\Bill as Notification;
+use App\Notifications\Purchase\Bill as Notification;
 use App\Utilities\Overrider;
 use Date;
 use Illuminate\Console\Command;

app/Console/Commands/InvoiceReminder.php

@@ -3,8 +3,8 @@
 namespace App\Console\Commands;
 
 use App\Models\Common\Company;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
-use App\Notifications\Income\Invoice as Notification;
+use App\Notifications\Sale\Invoice as Notification;
 use App\Utilities\Overrider;
 use Date;
 use Illuminate\Console\Command;

app/Console/Commands/RecurringCheck.php

@@ -2,10 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Events\Expense\BillCreated;
+use App\Events\Purchase\BillCreated;
-use App\Events\Expense\BillRecurring;
+use App\Events\Purchase\BillRecurring;
-use App\Events\Income\InvoiceCreated;
+use App\Events\Sale\InvoiceCreated;
-use App\Events\Income\InvoiceRecurring;
+use App\Events\Sale\InvoiceRecurring;
 use App\Models\Common\Company;
 use App\Traits\Incomes;
 use App\Utilities\Overrider;
@@ -93,7 +93,7 @@ class RecurringCheck extends Command
         }
 
         switch ($recurring->recurable_type) {
-            case 'App\Models\Expense\Bill':
+            case 'App\Models\Purchase\Bill':
                 if (!$clone = $this->getDocumentClone($model, 'billed_at')) {
                     break;
                 }
@@ -103,7 +103,7 @@ class RecurringCheck extends Command
                 event(new BillRecurring($clone));
 
                 break;
-            case 'App\Models\Income\Invoice':
+            case 'App\Models\Sale\Invoice':
                 if (!$clone = $this->getDocumentClone($model, 'invoiced_at')) {
                     break;
                 }

app/Events/Purchase/BillCreated.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Expense;
+namespace App\Events\Purchase;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Purchase/BillCreating.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Expense;
+namespace App\Events\Purchase;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Purchase/BillRecurring.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Expense;
+namespace App\Events\Purchase;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Purchase/BillUpdated.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Expense;
+namespace App\Events\Purchase;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Purchase/BillUpdating.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Expense;
+namespace App\Events\Purchase;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Sale/InvoiceCreated.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Sale/InvoiceCreating.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Sale/InvoicePrinting.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Sale/InvoiceRecurring.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Sale/InvoiceSent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Sale/InvoiceUpdated.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Sale/InvoiceUpdating.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Sale/InvoiceViewed.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 

app/Events/Sale/PaymentReceived.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events\Income;
+namespace App\Events\Sale;
 
 use Illuminate\Queue\SerializesModels;
 

app/Exports/Purchases/Bills.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Exports\Expenses;
+namespace App\Exports\Purchases;
 
-use App\Exports\Expenses\Sheets\Bills as Base;
+use App\Exports\Purchases\Sheets\Bills as Base;
-use App\Exports\Expenses\Sheets\BillItems;
+use App\Exports\Purchases\Sheets\BillItems;
-use App\Exports\Expenses\Sheets\BillItemTaxes;
+use App\Exports\Purchases\Sheets\BillItemTaxes;
-use App\Exports\Expenses\Sheets\BillHistories;
+use App\Exports\Purchases\Sheets\BillHistories;
-use App\Exports\Expenses\Sheets\BillPayments;
+use App\Exports\Purchases\Sheets\BillPayments;
-use App\Exports\Expenses\Sheets\BillTotals;
+use App\Exports\Purchases\Sheets\BillTotals;
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 
 class Bills implements WithMultipleSheets

app/Exports/Purchases/Payments.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Expenses;
+namespace App\Exports\Purchases;
 
 use App\Models\Banking\Transaction as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;

app/Exports/Purchases/Sheets/BillHistories.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
-use App\Models\Expense\BillHistory as Model;
+use App\Models\Purchase\BillHistory as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;

app/Exports/Purchases/Sheets/BillItemTaxes.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
-use App\Models\Expense\BillItemTax as Model;
+use App\Models\Purchase\BillItemTax as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;

app/Exports/Purchases/Sheets/BillItems.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
-use App\Models\Expense\BillItem as Model;
+use App\Models\Purchase\BillItem as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;

app/Exports/Purchases/Sheets/BillPayments.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
 use App\Models\Banking\Transaction as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;

app/Exports/Purchases/Sheets/BillTotals.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
-use App\Models\Expense\BillTotal as Model;
+use App\Models\Purchase\BillTotal as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;

app/Exports/Purchases/Sheets/Bills.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Expenses\Sheets;
+namespace App\Exports\Purchases\Sheets;
 
-use App\Models\Expense\Bill as Model;
+use App\Models\Purchase\Bill as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;

app/Exports/Purchases/Vendors.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Expenses;
+namespace App\Exports\Purchases;
 
 use App\Models\Common\Contact as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;

app/Exports/Sales/Customers.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Incomes;
+namespace App\Exports\Sales;
 
 use App\Models\Common\Contact as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;

app/Exports/Sales/Invoices.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Exports\Incomes;
+namespace App\Exports\Sales;
 
-use App\Exports\Incomes\Sheets\Invoices as Base;
+use App\Exports\Sales\Sheets\Invoices as Base;
-use App\Exports\Incomes\Sheets\InvoiceItems;
+use App\Exports\Sales\Sheets\InvoiceItems;
-use App\Exports\Incomes\Sheets\InvoiceItemTaxes;
+use App\Exports\Sales\Sheets\InvoiceItemTaxes;
-use App\Exports\Incomes\Sheets\InvoiceHistories;
+use App\Exports\Sales\Sheets\InvoiceHistories;
-use App\Exports\Incomes\Sheets\InvoicePayments;
+use App\Exports\Sales\Sheets\InvoicePayments;
-use App\Exports\Incomes\Sheets\InvoiceTotals;
+use App\Exports\Sales\Sheets\InvoiceTotals;
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 
 class Invoices implements WithMultipleSheets

app/Exports/Sales/Revenues.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Incomes;
+namespace App\Exports\Sales;
 
 use App\Models\Banking\Transaction as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;

app/Exports/Sales/Sheets/InvoiceHistories.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
-use App\Models\Income\InvoiceHistory as Model;
+use App\Models\Sale\InvoiceHistory as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;

app/Exports/Sales/Sheets/InvoiceItemTaxes.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
-use App\Models\Income\InvoiceItemTax as Model;
+use App\Models\Sale\InvoiceItemTax as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;

app/Exports/Sales/Sheets/InvoiceItems.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
-use App\Models\Income\InvoiceItem as Model;
+use App\Models\Sale\InvoiceItem as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;

app/Exports/Sales/Sheets/InvoicePayments.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
 use App\Models\Banking\Transaction as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;

app/Exports/Sales/Sheets/InvoiceTotals.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
-use App\Models\Income\InvoiceTotal as Model;
+use App\Models\Sale\InvoiceTotal as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;

app/Exports/Sales/Sheets/Invoices.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Exports\Incomes\Sheets;
+namespace App\Exports\Sales\Sheets;
 
-use App\Models\Income\Invoice as Model;
+use App\Models\Sale\Invoice as Model;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithHeadings;

app/Http/Controllers/Api/Common/Contacts.php

@@ -21,10 +21,10 @@ class Contacts extends ApiController
     public function __construct()
     {
         // Add CRUD permission check
-        $this->middleware('permission:create-incomes-customers')->only(['create', 'store', 'duplicate', 'import']);
+        $this->middleware('permission:create-sales-customers')->only(['create', 'store', 'duplicate', 'import']);
-        $this->middleware('permission:read-incomes-customers')->only(['index', 'show', 'edit', 'export']);
+        $this->middleware('permission:read-sales-customers')->only(['index', 'show', 'edit', 'export']);
-        $this->middleware('permission:update-incomes-customers')->only(['update', 'enable', 'disable']);
+        $this->middleware('permission:update-sales-customers')->only(['update', 'enable', 'disable']);
-        $this->middleware('permission:delete-incomes-customers')->only('destroy');
+        $this->middleware('permission:delete-sales-customers')->only('destroy');
     }
 
     /**

app/Http/Controllers/Api/Purchases/Bills.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Api\Expenses;
+namespace App\Http\Controllers\Api\Purchases;
 
 use App\Abstracts\Http\ApiController;
-use App\Http\Requests\Expense\Bill as Request;
+use App\Http\Requests\Purchase\Bill as Request;
-use App\Jobs\Expense\CreateBill;
+use App\Jobs\Purchase\CreateBill;
-use App\Jobs\Expense\DeleteBill;
+use App\Jobs\Purchase\DeleteBill;
-use App\Jobs\Expense\UpdateBill;
+use App\Jobs\Purchase\UpdateBill;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
-use App\Transformers\Expense\Bill as Transformer;
+use App\Transformers\Purchase\Bill as Transformer;
 
 class Bills extends ApiController
 {

app/Http/Controllers/Api/Sales/InvoiceTransactions.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Api\Incomes;
+namespace App\Http\Controllers\Api\Sales;
 
 use App\Http\Requests\Banking\Transaction as Request;
 use App\Jobs\Banking\CreateDocumentTransaction;
 use App\Jobs\Banking\DeleteTransaction;
 use App\Models\Banking\Transaction;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Transformers\Banking\Transaction as Transformer;
 use Dingo\Api\Routing\Helpers;
 use Illuminate\Foundation\Bus\DispatchesJobs;

app/Http/Controllers/Api/Sales/Invoices.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Api\Incomes;
+namespace App\Http\Controllers\Api\Sales;
 
 use App\Abstracts\Http\ApiController;
-use App\Http\Requests\Income\Invoice as Request;
+use App\Http\Requests\Sale\Invoice as Request;
-use App\Jobs\Income\CreateInvoice;
+use App\Jobs\Sale\CreateInvoice;
-use App\Jobs\Income\DeleteInvoice;
+use App\Jobs\Sale\DeleteInvoice;
-use App\Jobs\Income\UpdateInvoice;
+use App\Jobs\Sale\UpdateInvoice;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
-use App\Transformers\Income\Invoice as Transformer;
+use App\Transformers\Sale\Invoice as Transformer;
 
 class Invoices extends ApiController
 {

app/Http/Controllers/Auth/Users.php

@@ -201,7 +201,7 @@ class Users extends Controller
         // Mark bill notifications as read
         foreach ($user->unreadNotifications as $notification) {
             // Not a bill notification
-            if ($notification->getAttribute('type') != 'App\Notifications\Expense\Bill') {
+            if ($notification->getAttribute('type') != 'App\Notifications\Purchase\Bill') {
                 continue;
             }
 
@@ -223,7 +223,7 @@ class Users extends Controller
         // Mark invoice notifications as read
         foreach ($user->unreadNotifications as $notification) {
             // Not an invoice notification
-            if ($notification->getAttribute('type') != 'App\Notifications\Income\Invoice') {
+            if ($notification->getAttribute('type') != 'App\Notifications\Sale\Invoice') {
                 continue;
             }
 

app/Http/Controllers/Common/Search.php

@@ -6,8 +6,8 @@ use App\Abstracts\Http\Controller;
 use App\Models\Banking\Account;
 use App\Models\Banking\Transaction;
 use App\Models\Common\Contact;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Models\Common\Item;
 use App\Traits\Contacts;
 
@@ -63,7 +63,7 @@ class Search extends Controller
                     'name'  => $invoice->invoice_number . ' - ' . $invoice->contact_name,
                     'type'  => trans_choice('general.invoices', 1),
                     'color' => '#6da252',
-                    'href'  => url('incomes/invoices/' . $invoice->id),
+                    'href'  => url('sales/invoices/' . $invoice->id),
                 ];
             }
         }/*
@@ -77,7 +77,7 @@ class Search extends Controller
                     'name'  => $transaction->contact_name,
                     'type'  => trans_choice('general.revenues', 1),
                     'color' => '#00c0ef',
-                    'href'  => url('incomes/revenues/' . $transaction->id),
+                    'href'  => url('sales/revenues/' . $transaction->id),
                 ];
             }
         }*/
@@ -91,7 +91,7 @@ class Search extends Controller
                     'name'  => $customer->name,
                     'type'  => trans_choice('general.customers', 1),
                     'color' => '#328aef',
-                    'href'  => url('incomes/customers/' . $customer->id),
+                    'href'  => url('sales/customers/' . $customer->id),
                 ];
             }
         }
@@ -105,7 +105,7 @@ class Search extends Controller
                     'name'  => $bill->bill_number . ' - ' . $bill->contact_name,
                     'type'  => trans_choice('general.bills', 1),
                     'color' => '#ef3232',
-                    'href'  => url('expenses/bills/' . $bill->id),
+                    'href'  => url('purchases/bills/' . $bill->id),
                 ];
             }
         }
@@ -119,7 +119,7 @@ class Search extends Controller
                     'name'  => $revenue->contact_name,
                     'type'  => trans_choice('general.revenues', 1),
                     'color' => '#00c0ef',
-                    'href'  => url('incomes/revenues/' . $revenue->id),
+                    'href'  => url('sales/revenues/' . $revenue->id),
                 ];
             }
         }*/
@@ -133,7 +133,7 @@ class Search extends Controller
                     'name'  => $vendor->name,
                     'type'  => trans_choice('general.vendors', 1),
                     'color' => '#efef32',
-                    'href'  => url('expenses/vendors/' . $vendor->id),
+                    'href'  => url('purchases/vendors/' . $vendor->id),
                 ];
             }
         }

app/Http/Controllers/Modals/BillTransactions.php

@@ -7,7 +7,7 @@ use App\Http\Requests\Banking\Transaction as Request;
 use App\Jobs\Banking\CreateDocumentTransaction;
 use App\Models\Banking\Account;
 use App\Models\Banking\Transaction;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
 use App\Models\Setting\Currency;
 use App\Utilities\Modules;
 use App\Traits\Uploads;
@@ -22,10 +22,10 @@ class BillTransactions extends Controller
     public function __construct()
     {
         // Add CRUD permission check
-        $this->middleware('permission:create-expenses-bills')->only(['create', 'store', 'duplicate', 'import']);
+        $this->middleware('permission:create-purchases-bills')->only(['create', 'store', 'duplicate', 'import']);
-        $this->middleware('permission:read-expenses-bills')->only(['index', 'show', 'edit', 'export']);
+        $this->middleware('permission:read-purchases-bills')->only(['index', 'show', 'edit', 'export']);
-        $this->middleware('permission:update-expenses-bills')->only(['update', 'enable', 'disable']);
+        $this->middleware('permission:update-purchases-bills')->only(['update', 'enable', 'disable']);
-        $this->middleware('permission:delete-expenses-bills')->only('destroy');
+        $this->middleware('permission:delete-purchases-bills')->only('destroy');
     }
 
     /**

app/Http/Controllers/Modals/Customers.php

@@ -15,10 +15,10 @@ class Customers extends Controller
     public function __construct()
     {
         // Add CRUD permission check
-        $this->middleware('permission:create-incomes-customers')->only(['create', 'store', 'duplicate', 'import']);
+        $this->middleware('permission:create-sales-customers')->only(['create', 'store', 'duplicate', 'import']);
-        $this->middleware('permission:read-incomes-customers')->only(['index', 'show', 'edit', 'export']);
+        $this->middleware('permission:read-sales-customers')->only(['index', 'show', 'edit', 'export']);
-        $this->middleware('permission:update-incomes-customers')->only(['update', 'enable', 'disable']);
+        $this->middleware('permission:update-sales-customers')->only(['update', 'enable', 'disable']);
-        $this->middleware('permission:delete-incomes-customers')->only('destroy');
+        $this->middleware('permission:delete-sales-customers')->only('destroy');
     }
 
     /**

app/Http/Controllers/Modals/InvoiceTransactions.php

@@ -3,11 +3,11 @@
 namespace App\Http\Controllers\Modals;
 
 use App\Abstracts\Http\Controller;
-use App\Events\Income\PaymentReceived;
+use App\Events\Sale\PaymentReceived;
 use App\Http\Requests\Banking\Transaction as Request;
 use App\Models\Banking\Account;
 use App\Models\Banking\Transaction;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Models\Setting\Currency;
 use App\Utilities\Modules;
 use App\Traits\Uploads;
@@ -22,10 +22,10 @@ class InvoiceTransactions extends Controller
     public function __construct()
     {
         // Add CRUD permission check
-        $this->middleware('permission:create-incomes-invoices')->only(['create', 'store', 'duplicate', 'import']);
+        $this->middleware('permission:create-sales-invoices')->only(['create', 'store', 'duplicate', 'import']);
-        $this->middleware('permission:read-incomes-invoices')->only(['index', 'show', 'edit', 'export']);
+        $this->middleware('permission:read-sales-invoices')->only(['index', 'show', 'edit', 'export']);
-        $this->middleware('permission:update-incomes-invoices')->only(['update', 'enable', 'disable']);
+        $this->middleware('permission:update-sales-invoices')->only(['update', 'enable', 'disable']);
-        $this->middleware('permission:delete-incomes-invoices')->only('destroy');
+        $this->middleware('permission:delete-sales-invoices')->only('destroy');
     }
 
     /**

app/Http/Controllers/Modals/Vendors.php

@@ -15,10 +15,10 @@ class Vendors extends Controller
     public function __construct()
     {
         // Add CRUD permission check
-        $this->middleware('permission:create-expenses-vendors')->only(['create', 'store', 'duplicate', 'import']);
+        $this->middleware('permission:create-purchases-vendors')->only(['create', 'store', 'duplicate', 'import']);
-        $this->middleware('permission:read-expenses-vendors')->only(['index', 'show', 'edit', 'export']);
+        $this->middleware('permission:read-purchases-vendors')->only(['index', 'show', 'edit', 'export']);
-        $this->middleware('permission:update-expenses-vendors')->only(['update', 'enable', 'disable']);
+        $this->middleware('permission:update-purchases-vendors')->only(['update', 'enable', 'disable']);
-        $this->middleware('permission:delete-expenses-vendors')->only('destroy');
+        $this->middleware('permission:delete-purchases-vendors')->only('destroy');
     }
 
     /**

app/Http/Controllers/Portal/Dashboard.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Portal;
 
 use App\Abstracts\Http\Controller;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Utilities\Chartjs;
 use Date;
 

app/Http/Controllers/Portal/Invoices.php

@@ -5,8 +5,8 @@ namespace App\Http\Controllers\Portal;
 use App\Abstracts\Http\Controller;
 use App\Models\Banking\Account;
 use App\Models\Common\Contact;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
-use App\Models\Income\InvoiceStatus;
+use App\Models\Sale\InvoiceStatus;
 use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Traits\Currencies;
@@ -61,7 +61,7 @@ class Invoices extends Controller
 
         $payment_methods = Modules::getPaymentMethods();
 
-        event(new \App\Events\Income\InvoiceViewed($invoice));
+        event(new \App\Events\Sale\InvoiceViewed($invoice));
 
         return view('portal.invoices.show', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods'));
     }
@@ -124,9 +124,9 @@ class Invoices extends Controller
 
         $invoice->paid = $paid;
 
-        $invoice->template_path = 'incomes.invoices.print';
+        $invoice->template_path = 'sales.invoices.print';
 
-        event(new \App\Events\Income\InvoicePrinting($invoice));
+        event(new \App\Events\Sale\InvoicePrinting($invoice));
 
         return $invoice;
     }
@@ -178,7 +178,7 @@ class Invoices extends Controller
         $print_action = URL::signedRoute('signed.invoices.print', [$invoice->id, 'company_id' => session('company_id')]);
         $pdf_action = URL::signedRoute('signed.invoices.pdf', [$invoice->id, 'company_id' => session('company_id')]);
 
-        event(new \App\Events\Income\InvoiceViewed($invoice));
+        event(new \App\Events\Sale\InvoiceViewed($invoice));
 
         return view('portal.invoices.signed', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'payment_actions', 'print_action', 'pdf_action'));
     }

app/Http/Controllers/Portal/Profile.php

@@ -82,7 +82,7 @@ class Profile extends Controller
         // Mark invoice notifications as read
         foreach ($user->unreadNotifications as $notification) {
             // Not an invoice notification
-            if ($notification->getAttribute('type') != 'App\Notifications\Income\Invoice') {
+            if ($notification->getAttribute('type') != 'App\Notifications\Sale\Invoice') {
                 continue;
             }
 

app/Http/Controllers/Purchases/Bills.php

@@ -1,23 +1,23 @@
 <?php
 
-namespace App\Http\Controllers\Expenses;
+namespace App\Http\Controllers\Purchases;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Expenses\Bills as Export;
+use App\Exports\Purchases\Bills as Export;
 use App\Http\Requests\Common\Import as ImportRequest;
-use App\Http\Requests\Expense\Bill as Request;
+use App\Http\Requests\Purchase\Bill as Request;
-use App\Http\Requests\Expense\BillAddItem as ItemRequest;
+use App\Http\Requests\Purchase\BillAddItem as ItemRequest;
-use App\Imports\Expenses\Bills as Import;
+use App\Imports\Purchases\Bills as Import;
-use App\Jobs\Expense\CreateBill;
+use App\Jobs\Purchase\CreateBill;
-use App\Jobs\Expense\DeleteBill;
+use App\Jobs\Purchase\DeleteBill;
-use App\Jobs\Expense\DuplicateBill;
+use App\Jobs\Purchase\DuplicateBill;
-use App\Jobs\Expense\UpdateBill;
+use App\Jobs\Purchase\UpdateBill;
 use App\Models\Banking\Account;
 use App\Models\Common\Contact;
 use App\Models\Common\Item;
-use App\Models\Expense\BillStatus;
+use App\Models\Purchase\BillStatus;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
-use App\Models\Expense\BillHistory;
+use App\Models\Purchase\BillHistory;
 use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Models\Setting\Tax;
@@ -49,7 +49,7 @@ class Bills extends Controller
             return $item;
         })->pluck('name', 'code'));
 
-        return view('expenses.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
+        return view('purchases.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
     }
 
     /**
@@ -77,7 +77,7 @@ class Bills extends Controller
 
         $date_format = $this->getCompanyDateFormat();
 
-        return view('expenses.bills.show', compact('bill', 'accounts', 'currencies', 'currency', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'date_format'));
+        return view('purchases.bills.show', compact('bill', 'accounts', 'currencies', 'currency', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'date_format'));
     }
 
     /**
@@ -99,7 +99,7 @@ class Bills extends Controller
 
         $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
 
-        return view('expenses.bills.create', compact('vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
+        return view('purchases.bills.create', compact('vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
     }
 
     /**
@@ -193,7 +193,7 @@ class Bills extends Controller
 
         $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
 
-        return view('expenses.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
+        return view('purchases.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
     }
 
     /**
@@ -347,7 +347,7 @@ class Bills extends Controller
             $currency->precision = (int) $currency->precision;
         }
 
-        $html = view('expenses.bills.item', compact('item_row', 'taxes', 'currency'))->render();
+        $html = view('purchases.bills.item', compact('item_row', 'taxes', 'currency'))->render();
 
         return response()->json([
             'success' => true,
@@ -378,7 +378,7 @@ class Bills extends Controller
 
         $bill->paid = $paid;
 
-        $bill->template_path = 'expenses.bills.print';
+        $bill->template_path = 'purchases.bills.print';
 
         return $bill;
     }

app/Http/Controllers/Purchases/Payments.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Expenses;
+namespace App\Http\Controllers\Purchases;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Expenses\Payments as Export;
+use App\Exports\Purchases\Payments as Export;
 use App\Http\Requests\Banking\Transaction as Request;
 use App\Http\Requests\Common\Import as ImportRequest;
-use App\Imports\Expenses\Payments as Import;
+use App\Imports\Purchases\Payments as Import;
 use App\Jobs\Banking\CreateTransaction;
 use App\Jobs\Banking\DeleteTransaction;
 use App\Jobs\Banking\UpdateTransaction;
@@ -41,7 +41,7 @@ class Payments extends Controller
 
         $transfer_cat_id = Category::transfer();
 
-        return view('expenses.payments.index', compact('payments', 'vendors', 'categories', 'accounts', 'transfer_cat_id'));
+        return view('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts', 'transfer_cat_id'));
     }
 
     /**
@@ -75,7 +75,7 @@ class Payments extends Controller
 
         $payment_methods = Modules::getPaymentMethods();
 
-        return view('expenses.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'vendors', 'categories', 'payment_methods'));
+        return view('purchases.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'vendors', 'categories', 'payment_methods'));
     }
 
     /**
@@ -165,7 +165,7 @@ class Payments extends Controller
 
         $date_format = $this->getCompanyDateFormat();
 
-        return view('expenses.payments.edit', compact('payment', 'accounts', 'currencies', 'currency', 'vendors', 'categories', 'payment_methods', 'date_format'));
+        return view('purchases.payments.edit', compact('payment', 'accounts', 'currencies', 'currency', 'vendors', 'categories', 'payment_methods', 'date_format'));
     }
 
     /**

app/Http/Controllers/Purchases/Vendors.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Http\Controllers\Expenses;
+namespace App\Http\Controllers\Purchases;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Expenses\Vendors as Export;
+use App\Exports\Purchases\Vendors as Export;
 use App\Http\Requests\Common\Contact as Request;
 use App\Http\Requests\Common\Import as ImportRequest;
-use App\Imports\Expenses\Vendors as Import;
+use App\Imports\Purchases\Vendors as Import;
 use App\Jobs\Common\CreateContact;
 use App\Jobs\Common\DeleteContact;
 use App\Jobs\Common\UpdateContact;
 use App\Models\Banking\Transaction;
 use App\Models\Common\Contact;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
 use App\Models\Setting\Currency;
 use App\Traits\Contacts;
 use Date;
@@ -30,7 +30,7 @@ class Vendors extends Controller
     {
         $vendors = Contact::type($this->getVendorTypes())->collect();
 
-        return view('expenses.vendors.index', compact('vendors'));
+        return view('purchases.vendors.index', compact('vendors'));
     }
 
     /**
@@ -86,7 +86,7 @@ class Vendors extends Controller
         $transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit);
         $bills = $this->paginate($bills->sortByDesc('paid_at'), $limit);
 
-        return view('expenses.vendors.show', compact('vendor', 'counts', 'amounts', 'transactions', 'bills'));
+        return view('purchases.vendors.show', compact('vendor', 'counts', 'amounts', 'transactions', 'bills'));
     }
 
     /**
@@ -98,7 +98,7 @@ class Vendors extends Controller
     {
         $currencies = Currency::enabled()->pluck('name', 'code');
 
-        return view('expenses.vendors.create', compact('currencies'));
+        return view('purchases.vendors.create', compact('currencies'));
     }
 
     /**
@@ -176,7 +176,7 @@ class Vendors extends Controller
     {
         $currencies = Currency::enabled()->pluck('name', 'code');
 
-        return view('expenses.vendors.edit', compact('vendor', 'currencies'));
+        return view('purchases.vendors.edit', compact('vendor', 'currencies'));
     }
 
     /**

app/Http/Controllers/Sales/Customers.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Http\Controllers\Incomes;
+namespace App\Http\Controllers\Sales;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Incomes\Customers as Export;
+use App\Exports\Sales\Customers as Export;
 use App\Http\Requests\Common\Contact as Request;
 use App\Http\Requests\Common\Import as ImportRequest;
-use App\Imports\Incomes\Customers as Import;
+use App\Imports\Sales\Customers as Import;
 use App\Jobs\Common\CreateContact;
 use App\Jobs\Common\DeleteContact;
 use App\Jobs\Common\UpdateContact;
 use App\Models\Banking\Transaction;
 use App\Models\Common\Contact;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Models\Setting\Currency;
 use App\Traits\Contacts;
 use Date;
@@ -31,7 +31,7 @@ class Customers extends Controller
     {
         $customers = Contact::type($this->getCustomerTypes())->collect();
 
-        return view('incomes.customers.index', compact('customers'));
+        return view('sales.customers.index', compact('customers'));
     }
 
     /**
@@ -92,7 +92,7 @@ class Customers extends Controller
         $transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit);
         $invoices = $this->paginate($invoices->sortByDesc('invoiced_at'), $limit);
 
-        return view('incomes.customers.show', compact('customer', 'counts', 'amounts', 'transactions', 'invoices'));
+        return view('sales.customers.show', compact('customer', 'counts', 'amounts', 'transactions', 'invoices'));
     }
 
     /**
@@ -104,7 +104,7 @@ class Customers extends Controller
     {
         $currencies = Currency::enabled()->pluck('name', 'code');
 
-        return view('incomes.customers.create', compact('currencies'));
+        return view('sales.customers.create', compact('currencies'));
     }
 
     /**
@@ -182,7 +182,7 @@ class Customers extends Controller
     {
         $currencies = Currency::enabled()->pluck('name', 'code');
 
-        return view('incomes.customers.edit', compact('customer', 'currencies'));
+        return view('sales.customers.edit', compact('customer', 'currencies'));
     }
 
     /**

app/Http/Controllers/Sales/Invoices.php

@@ -1,26 +1,26 @@
 <?php
 
-namespace App\Http\Controllers\Incomes;
+namespace App\Http\Controllers\Sales;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Incomes\Invoices as Export;
+use App\Exports\Sales\Invoices as Export;
 use App\Http\Requests\Common\Import as ImportRequest;
-use App\Http\Requests\Income\Invoice as Request;
+use App\Http\Requests\Sale\Invoice as Request;
-use App\Http\Requests\Income\InvoiceAddItem as ItemRequest;
+use App\Http\Requests\Sale\InvoiceAddItem as ItemRequest;
-use App\Imports\Incomes\Invoices as Import;
+use App\Imports\Sales\Invoices as Import;
-use App\Jobs\Income\CreateInvoice;
+use App\Jobs\Sale\CreateInvoice;
-use App\Jobs\Income\DeleteInvoice;
+use App\Jobs\Sale\DeleteInvoice;
-use App\Jobs\Income\DuplicateInvoice;
+use App\Jobs\Sale\DuplicateInvoice;
-use App\Jobs\Income\UpdateInvoice;
+use App\Jobs\Sale\UpdateInvoice;
 use App\Models\Banking\Account;
 use App\Models\Common\Contact;
 use App\Models\Common\Item;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
-use App\Models\Income\InvoiceStatus;
+use App\Models\Sale\InvoiceStatus;
 use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Models\Setting\Tax;
-use App\Notifications\Income\Invoice as Notification;
+use App\Notifications\Sale\Invoice as Notification;
 use App\Traits\Contacts;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
@@ -51,7 +51,7 @@ class Invoices extends Controller
             return $item;
         })->pluck('name', 'code'));
 
-        return view('incomes.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
+        return view('sales.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
     }
 
     /**
@@ -81,7 +81,7 @@ class Invoices extends Controller
 
         $date_format = $this->getCompanyDateFormat();
 
-        return view('incomes.invoices.show', compact('invoice', 'accounts', 'currencies', 'currency', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'signed_url', 'date_format'));
+        return view('sales.invoices.show', compact('invoice', 'accounts', 'currencies', 'currency', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'signed_url', 'date_format'));
     }
 
     /**
@@ -105,7 +105,7 @@ class Invoices extends Controller
 
         $number = $this->getNextInvoiceNumber();
 
-        return view('incomes.invoices.create', compact('customers', 'currencies', 'currency', 'items', 'taxes', 'categories', 'number'));
+        return view('sales.invoices.create', compact('customers', 'currencies', 'currency', 'items', 'taxes', 'categories', 'number'));
     }
 
     /**
@@ -168,14 +168,14 @@ class Invoices extends Controller
         \Excel::import(new Import(), $request->file('import'));
 
         if (!$success) {
-            return redirect('common/import/incomes/invoices');
+            return redirect('common/import/sales/invoices');
         }
 
         $message = trans('messages.success.imported', ['type' => trans_choice('general.invoices', 2)]);
 
         flash($message)->success();
 
-        return redirect('incomes/invoices');
+        return redirect('sales/invoices');
     }
 
     /**
@@ -199,7 +199,7 @@ class Invoices extends Controller
 
         $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id');
 
-        return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories'));
+        return view('sales.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories'));
     }
 
     /**
@@ -276,7 +276,7 @@ class Invoices extends Controller
      */
     public function markSent(Invoice $invoice)
     {
-        event(new \App\Events\Income\InvoiceSent($invoice));
+        event(new \App\Events\Sale\InvoiceSent($invoice));
 
         $message = trans('invoices.messages.marked_sent');
 
@@ -324,7 +324,7 @@ class Invoices extends Controller
         unset($invoice->pdf_path);
         unset($invoice->reconciled);
 
-        event(new \App\Events\Income\InvoiceSent($invoice));
+        event(new \App\Events\Sale\InvoiceSent($invoice));
 
         flash(trans('invoices.messages.email_sent'))->success();
 
@@ -383,7 +383,7 @@ class Invoices extends Controller
     public function markPaid(Invoice $invoice)
     {
         try {
-            event(new \App\Events\Income\PaymentReceived($invoice, []));
+            event(new \App\Events\Sale\PaymentReceived($invoice, []));
 
             $message = trans('invoices.messages.marked_paid');
 
@@ -415,7 +415,7 @@ class Invoices extends Controller
             $currency->precision = (int) $currency->precision;
         }
 
-        $html = view('incomes.invoices.item', compact('item_row', 'taxes', 'currency'))->render();
+        $html = view('sales.invoices.item', compact('item_row', 'taxes', 'currency'))->render();
 
         return response()->json([
             'success' => true,
@@ -446,9 +446,9 @@ class Invoices extends Controller
 
         $invoice->paid = $paid;
 
-        $invoice->template_path = 'incomes.invoices.print_' . setting('invoice.template' ,'default');
+        $invoice->template_path = 'sales.invoices.print_' . setting('invoice.template' ,'default');
 
-        event(new \App\Events\Income\InvoicePrinting($invoice));
+        event(new \App\Events\Sale\InvoicePrinting($invoice));
 
         return $invoice;
     }

app/Http/Controllers/Sales/Revenues.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Incomes;
+namespace App\Http\Controllers\Sales;
 
 use App\Abstracts\Http\Controller;
-use App\Exports\Incomes\Revenues as Export;
+use App\Exports\Sales\Revenues as Export;
 use App\Http\Requests\Banking\Transaction as Request;
 use App\Http\Requests\Common\Import as ImportRequest;
 use App\Imports\Common\Items as Import;
@@ -41,7 +41,7 @@ class Revenues extends Controller
 
         $transfer_cat_id = Category::transfer();
 
-        return view('incomes.revenues.index', compact('revenues', 'customers', 'categories', 'accounts', 'transfer_cat_id'));
+        return view('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts', 'transfer_cat_id'));
     }
 
     /**
@@ -75,7 +75,7 @@ class Revenues extends Controller
 
         $payment_methods = Modules::getPaymentMethods();
 
-        return view('incomes.revenues.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'customers', 'categories', 'payment_methods'));
+        return view('sales.revenues.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'customers', 'categories', 'payment_methods'));
     }
 
     /**
@@ -165,7 +165,7 @@ class Revenues extends Controller
 
         $date_format = $this->getCompanyDateFormat();
 
-        return view('incomes.revenues.edit', compact('revenue', 'accounts', 'currencies', 'currency', 'customers', 'categories', 'payment_methods', 'date_format'));
+        return view('sales.revenues.edit', compact('revenue', 'accounts', 'currencies', 'currency', 'customers', 'categories', 'payment_methods', 'date_format'));
     }
 
     /**

app/Http/Controllers/Settings/Email.php

@@ -50,9 +50,9 @@ class Email extends Controller
             'log' => trans('settings.email.log'),
         ];
 
-        $invoice_tags = implode(', ', app('App\Notifications\Income\Invoice')->getTags());
+        $invoice_tags = implode(', ', app('App\Notifications\Sale\Invoice')->getTags());
         $payment_tags = implode(', ', app('App\Notifications\Portal\PaymentReceived')->getTags());
-        $bill_tags = implode(', ', app('App\Notifications\Expense\Bill')->getTags());
+        $bill_tags = implode(', ', app('App\Notifications\Purchase\Bill')->getTags());
 
         return view('settings.email.edit', compact(
             'setting',

app/Http/Requests/Purchase/Bill.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Expense;
+namespace App\Http\Requests\Purchase;
 
 use App\Abstracts\Http\FormRequest;
 use Date;

app/Http/Requests/Purchase/BillAddItem.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Expense;
+namespace App\Http\Requests\Purchase;
 
 use App\Abstracts\Http\FormRequest;
 

app/Http/Requests/Purchase/BillHistory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Expense;
+namespace App\Http\Requests\Purchase;
 
 use App\Abstracts\Http\FormRequest;
 

app/Http/Requests/Purchase/BillItem.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Expense;
+namespace App\Http\Requests\Purchase;
 
 use App\Abstracts\Http\FormRequest;
 

app/Http/Requests/Purchase/BillTotal.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Expense;
+namespace App\Http\Requests\Purchase;
 
 use App\Abstracts\Http\FormRequest;
 

app/Http/Requests/Sale/Invoice.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Income;
+namespace App\Http\Requests\Sale;
 
 use App\Abstracts\Http\FormRequest;
 use Date;

app/Http/Requests/Sale/InvoiceAddItem.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Income;
+namespace App\Http\Requests\Sale;
 
 use App\Abstracts\Http\FormRequest;
 

app/Http/Requests/Sale/InvoiceHistory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Income;
+namespace App\Http\Requests\Sale;
 
 use App\Abstracts\Http\FormRequest;
 

app/Http/Requests/Sale/InvoiceItem.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Income;
+namespace App\Http\Requests\Sale;
 
 use App\Abstracts\Http\FormRequest;
 

app/Http/Requests/Sale/InvoiceTotal.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Income;
+namespace App\Http\Requests\Sale;
 
 use App\Abstracts\Http\FormRequest;
 

app/Http/ViewComposers/Header.php

@@ -41,11 +41,11 @@ class Header
                 $data = $underead->getAttribute('data');
 
                 switch ($underead->getAttribute('type')) {
-                    case 'App\Notifications\Expense\Bill':
+                    case 'App\Notifications\Purchase\Bill':
                         $bills[$data['bill_id']] = $data['amount'];
                         $notifications++;
                         break;
-                    case 'App\Notifications\Income\Invoice':
+                    case 'App\Notifications\Sale\Invoice':
                         $invoices[$data['invoice_id']] = $data['amount'];
                         $notifications++;
                         break;

app/Imports/Purchases/Bills.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Imports\Expenses;
+namespace App\Imports\Purchases;
 
-use App\Imports\Expenses\Sheets\Bills as Base;
+use App\Imports\Purchases\Sheets\Bills as Base;
-use App\Imports\Expenses\Sheets\BillItems;
+use App\Imports\Purchases\Sheets\BillItems;
-use App\Imports\Expenses\Sheets\BillItemTaxes;
+use App\Imports\Purchases\Sheets\BillItemTaxes;
-use App\Imports\Expenses\Sheets\BillHistories;
+use App\Imports\Purchases\Sheets\BillHistories;
-use App\Imports\Expenses\Sheets\BillPayments;
+use App\Imports\Purchases\Sheets\BillPayments;
-use App\Imports\Expenses\Sheets\BillTotals;
+use App\Imports\Purchases\Sheets\BillTotals;
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 
 class Bills implements WithMultipleSheets

app/Imports/Purchases/Payments.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Imports\Expenses;
+namespace App\Imports\Purchases;
 
 use App\Models\Banking\Transaction as Model;
 use App\Http\Requests\Banking\Transaction as Request;

app/Imports/Purchases/Sheets/BillHistories.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
-use App\Models\Expense\BillHistory as Model;
+use App\Models\Purchase\BillHistory as Model;
-use App\Http\Requests\Expense\BillHistory as Request;
+use App\Http\Requests\Purchase\BillHistory as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;

app/Imports/Purchases/Sheets/BillItemTaxes.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
-use App\Models\Expense\BillItemTax as Model;
+use App\Models\Purchase\BillItemTax as Model;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;

app/Imports/Purchases/Sheets/BillItems.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
-use App\Models\Expense\BillItem as Model;
+use App\Models\Purchase\BillItem as Model;
-use App\Http\Requests\Expense\BillItem as Request;
+use App\Http\Requests\Purchase\BillItem as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;

app/Imports/Purchases/Sheets/BillPayments.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
 use App\Models\Banking\Transaction as Model;
 use App\Http\Requests\Banking\Transaction as Request;

app/Imports/Purchases/Sheets/BillTotals.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
-use App\Models\Expense\BillTotal as Model;
+use App\Models\Purchase\BillTotal as Model;
-use App\Http\Requests\Expense\BillTotal as Request;
+use App\Http\Requests\Purchase\BillTotal as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;

app/Imports/Purchases/Sheets/Bills.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Expenses\Sheets;
+namespace App\Imports\Purchases\Sheets;
 
-use App\Models\Expense\Bill as Model;
+use App\Models\Purchase\Bill as Model;
-use App\Http\Requests\Expense\Bill as Request;
+use App\Http\Requests\Purchase\Bill as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;

app/Imports/Purchases/Vendors.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Imports\Expenses;
+namespace App\Imports\Purchases;
 
 use App\Models\Common\Contact as Model;
 use App\Http\Requests\Common\Contact as Request;

app/Imports/Sales/Customers.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Imports\Incomes;
+namespace App\Imports\Sales;
 
 use App\Models\Common\Contact as Model;
 use App\Http\Requests\Common\Contact as Request;

app/Imports/Sales/Invoices.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Imports\Incomes;
+namespace App\Imports\Sales;
 
-use App\Imports\Incomes\Sheets\Invoices as Base;
+use App\Imports\Sales\Sheets\Invoices as Base;
-use App\Imports\Incomes\Sheets\InvoiceItems;
+use App\Imports\Sales\Sheets\InvoiceItems;
-use App\Imports\Incomes\Sheets\InvoiceItemTaxes;
+use App\Imports\Sales\Sheets\InvoiceItemTaxes;
-use App\Imports\Incomes\Sheets\InvoiceHistories;
+use App\Imports\Sales\Sheets\InvoiceHistories;
-use App\Imports\Incomes\Sheets\InvoicePayments;
+use App\Imports\Sales\Sheets\InvoicePayments;
-use App\Imports\Incomes\Sheets\InvoiceTotals;
+use App\Imports\Sales\Sheets\InvoiceTotals;
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 
 class Invoices implements WithMultipleSheets

app/Imports/Sales/Sheets/InvoiceHistories.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
-use App\Models\Income\InvoiceHistory as Model;
+use App\Models\Sale\InvoiceHistory as Model;
-use App\Http\Requests\Income\InvoiceHistory as Request;
+use App\Http\Requests\Sale\InvoiceHistory as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;

app/Imports/Sales/Sheets/InvoiceItemTaxes.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
-use App\Models\Income\InvoiceItemTax as Model;
+use App\Models\Sale\InvoiceItemTax as Model;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;

app/Imports/Sales/Sheets/InvoiceItems.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
-use App\Models\Income\InvoiceItem as Model;
+use App\Models\Sale\InvoiceItem as Model;
-use App\Http\Requests\Income\InvoiceItem as Request;
+use App\Http\Requests\Sale\InvoiceItem as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;

app/Imports/Sales/Sheets/InvoicePayments.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
 use App\Models\Banking\Transaction as Model;
 use App\Http\Requests\Banking\Transaction as Request;

app/Imports/Sales/Sheets/InvoiceTotals.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
-use App\Models\Income\InvoiceTotal as Model;
+use App\Models\Sale\InvoiceTotal as Model;
-use App\Http\Requests\Income\InvoiceTotal as Request;
+use App\Http\Requests\Sale\InvoiceTotal as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;

app/Imports/Sales/Sheets/Invoices.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Imports\Incomes\Sheets;
+namespace App\Imports\Sales\Sheets;
 
-use App\Models\Income\Invoice as Model;
+use App\Models\Sale\Invoice as Model;
-use App\Http\Requests\Income\Invoice as Request;
+use App\Http\Requests\Sale\Invoice as Request;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;

app/Jobs/Banking/CreateDocumentTransaction.php

@@ -4,10 +4,10 @@ namespace App\Jobs\Banking;
 
 use App\Abstracts\Job;
 use App\Jobs\Banking\CreateTransaction;
-use App\Jobs\Expense\CreateBillHistory;
+use App\Jobs\Purchase\CreateBillHistory;
-use App\Jobs\Income\CreateInvoiceHistory;
+use App\Jobs\Sale\CreateInvoiceHistory;
 use App\Models\Banking\Transaction;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
 use App\Models\Setting\Currency;
 use Date;
 

app/Jobs/Purchase/CreateBill.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Events\Expense\BillCreated;
+use App\Events\Purchase\BillCreated;
-use App\Events\Expense\BillCreating;
+use App\Events\Purchase\BillCreating;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
-use App\Models\Expense\BillTotal;
+use App\Models\Purchase\BillTotal;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
 

app/Jobs/Purchase/CreateBillHistory.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Models\Expense\BillHistory;
+use App\Models\Purchase\BillHistory;
 
 class CreateBillHistory extends Job
 {

app/Jobs/Purchase/CreateBillItem.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Models\Expense\BillItem;
+use App\Models\Purchase\BillItem;
-use App\Models\Expense\BillItemTax;
+use App\Models\Purchase\BillItemTax;
 use App\Models\Setting\Tax;
 use Illuminate\Support\Str;
 

app/Jobs/Purchase/DeleteBill.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
 
 class DeleteBill extends Job
 {

app/Jobs/Purchase/DuplicateBill.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
-use App\Models\Expense\BillHistory;
+use App\Models\Purchase\BillHistory;
 
 class DuplicateBill extends Job
 {

app/Jobs/Purchase/UpdateBill.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Jobs\Expense;
+namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
-use App\Events\Expense\BillUpdated;
+use App\Events\Purchase\BillUpdated;
-use App\Events\Expense\BillUpdating;
+use App\Events\Purchase\BillUpdating;
-use App\Models\Expense\Bill;
+use App\Models\Purchase\Bill;
-use App\Models\Expense\BillTotal;
+use App\Models\Purchase\BillTotal;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
 use App\Traits\Relationships;

app/Jobs/Sale/CreateInvoice.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Jobs\Income;
+namespace App\Jobs\Sale;
 
 use App\Abstracts\Job;
-use App\Events\Income\InvoiceCreated;
+use App\Events\Sale\InvoiceCreated;
-use App\Events\Income\InvoiceCreating;
+use App\Events\Sale\InvoiceCreating;
-use App\Models\Income\Invoice;
+use App\Models\Sale\Invoice;
-use App\Models\Income\InvoiceTotal;
+use App\Models\Sale\InvoiceTotal;
 use App\Traits\Currencies;
 use App\Traits\DateTime;