Merge branch 'billing_system' of github.com:IceToast/cpgg_monthly_billing_addon into billing_system

database/seeders/Seeds/ProductSeeder.php

@@ -21,6 +21,7 @@ class ProductSeeder extends Seeder
             'memory' => 64,
             'disk' => 1000,
             'databases' => 1,
+            'billing_period' => 'hourly'
         ]);
 
         Product::create([
@@ -30,6 +31,7 @@ class ProductSeeder extends Seeder
             'memory' => 128,
             'disk' => 2000,
             'databases' => 2,
+            'billing_period' => 'hourly'
         ]);
 
         Product::create([
@@ -39,6 +41,7 @@ class ProductSeeder extends Seeder
             'memory' => 256,
             'disk' => 5000,
             'databases' => 5,
+            'billing_period' => 'hourly'
         ]);
     }
 }

routes/web.php

@@ -224,8 +224,7 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () {
 
 
         Route::get('ticket/category/datatable', [TicketCategoryController::class, 'datatable'])->name('ticket.category.datatable');
-        Route::resource("ticket/category", TicketCategoryController::class,['as' => 'ticket']);
-
+        Route::resource("ticket/category", TicketCategoryController::class, ['as' => 'ticket']);
     });
 
     Route::get('/home', [HomeController::class, 'index'])->name('home');

themes/default/views/admin/settings/tabs/system.blade.php

@@ -61,22 +61,6 @@
                         </div>
                     </div>
 
-                    <div class="custom-control mb-3 p-0">
-                        <div class="col m-0 p-0 d-flex justify-content-between align-items-center">
-                            <div>
-                                <input value="true" id="server-create-charge-first-hour"
-                                    name="server-create-charge-first-hour"
-                                    {{ config('SETTINGS::SYSTEM:SERVER_CREATE_CHARGE_FIRST_HOUR') == 'true' ? 'checked' : '' }}
-                                    type="checkbox">
-                                <label for="server-create-charge-first-hour">{{ __('Charge first hour at creation') }}
-                                </label>
-                            </div>
-                            <i data-toggle="popover" data-trigger="hover" data-html="true"
-                                data-content="{{ __('Charges the first hour worth of credits upon creating a server.') }}"
-                                class="fas fa-info-circle"></i>
-                        </div>
-                    </div>
-
                     <div class="custom-control mb-3 p-0">
                         <label for="credits-display-name">{{ __('Credits Display Name') }}</label>
                         <input x-model="credits-display-name" id="credits-display-name" name="credits-display-name"

themes/default/views/servers/create.blade.php

@@ -251,6 +251,7 @@
                                             x-text="product.doesNotFit == true ? '{{ __('Server cant fit on this Node') }}' : (product.minimum_credits > user.credits || product.price > user.credits ? '{{ __('Not enough') }} {{ CREDITS_DISPLAY_NAME }}!' : '{{ __('Create server') }}')">
                                         </button>
                                     </div>
+
                                 </div>
                             </div>
                         </template>