beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat: ✨ Added yearly and half-yearly billing periods

Browse source
This commit is contained in:
IceToast 2022-07-22 04:00:23 +02:00 committed by IceToast
parent 7fa9bf2062
commit 759ba59988
No known key found for this signature in database
GPG key ID: 1464353E063A5B97
5 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Console/Commands/ChargeServers.php
View file

@ -61,6 +61,12 @@ 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 // check if server is due to be charged by comparing its last_billed date with the current date and the billing period
$newBillingDate = null; $newBillingDate = null;
switch($billing_period) { switch($billing_period) {
case 'yearly':
$newBillingDate = Carbon::parse($server->last_billed)->addYear();
break;
case 'half-yearly':
$newBillingDate = Carbon::parse($server->last_billed)->addMonths(6);
break;
case 'monthly': case 'monthly':
$newBillingDate = Carbon::parse($server->last_billed)->addMonth(); $newBillingDate = Carbon::parse($server->last_billed)->addMonth();
break; break;

4
app/Http/Controllers/Admin/ProductController.php
View file

@ -72,7 +72,7 @@ class ProductController extends Controller
"nodes.*" => "required|exists:nodes,id", "nodes.*" => "required|exists:nodes,id",
"eggs.*" => "required|exists:eggs,id", "eggs.*" => "required|exists:eggs,id",
"disabled" => "nullable", "disabled" => "nullable",
"billing_period" => "required|in:hourly,daily,weekly,monthly", "billing_period" => "required|in:hourly,daily,weekly,monthly,half-yearly,yearly",
]); ]);
$disabled = ! is_null($request->input('disabled')); $disabled = ! is_null($request->input('disabled'));
@ -139,7 +139,7 @@ class ProductController extends Controller
"nodes.*" => "required|exists:nodes,id", "nodes.*" => "required|exists:nodes,id",
"eggs.*" => "required|exists:eggs,id", "eggs.*" => "required|exists:eggs,id",
"disabled" => "nullable", "disabled" => "nullable",
"billing_period" => "required|in:hourly,daily,weekly,monthly", "billing_period" => "required|in:hourly,daily,weekly,monthly,half-yearly,yearly",
]); ]);
$disabled = ! is_null($request->input('disabled')); $disabled = ! is_null($request->input('disabled'));

4
resources/views/servers/index.blade.php
View file

@ -162,6 +162,10 @@
<div class="text-muted"> <div class="text-muted">
@if($server->product->billing_period == 'monthly') @if($server->product->billing_period == 'monthly')
{{ __('per Month') }} {{ __('per Month') }}
@elseif($server->product->billing_period == 'half-yearly')
{{ __('per 6 Months') }}
@elseif($server->product->billing_period == 'yearly')
{{ __('per Year') }}
@elseif($server->product->billing_period == 'weekly') @elseif($server->product->billing_period == 'weekly')
{{ __('per Week') }} {{ __('per Week') }}
@elseif($server->product->billing_period == 'daily') @elseif($server->product->billing_period == 'daily')

6
themes/default/views/admin/products/create.blade.php
View file

@ -183,6 +183,12 @@
<option value="monthly"> <option value="monthly">
{{__('Monthly')}} {{__('Monthly')}}
</option> </option>
<option value="half-yearly">
{{__('Half Yearly')}}
</option>
<option value="yearly">
{{__('Yearly')}}
</option>
</select> </select>
@error('billing_period') @error('billing_period')
<div class="invalid-feedback"> <div class="invalid-feedback">

8
themes/default/views/admin/products/edit.blade.php
View file

@ -190,6 +190,14 @@
@endif> @endif>
{{__('Monthly')}} {{__('Monthly')}}
</option> </option>
<option value="half-yearly" @if ($product->billing_period == 'half-yearly') selected
@endif>
{{__('Half Yearly')}}
</option>
<option value="yearly" @if ($product->billing_period == 'yearly') selected
@endif>
{{__('Yearly')}}
</option>
</select> </select>
@error('billing_period') @error('billing_period')
<div class="invalid-feedback"> <div class="invalid-feedback">