Merge remote-tracking branch 'origin/oasis' into oasis

app/Console/Commands/SetupOasisEnvironment.php

@@ -1,14 +1,9 @@
 <?php
 namespace App\Console\Commands;
 
-use App\Models\User;
 use App\Models\Setting;
-use Illuminate\Support\Str;
-use App\Models\Oasis\Client;
-use App\Models\Oasis\Invoice;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Database\Eloquent\Factories\Sequence;
 
 class SetupOasisEnvironment extends Command
 {

app/Http/helpers.php

@@ -1,10 +1,10 @@
 <?php
 
-use App\Models\Invoice;
 use Carbon\Carbon;
 use App\Models\User;
 use App\Models\Share;
 use ByteUnits\Metric;
+use App\Models\Invoice;
 use App\Models\Setting;
 use App\Models\Language;
 use Illuminate\Support\Str;
@@ -169,7 +169,6 @@ if (! function_exists('get_invoice_number')) {
     }
 }
 
-
 if (! function_exists('cache_forget_many')) {
     /**
      * Forget many cache keys at once
@@ -343,7 +342,6 @@ if (! function_exists('store_avatar')) {
     }
 }
 
-
 if (! function_exists('store_system_image')) {
     /**
      * Store system image

app/Models/User.php

@@ -12,9 +12,9 @@ use Kyslik\ColumnSortable\Sortable;
 use App\Notifications\ResetPassword;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Notifications\Notifiable;
+use Makingcg\Invoice\Http\Traits\Invoiceable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
-use Makingcg\Invoice\Http\Traits\Invoiceable;
 
 class User extends Authenticatable
 {