fix: fix apple pay address and loading issue

juspay · Oct 16, 2024 · 6d41782 · 6d41782
1 parent 64a1f03
commit 6d41782
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/src/Types/ApplePayTypes.res b/src/Types/ApplePayTypes.res
@@ -31,7 +31,7 @@ type lineItem = {
   \"type": string,
 }
 type shippingAddressChangeEvent = {shippingContact: JSON.t}
-type updatedOrderDetails = {newTotal: lineItem, newLineItems: array<lineItem>}
+type orderDetails = {newTotal: lineItem, newLineItems: array<lineItem>}
 type innerSession
 type session = {
   begin: unit => unit,
@@ -41,8 +41,8 @@ type session = {
   mutable onvalidatemerchant: event => unit,
   completeMerchantValidation: JSON.t => unit,
   mutable onpaymentauthorized: event => unit,
-  mutable onshippingcontactselected: shippingAddressChangeEvent => unit,
-  completeShippingContactSelection: updatedOrderDetails => unit,
+  mutable onshippingcontactselected: shippingAddressChangeEvent => promise<unit>,
+  completeShippingContactSelection: orderDetails => unit,
   completePayment: JSON.t => unit,
   \"STATUS_SUCCESS": string,
   \"STATUS_FAILURE": string,

diff --git a/src/Utilities/ApplePayHelpers.res b/src/Utilities/ApplePayHelpers.res
@@ -106,14 +106,28 @@ let startApplePaySession = (
   }
 
   ssn.onshippingcontactselected = shippingAddressChangeEvent => {
+    let currentTotal = paymentRequest->getDictFromJson->getDictFromDict("total")
+    let label = currentTotal->getString("label", "apple")
+    let currentAmount = currentTotal->getString("amount", "0.00")
+    let \"type" = currentTotal->getString("type", "final")
+
+    let oldTotal: lineItem = {
+      label,
+      amount: currentAmount,
+      \"type",
+    }
+    let currentOrderDetails: orderDetails = {
+      newTotal: oldTotal,
+      newLineItems: [oldTotal],
+    }
     if isTaxCalculationEnabled {
       let newShippingContact =
         shippingAddressChangeEvent.shippingContact
         ->getDictFromJson
         ->shippingContactItemToObjMapper
       let newShippingAddress =
         [
-          ("state", newShippingContact.locality->JSON.Encode.string),
+          ("state", newShippingContact.administrativeArea->JSON.Encode.string),
           ("country", newShippingContact.countryCode->JSON.Encode.string),
           ("zip", newShippingContact.postalCode->JSON.Encode.string),
         ]->getJsonFromArrayOfJson
@@ -126,8 +140,7 @@ let startApplePaySession = (
         ~publishableKey,
         ~clientSecret,
         ~paymentMethodType,
-      )
-      ->thenResolve(response => {
+      )->thenResolve(response => {
         switch response->taxResponseToObjMapper {
         | Some(taxCalculationResponse) => {
             let (netAmount, ordertaxAmount, shippingCost) = (
@@ -136,13 +149,13 @@ let startApplePaySession = (
               taxCalculationResponse.shipping_cost,
             )
             let newTotal: lineItem = {
-              label: "Net Amount",
+              label,
               amount: netAmount->minorUnitToString,
-              \"type": "final",
+              \"type",
             }
             let newLineItems: array<lineItem> = [
               {
-                label: "Bag Subtotal",
+                label: "Subtotal",
                 amount: (netAmount - ordertaxAmount - shippingCost)->minorUnitToString,
                 \"type": "final",
               },
@@ -157,16 +170,18 @@ let startApplePaySession = (
                 \"type": "final",
               },
             ]
-            let updatedOrderDetails: updatedOrderDetails = {
+            let updatedOrderDetails: orderDetails = {
               newTotal,
               newLineItems,
             }
             ssn.completeShippingContactSelection(updatedOrderDetails)
           }
-        | None => ssn.abort()
+        | None => ssn.completeShippingContactSelection(currentOrderDetails)
         }
       })
-      ->ignore
+    } else {
+      ssn.completeShippingContactSelection(currentOrderDetails)
+      resolve()
     }
   }