Support/sp-hydra-veil-gui
Support/sp-hydra-veil-gui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update: fixed laravel billing code priority

Browse source
This commit is contained in:
JOhn 2026-05-18 20:21:46 -04:00
parent 33a88a77a2
commit 012f9d7025
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gui/__main__.py
View file

@ -526,8 +526,8 @@ class CustomWindow(QMainWindow):
ticket_observer.subscribe('ticket_ready', lambda event: self.update_status('Ticket ready.')) ticket_observer.subscribe('ticket_ready', lambda event: self.update_status('Ticket ready.'))
ticket_observer.subscribe('used', lambda event: self.update_status('Ticket used.')) ticket_observer.subscribe('used', lambda event: self.update_status('Ticket used.'))
ticket_observer.subscribe('connection_error', lambda event: self.update_status('Ticket server connection error.')) ticket_observer.subscribe('connection_error', lambda event: self.update_status('Ticket server connection error.'))
ticket_observer.subscribe('failed_output', lambda event: self.update_status(f'Ticket server error: {event.subject if event.subject else ""}')) ticket_observer.subscribe('failed_output', lambda event: self.update_status(f'{event.subject if event.subject else ""}'))
ticket_observer.subscribe('failed_input', lambda event: self.update_status(f'Invalid ticket input: {event.subject if event.subject else ""}')) ticket_observer.subscribe('failed_input', lambda event: self.update_status(f'{event.subject if event.subject else ""}'))
ticket_observer.subscribe('unknown_error', lambda event: self.update_status('Unknown ticket error.')) ticket_observer.subscribe('unknown_error', lambda event: self.update_status('Unknown ticket error.'))
ticket_observer.subscribe('error', lambda event: self.update_status(f'Ticket error: {event.subject if event.subject else ""}')) ticket_observer.subscribe('error', lambda event: self.update_status(f'Ticket error: {event.subject if event.subject else ""}'))
@ -1531,11 +1531,12 @@ class Worker(QObject):
return return
self.profile_data['billing_code'] = ticket_billing_code self.profile_data['billing_code'] = ticket_billing_code
elif 'billing_code' not in self.profile_data and self.profile is not None: elif 'billing_code' not in self.profile_data and self.profile is not None:
ticket_billing_code = self._maybe_auto_use_ticket() if not self._profile_has_valid_subscription():
if ticket_billing_code is None and self._ticket_error_emitted: ticket_billing_code = self._maybe_auto_use_ticket()
return if ticket_billing_code is None and self._ticket_error_emitted:
if ticket_billing_code: return
self.profile_data['billing_code'] = ticket_billing_code if ticket_billing_code:
self.profile_data['billing_code'] = ticket_billing_code
if 'billing_code' in self.profile_data: if 'billing_code' in self.profile_data:
subscription = SubscriptionController.get( subscription = SubscriptionController.get(
@ -1631,6 +1632,20 @@ class Worker(QObject):
return candidates return candidates
def _profile_has_valid_subscription(self):
try:
sub = getattr(self.profile, 'subscription', None)
if not sub:
return False
expires_at = getattr(sub, 'expires_at', None)
if not expires_at:
return False
if expires_at.tzinfo is None:
expires_at = expires_at.replace(tzinfo=timezone.utc)
return expires_at > datetime.now(timezone.utc)
except Exception:
return False
def _maybe_auto_use_ticket(self): def _maybe_auto_use_ticket(self):
try: try:
which_ticket, error_msg = do_we_use_a_random_ticket(ticket_observer) which_ticket, error_msg = do_we_use_a_random_ticket(ticket_observer)