diff --git a/PadelClub/Views/Calling/CallView.swift b/PadelClub/Views/Calling/CallView.swift index 821cdd4..dd25e95 100644 --- a/PadelClub/Views/Calling/CallView.swift +++ b/PadelClub/Views/Calling/CallView.swift @@ -262,10 +262,8 @@ struct CallView: View { NavigationStack { LoginView(reason: LoginReason.loginRequiredForFeature) { _ in self.showUserCreationView = false - self._payTournamentAndExecute { - self._summon(byMessage: self.summonParamByMessage, - reSummon: self.summonParamByMessage) - } + self._summon(byMessage: self.summonParamByMessage, + reSummon: self.summonParamByMessage) } } }) @@ -353,12 +351,10 @@ struct CallView: View { self.summonParamByMessage = byMessage self.summonParamReSummon = reSummon self._verifyUser { - self._payTournamentAndExecute { - if byMessage { - self._contactByMessage(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage) - } else { - self._contactByMail(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage) - } + if byMessage { + self._contactByMessage(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage) + } else { + self._contactByMail(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage) } } } @@ -371,14 +367,14 @@ struct CallView: View { } } - fileprivate func _payTournamentAndExecute(_ handler: () -> ()) { - do { - try self.tournament.payIfNecessary() - handler() - } catch { - self.showSubscriptionView = true - } - } +// fileprivate func _payTournamentAndExecute(_ handler: () -> ()) { +// do { +// try self.tournament.payIfNecessary() +// handler() +// } catch { +// self.showSubscriptionView = true +// } +// } fileprivate func _contactByMessage(reSummon: Bool, forcedEmptyMessage: Bool) { self.contactType = .message(date: callDate, diff --git a/PadelClub/Views/Calling/Components/MenuWarningView.swift b/PadelClub/Views/Calling/Components/MenuWarningView.swift index 885b1cf..fb3d4bf 100644 --- a/PadelClub/Views/Calling/Components/MenuWarningView.swift +++ b/PadelClub/Views/Calling/Components/MenuWarningView.swift @@ -147,9 +147,7 @@ struct MenuWarningView: View { fileprivate func _tryToContact() { self._verifyUser { - self._payTournamentAndExecute { - self.contactType = self.savedContactType - } + self.contactType = self.savedContactType } } diff --git a/PadelClub/Views/Calling/SendToAllView.swift b/PadelClub/Views/Calling/SendToAllView.swift index 8547947..41c82ce 100644 --- a/PadelClub/Views/Calling/SendToAllView.swift +++ b/PadelClub/Views/Calling/SendToAllView.swift @@ -272,13 +272,10 @@ struct SendToAllView: View { fileprivate func _contact() { self._verifyUser { - self._payTournamentAndExecute { - - if contactMethod == 0 { - contactType = .message(date: nil, recipients: _teams().flatMap { $0.unsortedPlayers() }.compactMap { $0.phoneNumber }, body: finalMessage(), tournamentBuild: nil) - } else { - contactType = .mail(date: nil, recipients: tournament.umpireMail(), bccRecipients: _teams().flatMap { $0.unsortedPlayers() }.compactMap { $0.email }, body: finalMessage(), subject: tournament.mailSubject(), tournamentBuild: nil) - } + if contactMethod == 0 { + contactType = .message(date: nil, recipients: _teams().flatMap { $0.unsortedPlayers() }.compactMap { $0.phoneNumber }, body: finalMessage(), tournamentBuild: nil) + } else { + contactType = .mail(date: nil, recipients: tournament.umpireMail(), bccRecipients: _teams().flatMap { $0.unsortedPlayers() }.compactMap { $0.email }, body: finalMessage(), subject: tournament.mailSubject(), tournamentBuild: nil) } } @@ -292,14 +289,14 @@ struct SendToAllView: View { } } - fileprivate func _payTournamentAndExecute(_ handler: () -> ()) { - do { - try tournament.payIfNecessary() - handler() - } catch { - self.showSubscriptionView = true - } - } +// fileprivate func _payTournamentAndExecute(_ handler: () -> ()) { +// do { +// try tournament.payIfNecessary() +// handler() +// } catch { +// self.showSubscriptionView = true +// } +// } private var _networkErrorMessage: String { ContactManagerError.getNetworkErrorMessage(sentError: sentError, networkMonitorConnected: networkMonitor.connected) diff --git a/PadelClub/Views/GroupStage/Components/GroupStageTeamView.swift b/PadelClub/Views/GroupStage/Components/GroupStageTeamView.swift index 00e83b9..f286b4b 100644 --- a/PadelClub/Views/GroupStage/Components/GroupStageTeamView.swift +++ b/PadelClub/Views/GroupStage/Components/GroupStageTeamView.swift @@ -147,55 +147,45 @@ struct GroupStageTeamView: View { Group { switch contactType { case .message(_, let recipients, let body, _): - if Guard.main.paymentForNewTournament() != nil { - MessageComposeView(recipients: recipients, body: body) { result in - switch result { - case .cancelled: - break - case .failed: - self.sentError = .messageFailed - case .sent: - if networkMonitor.connected == false { - self.contactType = nil - if team.getPhoneNumbers().isEmpty == false { - self.sentError = .uncalledTeams([team]) - } else { - self.sentError = .messageNotSent - } + MessageComposeView(recipients: recipients, body: body) { result in + switch result { + case .cancelled: + break + case .failed: + self.sentError = .messageFailed + case .sent: + if networkMonitor.connected == false { + self.contactType = nil + if team.getPhoneNumbers().isEmpty == false { + self.sentError = .uncalledTeams([team]) + } else { + self.sentError = .messageNotSent } - @unknown default: - break } + @unknown default: + break } - } else { - SubscriptionView(isPresented: self.$showSubscriptionView, showLackOfPlanMessage: true) - .environment(\.colorScheme, .light) } case .mail(_, let recipients, let bccRecipients, let body, let subject, _): - if Guard.main.paymentForNewTournament() != nil { - MailComposeView(recipients: recipients, bccRecipients: bccRecipients, body: body, subject: subject) { result in - switch result { - case .cancelled, .saved: - self.contactType = nil - case .failed: + MailComposeView(recipients: recipients, bccRecipients: bccRecipients, body: body, subject: subject) { result in + switch result { + case .cancelled, .saved: + self.contactType = nil + case .failed: + self.contactType = nil + self.sentError = .mailFailed + case .sent: + if networkMonitor.connected == false { self.contactType = nil - self.sentError = .mailFailed - case .sent: - if networkMonitor.connected == false { - self.contactType = nil - if team.getMail().isEmpty == false { - self.sentError = .uncalledTeams([team]) - } else { - self.sentError = .mailNotSent - } + if team.getMail().isEmpty == false { + self.sentError = .uncalledTeams([team]) + } else { + self.sentError = .mailNotSent } - @unknown default: - break } + @unknown default: + break } - } else { - SubscriptionView(isPresented: self.$showSubscriptionView, showLackOfPlanMessage: true) - .environment(\.colorScheme, .light) } } } diff --git a/PadelClub/Views/Team/EditingTeamView.swift b/PadelClub/Views/Team/EditingTeamView.swift index 6136e36..10a58ac 100644 --- a/PadelClub/Views/Team/EditingTeamView.swift +++ b/PadelClub/Views/Team/EditingTeamView.swift @@ -354,55 +354,45 @@ struct EditingTeamView: View { Group { switch contactType { case .message(_, let recipients, let body, _): - if Guard.main.paymentForNewTournament() != nil { - MessageComposeView(recipients: recipients, body: body) { result in - switch result { - case .cancelled: - break - case .failed: - self.sentError = .messageFailed - case .sent: - if networkMonitor.connected == false { - self.contactType = nil - if team.getPhoneNumbers().isEmpty == false { - self.sentError = .uncalledTeams([team]) - } else { - self.sentError = .messageNotSent - } + MessageComposeView(recipients: recipients, body: body) { result in + switch result { + case .cancelled: + break + case .failed: + self.sentError = .messageFailed + case .sent: + if networkMonitor.connected == false { + self.contactType = nil + if team.getPhoneNumbers().isEmpty == false { + self.sentError = .uncalledTeams([team]) + } else { + self.sentError = .messageNotSent } - @unknown default: - break } + @unknown default: + break } - } else { - SubscriptionView(isPresented: self.$showSubscriptionView, showLackOfPlanMessage: true) - .environment(\.colorScheme, .light) } case .mail(_, let recipients, let bccRecipients, let body, let subject, _): - if Guard.main.paymentForNewTournament() != nil { - MailComposeView(recipients: recipients, bccRecipients: bccRecipients, body: body, subject: subject) { result in - switch result { - case .cancelled, .saved: + MailComposeView(recipients: recipients, bccRecipients: bccRecipients, body: body, subject: subject) { result in + switch result { + case .cancelled, .saved: + self.contactType = nil + case .failed: + self.contactType = nil + self.sentError = .mailFailed + case .sent: + if networkMonitor.connected == false { self.contactType = nil - case .failed: - self.contactType = nil - self.sentError = .mailFailed - case .sent: - if networkMonitor.connected == false { - self.contactType = nil - if team.getMail().isEmpty == false { - self.sentError = .uncalledTeams([team]) - } else { - self.sentError = .mailNotSent - } + if team.getMail().isEmpty == false { + self.sentError = .uncalledTeams([team]) + } else { + self.sentError = .mailNotSent } - @unknown default: - break } + @unknown default: + break } - } else { - SubscriptionView(isPresented: self.$showSubscriptionView, showLackOfPlanMessage: true) - .environment(\.colorScheme, .light) } } }