renaming

app/Console/Commands/RecurringCheck.php

@@ -7,7 +7,7 @@ use App\Events\Purchase\BillRecurring;
 use App\Events\Sale\InvoiceCreated;
 use App\Events\Sale\InvoiceRecurring;
 use App\Models\Common\Company;
-use App\Traits\Incomes;
+use App\Traits\Sales;
 use App\Utilities\Overrider;
 use Carbon\Carbon;
 use Date;
@@ -15,7 +15,7 @@ use Illuminate\Console\Command;
 
 class RecurringCheck extends Command
 {
-    use Incomes;
+    use Sales;
 
     /**
      * The name and signature of the console command.

app/Http/Controllers/Purchases/Bills.php

@@ -162,7 +162,7 @@ class Bills extends Controller
         \Excel::import(new Import(), $request->file('import'));
 
         if (!$success) {
-            return redirect()->route('import.create', ['expenses', 'bills']);
+            return redirect()->route('import.create', ['purchases', 'bills']);
         }
 
         $message = trans('messages.success.imported', ['type' => trans_choice('general.bills', 2)]);

app/Http/Controllers/Sales/Invoices.php

@@ -24,14 +24,14 @@ use App\Notifications\Sale\Invoice as Notification;
 use App\Traits\Contacts;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
-use App\Traits\Incomes;
+use App\Traits\Sales;
 use App\Utilities\Modules;
 use File;
 use Illuminate\Support\Facades\URL;
 
 class Invoices extends Controller
 {
-    use Contacts, Currencies, DateTime, Incomes;
+    use Contacts, Currencies, DateTime, Sales;
 
     /**
      * Display a listing of the resource.
@@ -168,7 +168,7 @@ class Invoices extends Controller
         \Excel::import(new Import(), $request->file('import'));
 
         if (!$success) {
-            return redirect('common/import/sales/invoices');
+            return redirect()->route('import.create', ['sales', 'invoices']);
         }
 
         $message = trans('messages.success.imported', ['type' => trans_choice('general.invoices', 2)]);

app/Listeners/Sale/IncreaseNextInvoiceNumber.php

@@ -3,11 +3,11 @@
 namespace App\Listeners\Sale;
 
 use App\Events\Sale\InvoiceCreated as Event;
-use App\Traits\Incomes;
+use App\Traits\Sales;
 
 class IncreaseNextInvoiceNumber
 {
-    use Incomes;
+    use Sales;
 
     /**
      * Handle the event.

app/Models/Sale/Invoice.php

@@ -7,15 +7,15 @@ use App\Models\Banking\Transaction;
 use App\Models\Setting\Currency;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
-use App\Traits\Incomes;
 use App\Traits\Media;
 use App\Traits\Recurring;
+use App\Traits\Sales;
 use Bkwld\Cloner\Cloneable;
 use Date;
 
 class Invoice extends Model
 {
-    use Cloneable, Currencies, DateTime, Incomes, Media, Recurring;
+    use Cloneable, Currencies, DateTime, Media, Recurring, Sales;
 
     protected $table = 'invoices';
 

app/Traits/Sales.php

@@ -2,7 +2,7 @@
 
 namespace App\Traits;
 
-trait Incomes
+trait Sales
 {
     /**
      * Generate next invoice number

resources/assets/js/views/sales/invoices.js

@@ -76,7 +76,7 @@ const app = new Vue({
 
     methods:{
         onChangeContact(contact_id) {
-            axios.get(url + '/incomes/customers/' + contact_id + '/currency')
+            axios.get(url + '/sales/customers/' + contact_id + '/currency')
             .then(response => {
                 this.form.contact_name = response.data.name;
                 this.form.contact_email = response.data.email;