feat(cards): implement full saved card management and transparent checkout

- ApiCardModels.swift: SavedCard, SaveCardPayload, CreditCardOrderPayload, etc.
- ApiOrderModels.swift: add savedCardId, clientCpfCnpj, creditCard, creditCardHolderInfo to CreateOrderPayload; Codable for item/addon payloads
- ApiService.swift: listCards, saveCard, updateCard, deleteCard, updateProfileCpf
- AppState.ProfileState: add cpf field
- CheckoutView: CardSelectionSheet (list saved cards + add new), rewrite PaymentCardView (submits order with card data), CardPaymentContext carries full order data
- CheckoutView+Logic: buildCreateOrderPayload accepts card params, new loadSavedCards/confirmOrderWithSavedCard/handleOrderResponse helpers, redirect credit card confirm to CardSelectionSheet
- OrdersView: CREDIT_CARD pending orders go to tracking (not card form, since card is now submitted with order)
- UserProfileView: CPF field with mask, save via PATCH /api/customer/profile
This commit is contained in:
Daniel Arantes Loverde
2026-06-03 17:32:30 -03:00
parent 2d27240cee
commit 6b397db494
8 changed files with 636 additions and 177 deletions

View File

@@ -26,6 +26,8 @@ struct CheckoutView: View {
@State var pixPaymentContext: PixPaymentContext? = nil
@State var cardPaymentContext: CardPaymentContext? = nil
@State var orderTrackingContext: OrderTrackingContext? = nil
@State var savedCards: [SavedCard] = []
@State var showCardSelectionSheet = false
var paymentConfig: StorePaymentMethodsInfo? { storeInfo?.paymentMethods }
@@ -167,14 +169,48 @@ struct CheckoutView: View {
.navigationDestination(item: $cardPaymentContext) { context in
PaymentCardView(
context: context,
onPaymentConfirmed: {
appState: $appState,
onOrderCreated: { orderId, shortId in
appState.cart.clear()
SessionStateStore.clearPendingCartOrder()
orderTrackingContext = OrderTrackingContext(orderId: orderId, shortId: shortId)
}
) {
appState.cart.clear()
SessionStateStore.clearPendingCartOrder()
orderTrackingContext = OrderTrackingContext(orderId: context.orderId, shortId: context.shortId)
)
}
.sheet(isPresented: $showCardSelectionSheet) {
let cardContext = CardPaymentContext.build(
storeId: appState.cart.storeId ?? "",
total: totalValue,
deliveryType: deliveryType.rawValue,
profile: appState.profile,
address: selectedCustomerAddress,
items: appState.cart.toOrderItemsPayload()
)
CardSelectionSheet(
savedCards: savedCards,
cardContext: cardContext,
onSavedCardConfirmed: { cardId in
showCardSelectionSheet = false
Task {
guard let storeId = appState.cart.storeId else { return }
await confirmOrderWithSavedCard(cardId: cardId, storeId: storeId)
}
},
onNewCard: {
showCardSelectionSheet = false
cardPaymentContext = cardContext
},
onOrderCreated: { orderId, shortId in
showCardSelectionSheet = false
appState.cart.clear()
SessionStateStore.clearPendingCartOrder()
orderTrackingContext = OrderTrackingContext(orderId: orderId, shortId: shortId)
}
)
}
.task(id: paymentMethod) {
if paymentMethod == .creditCard && useInAppPayment {
await loadSavedCards()
}
}
.navigationDestination(item: $orderTrackingContext) { context in
@@ -539,10 +575,55 @@ struct OrderTrackingContext: Identifiable, Hashable {
}
struct CardPaymentContext: Identifiable, Hashable {
var id: String { orderId }
let orderId: String
let shortId: String?
let id: String
let storeId: String
let total: Double
let deliveryType: String
let profileName: String
let profileEmail: String
let profilePhone: String
let addressStreet: String?
let addressNumber: String?
let addressNeighborhood: String?
let addressCity: String?
let addressState: String?
let addressZip: String?
let addressComplement: String?
let itemsJSON: String
static func build(storeId: String, total: Double, deliveryType: String, profile: ProfileState, address: CustomerAddress?, items: [CreateOrderItemPayload]) -> CardPaymentContext {
let itemsData = (try? JSONEncoder().encode(items)).flatMap { String(data: $0, encoding: .utf8) } ?? "[]"
return CardPaymentContext(
id: UUID().uuidString,
storeId: storeId,
total: total,
deliveryType: deliveryType,
profileName: profile.name,
profileEmail: profile.email,
profilePhone: profile.phone,
addressStreet: address?.address,
addressNumber: address?.number,
addressNeighborhood: address?.neighborhood,
addressCity: address?.city,
addressState: address?.state,
addressZip: address?.zipCode,
addressComplement: address?.complement,
itemsJSON: itemsData
)
}
var addressPayload: CreateOrderAddressPayload? {
guard let street = addressStreet, street.isEmpty == false,
let number = addressNumber, number.isEmpty == false,
let neighborhood = addressNeighborhood, neighborhood.isEmpty == false else { return nil }
return CreateOrderAddressPayload(street: street, number: number, neighborhood: neighborhood, city: addressCity, state: addressState, zip: addressZip, complement: addressComplement)
}
var orderItems: [CreateOrderItemPayload] {
guard let data = itemsJSON.data(using: .utf8),
let decoded = try? JSONDecoder().decode([CreateOrderItemPayload].self, from: data) else { return [] }
return decoded
}
}
struct PaymentPixView: View {
@@ -747,104 +828,328 @@ struct PaymentPixView: View {
}
}
struct PaymentCardView: View {
let context: CardPaymentContext
var onPaymentConfirmed: (() -> Void)? = nil
var onOpenTracking: (() -> Void)? = nil
// MARK: - CardSelectionSheet
struct CardSelectionSheet: View {
let savedCards: [SavedCard]
let cardContext: CardPaymentContext
let onSavedCardConfirmed: (String) -> Void
let onNewCard: () -> Void
let onOrderCreated: (String, String?) -> Void
@Environment(\.dismiss) var dismiss
@State var cardHolderName = ""
@State var cardNumber = ""
@State var expiry = ""
@State var cvv = ""
@State var tracker = OrderRealtimeTracker()
@State var latestOrder: PublicOrderResult? = nil
@State var hasOpenedTracking = false
@State var selectedCardId: String?
@State var isSubmitting = false
init(savedCards: [SavedCard], cardContext: CardPaymentContext, onSavedCardConfirmed: @escaping (String) -> Void, onNewCard: @escaping () -> Void, onOrderCreated: @escaping (String, String?) -> Void) {
self.savedCards = savedCards
self.cardContext = cardContext
self.onSavedCardConfirmed = onSavedCardConfirmed
self.onNewCard = onNewCard
self.onOrderCreated = onOrderCreated
_selectedCardId = State(initialValue: savedCards.first(where: { $0.isDefault })?.id ?? savedCards.first?.id)
}
var body: some View {
ScrollView(showsIndicators: false) {
VStack(alignment: .leading, spacing: 14) {
RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous)
.fill(AppColors.surface)
.overlay(
HStack {
VStack(alignment: .leading, spacing: 4) {
Text("Total do Pedido")
.font(AppTypography.caption)
.foregroundStyle(AppColors.textMuted)
Text(formatCurrency(context.total))
.font(AppTypography.heading2)
.foregroundStyle(AppColors.textPrimary)
NavigationStack {
ScrollView(showsIndicators: false) {
VStack(alignment: .leading, spacing: 16) {
if savedCards.isEmpty == false {
VStack(alignment: .leading, spacing: 0) {
ForEach(savedCards) { card in
savedCardRow(card)
if card.id != savedCards.last?.id {
Divider().padding(.horizontal, 14)
}
}
}
.background(AppColors.surface)
.clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
if let selectedCardId {
PrimaryButton(title: isSubmitting ? "Processando..." : "Pagar \(formatCurrency(cardContext.total))") {
guard isSubmitting == false else { return }
onSavedCardConfirmed(selectedCardId)
}
.disabled(isSubmitting)
}
Text("ou")
.font(AppTypography.caption)
.foregroundStyle(AppColors.textMuted)
.frame(maxWidth: .infinity, alignment: .center)
}
Button {
onNewCard()
} label: {
HStack(spacing: 10) {
Image(systemName: "plus.circle.fill")
.font(.system(size: 18))
.foregroundStyle(AppColors.primary)
Text("Adicionar novo cartão")
.font(AppTypography.heading3)
.foregroundStyle(AppColors.primary)
Spacer()
}
.padding(14)
)
.frame(height: 88)
Text("Dados do Cartão")
.font(AppTypography.heading2)
.foregroundStyle(AppColors.textPrimary)
VStack(spacing: 10) {
labeledField("Número do Cartão", placeholder: "0000 0000 0000 0000", text: $cardNumber)
labeledField("Nome no Cartão", placeholder: "Como impresso no cartão", text: $cardHolderName)
HStack(spacing: 10) {
labeledField("Validade", placeholder: "MM/AA", text: $expiry)
labeledField("CVV", placeholder: "•••", text: $cvv)
.background(AppColors.surface)
.clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
}
.buttonStyle(.plain)
}
.padding(20)
}
.background(AppColors.backgroundLight)
.navigationTitle("Selecionar Cartão")
.appInlineNavigationTitle()
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button("Cancelar") { dismiss() }
.foregroundStyle(AppColors.textMuted)
}
}
}
}
private func savedCardRow(_ card: SavedCard) -> some View {
Button {
selectedCardId = card.id
} label: {
HStack(spacing: 12) {
Image(systemName: "creditcard.fill")
.font(.system(size: 20))
.foregroundStyle(AppColors.textPrimary)
.frame(width: 44, height: 44)
.background(AppColors.backgroundLight)
.clipShape(RoundedRectangle(cornerRadius: 10, style: .continuous))
VStack(alignment: .leading, spacing: 3) {
Text(card.displayLabel)
.font(AppTypography.heading3)
.foregroundStyle(AppColors.textPrimary)
Text("Vence \(card.expiryLabel)")
.font(.caption)
.foregroundStyle(AppColors.textMuted)
}
Spacer()
Circle()
.stroke(selectedCardId == card.id ? AppColors.tertiary : AppColors.textMuted.opacity(0.45), lineWidth: 2)
.frame(width: 22, height: 22)
.background(Circle().fill(selectedCardId == card.id ? AppColors.tertiary : Color.clear))
}
.padding(14)
}
.buttonStyle(.plain)
}
private func formatCurrency(_ value: Double) -> String {
String(format: "R$ %.2f", value).replacingOccurrences(of: ".", with: ",")
}
}
// MARK: - PaymentCardView
struct PaymentCardView: View {
let context: CardPaymentContext
@Binding var appState: AppState
let onOrderCreated: (String, String?) -> Void
@Environment(\.dismiss) var dismiss
@State var holderName: String
@State var cardNumber = ""
@State var expiry = ""
@State var cvv = ""
@State var cpf: String
@State var saveCard = false
@State var nickname = ""
@State var isSubmitting = false
init(context: CardPaymentContext, appState: Binding<AppState>, onOrderCreated: @escaping (String, String?) -> Void) {
self.context = context
self._appState = appState
self.onOrderCreated = onOrderCreated
_holderName = State(initialValue: context.profileName)
_cpf = State(initialValue: appState.wrappedValue.profile.cpf)
}
var canSubmit: Bool {
holderName.isEmpty == false &&
cardNumber.filter(\.isNumber).count >= 13 &&
expiry.count >= 4 &&
cvv.count >= 3 &&
cpf.filter(\.isNumber).count == 11
}
var body: some View {
ScrollView(showsIndicators: false) {
VStack(alignment: .leading, spacing: 16) {
// Total
HStack {
VStack(alignment: .leading, spacing: 2) {
Text("Total do Pedido")
.font(AppTypography.caption)
.foregroundStyle(AppColors.textMuted)
Text(formatCurrency(context.total))
.font(AppTypography.heading2)
.foregroundStyle(AppColors.textPrimary)
}
Spacer()
}
.padding(14)
.background(AppColors.surface)
.clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
PrimaryButton(title: "Salvar e Pagar") {
if latestOrder?.isPaymentConfirmed == true {
onPaymentConfirmed?()
openTrackingOnce()
} else {
SnackbarCenter.shared.show(title: "Pagamento ainda não confirmado.", style: .info, icon: "clock.fill", duration: 2.0)
// Dados do cartão
VStack(alignment: .leading, spacing: 0) {
sectionHeader("DADOS DO CARTÃO")
VStack(spacing: 10) {
labeledField("Número do Cartão", placeholder: "0000 0000 0000 0000", text: $cardNumber)
.keyboardType(.numberPad)
labeledField("Nome no Cartão", placeholder: "Como impresso no cartão", text: $holderName)
HStack(spacing: 10) {
labeledField("Validade", placeholder: "MM/AAAA", text: $expiry)
.keyboardType(.numberPad)
labeledField("CVV", placeholder: "•••", text: $cvv)
.keyboardType(.numberPad)
}
labeledField("CPF do Titular", placeholder: "000.000.000-00", text: $cpf)
.keyboardType(.numberPad)
}
.padding(14)
}
Button("Apenas Pagar") {
if latestOrder?.isPaymentConfirmed == true {
onPaymentConfirmed?()
openTrackingOnce()
} else {
SnackbarCenter.shared.show(title: "Aguardando confirmação do pagamento.", style: .info, icon: "clock.fill", duration: 2.0)
}
}
.font(AppTypography.heading3)
.foregroundStyle(AppColors.textMuted)
.frame(maxWidth: .infinity, minHeight: 48)
.background(AppColors.surface)
.clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
.buttonStyle(.plain)
// Salvar cartão
VStack(spacing: 0) {
HStack {
VStack(alignment: .leading, spacing: 2) {
Text("Salvar cartão")
.font(AppTypography.heading3)
.foregroundStyle(AppColors.textPrimary)
Text("Pague mais rápido nas próximas compras")
.font(.caption)
.foregroundStyle(AppColors.textMuted)
}
Spacer()
Toggle("", isOn: $saveCard)
.labelsHidden()
.tint(AppColors.primary)
}
.padding(14)
if saveCard {
Divider().padding(.horizontal, 14)
labeledField("Apelido do cartão (opcional)", placeholder: "Ex: Meu Visa", text: $nickname)
.padding(14)
}
}
.background(AppColors.surface)
.clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
.animation(.easeInOut(duration: 0.2), value: saveCard)
PrimaryButton(title: isSubmitting ? "Processando..." : "Confirmar e Pagar") {
guard canSubmit, isSubmitting == false else { return }
Task { await submitOrder() }
}
.disabled(canSubmit == false || isSubmitting)
}
.padding(20)
}
.background(AppColors.backgroundLight)
.navigationTitle("Pagamento")
.navigationTitle("Novo Cartão")
.appInlineNavigationTitle()
.task {
tracker.onOrderUpdated = { updated in
latestOrder = updated
if updated.isPaymentConfirmed {
onPaymentConfirmed?()
openTrackingOnce()
}
@MainActor
private func submitOrder() async {
isSubmitting = true
defer { isSubmitting = false }
let cleanCpf = cpf.filter(\.isNumber)
let cleanCardNumber = cardNumber.filter(\.isNumber)
let expiryParts = expiry.filter(\.isNumber)
let expiryMonth = String(expiryParts.prefix(2))
let expiryYear: String
let yearPart = String(expiryParts.dropFirst(2))
expiryYear = yearPart.count == 2 ? "20\(yearPart)" : yearPart
let rawPhone = context.profilePhone.filter(\.isNumber)
let phoneWithDdi = rawPhone.hasPrefix("55") ? rawPhone : "55\(rawPhone)"
let holderInfo = SaveCardHolderInfoPayload(
name: context.profileName,
email: context.profileEmail,
cpfCnpj: cleanCpf,
postalCode: (context.addressZip ?? "").filter(\.isNumber),
addressNumber: context.addressNumber ?? "",
phone: phoneWithDdi
)
let creditCardPayload = CreditCardOrderPayload(
holderName: holderName,
number: cleanCardNumber,
expiryMonth: expiryMonth,
expiryYear: expiryYear,
ccv: cvv
)
let payload = CreateOrderPayload(
customer: CreateOrderCustomerPayload(name: context.profileName, phone: context.profilePhone, email: context.profileEmail, asaasId: nil),
items: context.orderItems,
total: context.total,
paymentMethod: CheckoutPaymentMethod.creditCard.rawValue,
deliveryType: context.deliveryType,
address: context.addressPayload,
savedCardId: nil,
clientCpfCnpj: cleanCpf,
creditCard: creditCardPayload,
creditCardHolderInfo: holderInfo
)
do {
// Save CPF locally for future use
if cleanCpf.count == 11 {
appState.profile.cpf = cleanCpf
Task<Void, Never> {
do { _ = try await ApiService().updateProfileCpf(cpf: cleanCpf) } catch {}
}
}
tracker.start(orderId: context.orderId, jwt: DefaultTokenStore().jwt)
}
.onDisappear {
tracker.stop()
// Optionally save card
if saveCard {
let savePayload = SaveCardPayload(
creditCard: SaveCardCreditCardPayload(holderName: holderName, number: cleanCardNumber, expiryMonth: expiryMonth, expiryYear: expiryYear, ccv: cvv),
creditCardHolderInfo: holderInfo,
nickname: nickname.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ? nil : nickname,
isDefault: false
)
Task<Void, Never> {
do { _ = try await ApiService().saveCard(payload: savePayload) } catch {}
}
}
let response = try await ApiService().createOrder(storeId: context.storeId, payload: payload)
if response.error {
SnackbarCenter.shared.show(title: response.message ?? "Pagamento recusado.", style: .error, icon: "xmark.octagon.fill", duration: 3.5)
return
}
guard let result = response.result else { return }
let orderId = result.id ?? UUID().uuidString
onOrderCreated(orderId, result.shortId)
} catch {
SnackbarCenter.shared.show(title: "Não foi possível processar o pagamento.", style: .error, icon: "xmark.octagon.fill", duration: 3.0)
}
}
private func openTrackingOnce() {
guard hasOpenedTracking == false else { return }
hasOpenedTracking = true
onOpenTracking?()
private func sectionHeader(_ text: String) -> some View {
Text(text)
.font(AppTypography.overline)
.foregroundStyle(AppColors.textMuted)
.padding(.horizontal, 14)
.padding(.top, 12)
.padding(.bottom, 4)
}
private func labeledField(_ label: String, placeholder: String, text: Binding<String>) -> some View {