fix code style

drop foreign issue solved

See merge request mohit.panjvani/crater-web!787

.editorconfig

@@ -19,4 +19,7 @@ indent_size = 2
 indent_size = 2
 
 [*.js]
-indent_size = 2
+indent_size = 2
+
+[*.json]
+indent_size = 2

.env.example

@@ -34,3 +34,5 @@ PUSHER_SECRET=
 
 SANCTUM_STATEFUL_DOMAINS=crater.test
 SESSION_DOMAIN=crater.test
+
+TRUSTED_PROXIES="*"

.github/workflows/ci.yaml

@@ -0,0 +1,37 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['7.4', '8.0']
+
+    name: PHP ${{ matrix.php }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Install dependencies
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        extensions: exif
+
+    - name: Install PHP 7 dependencies
+      run: composer update --no-interaction --no-progress
+      if: "matrix.php < 8"
+
+    - name: Install PHP 8 dependencies
+      run: composer update --ignore-platform-req=php --no-interaction --no-progress
+      if: "matrix.php >= 8"
+
+    - name: Check coding style
+      run: ./vendor/bin/php-cs-fixer fix -v --dry-run --using-cache=no --config=.php-cs-fixer.dist.php
+
+    - name: Unit Tests
+      run: php ./vendor/bin/pest

.php-cs-fixer.dist.php

@@ -0,0 +1,42 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+    ->exclude(['bootstrap', 'storage', 'vendor'])
+    ->name('*.php')
+    ->name('_ide_helper')
+    ->notName('*.blade.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+$rules = [
+    '@PSR12' => true,
+    'array_syntax' => ['syntax' => 'short'],
+    'ordered_imports' => ['sort_algorithm' => 'alpha'],
+    'concat_space' => true,
+    'no_unused_imports' => true,
+    'not_operator_with_successor_space' => true,
+    'phpdoc_scalar' => true,
+    'unary_operator_spaces' => true,
+    'binary_operator_spaces' => true,
+    'blank_line_before_statement' => [
+        'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
+    ],
+    'phpdoc_single_line_var_spacing' => true,
+    'phpdoc_var_without_name' => true,
+    'class_attributes_separation' => [
+        'elements' => [
+            'method' => 'one',
+            'property' => 'one',
+        ],
+    ],
+    'method_argument_space' => [
+        'on_multiline' => 'ensure_fully_multiline',
+        'keep_multiple_spaces_after_comma' => true,
+    ],
+];
+
+return (new PhpCsFixer\Config())
+    ->setUsingCache(true)
+    ->setRules($rules)
+    ->setFinder($finder);

Dockerfile

@@ -12,18 +12,19 @@ RUN apt-get update && apt-get install -y \
     libonig-dev \
     libxml2-dev \
     zip \
-    unzip \ 
-    libzip-dev \ 
-    libmagickwand-dev
+    unzip \
+    libzip-dev \
+    libmagickwand-dev \
+    mariadb-client
 
 # Clear cache
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN pecl install imagick \ 
+RUN pecl install imagick \
     && docker-php-ext-enable imagick
 
 # Install PHP extensions
-RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd 
+RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd
 
 # Get latest Composer
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

app/Console/Commands/CheckEstimateStatus.php

@@ -1,9 +1,10 @@
 <?php
+
 namespace Crater\Console\Commands;
 
-use Illuminate\Console\Command;
 use Carbon\Carbon;
 use Crater\Models\Estimate;
+use Illuminate\Console\Command;
 
 class CheckEstimateStatus extends Command
 {
@@ -39,7 +40,7 @@ class CheckEstimateStatus extends Command
     public function handle()
     {
         $date = Carbon::now();
-        $status = array(Estimate::STATUS_ACCEPTED, Estimate::STATUS_REJECTED, Estimate::STATUS_EXPIRED);
+        $status = [Estimate::STATUS_ACCEPTED, Estimate::STATUS_REJECTED, Estimate::STATUS_EXPIRED];
         $estimates = Estimate::whereNotIn('status', $status)->whereDate('expiry_date', '<', $date)->get();
 
         foreach ($estimates as $estimate) {

app/Console/Commands/CheckInvoiceStatus.php

@@ -1,9 +1,10 @@
 <?php
+
 namespace Crater\Console\Commands;
 
-use Illuminate\Console\Command;
 use Carbon\Carbon;
 use Crater\Models\Invoice;
+use Illuminate\Console\Command;
 
 class CheckInvoiceStatus extends Command
 {
@@ -39,7 +40,7 @@ class CheckInvoiceStatus extends Command
     public function handle()
     {
         $date = Carbon::now();
-        $invoices = Invoice::where('status', '<>', Invoice::STATUS_COMPLETED)->whereDate('due_date', '<',$date)->get();
+        $invoices = Invoice::where('status', '<>', Invoice::STATUS_COMPLETED)->whereDate('due_date', '<', $date)->get();
 
         foreach ($invoices as $invoice) {
             $invoice->status = Invoice::STATUS_OVERDUE;

app/Console/Commands/CreateTemplateCommand.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Crater\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+
+class CreateTemplateCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'make:template {name} {--type=}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create estimate or invoice pdf template.                               ';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $templateName = $this->argument('name');
+        $type = $this->option('type');
+
+        if (! $type) {
+            $type = $this->choice('Create a template for?', ['invoice', 'estimate']);
+        }
+
+        if (Storage::disk('views')->exists("/app/pdf/{$type}/{$templateName}.blade.php")) {
+            $this->info("Template with given name already exists.");
+
+            return 0;
+        }
+
+        Storage::disk('views')->copy("/app/pdf/{$type}/{$type}1.blade.php", "/app/pdf/{$type}/{$templateName}.blade.php");
+        copy(public_path("/assets/img/PDF/{$type}1.png"), public_path("/assets/img/PDF/{$templateName}.png"));
+
+        $path = resource_path("app/pdf/{$type}/{$templateName}.blade.php");
+        $type = ucfirst($type);
+        $this->info("{$type} Template created successfully at ".$path);
+
+        return 0;
+    }
+}

app/Console/Commands/ResetApp.php

@@ -5,7 +5,6 @@ namespace Crater\Console\Commands;
 use Illuminate\Console\Command;
 use Illuminate\Console\ConfirmableTrait;
 use Illuminate\Support\Facades\Artisan;
-use Illuminate\Filesystem\Filesystem;
 
 class ResetApp extends Command
 {
@@ -42,7 +41,7 @@ class ResetApp extends Command
      */
     public function handle()
     {
-        if (!$this->confirmToProceed()) {
+        if (! $this->confirmToProceed()) {
             return;
         }
 

app/Console/Commands/UpdateCommand.php

@@ -2,9 +2,9 @@
 
 namespace Crater\Console\Commands;
 
-use Illuminate\Console\Command;
-use Crater\Space\Updater;
 use Crater\Models\Setting;
+use Crater\Space\Updater;
+use Illuminate\Console\Command;
 
 // Implementation taken from Akaunting - https://github.com/akaunting/akaunting
 class UpdateCommand extends Command
@@ -57,42 +57,43 @@ class UpdateCommand extends Command
             return;
         }
 
-        if (!$this->version) {
+        if (! $this->version) {
             $this->info('No Update Available! You are already on the latest version.');
+
             return;
         }
 
-        if (!$this->confirm("Do you wish to update to {$this->version}?")) {
+        if (! $this->confirm("Do you wish to update to {$this->version}?")) {
             return;
         }
 
-        if (!$path = $this->download()) {
+        if (! $path = $this->download()) {
             return;
         }
 
-        if (!$path = $this->unzip($path)) {
+        if (! $path = $this->unzip($path)) {
             return;
         }
 
-        if (!$this->copyFiles($path)) {
+        if (! $this->copyFiles($path)) {
             return;
         }
 
-        if(isset($this->response->deleted_files) && !empty($this->response->deleted_files)) {
-            if (!$this->deleteFiles($this->response->deleted_files)) {
+        if (isset($this->response->deleted_files) && ! empty($this->response->deleted_files)) {
+            if (! $this->deleteFiles($this->response->deleted_files)) {
                 return;
             }
         }
 
-        if (!$this->migrateUpdate()) {
+        if (! $this->migrateUpdate()) {
             return;
         }
 
-        if (!$this->finish()) {
+        if (! $this->finish()) {
             return;
         }
 
-        $this->info('Successfully updated to ' . $this->version);
+        $this->info('Successfully updated to '.$this->version);
     }
 
     public function getInstalledVersion()
@@ -102,7 +103,7 @@ class UpdateCommand extends Command
 
     public function getLatestVersionResponse()
     {
-        $this->info('Your currently installed version is ' . $this->installed);
+        $this->info('Your currently installed version is '.$this->installed);
         $this->line('');
         $this->info('Checking for update...');
 
@@ -110,14 +111,12 @@ class UpdateCommand extends Command
             $response = Updater::checkForUpdate($this->installed);
 
             if ($response->success) {
-
                 $extensions = $response->version->extensions;
 
                 $is_required = false;
 
                 foreach ($extensions as $key => $extension) {
-
-                    if(!$extension) {
+                    if (! $extension) {
                         $is_required = true;
                         $this->info('❌ '.$key);
                     }
@@ -125,7 +124,7 @@ class UpdateCommand extends Command
                     $this->info('✅ '.$key);
                 }
 
-                if($is_required) {
+                if ($is_required) {
                     return 'extension_required';
                 }
 
@@ -146,8 +145,9 @@ class UpdateCommand extends Command
 
         try {
             $path = Updater::download($this->version, 1);
-            if (!is_string($path)) {
+            if (! is_string($path)) {
                 $this->error('Download exception');
+
                 return false;
             }
         } catch (\Exception $e) {
@@ -165,8 +165,9 @@ class UpdateCommand extends Command
 
         try {
             $path = Updater::unzip($path);
-            if (!is_string($path)) {
+            if (! is_string($path)) {
                 $this->error('Unzipping exception');
+
                 return false;
             }
         } catch (\Exception $e) {

app/Console/Kernel.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
@@ -13,7 +14,8 @@ class Kernel extends ConsoleKernel
      */
     protected $commands = [
         Commands\ResetApp::class,
-        Commands\UpdateCommand::class
+        Commands\UpdateCommand::class,
+        Commands\CreateTemplateCommand::class
     ];
 
     /**

app/Events/UpdateFinished.php

@@ -2,7 +2,7 @@
 
 namespace Crater\Events;
 
-use Illuminate\Foundation\Events\Dispatchable;  
+use Illuminate\Foundation\Events\Dispatchable;
 
 class UpdateFinished
 {

app/Exceptions/Handler.php

@@ -1,8 +1,9 @@
 <?php
+
 namespace Crater\Exceptions;
 
-use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {

app/Generators/CustomPathGenerator.php

@@ -1,9 +1,7 @@
 <?php
 
-
 namespace Crater\Generators;
 
-
 use Crater\Models\Estimate;
 use Crater\Models\Invoice;
 use Crater\Models\Payment;
@@ -12,20 +10,19 @@ use Spatie\MediaLibrary\Support\PathGenerator\PathGenerator;
 
 class CustomPathGenerator implements PathGenerator
 {
-
     public function getPath(Media $media): string
     {
-        return $this->getBasePath($media) . '/';
+        return $this->getBasePath($media).'/';
     }
 
     public function getPathForConversions(Media $media): string
     {
-        return $this->getBasePath($media) . '/conversations/';
+        return $this->getBasePath($media).'/conversations/';
     }
 
     public function getPathForResponsiveImages(Media $media): string
     {
-        return $this->getBasePath($media) . '/responsive-images/';
+        return $this->getBasePath($media).'/responsive-images/';
     }
 
     /*

app/Http/Controllers/Controller.php

@@ -1,12 +1,15 @@
 <?php
+
 namespace Crater\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
 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
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;
 }

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

@@ -3,10 +3,9 @@
 namespace Crater\Http\Controllers\V1\Auth;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Providers\RouteServiceProvider;
 use Crater\Models\User;
+use Crater\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\RegistersUsers;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 
 class RegisterController extends Controller
@@ -67,7 +66,7 @@ class RegisterController extends Controller
         return User::create([
             'name' => $data['name'],
             'email' => $data['email'],
-            'password' => $data['password']
+            'password' => $data['password'],
         ]);
     }
 }

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

@@ -4,10 +4,10 @@ namespace Crater\Http\Controllers\V1\Auth;
 
 use Crater\Http\Controllers\Controller;
 use Crater\Providers\RouteServiceProvider;
-use Illuminate\Support\Str;
 use Illuminate\Auth\Events\PasswordReset;
-use Illuminate\Http\Request;
 use Illuminate\Foundation\Auth\ResetsPasswords;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 
 class ResetPasswordController extends Controller
 {
@@ -31,7 +31,6 @@ class ResetPasswordController extends Controller
      */
     protected $redirectTo = RouteServiceProvider::HOME;
 
-
     /**
      * Get the response for a successful password reset.
      *
@@ -42,7 +41,7 @@ class ResetPasswordController extends Controller
     protected function sendResetResponse(Request $request, $response)
     {
         return response()->json([
-            'message' => 'Password reset successfully.'
+            'message' => 'Password reset successfully.',
         ]);
     }
 

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

@@ -1,4 +1,5 @@
 <?php
+
 // Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
 
 namespace Crater\Http\Controllers\V1\Backup;
@@ -12,12 +13,10 @@ class ApiController extends Controller
      *
      * @return JsonResponse
      */
-
     public function respondSuccess(): JsonResponse
     {
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
-
 }

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

@@ -1,17 +1,17 @@
 <?php
+
 // Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
 
 namespace Crater\Http\Controllers\V1\Backup;
 
+use Crater\Jobs\CreateBackupJob;
+use Crater\Rules\Backup\PathToZip;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Spatie\Backup\BackupDestination\Backup;
 use Spatie\Backup\BackupDestination\BackupDestination;
 use Spatie\Backup\Helpers\Format;
-use Crater\Jobs\CreateBackupJob;
-use Crater\Rules\Backup\BackupDisk;
-use Crater\Rules\Backup\PathToZip;
-use Illuminate\Http\JsonResponse;
 
 class BackupsController extends ApiController
 {
@@ -42,14 +42,14 @@ class BackupsController extends ApiController
 
             return response()->json([
                 'backups' => $backups,
-                'disks' => $configuredBackupDisks
+                'disks' => $configuredBackupDisks,
             ]);
         } catch (\Exception $e) {
             return response()->json([
                 'backups' => [],
                 'error' => 'invalid_disk_credentials',
                 'error_message' => $e->getMessage(),
-                'disks' => $configuredBackupDisks
+                'disks' => $configuredBackupDisks,
             ]);
         }
     }

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

@@ -1,14 +1,13 @@
 <?php
+
 // Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
 
 namespace Crater\Http\Controllers\V1\Backup;
 
-use Crater\Http\Controllers\Controller;
+use Crater\Rules\Backup\PathToZip;
 use Illuminate\Http\Request;
 use Spatie\Backup\BackupDestination\Backup;
 use Spatie\Backup\BackupDestination\BackupDestination;
-use Crater\Rules\Backup\BackupDisk;
-use Crater\Rules\Backup\PathToZip;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 

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

@@ -2,9 +2,9 @@
 
 namespace Crater\Http\Controllers\V1\CustomField;
 
-use Crater\Models\CustomField;
 use Crater\Http\Controllers\Controller;
 use Crater\Http\Requests\CustomFieldRequest;
+use Crater\Models\CustomField;
 use Illuminate\Http\Request;
 
 class CustomFieldsController extends Controller
@@ -16,19 +16,19 @@ class CustomFieldsController extends Controller
      */
     public function index(Request $request)
     {
-      $limit = $request->has('limit') ? $request->limit : 5;
+        $limit = $request->has('limit') ? $request->limit : 5;
 
-      $customFields = CustomField::whereCompany($request->header('company'))
+        $customFields = CustomField::whereCompany($request->header('company'))
             ->applyFilters($request->only([
                 'type',
-                'search'
+                'search',
             ]))
             ->latest()
             ->paginateData($limit);
 
 
         return response()->json([
-            'customFields' => $customFields
+            'customFields' => $customFields,
         ]);
     }
 
@@ -44,7 +44,7 @@ class CustomFieldsController extends Controller
 
         return response()->json([
             'customField' => $customField,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -58,7 +58,7 @@ class CustomFieldsController extends Controller
     {
         return response()->json([
             'customField' => $customField,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -75,7 +75,7 @@ class CustomFieldsController extends Controller
 
         return response()->json([
             'customField' => $customField,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -89,14 +89,14 @@ class CustomFieldsController extends Controller
     {
         if ($customField->customFieldValue()->exists()) {
             return response()->json([
-                'error' => 'values_attached'
+                'error' => 'values_attached',
             ]);
         }
 
         $customField->delete();
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -2,13 +2,13 @@
 
 namespace Crater\Http\Controllers\V1\Customer;
 
+use Carbon\Carbon;
 use Crater\Http\Controllers\Controller;
-use Crater\Models\Invoice;
+use Crater\Models\CompanySetting;
 use Crater\Models\Expense;
+use Crater\Models\Invoice;
 use Crater\Models\Payment;
 use Crater\Models\User;
-use Crater\Models\CompanySetting;
-use Carbon\Carbon;
 use Illuminate\Http\Request;
 
 class CustomerStatsController extends Controller
@@ -118,15 +118,15 @@ class CustomerStatsController extends Controller
         $netProfit = (int) $totalReceipts - (int) $totalExpenses;
 
         $chartData = [
-            'months'        => $months,
+            'months' => $months,
             'invoiceTotals' => $invoiceTotals,
             'expenseTotals' => $expenseTotals,
             'receiptTotals' => $receiptTotals,
-            'netProfit'     => $netProfit,
-            'netProfits'     => $netProfits,
-            'salesTotal'    => $salesTotal,
+            'netProfit' => $netProfit,
+            'netProfits' => $netProfits,
+            'salesTotal' => $salesTotal,
             'totalReceipts' => $totalReceipts,
-            'totalExpenses' => $totalExpenses
+            'totalExpenses' => $totalExpenses,
         ];
 
         $customer = User::with([
@@ -135,7 +135,7 @@ class CustomerStatsController extends Controller
             'billingAddress.country',
             'shippingAddress.country',
             'currency',
-            'fields.customField'
+            'fields.customField',
         ])->find($customer->id);
 
         return response()->json([

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

@@ -2,13 +2,12 @@
 
 namespace Crater\Http\Controllers\V1\Customer;
 
-use Illuminate\Http\Request;
+use Crater\Http\Controllers\Controller;
 use Crater\Http\Requests;
 use Crater\Models\User;
-use Crater\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
-
 class CustomersController extends Controller
 {
     /**
@@ -29,7 +28,7 @@ class CustomersController extends Controller
                 'phone',
                 'customer_id',
                 'orderByField',
-                'orderBy'
+                'orderBy',
             ]))
             ->whereCompany($request->header('company'))
             ->select(
@@ -42,7 +41,7 @@ class CustomersController extends Controller
 
         return response()->json([
             'customers' => $customers,
-            'customerTotalCount' => User::whereRole('customer')->count()
+            'customerTotalCount' => User::whereRole('customer')->count(),
         ]);
     }
 
@@ -58,7 +57,7 @@ class CustomersController extends Controller
 
         return response()->json([
             'customer' => $customer,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -74,7 +73,7 @@ class CustomersController extends Controller
             'billingAddress.country',
             'shippingAddress.country',
             'fields.customField',
-            'creator'
+            'creator',
         ]);
 
         $currency = $customer->currency;
@@ -85,7 +84,6 @@ class CustomersController extends Controller
         ]);
     }
 
-
     /**
      * Update the specified resource in storage.
      *
@@ -101,7 +99,7 @@ class CustomersController extends Controller
 
         return response()->json([
             'customer' => $customer,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -116,7 +114,7 @@ class CustomersController extends Controller
         User::deleteCustomers($request->ids);
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

app/Http/Controllers/V1/Dashboard/DashboardChartController.php

@@ -2,8 +2,8 @@
 
 namespace Crater\Http\Controllers\V1\Dashboard;
 
-use Crater\Models\Expense;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Expense;
 use Illuminate\Http\Request;
 
 class DashboardChartController extends Controller

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

@@ -1,15 +1,16 @@
 <?php
+
 namespace Crater\Http\Controllers\V1\Dashboard;
 
-use Illuminate\Http\Request;
-use Crater\Models\Estimate;
-use Crater\Models\Invoice;
-use Crater\Models\CompanySetting;
-use Crater\Models\Expense;
-use Crater\Models\Payment;
 use Carbon\Carbon;
-use Crater\Models\User;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\CompanySetting;
+use Crater\Models\Estimate;
+use Crater\Models\Expense;
+use Crater\Models\Invoice;
+use Crater\Models\Payment;
+use Crater\Models\User;
+use Illuminate\Http\Request;
 
 class DashboardController extends Controller
 {
@@ -113,11 +114,11 @@ class DashboardController extends Controller
         $netProfit = (int)$totalReceipts - (int)$totalExpenses;
 
         $chartData = [
-            'months'        => $months,
+            'months' => $months,
             'invoiceTotals' => $invoiceTotals,
             'expenseTotals' => $expenseTotals,
             'receiptTotals' => $receiptTotals,
-            'netProfits'    => $netProfits
+            'netProfits' => $netProfits,
         ];
 
         $customersCount = User::customer()->whereCompany($request->header('company'))->get()->count();
@@ -138,7 +139,7 @@ class DashboardController extends Controller
             'salesTotal' => $salesTotal,
             'totalReceipts' => $totalReceipts,
             'totalExpenses' => $totalExpenses,
-            'netProfit' => $netProfit
+            'netProfit' => $netProfit,
         ]);
     }
 }

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

@@ -2,9 +2,9 @@
 
 namespace Crater\Http\Controllers\V1\Estimate;
 
-use Illuminate\Http\Request;
 use Crater\Http\Controllers\Controller;
 use Crater\Models\Estimate;
+use Illuminate\Http\Request;
 
 class ChangeEstimateStatusController extends Controller
 {
@@ -15,12 +15,12 @@ class ChangeEstimateStatusController extends Controller
     * @param  Estimate $estimate
     * @return \Illuminate\Http\Response
     */
-   public function __invoke(Request $request, Estimate $estimate)
-   {
+    public function __invoke(Request $request, Estimate $estimate)
+    {
         $estimate->update($request->only('status'));
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -2,12 +2,12 @@
 
 namespace Crater\Http\Controllers\V1\Estimate;
 
-use Illuminate\Http\Request;
+use Carbon\Carbon;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\CompanySetting;
 use Crater\Models\Estimate;
 use Crater\Models\Invoice;
-use Carbon\Carbon;
-use Crater\Models\CompanySetting;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class ConvertEstimateController extends Controller
@@ -21,7 +21,7 @@ class ConvertEstimateController extends Controller
     */
     public function __invoke(Request $request, Estimate $estimate)
     {
-        $estimate->load(['items', 'items.taxes', 'user', 'estimateTemplate', 'taxes']);
+        $estimate->load(['items', 'items.taxes', 'user', 'taxes']);
 
         $invoice_date = Carbon::now();
         $due_date = Carbon::now()->addDays(7);
@@ -35,11 +35,11 @@ class ConvertEstimateController extends Controller
             'creator_id' => Auth::id(),
             'invoice_date' => $invoice_date->format('Y-m-d'),
             'due_date' => $due_date->format('Y-m-d'),
-            'invoice_number' => $invoice_prefix . "-" . Invoice::getNextInvoiceNumber($invoice_prefix),
+            'invoice_number' => $invoice_prefix."-".Invoice::getNextInvoiceNumber($invoice_prefix),
             'reference_number' => $estimate->reference_number,
             'user_id' => $estimate->user_id,
             'company_id' => $request->header('company'),
-            'invoice_template_id' => 1,
+            'template_name' => 'invoice1',
             'status' => Invoice::STATUS_DRAFT,
             'paid_status' => Invoice::STATUS_UNPAID,
             'sub_total' => $estimate->sub_total,
@@ -52,7 +52,7 @@ class ConvertEstimateController extends Controller
             'discount_per_item' => $estimate->discount_per_item,
             'tax' => $estimate->tax,
             'notes' => $estimate->notes,
-            'unique_hash' => str_random(60)
+            'unique_hash' => str_random(60),
         ]);
 
         $invoiceItems = $estimate->items->toArray();
@@ -84,12 +84,11 @@ class ConvertEstimateController extends Controller
         $invoice = Invoice::with([
             'items',
             'user',
-            'invoiceTemplate',
             'taxes'
         ])->find($invoice->id);
 
         return response()->json([
-            'invoice' => $invoice
+            'invoice' => $invoice,
         ]);
     }
 }

app/Http/Controllers/V1/Estimate/EstimatePdfController.php

@@ -2,8 +2,8 @@
 
 namespace Crater\Http\Controllers\V1\Estimate;
 
-use Crater\Models\Estimate; 
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Estimate;
 
 class EstimatePdfController extends Controller
 {

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

@@ -2,9 +2,10 @@
 
 namespace Crater\Http\Controllers\V1\Estimate;
 
-use Crater\Models\EstimateTemplate;
 use Crater\Http\Controllers\Controller;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 class EstimateTemplatesController extends Controller
 {
@@ -16,8 +17,17 @@ class EstimateTemplatesController extends Controller
      */
     public function __invoke(Request $request)
     {
+        $templates = Storage::disk('views')->files('/app/pdf/estimate');
+        $estimateTemplates = [];
+
+        foreach ($templates as $key => $template) {
+            $templateName = Str::before(basename($template), '.blade.php');
+            $estimateTemplates[$key]['name'] = $templateName;
+            $estimateTemplates[$key]['path'] = asset('assets/img/PDF/'.$templateName.'.png');
+        }
+
         return response()->json([
-            'templates' => EstimateTemplate::all()
+            'templates' => $estimateTemplates
         ]);
     }
 }

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

@@ -2,12 +2,12 @@
 
 namespace Crater\Http\Controllers\V1\Estimate;
 
-use Illuminate\Http\Request;
-use Crater\Models\Estimate;
-use Crater\Http\Requests\EstimatesRequest;
 use Crater\Http\Controllers\Controller;
 use Crater\Http\Requests\DeleteEstimatesRequest;
+use Crater\Http\Requests\EstimatesRequest;
 use Crater\Jobs\GenerateEstimatePdfJob;
+use Crater\Models\Estimate;
+use Illuminate\Http\Request;
 
 class EstimatesController extends Controller
 {
@@ -18,9 +18,8 @@ class EstimatesController extends Controller
         $estimates = Estimate::with([
                 'items',
                 'user',
-                'estimateTemplate',
                 'taxes',
-                'creator'
+                'creator',
             ])
             ->join('users', 'users.id', '=', 'estimates.user_id')
             ->applyFilters($request->only([
@@ -32,7 +31,7 @@ class EstimatesController extends Controller
                 'to_date',
                 'search',
                 'orderByField',
-                'orderBy'
+                'orderBy',
             ]))
             ->whereCompany($request->header('company'))
             ->select('estimates.*', 'users.name')
@@ -41,7 +40,7 @@ class EstimatesController extends Controller
 
         $siteData = [
             'estimates' => $estimates,
-            'estimateTotalCount' => Estimate::count()
+            'estimateTotalCount' => Estimate::count(),
         ];
 
         return response()->json($siteData);
@@ -58,7 +57,7 @@ class EstimatesController extends Controller
         GenerateEstimatePdfJob::dispatch($estimate);
 
         return response()->json([
-            'estimate' => $estimate
+            'estimate' => $estimate,
         ]);
     }
 
@@ -68,11 +67,10 @@ class EstimatesController extends Controller
             'items',
             'items.taxes',
             'user',
-            'estimateTemplate',
             'creator',
             'taxes',
             'taxes.taxType',
-            'fields.customField'
+            'fields.customField',
         ]);
 
         return response()->json([
@@ -89,7 +87,7 @@ class EstimatesController extends Controller
         GenerateEstimatePdfJob::dispatch($estimate, true);
 
         return response()->json([
-            'estimate' => $estimate
+            'estimate' => $estimate,
         ]);
     }
 
@@ -98,7 +96,7 @@ class EstimatesController extends Controller
         Estimate::destroy($request->ids);
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -3,8 +3,8 @@
 namespace Crater\Http\Controllers\V1\Estimate;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Models\Estimate;
 use Crater\Http\Requests\SendEstimatesRequest;
+use Crater\Models\Estimate;
 
 class SendEstimateController extends Controller
 {

app/Http/Controllers/V1/Expense/DownloadReceiptController.php

@@ -2,8 +2,8 @@
 
 namespace Crater\Http\Controllers\V1\Expense;
 
-use Crater\Models\Expense;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Expense;
 
 class DownloadReceiptController extends Controller
 {
@@ -23,12 +23,13 @@ class DownloadReceiptController extends Controller
                 $imagePath = $media->getPath();
                 $response = \Response::download($imagePath, $media->file_name);
                 ob_end_clean();
+
                 return $response;
             }
         }
 
         return response()->json([
-            'error' => 'receipt_not_found'
+            'error' => 'receipt_not_found',
         ]);
     }
 }

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

@@ -1,10 +1,11 @@
 <?php
+
 namespace Crater\Http\Controllers\V1\Expense;
 
+use Crater\Http\Controllers\Controller;
+use Crater\Http\Requests\ExpenseCategoryRequest;
 use Crater\Models\ExpenseCategory;
 use Illuminate\Http\Request;
-use Crater\Http\Requests\ExpenseCategoryRequest;
-use Crater\Http\Controllers\Controller;
 
 class ExpenseCategoriesController extends Controller
 {
@@ -20,13 +21,13 @@ class ExpenseCategoriesController extends Controller
         $categories = ExpenseCategory::whereCompany($request->header('company'))
             ->applyFilters($request->only([
                 'category_id',
-                'search'
+                'search',
             ]))
             ->latest()
             ->paginateData($limit);
 
         return response()->json([
-            'categories' => $categories
+            'categories' => $categories,
         ]);
     }
 
@@ -44,7 +45,7 @@ class ExpenseCategoriesController extends Controller
 
         return response()->json([
             'category' => $category,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -57,7 +58,7 @@ class ExpenseCategoriesController extends Controller
     public function show(ExpenseCategory $category)
     {
         return response()->json([
-            'category' => $category
+            'category' => $category,
         ]);
     }
 
@@ -74,7 +75,7 @@ class ExpenseCategoriesController extends Controller
 
         return response()->json([
             'category' => $category,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -88,14 +89,14 @@ class ExpenseCategoriesController extends Controller
     {
         if ($category->expenses() && $category->expenses()->count() > 0) {
             return response()->json([
-                'success' => false
+                'success' => false,
             ]);
         }
 
         $category->delete();
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -2,11 +2,11 @@
 
 namespace Crater\Http\Controllers\V1\Expense;
 
-use Crater\Models\Expense;
-use Illuminate\Http\Request;
-use Crater\Http\Requests\ExpenseRequest;
 use Crater\Http\Controllers\Controller;
 use Crater\Http\Requests\DeleteExpensesRequest;
+use Crater\Http\Requests\ExpenseRequest;
+use Crater\Models\Expense;
+use Illuminate\Http\Request;
 
 class ExpensesController extends Controller
 {
@@ -30,7 +30,7 @@ class ExpensesController extends Controller
                 'from_date',
                 'to_date',
                 'orderByField',
-                'orderBy'
+                'orderBy',
             ]))
             ->whereCompany($request->header('company'))
             ->select('expenses.*', 'expense_categories.name', 'users.name as user_name')
@@ -38,7 +38,7 @@ class ExpensesController extends Controller
 
         return response()->json([
             'expenses' => $expenses,
-            'expenseTotalCount' => Expense::count()
+            'expenseTotalCount' => Expense::count(),
         ]);
     }
 
@@ -54,7 +54,7 @@ class ExpensesController extends Controller
 
         return response()->json([
             'expense' => $expense,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -69,7 +69,7 @@ class ExpensesController extends Controller
         $expense->load('creator', 'fields.customField');
 
         return response()->json([
-            'expense' => $expense
+            'expense' => $expense,
         ]);
     }
 
@@ -86,7 +86,7 @@ class ExpensesController extends Controller
 
         return response()->json([
             'expense' => $expense,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -95,7 +95,7 @@ class ExpensesController extends Controller
         Expense::destroy($request->ids);
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -2,8 +2,8 @@
 
 namespace Crater\Http\Controllers\V1\Expense;
 
-use Crater\Models\Expense;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Expense;
 
 class ShowReceiptController extends Controller
 {
@@ -15,7 +15,7 @@ class ShowReceiptController extends Controller
      */
     public function __invoke(Expense $expense)
     {
-        $imagePath  = null;
+        $imagePath = null;
 
         if ($expense) {
             $media = $expense->getFirstMedia('receipts');
@@ -23,18 +23,18 @@ class ShowReceiptController extends Controller
                 $imagePath = $media->getPath();
             } else {
                 return response()->json([
-                    'error' => 'receipt_does_not_exist'
+                    'error' => 'receipt_does_not_exist',
                 ]);
             }
         }
 
         $type = \File::mimeType($imagePath);
 
-        $image = 'data:' . $type . ';base64,' . base64_encode(file_get_contents($imagePath));
+        $image = 'data:'.$type.';base64,'.base64_encode(file_get_contents($imagePath));
 
         return response()->json([
             'image' => $image,
-            'type' => $type
+            'type' => $type,
         ]);
     }
 }

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

@@ -2,8 +2,8 @@
 
 namespace Crater\Http\Controllers\V1\Expense;
 
-use Crater\Models\Expense;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Expense;
 use Illuminate\Http\Request;
 
 class UploadReceiptController extends Controller
@@ -30,7 +30,7 @@ class UploadReceiptController extends Controller
         }
 
         return response()->json([
-            'success' => 'Expense receipts uploaded successfully'
+            'success' => 'Expense receipts uploaded successfully',
         ]);
     }
 }

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

@@ -2,13 +2,12 @@
 
 namespace Crater\Http\Controllers\V1\General;
 
-use Crater\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Crater\Models\Currency;
-use Crater\Models\Country;
 use Auth;
+use Crater\Http\Controllers\Controller;
 use Crater\Models\CompanySetting;
-use Crater\Models\CustomField;
+use Crater\Models\Country;
+use Crater\Models\Currency;
+use Illuminate\Http\Request;
 
 class BootstrapController extends Controller
 {
@@ -22,14 +21,16 @@ class BootstrapController extends Controller
     {
         $user = Auth::user();
 
-        $default_language = $user->getSettings(['language'])['language'];
+        $default_language = $user->getSettings(['language']);
+
+        $default_language = array_key_exists('language', $default_language) ? $default_language['language'] : 'en';
 
         $settings = [
             'moment_date_format',
             'carbon_date_format',
             'fiscal_year',
             'time_zone',
-            'currency'
+            'currency',
         ];
 
         $settings = CompanySetting::getSettings($settings, $user->company_id);
@@ -46,7 +47,7 @@ class BootstrapController extends Controller
             'moment_date_format' => $settings['moment_date_format'],
             'carbon_date_format' => $settings['carbon_date_format'],
             'fiscal_year' => $settings['fiscal_year'],
-            'time_zone' => $settings['time_zone']
+            'time_zone' => $settings['time_zone'],
         ]);
     }
 }

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

@@ -2,8 +2,8 @@
 
 namespace Crater\Http\Controllers\V1\General;
 
-use Crater\Models\Country;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Country;
 use Illuminate\Http\Request;
 
 class CountriesController extends Controller
@@ -17,7 +17,7 @@ class CountriesController extends Controller
     public function __invoke(Request $request)
     {
         return response()->json([
-            'countries' => Country::all()
+            'countries' => Country::all(),
         ]);
     }
 }

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

@@ -2,8 +2,8 @@
 
 namespace Crater\Http\Controllers\V1\General;
 
-use Crater\Models\Currency;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Currency;
 use Illuminate\Http\Request;
 
 class CurrenciesController extends Controller
@@ -19,7 +19,7 @@ class CurrenciesController extends Controller
         $currencies = Currency::latest()->get();
 
         return response()->json([
-            'currencies' => $currencies
+            'currencies' => $currencies,
         ]);
     }
 }

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

@@ -17,7 +17,7 @@ class DateFormatsController extends Controller
     public function __invoke(Request $request)
     {
         return response()->json([
-            'date_formats' => DateFormatter::get_list()
+            'date_formats' => DateFormatter::get_list(),
         ]);
     }
 }

app/Http/Controllers/V1/General/FiscalYearsController.php

@@ -16,7 +16,7 @@ class FiscalYearsController extends Controller
     public function __invoke(Request $request)
     {
         return response()->json([
-            'fiscal_years' => config('crater.fiscal_years')
+            'fiscal_years' => config('crater.fiscal_years'),
         ]);
     }
 }

app/Http/Controllers/V1/General/LanguagesController.php

@@ -16,7 +16,7 @@ class LanguagesController extends Controller
     public function __invoke(Request $request)
     {
         return response()->json([
-            'languages' => config('crater.languages')
+            'languages' => config('crater.languages'),
         ]);
     }
 }

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

@@ -2,11 +2,11 @@
 
 namespace Crater\Http\Controllers\V1\General;
 
-use Crater\Models\Invoice;
-use Crater\Models\Estimate;
-use Crater\Models\Payment;
-use Crater\Models\CompanySetting;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\CompanySetting;
+use Crater\Models\Estimate;
+use Crater\Models\Invoice;
+use Crater\Models\Payment;
 use Illuminate\Http\Request;
 
 class NextNumberController extends Controller
@@ -21,7 +21,7 @@ class NextNumberController extends Controller
     {
         $key = $request->key;
 
-        $val = $key . '_prefix';
+        $val = $key.'_prefix';
 
         $prefix = CompanySetting::getSetting(
             $val,
@@ -33,14 +33,17 @@ class NextNumberController extends Controller
         switch ($key) {
             case 'invoice':
                 $nextNumber = Invoice::getNextInvoiceNumber($prefix);
+
                 break;
 
             case 'estimate':
                 $nextNumber = Estimate::getNextEstimateNumber($prefix);
+
                 break;
 
             case 'payment':
                 $nextNumber = Payment::getNextPaymentNumber($prefix);
+
                 break;
 
             default:
@@ -49,7 +52,7 @@ class NextNumberController extends Controller
 
         return response()->json([
             'nextNumber' => $nextNumber,
-            'prefix' => $prefix
+            'prefix' => $prefix,
         ]);
     }
 }

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

@@ -23,7 +23,7 @@ class NotesController extends Controller
             ->paginate($limit);
 
         return response()->json([
-            'notes' => $notes
+            'notes' => $notes,
         ]);
     }
 
@@ -38,7 +38,7 @@ class NotesController extends Controller
         $note = Note::create($request->validated());
 
         return response()->json([
-            'note' => $note
+            'note' => $note,
         ]);
     }
 
@@ -51,7 +51,7 @@ class NotesController extends Controller
     public function show(Note $note)
     {
         return response()->json([
-            'note' => $note
+            'note' => $note,
         ]);
     }
 
@@ -67,7 +67,7 @@ class NotesController extends Controller
         $note->update($request->validated());
 
         return response()->json([
-            'note' => $note
+            'note' => $note,
         ]);
     }
 
@@ -82,7 +82,7 @@ class NotesController extends Controller
         $note->delete();
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -31,7 +31,7 @@ class SearchController extends Controller
 
         return response()->json([
             'customers' => $customers,
-            'users' => $users ?? []
+            'users' => $users ?? [],
         ]);
     }
 }

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

@@ -17,7 +17,7 @@ class TimezonesController extends Controller
     public function __invoke(Request $request)
     {
         return response()->json([
-            'time_zones' => TimeZones::get_list()
+            'time_zones' => TimeZones::get_list(),
         ]);
     }
 }

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

@@ -2,9 +2,9 @@
 
 namespace Crater\Http\Controllers\V1\Invoice;
 
-use Illuminate\Http\Request;
 use Crater\Http\Controllers\Controller;
 use Crater\Models\Invoice;
+use Illuminate\Http\Request;
 
 class ChangeInvoiceStatusController extends Controller
 {
@@ -14,8 +14,8 @@ class ChangeInvoiceStatusController extends Controller
     * @param  \Illuminate\Http\Request  $request
     * @return \Illuminate\Http\JsonResponse
     */
-   public function __invoke(Request $request, Invoice $invoice)
-   {
+    public function __invoke(Request $request, Invoice $invoice)
+    {
         if ($request->status == Invoice::STATUS_SENT) {
             $invoice->status = Invoice::STATUS_SENT;
             $invoice->sent = true;
@@ -28,7 +28,7 @@ class ChangeInvoiceStatusController extends Controller
         }
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -2,11 +2,11 @@
 
 namespace Crater\Http\Controllers\V1\Invoice;
 
-use Illuminate\Http\Request;
-use Crater\Http\Controllers\Controller;
-use Crater\Models\Invoice;
 use Carbon\Carbon;
+use Crater\Http\Controllers\Controller;
 use Crater\Models\CompanySetting;
+use Crater\Models\Invoice;
+use Illuminate\Http\Request;
 
 class CloneInvoiceController extends Controller
 {
@@ -28,11 +28,11 @@ class CloneInvoiceController extends Controller
         $newInvoice = Invoice::create([
             'invoice_date' => $date->format('Y-m-d'),
             'due_date' => $date->format('Y-m-d'),
-            'invoice_number' => $invoice_prefix . "-" . Invoice::getNextInvoiceNumber($invoice_prefix),
+            'invoice_number' => $invoice_prefix."-".Invoice::getNextInvoiceNumber($invoice_prefix),
             'reference_number' => $invoice->reference_number,
             'user_id' => $invoice->user_id,
             'company_id' => $request->header('company'),
-            'invoice_template_id' => 1,
+            'template_name' => 'invoice1',
             'status' => Invoice::STATUS_DRAFT,
             'paid_status' => Invoice::STATUS_UNPAID,
             'sub_total' => $invoice->sub_total,
@@ -45,7 +45,7 @@ class CloneInvoiceController extends Controller
             'discount_per_item' => $invoice->discount_per_item,
             'tax' => $invoice->tax,
             'notes' => $invoice->notes,
-            'unique_hash' => str_random(60)
+            'unique_hash' => str_random(60),
         ]);
 
         $invoice->load('items.taxes');
@@ -78,14 +78,13 @@ class CloneInvoiceController extends Controller
         $newInvoice = Invoice::with([
                 'items',
                 'user',
-                'invoiceTemplate',
                 'taxes'
             ])
             ->find($newInvoice->id);
 
         return response()->json([
             'invoice' => $newInvoice,
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -3,8 +3,9 @@
 namespace Crater\Http\Controllers\V1\Invoice;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Models\InvoiceTemplate;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 class InvoiceTemplatesController extends Controller
 {
@@ -16,10 +17,17 @@ class InvoiceTemplatesController extends Controller
      */
     public function __invoke(Request $request)
     {
-        $invoiceTemplates = InvoiceTemplate::all();
+        $templates = Storage::disk('views')->files('/app/pdf/invoice');
+        $invoiceTemplates = [];
+
+        foreach ($templates as $key => $template) {
+            $templateName = Str::before(basename($template), '.blade.php');
+            $invoiceTemplates[$key]['name'] = $templateName;
+            $invoiceTemplates[$key]['path'] = asset('assets/img/PDF/'.$templateName.'.png');
+        }
 
         return response()->json([
-            'invoiceTemplates' => $invoiceTemplates
+            'invoiceTemplates' => $invoiceTemplates,
         ]);
     }
 }

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

@@ -2,12 +2,12 @@
 
 namespace Crater\Http\Controllers\V1\Invoice;
 
-use Illuminate\Http\Request;
-use Crater\Http\Requests;
-use Crater\Models\Invoice;
 use Crater\Http\Controllers\Controller;
+use Crater\Http\Requests;
 use Crater\Http\Requests\DeleteInvoiceRequest;
 use Crater\Jobs\GenerateInvoicePdfJob;
+use Crater\Models\Invoice;
+use Illuminate\Http\Request;
 
 class InvoicesController extends Controller
 {
@@ -20,7 +20,7 @@ class InvoicesController extends Controller
     {
         $limit = $request->has('limit') ? $request->limit : 10;
 
-        $invoices = Invoice::with(['items', 'user', 'creator', 'invoiceTemplate', 'taxes'])
+        $invoices = Invoice::with(['items', 'user', 'creator', 'taxes'])
             ->join('users', 'users.id', '=', 'invoices.user_id')
             ->applyFilters($request->only([
                 'status',
@@ -41,7 +41,7 @@ class InvoicesController extends Controller
 
         return response()->json([
             'invoices' => $invoices,
-            'invoiceTotalCount' => Invoice::count()
+            'invoiceTotalCount' => Invoice::count(),
         ]);
     }
 
@@ -62,7 +62,7 @@ class InvoicesController extends Controller
         GenerateInvoicePdfJob::dispatch($invoice);
 
         return response()->json([
-            'invoice' => $invoice
+            'invoice' => $invoice,
         ]);
     }
 
@@ -78,9 +78,8 @@ class InvoicesController extends Controller
             'items',
             'items.taxes',
             'user',
-            'invoiceTemplate',
             'taxes.taxType',
-            'fields.customField'
+            'fields.customField',
         ]);
 
         $siteData = [
@@ -107,7 +106,7 @@ class InvoicesController extends Controller
 
         return response()->json([
             'invoice' => $invoice,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -122,7 +121,7 @@ class InvoicesController extends Controller
         Invoice::destroy($request->ids);
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -3,8 +3,8 @@
 namespace Crater\Http\Controllers\V1\Invoice;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Models\Invoice;
 use Crater\Http\Requests\SendInvoiceRequest;
+use Crater\Models\Invoice;
 
 class SendInvoiceController extends Controller
 {
@@ -19,7 +19,7 @@ class SendInvoiceController extends Controller
         $invoice->send($request->all());
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -3,11 +3,11 @@
 namespace Crater\Http\Controllers\V1\Item;
 
 use Crater\Http\Controllers\Controller;
-use Illuminate\Http\Request;
 use Crater\Http\Requests;
 use Crater\Http\Requests\DeleteItemsRequest;
 use Crater\Models\Item;
 use Crater\Models\TaxType;
+use Illuminate\Http\Request;
 
 class ItemsController extends Controller
 {
@@ -29,7 +29,7 @@ class ItemsController extends Controller
                 'unit_id',
                 'item_id',
                 'orderByField',
-                'orderBy'
+                'orderBy',
             ]))
             ->whereCompany($request->header('company'))
             ->select('items.*', 'units.name as unit_name')
@@ -39,7 +39,7 @@ class ItemsController extends Controller
         return response()->json([
             'items' => $items,
             'taxTypes' => TaxType::latest()->get(),
-            'itemTotalCount' => Item::count()
+            'itemTotalCount' => Item::count(),
         ]);
     }
 
@@ -54,7 +54,7 @@ class ItemsController extends Controller
         $item = Item::createItem($request);
 
         return response()->json([
-            'item' => $item
+            'item' => $item,
         ]);
     }
 
@@ -69,7 +69,7 @@ class ItemsController extends Controller
         $item->load('taxes');
 
         return response()->json([
-            'item' => $item
+            'item' => $item,
         ]);
     }
 
@@ -85,7 +85,7 @@ class ItemsController extends Controller
         $item = $item->updateItem($request);
 
         return response()->json([
-            'item' => $item
+            'item' => $item,
         ]);
     }
 
@@ -100,7 +100,7 @@ class ItemsController extends Controller
         Item::destroy($request->ids);
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -2,10 +2,10 @@
 
 namespace Crater\Http\Controllers\V1\Item;
 
+use Crater\Http\Controllers\Controller;
+use Crater\Http\Requests\UnitRequest;
 use Crater\Models\Unit;
 use Illuminate\Http\Request;
-use Crater\Http\Requests\UnitRequest;
-use Crater\Http\Controllers\Controller;
 
 class UnitsController extends Controller
 {
@@ -20,13 +20,13 @@ class UnitsController extends Controller
 
         $units = Unit::whereCompany($request->header('company'))
             ->applyFilters($request->only([
-                'unit_id'
+                'unit_id',
             ]))
             ->latest()
             ->paginateData($limit);
 
         return response()->json([
-            'units' => $units
+            'units' => $units,
         ]);
     }
 
@@ -53,7 +53,7 @@ class UnitsController extends Controller
         $unit = Unit::create($data);
 
         return response()->json([
-            'unit' => $unit
+            'unit' => $unit,
         ]);
     }
 
@@ -66,7 +66,7 @@ class UnitsController extends Controller
     public function show(Unit $unit)
     {
         return response()->json([
-            'unit' => $unit
+            'unit' => $unit,
         ]);
     }
 
@@ -82,7 +82,7 @@ class UnitsController extends Controller
         $unit->update($request->validated());
 
         return response()->json([
-            'unit' => $unit
+            'unit' => $unit,
         ]);
     }
 
@@ -96,14 +96,14 @@ class UnitsController extends Controller
     {
         if ($unit->items()->exists()) {
             return response()->json([
-                'error' => 'items_attached'
+                'error' => 'items_attached',
             ]);
         }
 
         $unit->delete();
 
         return response()->json([
-            'success' => 'Unit deleted successfully'
+            'success' => 'Unit deleted successfully',
         ]);
     }
 }

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

@@ -5,6 +5,7 @@ namespace Crater\Http\Controllers\V1\Mobile;
 use Crater\Http\Controllers\Controller;
 use Crater\Models\User;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\ValidationException;
 
@@ -28,7 +29,7 @@ class AuthController extends Controller
 
         return response()->json([
             'type' => 'Bearer',
-            'token' => $user->createToken($request->device_name)->plainTextToken
+            'token' => $user->createToken($request->device_name)->plainTextToken,
         ]);
     }
 
@@ -37,7 +38,12 @@ class AuthController extends Controller
         $request->user()->currentAccessToken()->delete();
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
+
+    public function check()
+    {
+        return Auth::check();
+    }
 }

app/Http/Controllers/V1/Mobile/Customer/EstimatePdfController.php

@@ -2,13 +2,10 @@
 
 namespace Crater\Http\Controllers\V1\Mobile\Customer;
 
-use Barryvdh\DomPDF\PDF;
-use Crater\Models\Company;
-use Crater\Models\CompanySetting;
-use Crater\Models\Estimate;
-use Crater\Models\EstimateTemplate;
 use Crater\Http\Controllers\Controller;
 use Crater\Mail\EstimateViewedMail;
+use Crater\Models\CompanySetting;
+use Crater\Models\Estimate;
 use Crater\Models\User;
 
 class EstimatePdfController extends Controller

app/Http/Controllers/V1/Mobile/Customer/InvoicePdfController.php

@@ -2,13 +2,10 @@
 
 namespace Crater\Http\Controllers\V1\Mobile\Customer;
 
-use Barryvdh\DomPDF\PDF;
-use Crater\Models\Company;
-use Crater\Models\CompanySetting;
 use Crater\Http\Controllers\Controller;
-use Crater\Models\Invoice;
-use Crater\Models\InvoiceTemplate;
 use Crater\Mail\InvoiceViewedMail;
+use Crater\Models\CompanySetting;
+use Crater\Models\Invoice;
 use Crater\Models\User;
 
 class InvoicePdfController extends Controller

app/Http/Controllers/V1/Onboarding/AppDomainController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Crater\Http\Controllers\V1\Onboarding;
+
+use Crater\Http\Controllers\Controller;
+use Crater\Http\Requests\DomainEnvironmentRequest;
+use Crater\Space\EnvironmentManager;
+use Illuminate\Support\Facades\Artisan;
+
+class AppDomainController extends Controller
+{
+    /**
+     *
+     * @param DomainEnvironmentRequest $request
+     */
+    public function __invoke(DomainEnvironmentRequest $request)
+    {
+        Artisan::call('optimize:clear');
+
+        $environmentManager = new EnvironmentManager();
+
+        $results = $environmentManager->saveDomainVariables($request);
+
+        if (in_array('error', $results)) {
+            return response()->json($results);
+        }
+
+        return response()->json([
+            'success' => false,
+        ]);
+    }
+}

app/Http/Controllers/V1/Onboarding/DatabaseConfigurationController.php

@@ -3,10 +3,10 @@
 namespace Crater\Http\Controllers\V1\Onboarding;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Space\EnvironmentManager;
 use Crater\Http\Requests\DatabaseEnvironmentRequest;
-use Illuminate\Support\Facades\Artisan;
+use Crater\Space\EnvironmentManager;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Artisan;
 
 class DatabaseConfigurationController extends Controller
 {
@@ -36,6 +36,7 @@ class DatabaseConfigurationController extends Controller
 
         if (array_key_exists("success", $results)) {
             Artisan::call('key:generate --force');
+            Artisan::call('optimize:clear');
             Artisan::call('config:clear');
             Artisan::call('cache:clear');
             Artisan::call('storage:link');
@@ -55,6 +56,7 @@ class DatabaseConfigurationController extends Controller
                     'database_connection' => 'sqlite',
                     'database_name' => database_path('database.sqlite'),
                 ];
+
                 break;
 
             case 'pgsql':
@@ -63,6 +65,7 @@ class DatabaseConfigurationController extends Controller
                     'database_host' => '127.0.0.1',
                     'database_port' => 5432,
                 ];
+
                 break;
 
             case 'mysql':
@@ -71,21 +74,15 @@ class DatabaseConfigurationController extends Controller
                     'database_host' => '127.0.0.1',
                     'database_port' => 3306,
                 ];
+
                 break;
 
-            case 'sqlsrv':
-                $databaseData = [
-                    'driver' => 'sqlsrv',
-                    'host' => '127.0.0.1',
-                    'port' => 1433,
-                ];
-                break;
         }
 
 
         return response()->json([
             'config' => $databaseData,
-            'success' => true
+            'success' => true,
         ]);
     }
 }

app/Http/Controllers/V1/Onboarding/FinishController.php

@@ -3,9 +3,7 @@
 namespace Crater\Http\Controllers\V1\Onboarding;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Models\User;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 
 class FinishController extends Controller
 {
@@ -19,7 +17,6 @@ class FinishController extends Controller
     {
         \Storage::disk('local')->put('database_created', 'database_created');
 
-        $user = User::where('role', 'super admin')->first();
-        Auth::login($user);
+        return response()->json(['success' => true]);
     }
 }

app/Http/Controllers/V1/Onboarding/LoginController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Crater\Http\Controllers\V1\Onboarding;
+
+use Auth;
+use Crater\Http\Controllers\Controller;
+use Crater\Models\User;
+use Illuminate\Http\Request;
+
+class LoginController extends Controller
+{
+    /**
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function __invoke(Request $request)
+    {
+        $user = User::where('role', 'super admin')->first();
+        Auth::login($user);
+
+        return response()->json(['success' => true]);
+    }
+}

app/Http/Controllers/V1/Onboarding/OnboardingWizardController.php

@@ -16,15 +16,14 @@ class OnboardingWizardController extends Controller
      */
     public function getStep(Request $request)
     {
-        if (!\Storage::disk('local')->has('database_created')) {
-
+        if (! \Storage::disk('local')->has('database_created')) {
             return response()->json([
-                'profile_complete' => 0
+                'profile_complete' => 0,
             ]);
         }
 
         return response()->json([
-            'profile_complete' => Setting::getSetting('profile_complete')
+            'profile_complete' => Setting::getSetting('profile_complete'),
         ]);
     }
 
@@ -34,14 +33,14 @@ class OnboardingWizardController extends Controller
 
         if ($setting === 'COMPLETED') {
             return response()->json([
-                'profile_complete' => $setting
+                'profile_complete' => $setting,
             ]);
         }
 
         Setting::setSetting('profile_complete', $request->profile_complete);
 
         return response()->json([
-            'profile_complete' => Setting::getSetting('profile_complete')
+            'profile_complete' => Setting::getSetting('profile_complete'),
         ]);
     }
 }

app/Http/Controllers/V1/Onboarding/PermissionsController.php

@@ -2,9 +2,9 @@
 
 namespace Crater\Http\Controllers\V1\Onboarding;
 
+use Crater\Http\Controllers\Controller;
 use Crater\Space\PermissionsChecker;
 use Illuminate\Http\JsonResponse;
-use Crater\Http\Controllers\Controller;
 
 class PermissionsController extends Controller
 {
@@ -33,7 +33,7 @@ class PermissionsController extends Controller
         );
 
         return response()->json([
-            'permissions' => $permissions
+            'permissions' => $permissions,
         ]);
     }
 }

app/Http/Controllers/V1/Onboarding/RequirementsController.php

@@ -2,9 +2,9 @@
 
 namespace Crater\Http\Controllers\V1\Onboarding;
 
+use Crater\Http\Controllers\Controller;
 use Crater\Space\RequirementsChecker;
 use Illuminate\Http\JsonResponse;
-use Crater\Http\Controllers\Controller;
 
 class RequirementsController extends Controller
 {
@@ -28,16 +28,17 @@ class RequirementsController extends Controller
      */
     public function requirements()
     {
-        $phpSupportInfo = $this->requirements->checkPHPversion(
+        $phpSupportInfo = $this->requirements->checkPHPVersion(
             config('installer.core.minPhpVersion')
         );
+
         $requirements = $this->requirements->check(
             config('installer.requirements')
         );
 
         return response()->json([
             'phpSupportInfo' => $phpSupportInfo,
-            'requirements' => $requirements
+            'requirements' => $requirements,
         ]);
     }
 }

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

@@ -2,10 +2,10 @@
 
 namespace Crater\Http\Controllers\V1\Payment;
 
+use Crater\Http\Controllers\Controller;
+use Crater\Http\Requests\PaymentMethodRequest;
 use Crater\Models\PaymentMethod;
 use Illuminate\Http\Request;
-use Crater\Http\Requests\PaymentMethodRequest;
-use Crater\Http\Controllers\Controller;
 
 class PaymentMethodsController extends Controller
 {
@@ -21,13 +21,13 @@ class PaymentMethodsController extends Controller
         $paymentMethods = PaymentMethod::whereCompany($request->header('company'))
             ->applyFilters($request->only([
                 'method_id',
-                'search'
+                'search',
             ]))
             ->latest()
             ->paginateData($limit);
 
         return response()->json([
-            'paymentMethods' => $paymentMethods
+            'paymentMethods' => $paymentMethods,
         ]);
     }
 
@@ -42,7 +42,7 @@ class PaymentMethodsController extends Controller
         $paymentMethod = PaymentMethod::createPaymentMethod($request);
 
         return response()->json([
-            'paymentMethod' => $paymentMethod
+            'paymentMethod' => $paymentMethod,
         ]);
     }
 
@@ -55,7 +55,7 @@ class PaymentMethodsController extends Controller
     public function show(PaymentMethod $paymentMethod)
     {
         return response()->json([
-            'paymentMethod' => $paymentMethod
+            'paymentMethod' => $paymentMethod,
         ]);
     }
 
@@ -71,7 +71,7 @@ class PaymentMethodsController extends Controller
         $paymentMethod->update($request->validated());
 
         return response()->json([
-            'paymentMethod' => $paymentMethod
+            'paymentMethod' => $paymentMethod,
         ]);
     }
 
@@ -87,14 +87,14 @@ class PaymentMethodsController extends Controller
 
         if ($payments->count() > 0) {
             return response()->json([
-                'error' => 'payments_attached'
+                'error' => 'payments_attached',
             ]);
         }
 
         $paymentMethod->delete();
 
         return response()->json([
-            'success' => 'Payment method deleted successfully'
+            'success' => 'Payment method deleted successfully',
         ]);
     }
 }

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

@@ -2,11 +2,11 @@
 
 namespace Crater\Http\Controllers\V1\Payment;
 
-use Illuminate\Http\Request;
-use Crater\Models\Payment;
+use Crater\Http\Controllers\Controller;
 use Crater\Http\Requests\DeletePaymentsRequest;
 use Crater\Http\Requests\PaymentRequest;
-use Crater\Http\Controllers\Controller;
+use Crater\Models\Payment;
+use Illuminate\Http\Request;
 
 class PaymentsController extends Controller
 {
@@ -30,7 +30,7 @@ class PaymentsController extends Controller
                 'payment_method_id',
                 'customer_id',
                 'orderByField',
-                'orderBy'
+                'orderBy',
             ]))
             ->whereCompany($request->header('company'))
             ->select('payments.*', 'users.name', 'invoices.invoice_number', 'payment_methods.name as payment_mode')
@@ -39,7 +39,7 @@ class PaymentsController extends Controller
 
         return response()->json([
             'payments' => $payments,
-            'paymentTotalCount' => Payment::count()
+            'paymentTotalCount' => Payment::count(),
         ]);
     }
 
@@ -55,7 +55,7 @@ class PaymentsController extends Controller
 
         return response()->json([
             'payment' => $payment,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -65,7 +65,7 @@ class PaymentsController extends Controller
             'user',
             'invoice',
             'paymentMethod',
-            'fields.customField'
+            'fields.customField',
         ]);
 
         return response()->json([
@@ -81,7 +81,7 @@ class PaymentsController extends Controller
 
         return response()->json([
             'payment' => $payment,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -90,7 +90,7 @@ class PaymentsController extends Controller
         Payment::deletePayments($request->ids);
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -3,8 +3,8 @@
 namespace Crater\Http\Controllers\V1\Payment;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Models\Payment;
 use Crater\Http\Requests\SendPaymentRequest;
+use Crater\Models\Payment;
 
 class SendPaymentController extends Controller
 {

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

@@ -2,14 +2,14 @@
 
 namespace Crater\Http\Controllers\V1\Report;
 
-use Illuminate\Support\Facades\App;
-use Illuminate\Http\Request;
-use Crater\Models\Company;
-use PDF;
 use Carbon\Carbon;
-use Crater\Models\User;
-use Crater\Models\CompanySetting;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Company;
+use Crater\Models\CompanySetting;
+use Crater\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use PDF;
 
 class CustomerSalesReportController extends Controller
 {
@@ -32,11 +32,11 @@ class CustomerSalesReportController extends Controller
         $end = Carbon::createFromFormat('Y-m-d', $request->to_date);
 
         $customers = User::with(['invoices' => function ($query) use ($start, $end) {
-                $query->whereBetween(
-                    'invoice_date',
-                    [$start->format('Y-m-d'), $end->format('Y-m-d')]
-                );
-            }])
+            $query->whereBetween(
+                'invoice_date',
+                [$start->format('Y-m-d'), $end->format('Y-m-d')]
+            );
+        }])
             ->customer()
             ->whereCompany($company->id)
             ->applyInvoiceFilters($request->only(['from_date', 'to_date']))
@@ -65,7 +65,7 @@ class CustomerSalesReportController extends Controller
             'footer_text_color',
             'footer_total_color',
             'footer_bg_color',
-            'date_text_color'
+            'date_text_color',
         ];
 
         $colorSettings = CompanySetting::whereIn('option', $colors)
@@ -78,7 +78,7 @@ class CustomerSalesReportController extends Controller
             'colorSettings' => $colorSettings,
             'company' => $company,
             'from_date' => $from_date,
-            'to_date' => $to_date
+            'to_date' => $to_date,
         ]);
 
         $pdf = PDF::loadView('app.pdf.reports.sales-customers');

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

@@ -2,14 +2,14 @@
 
 namespace Crater\Http\Controllers\V1\Report;
 
-use Illuminate\Http\Request;
-use Crater\Models\Company;
-use PDF;
 use Carbon\Carbon;
-use Crater\Models\Expense;
-use Crater\Models\CompanySetting;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Company;
+use Crater\Models\CompanySetting;
+use Crater\Models\Expense;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
+use PDF;
 
 class ExpensesReportController extends Controller
 {
@@ -52,7 +52,7 @@ class ExpensesReportController extends Controller
             'footer_text_color',
             'footer_total_color',
             'footer_bg_color',
-            'date_text_color'
+            'date_text_color',
         ];
         $colorSettings = CompanySetting::whereIn('option', $colors)
             ->whereCompany($company->id)
@@ -64,7 +64,7 @@ class ExpensesReportController extends Controller
             'totalExpense' => $totalAmount,
             'company' => $company,
             'from_date' => $from_date,
-            'to_date' => $to_date
+            'to_date' => $to_date,
         ]);
         $pdf = PDF::loadView('app.pdf.reports.expenses');
 

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

@@ -2,14 +2,14 @@
 
 namespace Crater\Http\Controllers\V1\Report;
 
-use Illuminate\Http\Request;
-use Crater\Models\Company;
-use PDF;
 use Carbon\Carbon;
-use Crater\Models\InvoiceItem;
-use Crater\Models\CompanySetting;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Company;
+use Crater\Models\CompanySetting;
+use Crater\Models\InvoiceItem;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
+use PDF;
 
 class ItemSalesReportController extends Controller
 {
@@ -51,7 +51,7 @@ class ItemSalesReportController extends Controller
             'footer_text_color',
             'footer_total_color',
             'footer_bg_color',
-            'date_text_color'
+            'date_text_color',
         ];
         $colorSettings = CompanySetting::whereIn('option', $colors)
             ->whereCompany($company->id)
@@ -63,7 +63,7 @@ class ItemSalesReportController extends Controller
             'totalAmount' => $totalAmount,
             'company' => $company,
             'from_date' => $from_date,
-            'to_date' => $to_date
+            'to_date' => $to_date,
         ]);
         $pdf = PDF::loadView('app.pdf.reports.sales-items');
 

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

@@ -2,15 +2,15 @@
 
 namespace Crater\Http\Controllers\V1\Report;
 
-use Illuminate\Http\Request;
-use Crater\Models\Company;
-use PDF;
 use Carbon\Carbon;
-use Crater\Models\Invoice;
-use Crater\Models\Expense;
-use Crater\Models\CompanySetting;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Company;
+use Crater\Models\CompanySetting;
+use Crater\Models\Expense;
+use Crater\Models\Invoice;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
+use PDF;
 
 class ProfitLossReportController extends Controller
 {
@@ -58,7 +58,7 @@ class ProfitLossReportController extends Controller
             'footer_text_color',
             'footer_total_color',
             'footer_bg_color',
-            'date_text_color'
+            'date_text_color',
         ];
         $colorSettings = CompanySetting::whereIn('option', $colors)
             ->whereCompany($company->id)
@@ -72,7 +72,7 @@ class ProfitLossReportController extends Controller
             'colorSettings' => $colorSettings,
             'company' => $company,
             'from_date' => $from_date,
-            'to_date' => $to_date
+            'to_date' => $to_date,
         ]);
         $pdf = PDF::loadView('app.pdf.reports.profit-loss');
 

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

@@ -2,14 +2,14 @@
 
 namespace Crater\Http\Controllers\V1\Report;
 
-use Illuminate\Http\Request;
-use Crater\Models\Company;
-use PDF;
 use Carbon\Carbon;
-use Crater\Models\Tax;
-use Crater\Models\CompanySetting;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Company;
+use Crater\Models\CompanySetting;
+use Crater\Models\Tax;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
+use PDF;
 
 class TaxSummaryReportController extends Controller
 {
@@ -52,7 +52,7 @@ class TaxSummaryReportController extends Controller
             'footer_text_color',
             'footer_total_color',
             'footer_bg_color',
-            'date_text_color'
+            'date_text_color',
         ];
 
         $colorSettings = CompanySetting::whereIn('option', $colors)
@@ -65,7 +65,7 @@ class TaxSummaryReportController extends Controller
             'colorSettings' => $colorSettings,
             'company' => $company,
             'from_date' => $from_date,
-            'to_date' => $to_date
+            'to_date' => $to_date,
         ]);
 
         $pdf = PDF::loadView('app.pdf.reports.tax-summary');

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

@@ -2,11 +2,11 @@
 
 namespace Crater\Http\Controllers\V1\Settings;
 
-use Illuminate\Http\Request;
-use Crater\Models\Company;
-use Crater\Http\Requests\ProfileRequest;
-use Crater\Http\Requests\CompanyRequest;
 use Crater\Http\Controllers\Controller;
+use Crater\Http\Requests\CompanyRequest;
+use Crater\Http\Requests\ProfileRequest;
+use Crater\Models\Company;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class CompanyController extends Controller
@@ -24,11 +24,11 @@ class CompanyController extends Controller
             'addresses.country',
             'company',
             'company.address',
-            'company.address.country'
+            'company.address.country',
         ]);
 
         return response()->json([
-            'user' => $user
+            'user' => $user,
         ]);
     }
 
@@ -47,7 +47,7 @@ class CompanyController extends Controller
 
         return response()->json([
             'user' => $user,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -66,7 +66,7 @@ class CompanyController extends Controller
 
         return response()->json([
             'company' => $company,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -93,7 +93,7 @@ class CompanyController extends Controller
         }
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -121,7 +121,7 @@ class CompanyController extends Controller
 
         return response()->json([
             'user' => $user,
-            'success' => true
+            'success' => true,
         ]);
     }
 }

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

@@ -3,10 +3,10 @@
 namespace Crater\Http\Controllers\V1\Settings;
 
 use Crater\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Crater\Models\FileDisk;
 use Crater\Http\Requests\DiskEnvironmentRequest;
+use Crater\Models\FileDisk;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 class DiskController extends Controller
 {
@@ -33,10 +33,10 @@ class DiskController extends Controller
      */
     public function store(DiskEnvironmentRequest $request)
     {
-        if(!FileDisk::validateCredentials($request->credentials, $request->driver)) {
+        if (! FileDisk::validateCredentials($request->credentials, $request->driver)) {
             return response()->json([
                 'success' => false,
-                'error' => 'invalid_credentials'
+                'error' => 'invalid_credentials',
             ]);
         }
 
@@ -44,7 +44,7 @@ class DiskController extends Controller
 
         return response()->json([
             'success' => true,
-            'disk' => $disk
+            'disk' => $disk,
         ]);
     }
 
@@ -59,22 +59,22 @@ class DiskController extends Controller
         $credentials = $request->credentials;
         $driver = $request->driver;
 
-        if($credentials && $driver && $disk->type !== 'SYSTEM') {
-            if(!FileDisk::validateCredentials($credentials, $driver)) {
+        if ($credentials && $driver && $disk->type !== 'SYSTEM') {
+            if (! FileDisk::validateCredentials($credentials, $driver)) {
                 return response()->json([
                     'success' => false,
-                    'error' => 'invalid_credentials'
+                    'error' => 'invalid_credentials',
                 ]);
             }
 
             $disk->updateDisk($request);
-        } else if($request->set_as_default) {
+        } elseif ($request->set_as_default) {
             $disk->setAsDefaultDisk();
         }
 
         return response()->json([
             'success' => true,
-            'disk' => $disk
+            'disk' => $disk,
         ]);
     }
 
@@ -90,6 +90,7 @@ class DiskController extends Controller
                 $diskData = [
                     'root' => config('filesystems.disks.local.root'),
                 ];
+
                 break;
 
 
@@ -101,6 +102,7 @@ class DiskController extends Controller
                     'bucket' => '',
                     'root' => '',
                 ];
+
                 break;
 
             case 'doSpaces':
@@ -112,6 +114,7 @@ class DiskController extends Controller
                     'endpoint' => '',
                     'root' => '',
                 ];
+
                 break;
 
             case 'dropbox':
@@ -122,6 +125,7 @@ class DiskController extends Controller
                     'app' => '',
                     'root' => '',
                 ];
+
                 break;
         }
 
@@ -140,14 +144,14 @@ class DiskController extends Controller
     {
         if ($disk->setAsDefault() && $disk->type === 'SYSTEM') {
             return response()->json([
-                'success' => false
+                'success' => false,
             ]);
         }
 
         $disk->delete();
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -160,19 +164,19 @@ class DiskController extends Controller
         $drivers = [
             [
                 'name' => 'Local',
-                'value' => 'local'
+                'value' => 'local',
             ],
             [
                 'name' => 'Amazon S3',
-                'value' => 's3'
+                'value' => 's3',
             ],
             [
                 'name' => 'Digital Ocean Spaces',
-                'value' => 'doSpaces'
+                'value' => 'doSpaces',
             ],
             [
                 'name' => 'Dropbox',
-                'value' => 'dropbox'
+                'value' => 'dropbox',
             ],
         ];
 
@@ -180,7 +184,7 @@ class DiskController extends Controller
 
         return response()->json([
             'drivers' => $drivers,
-            'default' => $default
+            'default' => $default,
         ]);
     }
 }

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

@@ -2,9 +2,9 @@
 
 namespace Crater\Http\Controllers\V1\Settings;
 
-use Crater\Models\CompanySetting;
 use Crater\Http\Controllers\Controller;
 use Crater\Http\Requests\GetSettingsRequest;
+use Crater\Models\CompanySetting;
 
 class GetCompanySettingsController extends Controller
 {

app/Http/Controllers/V1/Settings/MailConfigurationController.php

@@ -2,13 +2,13 @@
 
 namespace Crater\Http\Controllers\V1\Settings;
 
-use Crater\Models\Setting;
-use Illuminate\Http\Request;
-use Crater\Space\EnvironmentManager;
-use Crater\Http\Requests\MailEnvironmentRequest;
-use Illuminate\Http\JsonResponse;
 use Crater\Http\Controllers\Controller;
+use Crater\Http\Requests\MailEnvironmentRequest;
 use Crater\Mail\TestMail;
+use Crater\Models\Setting;
+use Crater\Space\EnvironmentManager;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Mail;
 
 class MailConfigurationController extends Controller
@@ -36,8 +36,7 @@ class MailConfigurationController extends Controller
         $setting = Setting::getSetting('profile_complete');
         $results = $this->environmentManager->saveMailVariables($request);
 
-        if ($setting !== 'COMPLETED')
-        {
+        if ($setting !== 'COMPLETED') {
             Setting::setSetting('profile_complete', 4);
         }
 
@@ -77,7 +76,7 @@ class MailConfigurationController extends Controller
             'mail',
             'sendmail',
             'mailgun',
-            'ses'
+            'ses',
         ];
 
         return response()->json($drivers);
@@ -88,13 +87,13 @@ class MailConfigurationController extends Controller
         $this->validate($request, [
             'to' => 'required|email',
             'subject' => 'required',
-            'message' => 'required'
+            'message' => 'required',
         ]);
 
         Mail::to($request->to)->send(new TestMail($request->subject, $request->message));
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

app/Http/Controllers/V1/Settings/TaxTypesController.php

@@ -2,10 +2,10 @@
 
 namespace Crater\Http\Controllers\V1\Settings;
 
-use Crater\Models\TaxType;
-use Crater\Http\Requests\TaxTypeRequest;
-use Illuminate\Http\Request;
 use Crater\Http\Controllers\Controller;
+use Crater\Http\Requests\TaxTypeRequest;
+use Crater\Models\TaxType;
+use Illuminate\Http\Request;
 
 class TaxTypesController extends Controller
 {
@@ -23,13 +23,13 @@ class TaxTypesController extends Controller
                 'tax_type_id',
                 'search',
                 'orderByField',
-                'orderBy'
+                'orderBy',
             ]))
             ->latest()
             ->paginateData($limit);
 
         return response()->json([
-            'taxTypes' => $taxTypes
+            'taxTypes' => $taxTypes,
         ]);
     }
 
@@ -61,7 +61,7 @@ class TaxTypesController extends Controller
     public function show(TaxType $taxType)
     {
         return response()->json([
-            'taxType' => $taxType
+            'taxType' => $taxType,
         ]);
     }
 
@@ -91,13 +91,13 @@ class TaxTypesController extends Controller
     {
         if ($taxType->taxes() && $taxType->taxes()->count() > 0) {
             return response()->json([
-                'success' => false
+                'success' => false,
             ]);
         }
         $taxType->delete();
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

app/Http/Controllers/V1/Settings/UpdateCompanySettingsController.php

@@ -2,9 +2,9 @@
 
 namespace Crater\Http\Controllers\V1\Settings;
 
-use Crater\Models\CompanySetting;
 use Crater\Http\Controllers\Controller;
 use Crater\Http\Requests\UpdateSettingsRequest;
+use Crater\Models\CompanySetting;
 
 class UpdateCompanySettingsController extends Controller
 {
@@ -19,7 +19,7 @@ class UpdateCompanySettingsController extends Controller
         CompanySetting::setSettings($request->settings, $request->header('company'));
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

app/Http/Controllers/V1/Settings/UpdateUserSettingsController.php

@@ -21,7 +21,7 @@ class UpdateUserSettingsController extends Controller
         $user->setSettings($request->settings);
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

app/Http/Controllers/V1/Update/CopyFilesController.php

@@ -24,7 +24,7 @@ class CopyFilesController extends Controller
 
         return response()->json([
             'success' => true,
-            'path' => $path
+            'path' => $path,
         ]);
     }
 }

app/Http/Controllers/V1/Update/DeleteFilesController.php

@@ -3,8 +3,8 @@
 namespace Crater\Http\Controllers\V1\Update;
 
 use Crater\Http\Controllers\Controller;
-use Illuminate\Http\Request;
 use Crater\Space\Updater;
+use Illuminate\Http\Request;
 
 class DeleteFilesController extends Controller
 {
@@ -16,8 +16,7 @@ class DeleteFilesController extends Controller
      */
     public function __invoke(Request $request)
     {
-
-        if(isset($request->deleted_files) && !empty($request->deleted_files)) {
+        if (isset($request->deleted_files) && ! empty($request->deleted_files)) {
             Updater::deleteFiles($request->deleted_files);
         }
 

app/Http/Controllers/V1/Update/DownloadUpdateController.php

@@ -24,7 +24,7 @@ class DownloadUpdateController extends Controller
 
         return response()->json([
             'success' => true,
-            'path' => $path
+            'path' => $path,
         ]);
     }
 }

app/Http/Controllers/V1/Update/MigrateUpdateController.php

@@ -19,7 +19,7 @@ class MigrateUpdateController extends Controller
         Updater::migrateUpdate();
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

app/Http/Controllers/V1/Update/UnzipUpdateController.php

@@ -25,13 +25,12 @@ class UnzipUpdateController extends Controller
 
             return response()->json([
                 'success' => true,
-                'path' => $path
+                'path' => $path,
             ]);
-
         } catch (\Exception $e) {
             return response()->json([
                 'success' => false,
-                'error' => $e->getMessage()
+                'error' => $e->getMessage(),
             ], 500);
         }
     }

app/Http/Controllers/V1/Update/UpdateController.php

@@ -2,12 +2,10 @@
 
 namespace Crater\Http\Controllers\V1\Update;
 
-use Crater\Models\Setting;
-use Illuminate\Http\Request;
-use Crater\Space\Updater;
-use Crater\Space\SiteApi;
-use Illuminate\Support\Facades\Artisan;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Setting;
+use Crater\Space\Updater;
+use Illuminate\Http\Request;
 
 class UpdateController extends Controller
 {
@@ -21,7 +19,7 @@ class UpdateController extends Controller
 
         return response()->json([
             'success' => true,
-            'path' => $path
+            'path' => $path,
         ]);
     }
 
@@ -36,13 +34,12 @@ class UpdateController extends Controller
 
             return response()->json([
                 'success' => true,
-                'path' => $path
+                'path' => $path,
             ]);
-
         } catch (\Exception $e) {
             return response()->json([
                 'success' => false,
-                'error' => $e->getMessage()
+                'error' => $e->getMessage(),
             ], 500);
         }
     }
@@ -57,7 +54,7 @@ class UpdateController extends Controller
 
         return response()->json([
             'success' => true,
-            'path' => $path
+            'path' => $path,
         ]);
     }
 
@@ -66,7 +63,7 @@ class UpdateController extends Controller
         Updater::migrateUpdate();
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 

app/Http/Controllers/V1/Users/UsersController.php

@@ -4,8 +4,8 @@ namespace Crater\Http\Controllers\V1\Users;
 
 use Crater\Http\Controllers\Controller;
 use Crater\Http\Requests\UserRequest;
-use Crater\Models\User;
 use Crater\Models\CompanySetting;
+use Crater\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
@@ -28,14 +28,14 @@ class UsersController extends Controller
                     'email',
                     'display_name',
                     'orderByField',
-                    'orderBy'
+                    'orderBy',
                 ])
             )
             ->latest()
             ->paginate($limit);
 
         return response()->json([
-            'users' => $users
+            'users' => $users,
         ]);
     }
 
@@ -54,12 +54,12 @@ class UsersController extends Controller
         $user = User::create($data);
 
         $user->setSettings([
-            'language' => CompanySetting::getSetting('language', $user->company_id)
+            'language' => CompanySetting::getSetting('language', $user->company_id),
         ]);
 
         return response()->json([
             'user' => $user,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -73,7 +73,7 @@ class UsersController extends Controller
     {
         return response()->json([
             'user' => $user,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -90,7 +90,7 @@ class UsersController extends Controller
 
         return response()->json([
             'user' => $user,
-            'success' => true
+            'success' => true,
         ]);
     }
 
@@ -107,7 +107,7 @@ class UsersController extends Controller
         }
 
         return response()->json([
-            'success' => true
+            'success' => true,
         ]);
     }
 }

app/Http/Kernel.php

@@ -2,8 +2,8 @@
 
 namespace Crater\Http;
 
-use Illuminate\Foundation\Http\Kernel as HttpKernel;
 use Crater\Http\Middleware\AdminMiddleware;
+use Illuminate\Foundation\Http\Kernel as HttpKernel;
 use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;
 
 class Kernel extends HttpKernel
@@ -22,7 +22,7 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \Crater\Http\Middleware\TrustProxies::class,
         \Crater\Http\Middleware\ConfigMiddleware::class,
-        \Fruitcake\Cors\HandleCors::class
+        \Fruitcake\Cors\HandleCors::class,
     ];
 
     /**
@@ -68,6 +68,7 @@ class Kernel extends HttpKernel
         'redirect-if-installed' => \Crater\Http\Middleware\RedirectIfInstalled::class,
         'redirect-if-unauthenticated' => \Crater\Http\Middleware\RedirectIfUnauthorized::class,
     ];
+
     /**
      * The priority-sorted list of middleware.
      *

app/Http/Middleware/AdminMiddleware.php

@@ -17,7 +17,7 @@ class AdminMiddleware
      */
     public function handle($request, Closure $next, $guard = null)
     {
-        if (Auth::guard($guard)->guest() || !Auth::user()->isSuperAdminOrAdmin()) {
+        if (Auth::guard($guard)->guest() || ! Auth::user()->isSuperAdminOrAdmin()) {
             if ($request->ajax() || $request->wantsJson()) {
                 return response('Unauthorized.', 401);
             } else {

app/Http/Middleware/Authenticate.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Http\Middleware;
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;

app/Http/Middleware/ConfigMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Http\Middleware;
 
 use Closure;
@@ -26,13 +27,13 @@ class ConfigMiddleware
                 date_default_timezone_set($setting);
             }
 
-            if($request->has('file_disk_id')) {
+            if ($request->has('file_disk_id')) {
                 $file_disk = FileDisk::find($request->file_disk_id);
             } else {
                 $file_disk = FileDisk::whereSetAsDefault(true)->first();
             }
 
-            if($file_disk) {
+            if ($file_disk) {
                 $file_disk->setConfig();
             }
         }

app/Http/Middleware/EncryptCookies.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Http\Middleware;
 
 use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;

app/Http/Middleware/InstallationMiddleware.php

@@ -16,7 +16,7 @@ class InstallationMiddleware
      */
     public function handle($request, Closure $next)
     {
-        if (!\Storage::disk('local')->has('database_created')) {
+        if (! \Storage::disk('local')->has('database_created')) {
             return redirect('/on-boarding');
         }
 

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,8 +2,8 @@
 
 namespace Crater\Http\Middleware;
 
-use Crater\Providers\RouteServiceProvider;
 use Closure;
+use Crater\Providers\RouteServiceProvider;
 use Illuminate\Support\Facades\Auth;
 
 class RedirectIfAuthenticated

app/Http/Middleware/TrimStrings.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;

app/Http/Middleware/TrustProxies.php

@@ -1,8 +1,9 @@
 <?php
+
 namespace Crater\Http\Middleware;
 
-use Illuminate\Http\Request;
 use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
 {
@@ -12,6 +13,7 @@ class TrustProxies extends Middleware
      * @var array
      */
     protected $proxies;
+
     /**
      * The current proxy header mappings.
      *

app/Http/Middleware/VerifyCsrfToken.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
@@ -18,6 +19,6 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        'login'
+        'login',
     ];
 }

app/Http/Requests/CompanyRequest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -24,11 +25,11 @@ class CompanyRequest extends FormRequest
     {
         return [
             'name' => [
-                'required'
+                'required',
             ],
             'country_id' => [
-                'required'
-            ]
+                'required',
+            ],
         ];
     }
 }

app/Http/Requests/CompanySettingRequest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -24,23 +25,23 @@ class CompanySettingRequest extends FormRequest
     {
         return [
             'currency' => [
-                'required'
+                'required',
             ],
             'time_zone' => [
-                'required'
+                'required',
             ],
             'language' => [
-                'required'
+                'required',
             ],
             'fiscal_year' => [
-                'required'
+                'required',
             ],
             'moment_date_format' => [
-                'required'
+                'required',
             ],
             'carbon_date_format' => [
-                'required'
-            ]
+                'required',
+            ],
         ];
     }
 }

app/Http/Requests/CustomerRequest.php

@@ -26,19 +26,19 @@ class CustomerRequest extends FormRequest
     {
         $rules = [
             'name' => [
-                'required'
+                'required',
             ],
             'addresses.*.address_street_1' => [
-                'max:255'
+                'max:255',
             ],
             'addresses.*.address_street_2' => [
-                'max:255'
+                'max:255',
             ],
             'email' => [
                 'email',
                 'nullable',
                 'unique:users,email',
-            ]
+            ],
         ];
 
         if ($this->isMethod('PUT') && $this->email != null) {
@@ -46,8 +46,8 @@ class CustomerRequest extends FormRequest
                 'email' => [
                     'email',
                     'nullable',
-                    Rule::unique('users')->ignore($this->route('customer')->id)
-                ]
+                    Rule::unique('users')->ignore($this->route('customer')->id),
+                ],
             ];
         };
 

app/Http/Requests/DatabaseEnvironmentRequest.php

@@ -28,51 +28,47 @@ class DatabaseEnvironmentRequest extends FormRequest
                 return  [
                     'app_url' => [
                         'required',
-                        'url'
-                    ],
-                    'app_domain' => [
-                        'required',
+                        'url',
                     ],
                     'database_connection' => [
                         'required',
-                        'string'
+                        'string',
                     ],
                     'database_name' => [
                         'required',
-                        'string'
+                        'string',
                     ],
                 ];
+
                 break;
             default:
                 return  [
                     'app_url' => [
                         'required',
-                        'url'
-                    ],
-                    'app_domain' => [
-                        'required',
+                        'url',
                     ],
                     'database_connection' => [
                         'required',
-                        'string'
+                        'string',
                     ],
                     'database_hostname' => [
                         'required',
-                        'string'
+                        'string',
                     ],
                     'database_port' => [
                         'required',
-                        'numeric'
+                        'numeric',
                     ],
                     'database_name' => [
                         'required',
-                        'string'
+                        'string',
                     ],
                     'database_username' => [
                         'required',
-                        'string'
+                        'string',
                     ],
                 ];
+
             break;
 
         }