From d1eb588b11d89074ca1210bf8aeece0197b2a993 Mon Sep 17 00:00:00 2001 From: cp6 Date: Tue, 30 Aug 2022 23:37:05 +1000 Subject: [PATCH] Updated pricing model insertPricing() func Updated pricing model insertPricing() function Move as_usd parameter into the function Updated is_active check as it is an int anyway --- app/Http/Controllers/ApiController.php | 5 +---- app/Http/Controllers/DomainsController.php | 3 +-- app/Http/Controllers/MiscController.php | 3 +-- app/Http/Controllers/ResellerController.php | 3 +-- app/Http/Controllers/SeedBoxesController.php | 3 +-- app/Http/Controllers/ServerController.php | 5 +---- app/Http/Controllers/SharedController.php | 3 +-- app/Models/Pricing.php | 5 +++-- 8 files changed, 10 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index c67eb7b..16f3cac 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -307,10 +307,7 @@ class ApiController extends Controller $server_id = Str::random(8); $pricing = new Pricing(); - - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - - $pricing->insertPricing(1, $server_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->insertPricing(1, $server_id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); if (!is_null($request->ip1)) { IPs::insertIP($server_id, $request->ip1); diff --git a/app/Http/Controllers/DomainsController.php b/app/Http/Controllers/DomainsController.php index 89b6ef7..06d172e 100644 --- a/app/Http/Controllers/DomainsController.php +++ b/app/Http/Controllers/DomainsController.php @@ -43,8 +43,7 @@ class DomainsController extends Controller $domain_id = Str::random(8); $pricing = new Pricing(); - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - $pricing->insertPricing(4, $domain_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->insertPricing(4, $domain_id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); Domains::create([ 'id' => $domain_id, diff --git a/app/Http/Controllers/MiscController.php b/app/Http/Controllers/MiscController.php index 271e9d7..5100381 100644 --- a/app/Http/Controllers/MiscController.php +++ b/app/Http/Controllers/MiscController.php @@ -41,8 +41,7 @@ class MiscController extends Controller $misc_id = Str::random(8); $pricing = new Pricing(); - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - $pricing->insertPricing(5, $misc_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->insertPricing(5, $misc_id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); Misc::create([ 'id' => $misc_id, diff --git a/app/Http/Controllers/ResellerController.php b/app/Http/Controllers/ResellerController.php index 399a3c6..f74949c 100644 --- a/app/Http/Controllers/ResellerController.php +++ b/app/Http/Controllers/ResellerController.php @@ -57,8 +57,7 @@ class ResellerController extends Controller $reseller_id = Str::random(8); $pricing = new Pricing(); - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - $pricing->insertPricing(3, $reseller_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->insertPricing(3, $reseller_id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); if (!is_null($request->dedicated_ip)) { IPs::insertIP($reseller_id, $request->dedicated_ip); diff --git a/app/Http/Controllers/SeedBoxesController.php b/app/Http/Controllers/SeedBoxesController.php index 5a4ad2d..b6182f6 100644 --- a/app/Http/Controllers/SeedBoxesController.php +++ b/app/Http/Controllers/SeedBoxesController.php @@ -47,8 +47,7 @@ class SeedBoxesController extends Controller $seedbox_id = Str::random(8); $pricing = new Pricing(); - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - $pricing->insertPricing(6, $seedbox_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->insertPricing(6, $seedbox_id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); Labels::deleteLabelsAssignedTo($seedbox_id); Labels::insertLabelsAssigned([$request->label1, $request->label2, $request->label3, $request->label4], $seedbox_id); diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 5185081..1058447 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -75,10 +75,7 @@ class ServerController extends Controller $server_id = Str::random(8); $pricing = new Pricing(); - - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - - $pricing->insertPricing(1, $server_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->insertPricing(1, $server_id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); if (!is_null($request->ip1)) { IPs::insertIP($server_id, $request->ip1); diff --git a/app/Http/Controllers/SharedController.php b/app/Http/Controllers/SharedController.php index 6b824f9..4067bb9 100644 --- a/app/Http/Controllers/SharedController.php +++ b/app/Http/Controllers/SharedController.php @@ -52,8 +52,7 @@ class SharedController extends Controller $shared_id = Str::random(8); $pricing = new Pricing(); - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - $pricing->insertPricing(2, $shared_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->insertPricing(2, $shared_id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); Labels::deleteLabelsAssignedTo($shared_id); Labels::insertLabelsAssigned([$request->label1, $request->label2, $request->label3, $request->label4], $shared_id); diff --git a/app/Models/Pricing.php b/app/Models/Pricing.php index 31f578c..494cc23 100644 --- a/app/Models/Pricing.php +++ b/app/Models/Pricing.php @@ -103,8 +103,9 @@ class Pricing extends Model DB::table('pricings')->where('service_id', '=', $id)->delete(); } - public function insertPricing(int $type, string $service_id, string $currency, float $price, int $term, float $as_usd, string $next_due_date, int $is_active = 1) + public function insertPricing(int $type, string $service_id, string $currency, float $price, int $term, string $next_due_date, int $is_active = 1) { + $as_usd = $this->convertToUSD($price, $currency); return self::create([ 'service_type' => $type, 'service_id' => $service_id, @@ -114,7 +115,7 @@ class Pricing extends Model 'as_usd' => $as_usd, 'usd_per_month' => $this->costAsPerMonth($as_usd, $term), 'next_due_date' => $next_due_date, - 'active' => ($is_active) ? 1 : 0 + 'active' => $is_active ]); }