Merge remote-tracking branch 'refs/remotes/origin/main'

online_payment
Raz 7 months ago
commit 2bf26a9113
  1. 4
      PadelClub.xcodeproj/project.pbxproj
  2. 2
      PadelClub/Utils/Patcher.swift
  3. 18
      PadelClub/Views/Tournament/Subscription/Guard.swift

@ -3640,7 +3640,7 @@
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@ -3686,7 +3686,7 @@
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 3;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
DEVELOPMENT_TEAM = BQ3Y44M3Q6; DEVELOPMENT_TEAM = BQ3Y44M3Q6;

@ -54,7 +54,7 @@ enum Patch: String, CaseIterable {
case cleanLogs case cleanLogs
case syncUpgrade case syncUpgrade
case updateTournaments case updateTournaments
case cleanPurchaseApiCalls case cleanPurchaseApiCalls = "cleanPurchaseApiCalls_2"
var id: String { var id: String {
return "padelclub.app.patch.\(self.rawValue)" return "padelclub.app.patch.\(self.rawValue)"

@ -187,18 +187,20 @@ import LeStorage
} }
var currentPlan: StoreItem? { var currentPlan: StoreItem? {
// #if DEBUG #if DEBUG
// return .monthlyUnlimited if let plan = PListReader.readString(plist: "local", key: "plan"), !plan.isEmpty {
// #elseif TESTFLIGHT return StoreItem(rawValue: plan)
// return .monthlyUnlimited }
// #elseif PRODTEST #elseif TESTFLIGHT
// return .monthlyUnlimited return .monthlyUnlimited
// #else #elseif PRODTEST
return .monthlyUnlimited
#else
if let currentBestPurchase = self.currentBestPurchase, let plan = StoreItem(rawValue: currentBestPurchase.productId) { if let currentBestPurchase = self.currentBestPurchase, let plan = StoreItem(rawValue: currentBestPurchase.productId) {
return plan return plan
} }
#endif
return nil return nil
// #endif
} }
func userFilteredPurchases() -> [StoreKit.Transaction] { func userFilteredPurchases() -> [StoreKit.Transaction] {

Loading…
Cancel
Save