From a9ca93f723c8b68b4db41d282be31cc341c79af0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 29 Jun 2021 14:02:24 +1000 Subject: [PATCH] Fixes for restored user activity --- app/Listeners/User/RestoredUserActivity.php | 2 +- .../Subscription/SubscriptionService.php | 41 +------------------ 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/app/Listeners/User/RestoredUserActivity.php b/app/Listeners/User/RestoredUserActivity.php index 4997791637..c02f8169b0 100644 --- a/app/Listeners/User/RestoredUserActivity.php +++ b/app/Listeners/User/RestoredUserActivity.php @@ -43,7 +43,7 @@ class RestoredUserActivity implements ShouldQueue $fields = new stdClass; - $fields->user_id = $creating_user->user->id; + $fields->user_id = $event->user->id; $fields->notes = $event->creating_user->present()->name() . " Restored user " . $event->user->present()->name(); $fields->company_id = $event->company->id; diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php index 10a87d72df..d639c1b212 100644 --- a/app/Services/Subscription/SubscriptionService.php +++ b/app/Services/Subscription/SubscriptionService.php @@ -385,8 +385,6 @@ class SubscriptionService $pro_rata_charge_amount = 0; $pro_rata_refund_amount = 0; - $is_credit = false; - $last_invoice = Invoice::where('subscription_id', $recurring_invoice->subscription_id) ->where('client_id', $recurring_invoice->client_id) ->where('is_deleted', 0) @@ -394,24 +392,7 @@ class SubscriptionService ->orderBy('id', 'desc') ->first(); - if(!$last_invoice) - { - $last_invoice = Credit::where('subscription_id', $recurring_invoice->subscription_id) - ->where('client_id', $recurring_invoice->client_id) - ->where('is_deleted', 0) - ->withTrashed() - ->orderBy('id', 'desc') - ->first(); - - $is_credit = true; - } - - if($is_credit) - { - $pro_rata_refund_amount = $this->calculateProRataRefund($last_invoice, $old_subscription) * -1; - nlog("pro rata refund = {$pro_rata_refund_amount}"); - } - elseif($last_invoice->balance > 0) + if($last_invoice->balance > 0) { $pro_rata_charge_amount = $this->calculateProRataCharge($last_invoice, $old_subscription); nlog("pro rata charge = {$pro_rata_charge_amount}"); @@ -456,7 +437,6 @@ class SubscriptionService $pro_rata_charge_amount = 0; $pro_rata_refund_amount = 0; - $is_credit = false; $last_invoice = Invoice::where('subscription_id', $recurring_invoice->subscription_id) ->where('client_id', $recurring_invoice->client_id) @@ -465,24 +445,7 @@ class SubscriptionService ->orderBy('id', 'desc') ->first(); - if(!$last_invoice) - { - $last_invoice = Credit::where('subscription_id', $recurring_invoice->subscription_id) - ->where('client_id', $recurring_invoice->client_id) - ->where('is_deleted', 0) - ->withTrashed() - ->orderBy('id', 'desc') - ->first(); - - $is_credit = true; - } - - if($is_credit) - { - $pro_rata_refund_amount = $this->calculateProRataRefund($last_invoice, $old_subscription) * -1; - nlog("pro rata refund = {$pro_rata_refund_amount}"); - } - elseif($last_invoice->balance > 0) + if($last_invoice->balance > 0) { $pro_rata_charge_amount = $this->calculateProRataCharge($last_invoice, $old_subscription); nlog("pro rata charge = {$pro_rata_charge_amount}");