From f5c23b33dab97ecf8430cf363469e3a975089336 Mon Sep 17 00:00:00 2001 From: Mohit Panjwani Date: Thu, 24 Jun 2021 14:21:43 +0530 Subject: [PATCH] fix code style --- app/Console/Commands/CreateTemplateCommand.php | 4 ++-- .../V1/Estimate/EstimateTemplatesController.php | 1 - .../V1/Invoice/InvoiceTemplatesController.php | 2 +- app/Http/Controllers/V1/Mobile/AuthController.php | 3 --- .../V1/Onboarding/AppDomainController.php | 1 - .../Controllers/V1/Onboarding/FinishController.php | 2 -- app/Models/Estimate.php | 5 +---- app/Models/Invoice.php | 7 +------ app/Rules/UniqueNumber.php | 1 + ...template_id_from_invoices_and_estimates_table.php | 12 +++++------- 10 files changed, 11 insertions(+), 27 deletions(-) diff --git a/app/Console/Commands/CreateTemplateCommand.php b/app/Console/Commands/CreateTemplateCommand.php index 69151aa5..f7b75dbe 100644 --- a/app/Console/Commands/CreateTemplateCommand.php +++ b/app/Console/Commands/CreateTemplateCommand.php @@ -41,7 +41,7 @@ class CreateTemplateCommand extends Command $templateName = $this->argument('name'); $type = $this->option('type'); - if (!$type) { + if (! $type) { $type = $this->choice('Create a template for?', ['invoice', 'estimate']); } @@ -56,7 +56,7 @@ class CreateTemplateCommand extends Command $path = resource_path("app/pdf/{$type}/{$templateName}.blade.php"); $type = ucfirst($type); - $this->info("{$type} Template created successfully at ". $path); + $this->info("{$type} Template created successfully at ".$path); return 0; } diff --git a/app/Http/Controllers/V1/Estimate/EstimateTemplatesController.php b/app/Http/Controllers/V1/Estimate/EstimateTemplatesController.php index cb7d53cb..d7e78c77 100644 --- a/app/Http/Controllers/V1/Estimate/EstimateTemplatesController.php +++ b/app/Http/Controllers/V1/Estimate/EstimateTemplatesController.php @@ -3,7 +3,6 @@ namespace Crater\Http\Controllers\V1\Estimate; use Crater\Http\Controllers\Controller; -use Crater\Models\EstimateTemplate; use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; diff --git a/app/Http/Controllers/V1/Invoice/InvoiceTemplatesController.php b/app/Http/Controllers/V1/Invoice/InvoiceTemplatesController.php index 4f7ca0f9..73729c6d 100644 --- a/app/Http/Controllers/V1/Invoice/InvoiceTemplatesController.php +++ b/app/Http/Controllers/V1/Invoice/InvoiceTemplatesController.php @@ -3,9 +3,9 @@ namespace Crater\Http\Controllers\V1\Invoice; use Crater\Http\Controllers\Controller; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; -use Illuminate\Http\Request; class InvoiceTemplatesController extends Controller { diff --git a/app/Http/Controllers/V1/Mobile/AuthController.php b/app/Http/Controllers/V1/Mobile/AuthController.php index fde80dca..f4b1b5ec 100644 --- a/app/Http/Controllers/V1/Mobile/AuthController.php +++ b/app/Http/Controllers/V1/Mobile/AuthController.php @@ -3,11 +3,8 @@ namespace Crater\Http\Controllers\V1\Mobile; use Crater\Http\Controllers\Controller; -use Crater\Http\Requests\DomainEnvironmentRequest; use Crater\Models\User; -use Crater\Space\EnvironmentManager; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; use Illuminate\Validation\ValidationException; diff --git a/app/Http/Controllers/V1/Onboarding/AppDomainController.php b/app/Http/Controllers/V1/Onboarding/AppDomainController.php index 2665347c..b2571f48 100644 --- a/app/Http/Controllers/V1/Onboarding/AppDomainController.php +++ b/app/Http/Controllers/V1/Onboarding/AppDomainController.php @@ -5,7 +5,6 @@ namespace Crater\Http\Controllers\V1\Onboarding; use Crater\Http\Controllers\Controller; use Crater\Http\Requests\DomainEnvironmentRequest; use Crater\Space\EnvironmentManager; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Artisan; class AppDomainController extends Controller diff --git a/app/Http/Controllers/V1/Onboarding/FinishController.php b/app/Http/Controllers/V1/Onboarding/FinishController.php index bacfd0d4..ce82f326 100644 --- a/app/Http/Controllers/V1/Onboarding/FinishController.php +++ b/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 { diff --git a/app/Models/Estimate.php b/app/Models/Estimate.php index 13a1e8b3..e05716d6 100644 --- a/app/Models/Estimate.php +++ b/app/Models/Estimate.php @@ -2,10 +2,6 @@ namespace Crater\Models; -use Crater\Models\Company; -use Crater\Models\Tax; -use Illuminate\Database\Eloquent\Model; -use Crater\Models\CompanySetting; use App; use Barryvdh\DomPDF\Facade as PDF; use Carbon\Carbon; @@ -13,6 +9,7 @@ use Crater\Mail\SendEstimateMail; use Crater\Traits\GeneratesPdfTrait; use Crater\Traits\HasCustomFieldsTrait; use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Auth; use Spatie\MediaLibrary\HasMedia; use Spatie\MediaLibrary\InteractsWithMedia; diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index c78208b2..9a69b321 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -2,12 +2,6 @@ namespace Crater\Models; -use Crater\Models\Company; -use Crater\Models\CompanySetting; -use Crater\Models\Currency; -use Crater\Models\Tax; -use Illuminate\Database\Eloquent\Model; -use Crater\Models\Payment; use App; use Barryvdh\DomPDF\Facade as PDF; use Carbon\Carbon; @@ -15,6 +9,7 @@ use Crater\Mail\SendInvoiceMail; use Crater\Traits\GeneratesPdfTrait; use Crater\Traits\HasCustomFieldsTrait; use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Auth; use Spatie\MediaLibrary\HasMedia; use Spatie\MediaLibrary\InteractsWithMedia; diff --git a/app/Rules/UniqueNumber.php b/app/Rules/UniqueNumber.php index f85a6d57..23f0d65d 100644 --- a/app/Rules/UniqueNumber.php +++ b/app/Rules/UniqueNumber.php @@ -61,6 +61,7 @@ class UniqueNumber implements Rule public function message() { $type = str_replace('_', ' ', $this->type); + return "{$type} is already used."; } } diff --git a/database/migrations/2020_12_14_051450_remove_template_id_from_invoices_and_estimates_table.php b/database/migrations/2020_12_14_051450_remove_template_id_from_invoices_and_estimates_table.php index 651136c6..d0b0cc52 100644 --- a/database/migrations/2020_12_14_051450_remove_template_id_from_invoices_and_estimates_table.php +++ b/database/migrations/2020_12_14_051450_remove_template_id_from_invoices_and_estimates_table.php @@ -15,10 +15,9 @@ class RemoveTemplateIdFromInvoicesAndEstimatesTable extends Migration */ public function up() { - if (Schema::hasColumn('invoices', 'invoice_template_id')) - { + if (Schema::hasColumn('invoices', 'invoice_template_id')) { $invoices = Invoice::all(); - + $invoices->map(function ($invoice) { $invoice->template_name = 'invoice'.$invoice->invoice_template_id; $invoice->save(); @@ -31,9 +30,8 @@ class RemoveTemplateIdFromInvoicesAndEstimatesTable extends Migration $table->dropColumn('invoice_template_id'); }); } - - if (Schema::hasColumn('estimates', 'estimate_template_id')) - { + + if (Schema::hasColumn('estimates', 'estimate_template_id')) { $estimates = Estimate::all(); $estimates->map(function ($estimate) { @@ -48,7 +46,7 @@ class RemoveTemplateIdFromInvoicesAndEstimatesTable extends Migration $table->dropColumn('estimate_template_id'); }); } - + Schema::dropIfExists('invoice_templates'); Schema::dropIfExists('estimate_templates'); }