fix merge

PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift

@@ -38,9 +38,17 @@ struct TournamentStatusView: View {
             
             Section {
                 RowButtonView("Supprimer le tournoi", role: .destructive) {
+                    if tournament.currentPayment == nil {
+                        do {
+                            try dataStore.tournaments.delete(instance: tournament)
+                        } catch {
+                            Logger.error(error)
+                        }
+                    } else {
                         tournament.endDate = Date()
                         tournament.isDeleted.toggle()
                         tournament.navigationPath.removeAll()
+                    }
                     navigation.path = NavigationPath()
                 }
             } footer: {
@@ -50,7 +58,7 @@ struct TournamentStatusView: View {
             if tournament.hasEnded() == false && tournament.isCanceled == false {
                 Section {
                     RowButtonView("Annuler le tournoi", role: .destructive) {
-                        tournament.isCanceled.toggle()
+                        tournament.setCanceled(true)
                         dismiss()
                     }
                 } footer: {

PadelClub/Views/Tournament/TournamentView.swift

@@ -64,7 +64,7 @@ struct TournamentView: View {
                 case .canceled:
                     Section {
                         RowButtonView("Reprendre le tournoi", role: .destructive) {
-                            tournament.isCanceled.toggle()
+                            tournament.setCanceled(false)
                             _save()
                         }
                     } footer: {