From 2139629077255917b2786dbe9832e130ce11fa18 Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 20 Oct 2022 11:17:34 +1100 Subject: [PATCH] Updated updatePricing() to not need as_usd parameter Updated updatePricing() to not need as_usd parameter --- 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 | 8 ++++---- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/DomainsController.php b/app/Http/Controllers/DomainsController.php index 927b56a..bd15a6a 100644 --- a/app/Http/Controllers/DomainsController.php +++ b/app/Http/Controllers/DomainsController.php @@ -100,8 +100,7 @@ class DomainsController extends Controller ]); $pricing = new Pricing(); - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - $pricing->updatePricing($domain->id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->updatePricing($domain->id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); $domain->update([ 'domain' => $request->domain, diff --git a/app/Http/Controllers/MiscController.php b/app/Http/Controllers/MiscController.php index cc1a239..f82a956 100644 --- a/app/Http/Controllers/MiscController.php +++ b/app/Http/Controllers/MiscController.php @@ -82,8 +82,7 @@ class MiscController extends Controller ]); $pricing = new Pricing(); - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - $pricing->updatePricing($misc->id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->updatePricing($misc->id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); Cache::forget("all_misc"); Cache::forget("misc.{$misc->id}"); diff --git a/app/Http/Controllers/ResellerController.php b/app/Http/Controllers/ResellerController.php index dafddba..14a330c 100644 --- a/app/Http/Controllers/ResellerController.php +++ b/app/Http/Controllers/ResellerController.php @@ -150,8 +150,7 @@ class ResellerController extends Controller ]); $pricing = new Pricing(); - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - $pricing->updatePricing($request->id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->updatePricing($request->id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); Labels::deleteLabelsAssignedTo($request->id); Labels::insertLabelsAssigned([$request->label1, $request->label2, $request->label3, $request->label4], $request->id); diff --git a/app/Http/Controllers/SeedBoxesController.php b/app/Http/Controllers/SeedBoxesController.php index bbea812..39411fe 100644 --- a/app/Http/Controllers/SeedBoxesController.php +++ b/app/Http/Controllers/SeedBoxesController.php @@ -130,8 +130,7 @@ class SeedBoxesController extends Controller ]); $pricing = new Pricing(); - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - $pricing->updatePricing($seedbox->id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->updatePricing($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 e7a5b0f..03f9070 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -179,10 +179,7 @@ class ServerController extends Controller $server_id = $request->server_id; $pricing = new Pricing(); - - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - - $pricing->updatePricing($server_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->updatePricing($server_id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); Labels::deleteLabelsAssignedTo($server_id); diff --git a/app/Http/Controllers/SharedController.php b/app/Http/Controllers/SharedController.php index c863871..fb8aea4 100644 --- a/app/Http/Controllers/SharedController.php +++ b/app/Http/Controllers/SharedController.php @@ -147,8 +147,7 @@ class SharedController extends Controller ]); $pricing = new Pricing(); - $as_usd = $pricing->convertToUSD($request->price, $request->currency); - $pricing->updatePricing($request->id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date); + $pricing->updatePricing($request->id, $request->currency, $request->price, $request->payment_term, $request->next_due_date); Labels::deleteLabelsAssignedTo($request->id); Labels::insertLabelsAssigned([$request->label1, $request->label2, $request->label3, $request->label4], $request->id); diff --git a/app/Models/Pricing.php b/app/Models/Pricing.php index 4ecfa3d..254a89a 100644 --- a/app/Models/Pricing.php +++ b/app/Models/Pricing.php @@ -125,8 +125,9 @@ class Pricing extends Model ]); } - public function updatePricing(string $service_id, string $currency, float $price, int $term, float $as_usd, string $next_due_date, int $is_active = 1): int + public function updatePricing(string $service_id, string $currency, float $price, int $term, string $next_due_date, int $is_active = 1): int { + $as_usd = $this->convertToUSD($price, $currency); return DB::table('pricings') ->where('service_id', $service_id) ->update([ @@ -136,15 +137,14 @@ 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 ]); } public static function allPricing() { return Cache::remember('all_pricing', now()->addWeek(1), function () { - return DB::table('pricings') - ->get(); + return Pricing::get(); }); }