Loverde-Company-LTDA/LCEssentials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

fix(payment): accept either 2-digit or 4-digit years in card expiry validation

Browse Source
This commit is contained in:
Daniel Arantes Loverde
2026-06-04 15:58:52 -03:00
parent f49e4ea337
commit 8c19b1323c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pedi-foods/Sources/PediFoods/Views/Main/CheckoutView.swift
View File

@@ -1116,9 +1116,9 @@ struct PaymentCardView: View {
_cpf = State(initialValue: appState.wrappedValue.profile.cpf) _cpf = State(initialValue: appState.wrappedValue.profile.cpf)
} }
private func validateExpiryDate(digits: Int) -> Bool { private func validateExpiryDate() -> Bool {
let clean = expiry.filter(\.isNumber) let clean = expiry.filter(\.isNumber)
guard clean.count == digits else { return false } guard clean.count == 4 || clean.count == 6 else { return false }
let monthStr = String(clean.prefix(2)) let monthStr = String(clean.prefix(2))
guard let month = Int(monthStr), (1...12).contains(month) else { return false } guard let month = Int(monthStr), (1...12).contains(month) else { return false }
return true return true
@@ -1127,7 +1127,7 @@ struct PaymentCardView: View {
var canSubmit: Bool { var canSubmit: Bool {
holderName.trimmingCharacters(in: .whitespaces).isEmpty == false && holderName.trimmingCharacters(in: .whitespaces).isEmpty == false &&
cardNumber.filter(\.isNumber).count >= 13 && cardNumber.filter(\.isNumber).count >= 13 &&
validateExpiryDate(digits: 4) && validateExpiryDate() &&
cvv.filter(\.isNumber).count >= 3 && cvv.filter(\.isNumber).count >= 3 &&
cpf.filter(\.isNumber).count == 11 cpf.filter(\.isNumber).count == 11
} }
@@ -1673,9 +1673,9 @@ struct ChangePaymentNewCardView: View {
_cpf = State(initialValue: appState.wrappedValue.profile.cpf) _cpf = State(initialValue: appState.wrappedValue.profile.cpf)
} }
private func validateExpiryDate(digits: Int) -> Bool { private func validateExpiryDate() -> Bool {
let clean = expiry.filter(\.isNumber) let clean = expiry.filter(\.isNumber)
guard clean.count == digits else { return false } guard clean.count == 4 || clean.count == 6 else { return false }
let monthStr = String(clean.prefix(2)) let monthStr = String(clean.prefix(2))
guard let month = Int(monthStr), (1...12).contains(month) else { return false } guard let month = Int(monthStr), (1...12).contains(month) else { return false }
return true return true
@@ -1684,7 +1684,7 @@ struct ChangePaymentNewCardView: View {
var canSubmit: Bool { var canSubmit: Bool {
holderName.trimmingCharacters(in: .whitespaces).isEmpty == false && holderName.trimmingCharacters(in: .whitespaces).isEmpty == false &&
cardNumber.filter(\.isNumber).count >= 13 && cardNumber.filter(\.isNumber).count >= 13 &&
validateExpiryDate(digits: 6) && validateExpiryDate() &&
cvv.filter(\.isNumber).count >= 3 && cvv.filter(\.isNumber).count >= 3 &&
cpf.filter(\.isNumber).count == 11 cpf.filter(\.isNumber).count == 11
} }