Laravel 11 (#84)

* Convert string references to `::class`

PHP 5.5.9 adds the new static `class` property which provides the fully qualified class name. This is preferred over using strings for class names since the `class` property references are checked by PHP.

* Use Faker methods

Accessing Faker properties was deprecated in Faker 1.14.

* Convert route options to fluent methods

Laravel 8 adopts the tuple syntax for controller actions. Since the old options array is incompatible with this syntax, Shift converted them to use modern, fluent methods.

* Adopt class based routes

* Remove default `app` files

* Shift core files

* Streamline config files

* Set new `ENV` variables

* Default new `bootstrap/app.php`

* Re-register HTTP middleware

* Consolidate service providers

* Re-register service providers

* Re-register routes

* Re-register scheduled commands

* Bump Composer dependencies

* Use `<env>` tags for configuration

`<env>` tags have a lower precedence than system environment variables making it easier to overwrite PHPUnit configuration values in additional environments, such a CI.

Review this blog post for more details on configuration precedence when testing Laravel: https://jasonmccreary.me/articles/laravel-testing-configuration-precedence/

* Adopt anonymous migrations

* Rename `password_resets` table

* Convert `$casts` property to method

* Adopt Laravel type hints

* Mark base controller as `abstract`

* Remove `CreatesApplication` testing trait

* Shift cleanup

* Fix shift first issues

* Updating Rules for laravel 11, sanctum config and pint

* Fix Carbon issue on dashboard

* Temporary fix for tests while migration is issue fixed on laravel side

* Carbon needs numerical values, not strings

* Minimum php version

* Fix domain installation step not fetching the correct company_id

* Fix Role Policy wasn't properly registered

---------

.env.example

@@ -2,8 +2,18 @@ APP_ENV=production
 APP_KEY=base64:kgk/4DW1vEVy7aEvet5FPp5un6PIGe/so8H0mvoUtW0=
 APP_DEBUG=true
 APP_LOG_LEVEL=debug
+APP_TIMEZONE=UTC
 APP_URL=http://invoiceshelf.test
 
+APP_LOCALE=en
+APP_FALLBACK_LOCALE=en
+APP_FAKER_LOCALE=en_US
+
+APP_MAINTENANCE_DRIVER=file
+APP_MAINTENANCE_STORE=database
+
+BCRYPT_ROUNDS=12
+
 DB_CONNECTION=mysql
 DB_HOST=db
 DB_PORT=3306
@@ -11,11 +21,14 @@ DB_DATABASE=invoiceshelf
 DB_USERNAME=invoiceshelf
 DB_PASSWORD="invoiceshelf"
 
-BROADCAST_DRIVER=log
+BROADCAST_CONNECTION=log
-CACHE_DRIVER=file
+CACHE_STORE=file
 QUEUE_DRIVER=sync
 SESSION_DRIVER=cookie
 SESSION_LIFETIME=1440
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
@@ -41,3 +54,4 @@ SESSION_DOMAIN=invoiceshelf.test
 TRUSTED_PROXIES="*"
 
 CRON_JOB_AUTH_TOKEN=""
+LOG_STACK=single

app/Bouncer/Scopes/DefaultScope.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Bouncer\Scopes;
+namespace App\Bouncer\Scopes;
 
 use Silber\Bouncer\Database\Scope\Scope;
 

app/Console/Commands/CheckEstimateStatus.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Console\Commands;
+namespace App\Console\Commands;
 
+use App\Models\Estimate;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
-use InvoiceShelf\Models\Estimate;
 
 class CheckEstimateStatus extends Command
 {
@@ -37,7 +37,7 @@ class CheckEstimateStatus extends Command
      *
      * @return mixed
      */
-    public function handle()
+    public function handle(): void
     {
         $date = Carbon::now();
         $status = [Estimate::STATUS_ACCEPTED, Estimate::STATUS_REJECTED, Estimate::STATUS_EXPIRED];

app/Console/Commands/CheckInvoiceStatus.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Console\Commands;
+namespace App\Console\Commands;
 
+use App\Models\Invoice;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
-use InvoiceShelf\Models\Invoice;
 
 class CheckInvoiceStatus extends Command
 {
@@ -37,7 +37,7 @@ class CheckInvoiceStatus extends Command
      *
      * @return mixed
      */
-    public function handle()
+    public function handle(): void
     {
         $date = Carbon::now();
         $invoices = Invoice::whereNotIn('status', [Invoice::STATUS_COMPLETED, Invoice::STATUS_DRAFT])

app/Console/Commands/CreateTemplateCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Console\Commands;
+namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
@@ -33,10 +33,8 @@ class CreateTemplateCommand extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
-    public function handle()
+    public function handle(): int
     {
         $templateName = $this->argument('name');
         $type = $this->option('type');

app/Console/Commands/InstallModuleCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace InvoiceShelf\Console\Commands;
+namespace App\Console\Commands;
 
+use App\Space\ModuleInstaller;
 use Illuminate\Console\Command;
-use InvoiceShelf\Space\ModuleInstaller;
 
 class InstallModuleCommand extends Command
 {
@@ -33,10 +33,8 @@ class InstallModuleCommand extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
-    public function handle()
+    public function handle(): int
     {
         ModuleInstaller::complete($this->argument('module'), $this->argument('version'));
 

app/Console/Commands/ResetApp.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Console\Commands;
+namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Console\ConfirmableTrait;
@@ -39,7 +39,7 @@ class ResetApp extends Command
      *
      * @return mixed
      */
-    public function handle()
+    public function handle(): void
     {
         if (! $this->confirmToProceed()) {
             return;

app/Console/Commands/UpdateCommand.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Console\Commands;
+namespace App\Console\Commands;
 
+use App\Models\Setting;
+use App\Space\Updater;
 use Illuminate\Console\Command;
-use InvoiceShelf\Models\Setting;
-use InvoiceShelf\Space\Updater;
 
 // Implementation taken from Akaunting - https://github.com/akaunting/akaunting
 class UpdateCommand extends Command
@@ -42,7 +42,7 @@ class UpdateCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle()
+    public function handle(): void
     {
         set_time_limit(3600); // 1 hour
 

app/Console/Kernel.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace InvoiceShelf\Console;
-
-use Illuminate\Console\Scheduling\Schedule;
-use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\RecurringInvoice;
-use InvoiceShelf\Space\InstallUtils;
-
-class Kernel extends ConsoleKernel
-{
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        Commands\ResetApp::class,
-        Commands\UpdateCommand::class,
-        Commands\CreateTemplateCommand::class,
-        Commands\InstallModuleCommand::class,
-    ];
-
-    /**
-     * Define the application's command schedule.
-     *
-     * @return void
-     */
-    protected function schedule(Schedule $schedule)
-    {
-        if (InstallUtils::isDbCreated()) {
-            $schedule->command('check:invoices:status')
-                ->daily();
-
-            $schedule->command('check:estimates:status')
-                ->daily();
-
-            $recurringInvoices = RecurringInvoice::where('status', 'ACTIVE')->get();
-            foreach ($recurringInvoices as $recurringInvoice) {
-                $timeZone = CompanySetting::getSetting('time_zone', $recurringInvoice->company_id);
-
-                $schedule->call(function () use ($recurringInvoice) {
-                    $recurringInvoice->generateInvoice();
-                })->cron($recurringInvoice->frequency)->timezone($timeZone);
-            }
-        }
-    }
-
-    /**
-     * Register the Closure based commands for the application.
-     *
-     * @return void
-     */
-    protected function commands()
-    {
-        $this->load(__DIR__.'/Commands');
-        require base_path('routes/console.php');
-    }
-}

app/Events/ModuleDisabledEvent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Events;
+namespace App\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;

app/Events/ModuleEnabledEvent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Events;
+namespace App\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;

app/Events/ModuleInstalledEvent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Events;
+namespace App\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;

app/Events/UpdateFinished.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Events;
+namespace App\Events;
 
 use Illuminate\Foundation\Events\Dispatchable;
 

app/Exceptions/Handler.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace InvoiceShelf\Exceptions;
-
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Throwable;
-
-class Handler extends ExceptionHandler
-{
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array
-     */
-    protected $dontReport = [
-        //
-    ];
-
-    /**
-     * A list of the inputs that are never flashed for validation exceptions.
-     *
-     * @var array
-     */
-    protected $dontFlash = [
-        'password',
-        'password_confirmation',
-    ];
-
-    /**
-     * Report or log an exception.
-     *
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-     *
-     * @return void
-     */
-    public function report(Throwable $exception)
-    {
-        parent::report($exception);
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Throwable $exception)
-    {
-        return parent::render($request, $exception);
-    }
-}

app/Generators/CustomPathGenerator.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Generators;
+namespace App\Generators;
 
-use InvoiceShelf\Models\Estimate;
+use App\Models\Estimate;
-use InvoiceShelf\Models\Invoice;
+use App\Models\Invoice;
-use InvoiceShelf\Models\Payment;
+use App\Models\Payment;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Spatie\MediaLibrary\Support\PathGenerator\PathGenerator;
 

app/Http/Controllers/AppVersionController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers;
+namespace App\Http\Controllers;
 
+use App\Models\Setting;
 use Illuminate\Http\Request;
-use InvoiceShelf\Models\Setting;
 
 class AppVersionController extends Controller
 {

app/Http/Controllers/Controller.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers;
+namespace App\Http\Controllers;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 
-class Controller extends BaseController
+abstract class Controller extends BaseController
 {
     use AuthorizesRequests;
     use DispatchesJobs;

app/Http/Controllers/V1/Admin/Auth/ConfirmPasswordController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\V1\Admin\Auth;
 
+use App\Http\Controllers\Controller;
+use App\Providers\AppServiceProvider;
 use Illuminate\Foundation\Auth\ConfirmsPasswords;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Providers\RouteServiceProvider;
 
 class ConfirmPasswordController extends Controller
 {
@@ -26,7 +26,7 @@ class ConfirmPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = RouteServiceProvider::HOME;
+    protected $redirectTo = AppServiceProvider::HOME;
 
     /**
      * Create a new controller instance.

app/Http/Controllers/V1/Admin/Auth/ForgotPasswordController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\V1\Admin\Auth;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
 
 class ForgotPasswordController extends Controller
 {

app/Http/Controllers/V1/Admin/Auth/LoginController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\V1\Admin\Auth;
 
+use App\Http\Controllers\Controller;
+use App\Providers\AppServiceProvider;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Providers\RouteServiceProvider;
 
 class LoginController extends Controller
 {
@@ -26,7 +26,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = RouteServiceProvider::HOME;
+    protected $redirectTo = AppServiceProvider::HOME;
 
     /**
      * Create a new controller instance.

app/Http/Controllers/V1/Admin/Auth/RegisterController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\V1\Admin\Auth;
 
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use App\Providers\AppServiceProvider;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Validator;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\User;
-use InvoiceShelf\Providers\RouteServiceProvider;
 
 class RegisterController extends Controller
 {
@@ -28,7 +28,7 @@ class RegisterController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = RouteServiceProvider::HOME;
+    protected $redirectTo = AppServiceProvider::HOME;
 
     /**
      * Create a new controller instance.

app/Http/Controllers/V1/Admin/Auth/ResetPasswordController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\V1\Admin\Auth;
 
+use App\Http\Controllers\Controller;
+use App\Providers\AppServiceProvider;
 use Illuminate\Auth\Events\PasswordReset;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Providers\RouteServiceProvider;
 
 class ResetPasswordController extends Controller
 {
@@ -29,7 +29,7 @@ class ResetPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = RouteServiceProvider::HOME;
+    protected $redirectTo = AppServiceProvider::HOME;
 
     /**
      * Get the response for a successful password reset.

app/Http/Controllers/V1/Admin/Auth/VerificationController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\V1\Admin\Auth;
 
+use App\Http\Controllers\Controller;
+use App\Providers\AppServiceProvider;
 use Illuminate\Foundation\Auth\VerifiesEmails;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Providers\RouteServiceProvider;
 
 class VerificationController extends Controller
 {
@@ -26,7 +26,7 @@ class VerificationController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = RouteServiceProvider::HOME;
+    protected $redirectTo = AppServiceProvider::HOME;
 
     /**
      * Create a new controller instance.

app/Http/Controllers/V1/Admin/Backup/ApiController.php

@@ -2,10 +2,10 @@
 
 // Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Backup;
+namespace App\Http\Controllers\V1\Admin\Backup;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
-use InvoiceShelf\Http\Controllers\Controller;
 
 class ApiController extends Controller
 {

app/Http/Controllers/V1/Admin/Backup/BackupsController.php

@@ -2,13 +2,13 @@
 
 // Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Backup;
+namespace App\Http\Controllers\V1\Admin\Backup;
 
+use App\Jobs\CreateBackupJob;
+use App\Rules\Backup\PathToZip;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-use InvoiceShelf\Jobs\CreateBackupJob;
-use InvoiceShelf\Rules\Backup\PathToZip;
 use Spatie\Backup\BackupDestination\Backup;
 use Spatie\Backup\BackupDestination\BackupDestination;
 use Spatie\Backup\Helpers\Format;

app/Http/Controllers/V1/Admin/Backup/DownloadBackupController.php

@@ -2,10 +2,10 @@
 
 // Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Backup;
+namespace App\Http\Controllers\V1\Admin\Backup;
 
+use App\Rules\Backup\PathToZip;
 use Illuminate\Http\Request;
-use InvoiceShelf\Rules\Backup\PathToZip;
 use Spatie\Backup\BackupDestination\Backup;
 use Spatie\Backup\BackupDestination\BackupDestination;
 use Symfony\Component\HttpFoundation\Response;

app/Http/Controllers/V1/Admin/Company/CompaniesController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Company;
+namespace App\Http\Controllers\V1\Admin\Company;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\CompaniesRequest;
+use App\Http\Resources\CompanyResource;
+use App\Models\Company;
+use App\Models\User;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\CompaniesRequest;
-use InvoiceShelf\Http\Resources\CompanyResource;
-use InvoiceShelf\Models\Company;
-use InvoiceShelf\Models\User;
 use Silber\Bouncer\BouncerFacade;
 use Vinkla\Hashids\Facades\Hashids;
 

app/Http/Controllers/V1/Admin/Company/CompanyController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Company;
+namespace App\Http\Controllers\V1\Admin\Company;
 
+use App\Http\Controllers\Controller;
+use App\Http\Resources\CompanyResource;
+use App\Models\Company;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Resources\CompanyResource;
-use InvoiceShelf\Models\Company;
 
 class CompanyController extends Controller
 {

app/Http/Controllers/V1/Admin/Config/FiscalYearsController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Config;
+namespace App\Http\Controllers\V1\Admin\Config;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
 
 class FiscalYearsController extends Controller
 {

app/Http/Controllers/V1/Admin/Config/LanguagesController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Config;
+namespace App\Http\Controllers\V1\Admin\Config;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
 
 class LanguagesController extends Controller
 {

app/Http/Controllers/V1/Admin/Config/RetrospectiveEditsController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Config;
+namespace App\Http\Controllers\V1\Admin\Config;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
 
 class RetrospectiveEditsController extends Controller
 {

app/Http/Controllers/V1/Admin/CustomField/CustomFieldsController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\CustomField;
+namespace App\Http\Controllers\V1\Admin\CustomField;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\CustomFieldRequest;
+use App\Http\Resources\CustomFieldResource;
+use App\Models\CustomField;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\CustomFieldRequest;
-use InvoiceShelf\Http\Resources\CustomFieldResource;
-use InvoiceShelf\Models\CustomField;
 
 class CustomFieldsController extends Controller
 {

app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Customer;
+namespace App\Http\Controllers\V1\Admin\Customer;
 
+use App\Http\Controllers\Controller;
+use App\Http\Resources\CustomerResource;
+use App\Models\CompanySetting;
+use App\Models\Customer;
+use App\Models\Expense;
+use App\Models\Invoice;
+use App\Models\Payment;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Resources\CustomerResource;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\Customer;
-use InvoiceShelf\Models\Expense;
-use InvoiceShelf\Models\Invoice;
-use InvoiceShelf\Models\Payment;
 
 class CustomerStatsController extends Controller
 {
@@ -35,15 +35,16 @@ class CustomerStatsController extends Controller
         $start = Carbon::now();
         $end = Carbon::now();
         $terms = explode('-', $fiscalYear);
+        $companyStartMonth = intval($terms[0]);
 
-        if ($terms[0] <= $start->month) {
+        if ($companyStartMonth <= $start->month) {
-            $startDate->month($terms[0])->startOfMonth();
+            $startDate->month($companyStartMonth)->startOfMonth();
-            $start->month($terms[0])->startOfMonth();
+            $start->month($companyStartMonth)->startOfMonth();
-            $end->month($terms[0])->endOfMonth();
+            $end->month($companyStartMonth)->endOfMonth();
         } else {
-            $startDate->subYear()->month($terms[0])->startOfMonth();
+            $startDate->subYear()->month($companyStartMonth)->startOfMonth();
-            $start->subYear()->month($terms[0])->startOfMonth();
+            $start->subYear()->month($companyStartMonth)->startOfMonth();
-            $end->subYear()->month($terms[0])->endOfMonth();
+            $end->subYear()->month($companyStartMonth)->endOfMonth();
         }
 
         if ($request->has('previous_year')) {

app/Http/Controllers/V1/Admin/Customer/CustomersController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Customer;
+namespace App\Http\Controllers\V1\Admin\Customer;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Http\Requests\DeleteCustomersRequest;
+use App\Http\Resources\CustomerResource;
+use App\Models\Customer;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests;
-use InvoiceShelf\Http\Requests\DeleteCustomersRequest;
-use InvoiceShelf\Http\Resources\CustomerResource;
-use InvoiceShelf\Models\Customer;
 
 class CustomersController extends Controller
 {

app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Dashboard;
+namespace App\Http\Controllers\V1\Admin\Dashboard;
 
+use App\Http\Controllers\Controller;
+use App\Models\Company;
+use App\Models\CompanySetting;
+use App\Models\Customer;
+use App\Models\Estimate;
+use App\Models\Expense;
+use App\Models\Invoice;
+use App\Models\Payment;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Company;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\Customer;
-use InvoiceShelf\Models\Estimate;
-use InvoiceShelf\Models\Expense;
-use InvoiceShelf\Models\Invoice;
-use InvoiceShelf\Models\Payment;
 use Silber\Bouncer\BouncerFacade;
 
 class DashboardController extends Controller
@@ -40,15 +40,16 @@ class DashboardController extends Controller
         $start = Carbon::now();
         $end = Carbon::now();
         $terms = explode('-', $fiscalYear);
+        $companyStartMonth = intval($terms[0]);
 
-        if ($terms[0] <= $start->month) {
+        if ($companyStartMonth <= $start->month) {
-            $startDate->month($terms[0])->startOfMonth();
+            $startDate->month($companyStartMonth)->startOfMonth();
-            $start->month($terms[0])->startOfMonth();
+            $start->month($companyStartMonth)->startOfMonth();
-            $end->month($terms[0])->endOfMonth();
+            $end->month($companyStartMonth)->endOfMonth();
         } else {
-            $startDate->subYear()->month($terms[0])->startOfMonth();
+            $startDate->subYear()->month($companyStartMonth)->startOfMonth();
-            $start->subYear()->month($terms[0])->startOfMonth();
+            $start->subYear()->month($companyStartMonth)->startOfMonth();
-            $end->subYear()->month($terms[0])->endOfMonth();
+            $end->subYear()->month($companyStartMonth)->endOfMonth();
         }
 
         if ($request->has('previous_year')) {

app/Http/Controllers/V1/Admin/Estimate/ChangeEstimateStatusController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Estimate;
+namespace App\Http\Controllers\V1\Admin\Estimate;
 
+use App\Http\Controllers\Controller;
+use App\Models\Estimate;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Estimate;
 
 class ChangeEstimateStatusController extends Controller
 {

app/Http/Controllers/V1/Admin/Estimate/ConvertEstimateController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Estimate;
+namespace App\Http\Controllers\V1\Admin\Estimate;
 
+use App\Http\Controllers\Controller;
+use App\Http\Resources\InvoiceResource;
+use App\Models\CompanySetting;
+use App\Models\Estimate;
+use App\Models\Invoice;
+use App\Services\SerialNumberFormatter;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Resources\InvoiceResource;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\Estimate;
-use InvoiceShelf\Models\Invoice;
-use InvoiceShelf\Services\SerialNumberFormatter;
 use Vinkla\Hashids\Facades\Hashids;
 
 class ConvertEstimateController extends Controller
@@ -35,10 +35,10 @@ class ConvertEstimateController extends Controller
         );
 
         if ($dueDateEnabled === 'YES') {
-            $dueDateDays = CompanySetting::getSetting(
+            $dueDateDays = intval(CompanySetting::getSetting(
                 'invoice_due_date_days',
                 $request->header('company')
-            );
+            ));
             $due_date = Carbon::now()->addDays($dueDateDays)->format('Y-m-d');
         }
 

app/Http/Controllers/V1/Admin/Estimate/EstimateTemplatesController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Estimate;
+namespace App\Http\Controllers\V1\Admin\Estimate;
 
+use App\Http\Controllers\Controller;
+use App\Models\Estimate;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Estimate;
 
 class EstimateTemplatesController extends Controller
 {

app/Http/Controllers/V1/Admin/Estimate/EstimatesController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Estimate;
+namespace App\Http\Controllers\V1\Admin\Estimate;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\DeleteEstimatesRequest;
+use App\Http\Requests\EstimatesRequest;
+use App\Http\Resources\EstimateResource;
+use App\Jobs\GenerateEstimatePdfJob;
+use App\Models\Estimate;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\DeleteEstimatesRequest;
-use InvoiceShelf\Http\Requests\EstimatesRequest;
-use InvoiceShelf\Http\Resources\EstimateResource;
-use InvoiceShelf\Jobs\GenerateEstimatePdfJob;
-use InvoiceShelf\Models\Estimate;
 
 class EstimatesController extends Controller
 {

app/Http/Controllers/V1/Admin/Estimate/SendEstimateController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Estimate;
+namespace App\Http\Controllers\V1\Admin\Estimate;
 
-use InvoiceShelf\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\SendEstimatesRequest;
+use App\Http\Requests\SendEstimatesRequest;
-use InvoiceShelf\Models\Estimate;
+use App\Models\Estimate;
 
 class SendEstimateController extends Controller
 {

app/Http/Controllers/V1/Admin/Estimate/SendEstimatePreviewController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Estimate;
+namespace App\Http\Controllers\V1\Admin\Estimate;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\SendEstimatesRequest;
+use App\Models\Estimate;
 use Illuminate\Mail\Markdown;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\SendEstimatesRequest;
-use InvoiceShelf\Models\Estimate;
 
 class SendEstimatePreviewController extends Controller
 {

app/Http/Controllers/V1/Admin/ExchangeRate/ExchangeRateProviderController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\ExchangeRate;
+namespace App\Http\Controllers\V1\Admin\ExchangeRate;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\ExchangeRateProviderRequest;
+use App\Http\Resources\ExchangeRateProviderResource;
+use App\Models\ExchangeRateProvider;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\ExchangeRateProviderRequest;
-use InvoiceShelf\Http\Resources\ExchangeRateProviderResource;
-use InvoiceShelf\Models\ExchangeRateProvider;
 
 class ExchangeRateProviderController extends Controller
 {

app/Http/Controllers/V1/Admin/ExchangeRate/GetActiveProviderController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\ExchangeRate;
+namespace App\Http\Controllers\V1\Admin\ExchangeRate;
 
+use App\Http\Controllers\Controller;
+use App\Models\Currency;
+use App\Models\ExchangeRateProvider;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Currency;
-use InvoiceShelf\Models\ExchangeRateProvider;
 
 class GetActiveProviderController extends Controller
 {

app/Http/Controllers/V1/Admin/ExchangeRate/GetExchangeRateController.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\ExchangeRate;
+namespace App\Http\Controllers\V1\Admin\ExchangeRate;
 
+use App\Http\Controllers\Controller;
+use App\Models\CompanySetting;
+use App\Models\Currency;
+use App\Models\ExchangeRateLog;
+use App\Models\ExchangeRateProvider;
+use App\Traits\ExchangeRateProvidersTrait;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\Currency;
-use InvoiceShelf\Models\ExchangeRateLog;
-use InvoiceShelf\Models\ExchangeRateProvider;
-use InvoiceShelf\Traits\ExchangeRateProvidersTrait;
 
 class GetExchangeRateController extends Controller
 {

app/Http/Controllers/V1/Admin/ExchangeRate/GetSupportedCurrenciesController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\ExchangeRate;
+namespace App\Http\Controllers\V1\Admin\ExchangeRate;
 
+use App\Http\Controllers\Controller;
+use App\Models\ExchangeRateProvider;
+use App\Traits\ExchangeRateProvidersTrait;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\ExchangeRateProvider;
-use InvoiceShelf\Traits\ExchangeRateProvidersTrait;
 
 class GetSupportedCurrenciesController extends Controller
 {

app/Http/Controllers/V1/Admin/ExchangeRate/GetUsedCurrenciesController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\ExchangeRate;
+namespace App\Http\Controllers\V1\Admin\ExchangeRate;
 
+use App\Http\Controllers\Controller;
+use App\Models\ExchangeRateProvider;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\ExchangeRateProvider;
 
 class GetUsedCurrenciesController extends Controller
 {

app/Http/Controllers/V1/Admin/Expense/ExpenseCategoriesController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Expense;
+namespace App\Http\Controllers\V1\Admin\Expense;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\ExpenseCategoryRequest;
+use App\Http\Resources\ExpenseCategoryResource;
+use App\Models\ExpenseCategory;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\ExpenseCategoryRequest;
-use InvoiceShelf\Http\Resources\ExpenseCategoryResource;
-use InvoiceShelf\Models\ExpenseCategory;
 
 class ExpenseCategoriesController extends Controller
 {
@@ -60,7 +60,7 @@ class ExpenseCategoriesController extends Controller
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \InvoiceShelf\Models\ExpenseCategory  $ExpenseCategory
+     * @param  \App\Models\ExpenseCategory  $ExpenseCategory
      * @return \Illuminate\Http\Response
      */
     public function update(ExpenseCategoryRequest $request, ExpenseCategory $category)
@@ -75,7 +75,7 @@ class ExpenseCategoriesController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \InvoiceShelf\ExpensesCategory  $category
+     * @param  \App\ExpensesCategory  $category
      * @return \Illuminate\Http\Response
      */
     public function destroy(ExpenseCategory $category)

app/Http/Controllers/V1/Admin/Expense/ExpensesController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Expense;
+namespace App\Http\Controllers\V1\Admin\Expense;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\DeleteExpensesRequest;
+use App\Http\Requests\ExpenseRequest;
+use App\Http\Resources\ExpenseResource;
+use App\Models\Expense;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\DeleteExpensesRequest;
-use InvoiceShelf\Http\Requests\ExpenseRequest;
-use InvoiceShelf\Http\Resources\ExpenseResource;
-use InvoiceShelf\Models\Expense;
 
 class ExpensesController extends Controller
 {

app/Http/Controllers/V1/Admin/Expense/ShowReceiptController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Expense;
+namespace App\Http\Controllers\V1\Admin\Expense;
 
-use InvoiceShelf\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
-use InvoiceShelf\Models\Expense;
+use App\Models\Expense;
 
 class ShowReceiptController extends Controller
 {

app/Http/Controllers/V1/Admin/Expense/UploadReceiptController.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Expense;
+namespace App\Http\Controllers\V1\Admin\Expense;
 
-use InvoiceShelf\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\UploadExpenseReceiptRequest;
+use App\Http\Requests\UploadExpenseReceiptRequest;
-use InvoiceShelf\Models\Expense;
+use App\Models\Expense;
 
 class UploadReceiptController extends Controller
 {
     /**
      * Upload the expense receipts to storage.
      *
-     * @param  \InvoiceShelf\Http\Requests\ExpenseRequest  $request
+     * @param  \App\Http\Requests\ExpenseRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function __invoke(UploadExpenseReceiptRequest $request, Expense $expense)

app/Http/Controllers/V1/Admin/General/BootstrapController.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
+use App\Http\Resources\CompanyResource;
+use App\Http\Resources\UserResource;
+use App\Models\Company;
+use App\Models\CompanySetting;
+use App\Models\Currency;
+use App\Models\Module;
+use App\Models\Setting;
+use App\Traits\GeneratesMenuTrait;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Resources\CompanyResource;
-use InvoiceShelf\Http\Resources\UserResource;
-use InvoiceShelf\Models\Company;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\Currency;
-use InvoiceShelf\Models\Module;
-use InvoiceShelf\Models\Setting;
-use InvoiceShelf\Traits\GeneratesMenuTrait;
 use Silber\Bouncer\BouncerFacade;
 
 class BootstrapController extends Controller

app/Http/Controllers/V1/Admin/General/BulkExchangeRateController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
-use InvoiceShelf\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\BulkExchangeRateRequest;
+use App\Http\Requests\BulkExchangeRateRequest;
-use InvoiceShelf\Models\CompanySetting;
+use App\Models\CompanySetting;
-use InvoiceShelf\Models\Estimate;
+use App\Models\Estimate;
-use InvoiceShelf\Models\Invoice;
+use App\Models\Invoice;
-use InvoiceShelf\Models\Payment;
+use App\Models\Payment;
-use InvoiceShelf\Models\Tax;
+use App\Models\Tax;
 
 class BulkExchangeRateController extends Controller
 {

app/Http/Controllers/V1/Admin/General/ConfigController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
 
 class ConfigController extends Controller
 {

app/Http/Controllers/V1/Admin/General/CountriesController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
+use App\Http\Resources\CountryResource;
+use App\Models\Country;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Resources\CountryResource;
-use InvoiceShelf\Models\Country;
 
 class CountriesController extends Controller
 {

app/Http/Controllers/V1/Admin/General/CurrenciesController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
+use App\Http\Resources\CurrencyResource;
+use App\Models\Currency;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Resources\CurrencyResource;
-use InvoiceShelf\Models\Currency;
 
 class CurrenciesController extends Controller
 {

app/Http/Controllers/V1/Admin/General/DateFormatsController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
+use App\Space\DateFormatter;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Space\DateFormatter;
 
 class DateFormatsController extends Controller
 {

app/Http/Controllers/V1/Admin/General/GetAllUsedCurrenciesController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
+use App\Models\Currency;
+use App\Models\Estimate;
+use App\Models\Invoice;
+use App\Models\Payment;
+use App\Models\Tax;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Currency;
-use InvoiceShelf\Models\Estimate;
-use InvoiceShelf\Models\Invoice;
-use InvoiceShelf\Models\Payment;
-use InvoiceShelf\Models\Tax;
 
 class GetAllUsedCurrenciesController extends Controller
 {

app/Http/Controllers/V1/Admin/General/NextNumberController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
+use App\Models\Estimate;
+use App\Models\Invoice;
+use App\Models\Payment;
+use App\Services\SerialNumberFormatter;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Estimate;
-use InvoiceShelf\Models\Invoice;
-use InvoiceShelf\Models\Payment;
-use InvoiceShelf\Services\SerialNumberFormatter;
 
 class NextNumberController extends Controller
 {

app/Http/Controllers/V1/Admin/General/NotesController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\NotesRequest;
+use App\Http\Resources\NoteResource;
+use App\Models\Note;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\NotesRequest;
-use InvoiceShelf\Http\Resources\NoteResource;
-use InvoiceShelf\Models\Note;
 
 class NotesController extends Controller
 {

app/Http/Controllers/V1/Admin/General/NumberPlaceholdersController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
+use App\Services\SerialNumberFormatter;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Services\SerialNumberFormatter;
 
 class NumberPlaceholdersController extends Controller
 {

app/Http/Controllers/V1/Admin/General/SearchController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
+use App\Models\Customer;
+use App\Models\User;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Customer;
-use InvoiceShelf\Models\User;
 
 class SearchController extends Controller
 {

app/Http/Controllers/V1/Admin/General/SearchUsersController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
+use App\Models\User;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\User;
 
 class SearchUsersController extends Controller
 {

app/Http/Controllers/V1/Admin/General/TimezonesController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\V1\Admin\General;
 
+use App\Http\Controllers\Controller;
+use App\Space\TimeZones;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Space\TimeZones;
 
 class TimezonesController extends Controller
 {

app/Http/Controllers/V1/Admin/Invoice/ChangeInvoiceStatusController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Invoice;
+namespace App\Http\Controllers\V1\Admin\Invoice;
 
+use App\Http\Controllers\Controller;
+use App\Models\Invoice;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Invoice;
 
 class ChangeInvoiceStatusController extends Controller
 {

app/Http/Controllers/V1/Admin/Invoice/CloneInvoiceController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Invoice;
+namespace App\Http\Controllers\V1\Admin\Invoice;
 
+use App\Http\Controllers\Controller;
+use App\Http\Resources\InvoiceResource;
+use App\Models\CompanySetting;
+use App\Models\Invoice;
+use App\Services\SerialNumberFormatter;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Resources\InvoiceResource;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\Invoice;
-use InvoiceShelf\Services\SerialNumberFormatter;
 use Vinkla\Hashids\Facades\Hashids;
 
 class CloneInvoiceController extends Controller
@@ -37,10 +37,10 @@ class CloneInvoiceController extends Controller
         );
 
         if ($dueDateEnabled === 'YES') {
-            $dueDateDays = CompanySetting::getSetting(
+            $dueDateDays = intval(CompanySetting::getSetting(
                 'invoice_due_date_days',
                 $request->header('company')
-            );
+            ));
             $due_date = Carbon::now()->addDays($dueDateDays)->format('Y-m-d');
         }
 

app/Http/Controllers/V1/Admin/Invoice/InvoiceTemplatesController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Invoice;
+namespace App\Http\Controllers\V1\Admin\Invoice;
 
+use App\Http\Controllers\Controller;
+use App\Models\Invoice;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Invoice;
 
 class InvoiceTemplatesController extends Controller
 {

app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Invoice;
+namespace App\Http\Controllers\V1\Admin\Invoice;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Http\Requests\DeleteInvoiceRequest;
+use App\Http\Resources\InvoiceResource;
+use App\Jobs\GenerateInvoicePdfJob;
+use App\Models\Invoice;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests;
-use InvoiceShelf\Http\Requests\DeleteInvoiceRequest;
-use InvoiceShelf\Http\Resources\InvoiceResource;
-use InvoiceShelf\Jobs\GenerateInvoicePdfJob;
-use InvoiceShelf\Models\Invoice;
 
 class InvoicesController extends Controller
 {

app/Http/Controllers/V1/Admin/Invoice/SendInvoiceController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Invoice;
+namespace App\Http\Controllers\V1\Admin\Invoice;
 
-use InvoiceShelf\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\SendInvoiceRequest;
+use App\Http\Requests\SendInvoiceRequest;
-use InvoiceShelf\Models\Invoice;
+use App\Models\Invoice;
 
 class SendInvoiceController extends Controller
 {

app/Http/Controllers/V1/Admin/Invoice/SendInvoicePreviewController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Invoice;
+namespace App\Http\Controllers\V1\Admin\Invoice;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\SendInvoiceRequest;
+use App\Models\Invoice;
 use Illuminate\Mail\Markdown;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\SendInvoiceRequest;
-use InvoiceShelf\Models\Invoice;
 
 class SendInvoicePreviewController extends Controller
 {

app/Http/Controllers/V1/Admin/Item/ItemsController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Item;
+namespace App\Http\Controllers\V1\Admin\Item;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Http\Requests\DeleteItemsRequest;
+use App\Http\Resources\ItemResource;
+use App\Models\Item;
+use App\Models\TaxType;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests;
-use InvoiceShelf\Http\Requests\DeleteItemsRequest;
-use InvoiceShelf\Http\Resources\ItemResource;
-use InvoiceShelf\Models\Item;
-use InvoiceShelf\Models\TaxType;
 
 class ItemsController extends Controller
 {
@@ -40,7 +40,7 @@ class ItemsController extends Controller
     /**
      * Create Item.
      *
-     * @param  InvoiceShelf\Http\Requests\ItemsRequest  $request
+     * @param  App\Http\Requests\ItemsRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(Requests\ItemsRequest $request)
@@ -67,7 +67,7 @@ class ItemsController extends Controller
     /**
      * Update an existing Item.
      *
-     * @param  InvoiceShelf\Http\Requests\ItemsRequest  $request
+     * @param  App\Http\Requests\ItemsRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function update(Requests\ItemsRequest $request, Item $item)

app/Http/Controllers/V1/Admin/Item/UnitsController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Item;
+namespace App\Http\Controllers\V1\Admin\Item;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UnitRequest;
+use App\Http\Resources\UnitResource;
+use App\Models\Unit;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\UnitRequest;
-use InvoiceShelf\Http\Resources\UnitResource;
-use InvoiceShelf\Models\Unit;
 
 class UnitsController extends Controller
 {

app/Http/Controllers/V1/Admin/Mobile/AuthController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Mobile;
+namespace App\Http\Controllers\V1\Admin\Mobile;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\LoginRequest;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\ValidationException;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\LoginRequest;
-use InvoiceShelf\Models\User;
 
 class AuthController extends Controller
 {

app/Http/Controllers/V1/Admin/Modules/ApiTokenController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules;
+namespace App\Http\Controllers\V1\Admin\Modules;
 
+use App\Http\Controllers\Controller;
+use App\Space\ModuleInstaller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Space\ModuleInstaller;
 
 class ApiTokenController extends Controller
 {

app/Http/Controllers/V1/Admin/Modules/CompleteModuleInstallationController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules;
+namespace App\Http\Controllers\V1\Admin\Modules;
 
+use App\Http\Controllers\Controller;
+use App\Space\ModuleInstaller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Space\ModuleInstaller;
 
 class CompleteModuleInstallationController extends Controller
 {

app/Http/Controllers/V1/Admin/Modules/CopyModuleController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules;
+namespace App\Http\Controllers\V1\Admin\Modules;
 
+use App\Http\Controllers\Controller;
+use App\Space\ModuleInstaller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Space\ModuleInstaller;
 
 class CopyModuleController extends Controller
 {

app/Http/Controllers/V1/Admin/Modules/DisableModuleController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules;
+namespace App\Http\Controllers\V1\Admin\Modules;
 
+use App\Events\ModuleDisabledEvent;
+use App\Http\Controllers\Controller;
+use App\Models\Module as ModelsModule;
 use Illuminate\Http\Request;
-use InvoiceShelf\Events\ModuleDisabledEvent;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Module as ModelsModule;
 use Nwidart\Modules\Facades\Module;
 
 class DisableModuleController extends Controller

app/Http/Controllers/V1/Admin/Modules/DownloadModuleController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules;
+namespace App\Http\Controllers\V1\Admin\Modules;
 
+use App\Http\Controllers\Controller;
+use App\Space\ModuleInstaller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Space\ModuleInstaller;
 
 class DownloadModuleController extends Controller
 {

app/Http/Controllers/V1/Admin/Modules/EnableModuleController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules;
+namespace App\Http\Controllers\V1\Admin\Modules;
 
+use App\Events\ModuleEnabledEvent;
+use App\Http\Controllers\Controller;
+use App\Models\Module as ModelsModule;
 use Illuminate\Http\Request;
-use InvoiceShelf\Events\ModuleEnabledEvent;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Module as ModelsModule;
 use Nwidart\Modules\Facades\Module;
 
 class EnableModuleController extends Controller

app/Http/Controllers/V1/Admin/Modules/ModuleController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules;
+namespace App\Http\Controllers\V1\Admin\Modules;
 
+use App\Http\Controllers\Controller;
+use App\Http\Resources\ModuleResource;
+use App\Space\ModuleInstaller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Resources\ModuleResource;
-use InvoiceShelf\Space\ModuleInstaller;
 
 class ModuleController extends Controller
 {

app/Http/Controllers/V1/Admin/Modules/ModulesController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules;
+namespace App\Http\Controllers\V1\Admin\Modules;
 
+use App\Http\Controllers\Controller;
+use App\Space\ModuleInstaller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Space\ModuleInstaller;
 
 class ModulesController extends Controller
 {

app/Http/Controllers/V1/Admin/Modules/UnzipModuleController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules;
+namespace App\Http\Controllers\V1\Admin\Modules;
 
-use InvoiceShelf\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\UnzipUpdateRequest;
+use App\Http\Requests\UnzipUpdateRequest;
-use InvoiceShelf\Space\ModuleInstaller;
+use App\Space\ModuleInstaller;
 
 class UnzipModuleController extends Controller
 {

app/Http/Controllers/V1/Admin/Modules/UploadModuleController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules;
+namespace App\Http\Controllers\V1\Admin\Modules;
 
-use InvoiceShelf\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\UploadModuleRequest;
+use App\Http\Requests\UploadModuleRequest;
-use InvoiceShelf\Space\ModuleInstaller;
+use App\Space\ModuleInstaller;
 
 class UploadModuleController extends Controller
 {

app/Http/Controllers/V1/Admin/Payment/PaymentMethodsController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Payment;
+namespace App\Http\Controllers\V1\Admin\Payment;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\PaymentMethodRequest;
+use App\Http\Resources\PaymentMethodResource;
+use App\Models\PaymentMethod;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\PaymentMethodRequest;
-use InvoiceShelf\Http\Resources\PaymentMethodResource;
-use InvoiceShelf\Models\PaymentMethod;
 
 class PaymentMethodsController extends Controller
 {

app/Http/Controllers/V1/Admin/Payment/PaymentsController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Payment;
+namespace App\Http\Controllers\V1\Admin\Payment;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\DeletePaymentsRequest;
+use App\Http\Requests\PaymentRequest;
+use App\Http\Resources\PaymentResource;
+use App\Models\Payment;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\DeletePaymentsRequest;
-use InvoiceShelf\Http\Requests\PaymentRequest;
-use InvoiceShelf\Http\Resources\PaymentResource;
-use InvoiceShelf\Models\Payment;
 
 class PaymentsController extends Controller
 {

app/Http/Controllers/V1/Admin/Payment/SendPaymentController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Payment;
+namespace App\Http\Controllers\V1\Admin\Payment;
 
-use InvoiceShelf\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\SendPaymentRequest;
+use App\Http\Requests\SendPaymentRequest;
-use InvoiceShelf\Models\Payment;
+use App\Models\Payment;
 
 class SendPaymentController extends Controller
 {

app/Http/Controllers/V1/Admin/Payment/SendPaymentPreviewController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Payment;
+namespace App\Http\Controllers\V1\Admin\Payment;
 
+use App\Http\Controllers\Controller;
+use App\Models\Payment;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Markdown;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Payment;
 
 class SendPaymentPreviewController extends Controller
 {

app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\RecurringInvoice;
+namespace App\Http\Controllers\V1\Admin\RecurringInvoice;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\RecurringInvoiceRequest;
+use App\Http\Resources\RecurringInvoiceResource;
+use App\Models\RecurringInvoice;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\RecurringInvoiceRequest;
-use InvoiceShelf\Http\Resources\RecurringInvoiceResource;
-use InvoiceShelf\Models\RecurringInvoice;
 
 class RecurringInvoiceController extends Controller
 {
@@ -76,7 +76,7 @@ class RecurringInvoiceController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \InvoiceShelf\Models\RecurringInvoice  $recurringInvoice
+     * @param  \App\Models\RecurringInvoice  $recurringInvoice
      * @return \Illuminate\Http\Response
      */
     public function delete(Request $request)

app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceFrequencyController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\RecurringInvoice;
+namespace App\Http\Controllers\V1\Admin\RecurringInvoice;
 
+use App\Http\Controllers\Controller;
+use App\Models\RecurringInvoice;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\RecurringInvoice;
 
 class RecurringInvoiceFrequencyController extends Controller
 {

app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Report;
+namespace App\Http\Controllers\V1\Admin\Report;
 
+use App\Http\Controllers\Controller;
+use App\Models\Company;
+use App\Models\CompanySetting;
+use App\Models\Currency;
+use App\Models\Customer;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Company;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\Currency;
-use InvoiceShelf\Models\Customer;
 use PDF;
 
 class CustomerSalesReportController extends Controller

app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Report;
+namespace App\Http\Controllers\V1\Admin\Report;
 
+use App\Http\Controllers\Controller;
+use App\Models\Company;
+use App\Models\CompanySetting;
+use App\Models\Currency;
+use App\Models\Expense;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Company;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\Currency;
-use InvoiceShelf\Models\Expense;
 use PDF;
 
 class ExpensesReportController extends Controller

app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Report;
+namespace App\Http\Controllers\V1\Admin\Report;
 
+use App\Http\Controllers\Controller;
+use App\Models\Company;
+use App\Models\CompanySetting;
+use App\Models\Currency;
+use App\Models\InvoiceItem;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Company;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\Currency;
-use InvoiceShelf\Models\InvoiceItem;
 use PDF;
 
 class ItemSalesReportController extends Controller

app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Report;
+namespace App\Http\Controllers\V1\Admin\Report;
 
+use App\Http\Controllers\Controller;
+use App\Models\Company;
+use App\Models\CompanySetting;
+use App\Models\Currency;
+use App\Models\Expense;
+use App\Models\Payment;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Company;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\Currency;
-use InvoiceShelf\Models\Expense;
-use InvoiceShelf\Models\Payment;
 use PDF;
 
 class ProfitLossReportController extends Controller

app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Report;
+namespace App\Http\Controllers\V1\Admin\Report;
 
+use App\Http\Controllers\Controller;
+use App\Models\Company;
+use App\Models\CompanySetting;
+use App\Models\Currency;
+use App\Models\Tax;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Company;
-use InvoiceShelf\Models\CompanySetting;
-use InvoiceShelf\Models\Currency;
-use InvoiceShelf\Models\Tax;
 use PDF;
 
 class TaxSummaryReportController extends Controller

app/Http/Controllers/V1/Admin/Role/AbilitiesController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Role;
+namespace App\Http\Controllers\V1\Admin\Role;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
 
 class AbilitiesController extends Controller
 {

app/Http/Controllers/V1/Admin/Role/RolesController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Role;
+namespace App\Http\Controllers\V1\Admin\Role;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\RoleRequest;
+use App\Http\Resources\RoleResource;
+use App\Models\User;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\RoleRequest;
-use InvoiceShelf\Http\Resources\RoleResource;
-use InvoiceShelf\Models\User;
 use Silber\Bouncer\BouncerFacade;
 use Silber\Bouncer\Database\Role;
 

app/Http/Controllers/V1/Admin/Settings/CompanyController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\V1\Admin\Settings;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\AvatarRequest;
+use App\Http\Requests\CompanyLogoRequest;
+use App\Http\Requests\CompanyRequest;
+use App\Http\Requests\ProfileRequest;
+use App\Http\Resources\CompanyResource;
+use App\Http\Resources\UserResource;
+use App\Models\Company;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\AvatarRequest;
-use InvoiceShelf\Http\Requests\CompanyLogoRequest;
-use InvoiceShelf\Http\Requests\CompanyRequest;
-use InvoiceShelf\Http\Requests\ProfileRequest;
-use InvoiceShelf\Http\Resources\CompanyResource;
-use InvoiceShelf\Http\Resources\UserResource;
-use InvoiceShelf\Models\Company;
 
 class CompanyController extends Controller
 {

app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\V1\Admin\Settings;
 
+use App\Http\Controllers\Controller;
+use App\Models\Company;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Models\Company;
 
 class CompanyCurrencyCheckTransactionsController extends Controller
 {

app/Http/Controllers/V1/Admin/Settings/DiskController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\V1\Admin\Settings;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\DiskEnvironmentRequest;
+use App\Http\Resources\FileDiskResource;
+use App\Models\FileDisk;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\DiskEnvironmentRequest;
-use InvoiceShelf\Http\Resources\FileDiskResource;
-use InvoiceShelf\Models\FileDisk;
 
 class DiskController extends Controller
 {
@@ -43,7 +43,7 @@ class DiskController extends Controller
     }
 
     /**
-     * @param  \InvoiceShelf\Models\FileDisk  $file_disk
+     * @param  \App\Models\FileDisk  $file_disk
      * @return JsonResponse
      */
     public function update(FileDisk $disk, Request $request)
@@ -136,7 +136,7 @@ class DiskController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \InvoiceShelf\Models\FileDisk  $taxType
+     * @param  \App\Models\FileDisk  $taxType
      * @return \Illuminate\Http\Response
      */
     public function destroy(FileDisk $disk)

app/Http/Controllers/V1/Admin/Settings/GetCompanyMailConfigurationController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\V1\Admin\Settings;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use InvoiceShelf\Http\Controllers\Controller;
 
 class GetCompanyMailConfigurationController extends Controller
 {

app/Http/Controllers/V1/Admin/Settings/GetCompanySettingsController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\V1\Admin\Settings;
 
-use InvoiceShelf\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
-use InvoiceShelf\Http\Requests\GetSettingsRequest;
+use App\Http\Requests\GetSettingsRequest;
-use InvoiceShelf\Models\CompanySetting;
+use App\Models\CompanySetting;
 
 class GetCompanySettingsController extends Controller
 {