Fixes for subs v1 + setting guard on repo activities

turbo124 · Aug 14, 2024 · 40ecb6a · 40ecb6a
1 parent f938f37
commit 40ecb6a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/Livewire/BillingPortalPurchase.php b/app/Livewire/BillingPortalPurchase.php
@@ -349,7 +349,11 @@ protected function getPaymentMethods(ClientContact $contact): self
         }
 
         if ((int)$this->price == 0) {
+
             $this->steps['payment_required'] = false;
+            $this->steps['fetched_payment_methods'] = false;
+            $this->heading_text = ctrans('texts.payment_methods');
+            return $this;
         } else {
             // $this->steps['fetched_payment_methods'] = true;
         }

diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
@@ -58,7 +58,7 @@ public function archive($entity)
         $className = $this->getEventClass($entity, 'Archived');
 
         if (class_exists($className)) {
-            event(new $className($entity, $entity->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
+            event(new $className($entity, $entity->company, Ninja::eventVars(auth()->guard('api')->user() ? auth()->guard('api')->user()->id : null)));
         }
     }
 
@@ -84,7 +84,7 @@ public function restore($entity)
         $className = $this->getEventClass($entity, 'Restored');
 
         if (class_exists($className)) {
-            event(new $className($entity, $fromDeleted, $entity->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
+            event(new $className($entity, $fromDeleted, $entity->company, Ninja::eventVars(auth()->guard('api')->user() ? auth()->guard('api')->user()->id : null)));
         }
     }
 
@@ -105,7 +105,7 @@ public function delete($entity)
         $className = $this->getEventClass($entity, 'Deleted');
 
         if (class_exists($className) && !($entity instanceof Company)) {
-            event(new $className($entity, $entity->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
+            event(new $className($entity, $entity->company, Ninja::eventVars(auth()->guard('api')->user() ? auth()->guard('api')->user()->id : null)));
         }
     }