From 7369e8a643e5016459e5fd5be6e1e8682b9b44a1 Mon Sep 17 00:00:00 2001 From: IceToast Date: Fri, 22 Jul 2022 04:09:34 +0200 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=9A=9A=20Rename=20Yearly=20->?= =?UTF-8?q?=20Annually?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/ChargeServers.php | 4 +- .../Controllers/Admin/ProductController.php | 4 +- .../views/admin/products/create.blade.php | 8 +-- resources/views/admin/products/edit.blade.php | 8 +-- resources/views/servers/index.blade.php | 62 +++++++++++-------- 5 files changed, 47 insertions(+), 39 deletions(-) diff --git a/app/Console/Commands/ChargeServers.php b/app/Console/Commands/ChargeServers.php index 45f18c2b..dac01f0f 100644 --- a/app/Console/Commands/ChargeServers.php +++ b/app/Console/Commands/ChargeServers.php @@ -61,10 +61,10 @@ class ChargeServers extends Command // check if server is due to be charged by comparing its last_billed date with the current date and the billing period $newBillingDate = null; switch($billing_period) { - case 'yearly': + case 'annually': $newBillingDate = Carbon::parse($server->last_billed)->addYear(); break; - case 'half-yearly': + case 'half-annually': $newBillingDate = Carbon::parse($server->last_billed)->addMonths(6); break; case 'monthly': diff --git a/app/Http/Controllers/Admin/ProductController.php b/app/Http/Controllers/Admin/ProductController.php index 9fb51801..b24c5cc6 100644 --- a/app/Http/Controllers/Admin/ProductController.php +++ b/app/Http/Controllers/Admin/ProductController.php @@ -73,7 +73,7 @@ class ProductController extends Controller "nodes.*" => "required|exists:nodes,id", "eggs.*" => "required|exists:eggs,id", "disabled" => "nullable", - "billing_period" => "required|in:hourly,daily,weekly,monthly,half-yearly,yearly", + "billing_period" => "required|in:hourly,daily,weekly,monthly,half-annually,annually", ]); $disabled = !is_null($request->input('disabled')); @@ -140,7 +140,7 @@ class ProductController extends Controller "nodes.*" => "required|exists:nodes,id", "eggs.*" => "required|exists:eggs,id", "disabled" => "nullable", - "billing_period" => "required|in:hourly,daily,weekly,monthly,half-yearly,yearly", + "billing_period" => "required|in:hourly,daily,weekly,monthly,half-annually,annually", ]); $disabled = !is_null($request->input('disabled')); diff --git a/resources/views/admin/products/create.blade.php b/resources/views/admin/products/create.blade.php index 578fa910..f44f64f4 100644 --- a/resources/views/admin/products/create.blade.php +++ b/resources/views/admin/products/create.blade.php @@ -183,11 +183,11 @@ - - @error('billing_period') diff --git a/resources/views/admin/products/edit.blade.php b/resources/views/admin/products/edit.blade.php index 3401577b..9d3aec52 100644 --- a/resources/views/admin/products/edit.blade.php +++ b/resources/views/admin/products/edit.blade.php @@ -190,13 +190,13 @@ @endif> {{__('Monthly')}} - - @error('billing_period') diff --git a/resources/views/servers/index.blade.php b/resources/views/servers/index.blade.php index 1d0edd65..fdcf2d10 100644 --- a/resources/views/servers/index.blade.php +++ b/resources/views/servers/index.blade.php @@ -72,9 +72,13 @@
{{ __('Status') }}:
- - {{ $server->isSuspended() ? 'Suspended' : 'Active' }} + @if($server->suspennded) + {{ __('Suspended') }} + @elseif($server->cancelled) + {{ __('Cancelled') }} + @else + {{ __('Active') }} + @endif
@@ -125,28 +129,32 @@
- @switch($server->product->billing_period) - @case('monthly') - {{ \Carbon\Carbon::parse($server->last_billed)->addMonth()->toDayDateTimeString(); }} - @break - @case('weekly') - {{ \Carbon\Carbon::parse($server->last_billed)->addWeek()->toDayDateTimeString(); }} - @break - @case('daily') - {{ \Carbon\Carbon::parse($server->last_billed)->addDay()->toDayDateTimeString(); }} - @break - @case('hourly') - {{ \Carbon\Carbon::parse($server->last_billed)->addHour()->toDayDateTimeString(); }} - @break - @case('half-yearly') - {{ \Carbon\Carbon::parse($server->last_billed)->addMonths(6)->toDayDateTimeString(); }} - @break - @case('yearly') - {{ \Carbon\Carbon::parse($server->last_billed)->addYear()->toDayDateTimeString(); }} - @break - @default - {{ \Carbon\Carbon::parse($server->last_billed)->addHour()->toDayDateTimeString(); }} - @endswitch + @if ($server->cancelled) + - + @else + @switch($server->product->billing_period) + @case('monthly') + {{ \Carbon\Carbon::parse($server->last_billed)->addMonth()->toDayDateTimeString(); }} + @break + @case('weekly') + {{ \Carbon\Carbon::parse($server->last_billed)->addWeek()->toDayDateTimeString(); }} + @break + @case('daily') + {{ \Carbon\Carbon::parse($server->last_billed)->addDay()->toDayDateTimeString(); }} + @break + @case('hourly') + {{ \Carbon\Carbon::parse($server->last_billed)->addHour()->toDayDateTimeString(); }} + @break + @case('half-annually') + {{ \Carbon\Carbon::parse($server->last_billed)->addMonths(6)->toDayDateTimeString(); }} + @break + @case('annually') + {{ \Carbon\Carbon::parse($server->last_billed)->addYear()->toDayDateTimeString(); }} + @break + @default + {{ __('Unknown') }} + @endswitch + @endif
@@ -162,9 +170,9 @@
@if($server->product->billing_period == 'monthly') {{ __('per Month') }} - @elseif($server->product->billing_period == 'half-yearly') + @elseif($server->product->billing_period == 'half-annually') {{ __('per 6 Months') }} - @elseif($server->product->billing_period == 'yearly') + @elseif($server->product->billing_period == 'annually') {{ __('per Year') }} @elseif($server->product->billing_period == 'weekly') {{ __('per Week') }}