diff --git a/PadelClub/Views/Calling/CallView.swift b/PadelClub/Views/Calling/CallView.swift index 85fb5cb..86f12af 100644 --- a/PadelClub/Views/Calling/CallView.swift +++ b/PadelClub/Views/Calling/CallView.swift @@ -137,8 +137,8 @@ struct CallView: View { } } - func finalMessage(reSummon: Bool) -> String { - if simpleMode { + func finalMessage(reSummon: Bool, forcedEmptyMessage: Bool) -> String { + if simpleMode || forcedEmptyMessage { let signature = dataStore.user.summonsMessageSignature ?? dataStore.user.defaultSignature() return "\n\n\n\n" + signature } @@ -325,6 +325,13 @@ struct CallView: View { Button("Re-convoquer") { self._summon(byMessage: byMessage, reSummon: true) } + + if simpleMode == false { + Divider() + Button("Contacter") { + self._summon(byMessage: byMessage, reSummon: false, forcedEmptyMessage: true) + } + } } label: { Text(byMessage ? "sms" : "mail") @@ -337,15 +344,15 @@ struct CallView: View { } } - private func _summon(byMessage: Bool, reSummon: Bool) { + private func _summon(byMessage: Bool, reSummon: Bool, forcedEmptyMessage: Bool = false) { self.summonParamByMessage = byMessage self.summonParamReSummon = reSummon self._verifyUser { self._payTournamentAndExecute { if byMessage { - self._contactByMessage(reSummon: reSummon) + self._contactByMessage(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage) } else { - self._contactByMail(reSummon: reSummon) + self._contactByMail(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage) } } } @@ -368,18 +375,18 @@ struct CallView: View { } } - fileprivate func _contactByMessage(reSummon: Bool) { - self.contactType = .message(date: callDate, + fileprivate func _contactByMessage(reSummon: Bool, forcedEmptyMessage: Bool) { + self.contactType = .message(date: callDate, recipients: teams.flatMap { $0.getPhoneNumbers() }, - body: finalMessage(reSummon: reSummon), + body: finalMessage(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage), tournamentBuild: nil) } - fileprivate func _contactByMail(reSummon: Bool) { + fileprivate func _contactByMail(reSummon: Bool, forcedEmptyMessage: Bool) { self.contactType = .mail(date: callDate, recipients: tournament.umpireMail(), bccRecipients: teams.flatMap { $0.getMail() }, - body: finalMessage(reSummon: reSummon), + body: finalMessage(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage), subject: tournament.tournamentTitle(), tournamentBuild: nil) }