[WEB-1857] Use correct shipping location for checkout (#2132)

kickstarter · Aug 26, 2024 · 2bc129f · 2bc129f
1 parent eaa11d9
commit 2bc129f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Library/ViewModels/ConfirmDetailsViewModel.swift b/Library/ViewModels/ConfirmDetailsViewModel.swift
@@ -331,6 +331,7 @@ public class ConfirmDetailsViewModel: ConfirmDetailsViewModelType, ConfirmDetail
       project,
       rewards,
       selectedQuantities,
+      selectedShippingRule,
       pledgeTotal,
       refTag
     )
@@ -344,7 +345,7 @@ public class ConfirmDetailsViewModel: ConfirmDetailsViewModelType, ConfirmDetail
       .takeWhen(isLoggedInAndContinueButtonTapped)
       .filter { isLoggedIn, _ in isLoggedIn }
       .map { _, pledgeDetailsData in
-        let (project, rewards, selectedQuantities, pledgeTotal, refTag) = pledgeDetailsData
+        let (project, rewards, selectedQuantities, selectedShippingRule, pledgeTotal, refTag) = pledgeDetailsData
         let rewardsIDs: [String] = rewards.first?.isNoReward == true
           ? []
           : rewards.flatMap { reward -> [String] in
@@ -357,7 +358,7 @@ public class ConfirmDetailsViewModel: ConfirmDetailsViewModelType, ConfirmDetail
         return CreateCheckoutInput(
           projectId: project.graphID,
           amount: String(format: "%.2f", pledgeTotal),
-          locationId: "\(project.location.id)",
+          locationId: "\(selectedShippingRule?.location.id)",
           rewardIds: rewardsIDs,
           refParam: refTag?.stringTag
         )

diff --git a/Library/ViewModels/NoShippingConfirmDetailsViewModel.swift b/Library/ViewModels/NoShippingConfirmDetailsViewModel.swift
@@ -272,6 +272,7 @@ public class NoShippingConfirmDetailsViewModel: NoShippingConfirmDetailsViewMode
       project,
       rewards,
       selectedQuantities,
+      selectedShippingRule,
       pledgeTotal,
       refTag
     )
@@ -285,7 +286,7 @@ public class NoShippingConfirmDetailsViewModel: NoShippingConfirmDetailsViewMode
       .takeWhen(isLoggedInAndContinueButtonTapped)
       .filter { isLoggedIn, _ in isLoggedIn }
       .map { _, pledgeDetailsData in
-        let (project, rewards, selectedQuantities, pledgeTotal, refTag) = pledgeDetailsData
+        let (project, rewards, selectedQuantities, selectedShippingRule, pledgeTotal, refTag) = pledgeDetailsData
         let rewardsIDs: [String] = rewards.first?.isNoReward == true
           ? []
           : rewards.flatMap { reward -> [String] in
@@ -298,7 +299,7 @@ public class NoShippingConfirmDetailsViewModel: NoShippingConfirmDetailsViewMode
         return CreateCheckoutInput(
           projectId: project.graphID,
           amount: String(format: "%.2f", pledgeTotal),
-          locationId: "\(project.location.id)",
+          locationId: "\(selectedShippingRule?.location.id)",
           rewardIds: rewardsIDs,
           refParam: refTag?.stringTag
         )