diff --git a/apps/OSC/pages/checkout.tsx b/apps/OSC/pages/checkout.tsx index e2e09d371..e2fbee4a9 100644 --- a/apps/OSC/pages/checkout.tsx +++ b/apps/OSC/pages/checkout.tsx @@ -50,7 +50,7 @@ const CheckoutPage = () => { mobileNumber: '0612345678', email: 'lisa.k@gmail.com', address: '15 rue du soleil, paris, france', - pinCode: '75001' + pinCode: '75020' }) const [isBillingAddressSameAsShippingAddress, setIsBillingAddressSameAsShippingAddress] = useState(true) @@ -60,7 +60,7 @@ const CheckoutPage = () => { mobileNumber: '0612345678', email: 'lisa.k@gmail.com', address: '15 rue du soleil, paris, france', - pinCode: '75001' + pinCode: '75020' }) const router = useRouter() diff --git a/apps/retail/pages/checkout.tsx b/apps/retail/pages/checkout.tsx index 387dee0e9..808381cb5 100644 --- a/apps/retail/pages/checkout.tsx +++ b/apps/retail/pages/checkout.tsx @@ -49,7 +49,7 @@ const CheckoutPage = () => { mobileNumber: '0612345678', email: 'lisa.k@gmail.com', address: '15 Rue Du Soleil, Paris, France', - pinCode: '75001' + pinCode: '75020' } ) @@ -69,7 +69,7 @@ const CheckoutPage = () => { mobileNumber: '0612345678', email: 'lisa.k@gmail.com', address: '15 Rue Du Soleil, Paris, France', - pinCode: '75001' + pinCode: '75020' } ) diff --git a/apps/tourismV1.1/pages/checkout.tsx b/apps/tourismV1.1/pages/checkout.tsx index f3f559bce..c92524859 100644 --- a/apps/tourismV1.1/pages/checkout.tsx +++ b/apps/tourismV1.1/pages/checkout.tsx @@ -64,7 +64,7 @@ const CheckoutPage = () => { mobileNumber: '0612345678', email: 'lisa.k@gmail.com', address: '15 Rue du Soleil, Paris, France', - pinCode: '75001' + pinCode: '75020' } ) const [isBillingAddressSameAsShippingAddress, setIsBillingAddressSameAsShippingAddress] = useState(true) @@ -83,7 +83,7 @@ const CheckoutPage = () => { mobileNumber: '0612345678', email: 'lisa.k@gmail.com', address: '15 Rue du Soleil, Paris, France', - pinCode: '75001' + pinCode: '75020' } ) const theme = useTheme() diff --git a/packages/common/src/pages/checkout.tsx b/packages/common/src/pages/checkout.tsx index bddb18ba1..20c200125 100644 --- a/packages/common/src/pages/checkout.tsx +++ b/packages/common/src/pages/checkout.tsx @@ -48,7 +48,7 @@ const CheckoutPage = () => { mobileNumber: '0612345678', email: 'lisa.k@gmail.com', address: '15 Rue Du Soleil, Paris, France', - pinCode: '75001' + pinCode: '75020' } ) @@ -68,7 +68,7 @@ const CheckoutPage = () => { mobileNumber: '0612345678', email: 'lisa.k@gmail.com', address: '15 Rue Du Soleil, Paris, France', - pinCode: '75001' + pinCode: '75020' } ) diff --git a/packages/common/src/utils/checkout-utils.ts b/packages/common/src/utils/checkout-utils.ts index 56235115e..fc1398ed6 100644 --- a/packages/common/src/utils/checkout-utils.ts +++ b/packages/common/src/utils/checkout-utils.ts @@ -49,8 +49,8 @@ export const getPaymentBreakDown = (initData: InitResponseModel[] | StatusRespon const quote = initData[0].message.order.quote const breakUp = quote.breakup const totalPricewithCurrent = { - currency: quote.price.currency, - value: quote.price.value + value: getSubTotalAndDeliveryCharges(initData).subTotal.toString(), + currency: getSubTotalAndDeliveryCharges(initData).currencySymbol! } const breakUpMap: Record = {} @@ -70,16 +70,18 @@ export const getPaymentBreakDown = (initData: InitResponseModel[] | StatusRespon return { breakUpMap, totalPricewithCurrent } } -export const getSubTotalAndDeliveryCharges = (initData: InitResponseModel[]) => { +export const getSubTotalAndDeliveryCharges = (initData: InitResponseModel[] | StatusResponseModel[]) => { let subTotal: number = 0 let currencySymbol if (initData && initData.length > 0) { initData.forEach(data => { - subTotal = - subTotal + Number(parseFloat((Number(data.message.order.quote.price.value) || 0).toString()).toFixed(2)) - - currencySymbol = data.message.order.quote.price.currency + if (data.message.order.quote.breakup) { + data.message.order.quote.breakup.forEach(breakup => { + subTotal += Number(parseFloat((Number(breakup.price.value) || 0).toString()).toFixed(2)) + }) + currencySymbol = data.message.order.quote.breakup[0]?.price.currency + } }) }