diff --git a/com.twin.app.shoptime/src/actions/checkoutActions.js b/com.twin.app.shoptime/src/actions/checkoutActions.js index 70c54f15..3b0621d5 100644 --- a/com.twin.app.shoptime/src/actions/checkoutActions.js +++ b/com.twin.app.shoptime/src/actions/checkoutActions.js @@ -21,13 +21,10 @@ export const getMyInfoCheckoutInfo = }); if (callback) callback(response.data); - - dispatch(changeAppStatus({ showLoadingPanel: { show: false } })); }; const onFail = (error) => { console.error("getMyInfoCheckoutInfo OnFail: ", error); - dispatch(changeAppStatus({ showLoadingPanel: { show: false } })); }; TAxios( @@ -100,13 +97,14 @@ export const getCheckoutTotalAmt = payload: response.data.data, }); - dispatch(changeAppStatus({ showLoadingPanel: { show: false } })); - if (callback) callback(response.data); + + dispatch(changeAppStatus({ showLoadingPanel: { show: false } })); }; const onFail = (error) => { console.error("getCheckoutTotalAmt onFail: ", error); + dispatch(changeAppStatus({ showLoadingPanel: { show: false } })); }; diff --git a/com.twin.app.shoptime/src/utils/helperMethods.js b/com.twin.app.shoptime/src/utils/helperMethods.js index fd1cf8e0..d0eaaa72 100644 --- a/com.twin.app.shoptime/src/utils/helperMethods.js +++ b/com.twin.app.shoptime/src/utils/helperMethods.js @@ -482,3 +482,24 @@ export const parseLocalizedNumber = (numberString, countryCode) => { return parseFloat(numberString); }; + +export const formatCurrencyValue = ( + value, + currSign, + currSignLoc, + isDiscount = false +) => { + if (value === "-" || value === 0) return "-"; + + const numValue = parseFloat(value); + if (isNaN(numValue)) return "-"; + + const sign = isDiscount && numValue > 0 ? "- " : ""; + const formattedValue = numValue.toFixed(2); + + if (!currSign || !currSignLoc) return `${sign}${formattedValue}`; + + return currSignLoc === "L" + ? `${sign}${currSign} ${formattedValue}` + : `${sign}${formattedValue} ${currSign}`; +}; diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx index 92fc40c9..16040c5f 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx @@ -7,15 +7,16 @@ import Spotlight from "@enact/spotlight"; import { getCheckoutTotalAmt, - getMyInfoCheckoutInfo, resetCheckoutData, } from "../../actions/checkoutActions"; -import { - changeAppStatus, - setHidePopup, - setShowPopup, -} from "../../actions/commonActions"; +import { setHidePopup, setShowPopup } from "../../actions/commonActions"; import { getShoptimeTerms } from "../../actions/empActions"; +import { + sendLogCheckOutBtnClick, + sendLogGNB, + sendLogMyInfoEdit, + sendLogPaymentEntry, +} from "../../actions/logActions"; import { popPanel } from "../../actions/panelActions"; import TBody from "../../components/TBody/TBody"; import TButton from "../../components/TButton/TButton"; @@ -36,7 +37,6 @@ import FixedSideBar from "./container/FixedSideBar"; import InformationContainer from "./container/InformationContainer"; import OrderItemsSideBar from "./container/OrderItemsSideBar"; import SummaryContainer from "./container/SummaryCotainer"; -import {sendLogCheckOutBtnClick, sendLogGNB, sendLogPaymentEntry, sendLogMyInfoEdit} from "../../actions/logActions"; export default function CheckOutPanel({ panelInfo }) { const dispatch = useDispatch(); @@ -298,12 +298,9 @@ export default function CheckOutPanel({ panelInfo }) { } }, [panelInfo?.logInfo]); - const doSendLogMyInfoEdit = useCallback( - (btnNm) => { - dispatch(sendLogMyInfoEdit({ btnNm })); - }, - [] - ); + const doSendLogMyInfoEdit = useCallback((btnNm) => { + dispatch(sendLogMyInfoEdit({ btnNm })); + }, []); return ( <> diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/components/OffersPromotionItemCard.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/components/OffersPromotionItemCard.jsx index 2f92e277..c6cbd3d2 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/components/OffersPromotionItemCard.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/components/OffersPromotionItemCard.jsx @@ -33,6 +33,7 @@ export default memo(function OffersPromotionItemCard({ currSignLoc, shippingCharge, auctProdYn, + auctFinalPriceChgDt, prdtCoupon, spotlightId, offerSideBarOpen, @@ -85,7 +86,11 @@ export default memo(function OffersPromotionItemCard({

{prdtNm}

- {auctProdYn === "N" ? ( + {auctProdYn === "Y" && !auctFinalPriceChgDt ? ( +

+ {$L("Purchased products will be paid at the final price.")} +
+ ) : ( <> {currSignLoc === "L" ? ( @@ -111,10 +116,6 @@ export default memo(function OffersPromotionItemCard({ : `${shippingCharge || 0.0} ${currSign}`} - ) : ( -
- {$L("Purchased products will be paid at the final price.")} -
)}

diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/components/OrderItemCard.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/components/OrderItemCard.jsx index 1b7804cd..d06dc8a5 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/components/OrderItemCard.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/components/OrderItemCard.jsx @@ -27,6 +27,7 @@ export default memo(function OrderItemCard({ currSignLoc, shippingCharge, auctProdYn, + auctFinalPriceChgDt, ...rest }) { return ( @@ -55,7 +56,11 @@ export default memo(function OrderItemCard({

Qty: {prodQty}

- {auctProdYn === "N" ? ( + {auctProdYn === "Y" && !auctFinalPriceChgDt ? ( +

+ {$L("Purchased products will be paid at the final price.")} +
+ ) : ( <> {currSignLoc === "L" @@ -67,10 +72,6 @@ export default memo(function OrderItemCard({ ? `${currSign} ${shippingCharge || 0.0}` : `${shippingCharge || 0.0} ${currSign}`} - ) : ( -
- {$L("Purchased products will be paid at the final price.")} -
)}

diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/components/PinCodeInput.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/components/PinCodeInput.jsx index dd7ea8f0..f138dc1c 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/components/PinCodeInput.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/components/PinCodeInput.jsx @@ -62,6 +62,10 @@ export default function PinCodeInput({ const auctProdYn = useSelector( (state) => state.checkout?.checkoutData?.productList?.[0].auctProdYn ); + const auctFinalPriceChgDt = useSelector( + (state) => + state.checkout?.checkoutData?.productList?.[0].auctFinalPriceChgDt + ); const serverHOST = useSelector((state) => state.common.appStatus.serverHOST); const serverType = useSelector((state) => state.localSettings.serverType); @@ -171,36 +175,14 @@ export default function PinCodeInput({ if (response.retCode === 0) { const orderProductCoupontUse = Object.keys(selectedCoupons).map( (productId) => { - const { - cpnAplyMaxDcAmt, - cpnAplyMinProdAmt, - cpnAplyMinPurcAmt, - cpnCdCval, - cpnCdSeq, - cpnDctrt, - cpnSno, - dcAmt, - mbrNo, - prdtId, - shptmCpnTpCd, - shptmCpnTrgtCd, - shptmDcTpCd, - } = selectedCoupons[productId]; + const { prdtId, cpnSno, cpnCdSeq } = selectedCoupons[productId]; return { - cpnAplyMaxDcAmt, - cpnAplyMinProdAmt, - cpnAplyMinPurcAmt, - cpnCdCval, - cpnCdSeq, - cpnDctrt, - cpnSno, - dcAmt, - mbrNo, prdtId, - shptmCpnTpCd, - shptmCpnTrgtCd, - shptmDcTpCd, + patnrId: productList.patnrId, + prodSno: productList.prodSno, + cpnSno, + cpnCdSeq, }; } ); @@ -227,6 +209,7 @@ export default function PinCodeInput({ panelInfo: { orderInfo: response.data.data, auctProdYn: auctProdYn, + auctFinalPriceChgDt: auctFinalPriceChgDt, logInfo: logInfo, }, }) @@ -260,6 +243,7 @@ export default function PinCodeInput({ productList, isMounted, auctProdYn, + auctFinalPriceChgDt, dispatch, logInfo, setIsOrderSuccessful, diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/container/FixedSideBar.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/container/FixedSideBar.jsx index 62844b91..1ed8080e 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/container/FixedSideBar.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/container/FixedSideBar.jsx @@ -44,6 +44,7 @@ export default function FixedSideBar({ closeSideBar, offerSideBarOpen }) { currSignLoc={item.currSignLoc} shippingCharge={item.shippingCharge} auctProdYn={item.auctProdYn} + auctFinalPriceChgDt={item.auctFinalPriceChgDt} prdtCoupon={item.prdtCoupon} offerSideBarOpen={offerSideBarOpen} /> diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx index 8df27191..b641bf93 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx @@ -58,6 +58,10 @@ export default function InformationContainer({ const auctProdYn = useSelector( (state) => state.checkout?.checkoutData?.productList?.[0].auctProdYn ); + const auctFinalPriceChgDt = useSelector( + (state) => + state.checkout?.checkoutData?.productList?.[0].auctFinalPriceChgDt + ); const totDcAmt = useSelector( (state) => state.checkout?.checkoutTotalData?.orderTotalAmtInfo?.totDcAmt ); @@ -198,7 +202,7 @@ export default function InformationContainer({ spotlightId="checkout-btn-fifth" onFocus={handleFocus} > - {auctProdYn === "Y" ? " - " : totDcAmt} + {auctProdYn === "Y" && !auctFinalPriceChgDt ? " - " : totDcAmt} diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/container/OrderItemsSideBar.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/container/OrderItemsSideBar.jsx index 44f7e1e3..e7e1d87e 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/container/OrderItemsSideBar.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/container/OrderItemsSideBar.jsx @@ -42,6 +42,7 @@ export default function OrderItemsSideBar({ closeSideBar }) { currSignLoc={item.currSignLoc} shippingCharge={item.shippingCharge} auctProdYn={item.auctProdYn} + auctFinalPriceChgDt={item.auctFinalPriceChgDt} /> ); }, diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryCotainer.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryCotainer.jsx index 04b58dad..34075167 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryCotainer.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryCotainer.jsx @@ -7,7 +7,7 @@ import SpotlightContainerDecorator from "@enact/spotlight/SpotlightContainerDeco import { setShowPopup } from "../../../actions/commonActions"; import TButton from "../../../components/TButton/TButton"; import * as Config from "../../../utils/Config"; -import { $L } from "../../../utils/helperMethods"; +import { $L, formatCurrencyValue } from "../../../utils/helperMethods"; import css from "./SummaryContainer.module.less"; const Container = SpotlightContainerDecorator( @@ -33,14 +33,47 @@ export default function SummaryContainer({ ); const items = [ - { name: "Items", value: priceTotalData.totProdPrc || "-" }, + { + name: "Items", + value: formatCurrencyValue( + priceTotalData.totProdPrc, + currSign, + currSignLoc + ), + }, { name: "Your Coupon Savings", - value: priceTotalData.totDcAmt || "-", + value: formatCurrencyValue( + priceTotalData.totDcAmt, + currSign, + currSignLoc, + true + ), + }, + { + name: "Shipping & Handling", + value: formatCurrencyValue( + priceTotalData.totDlvrAmt, + currSign, + currSignLoc + ), + }, + { + name: "TOTAL (before Tax)", + value: formatCurrencyValue( + priceTotalData.ordPmtNoTaxAmt, + currSign, + currSignLoc + ), + }, + { + name: "Estimated Sales Tax", + value: formatCurrencyValue( + priceTotalData.ordTotTaxAmt, + currSign, + currSignLoc + ), }, - { name: "Shipping & Handling", value: priceTotalData.totDlvrAmt || "-" }, - { name: "TOTAL (before Tax)", value: priceTotalData.totProdPrc || "-" }, - { name: "Estimated Sales Tax", value: priceTotalData.ordTotTaxAmt || "-" }, ]; const handleClickOrder = useCallback(() => { @@ -53,11 +86,12 @@ export default function SummaryContainer({ return (
-

ORDER SUMMARY

+

{$L("ORDER SUMMARY")}

{productList && - (productList.auctProdYn === "Y" ? ( + (productList.auctProdYn === "Y" && + !productList.auctFinalPriceChgDt ? (
{$L("Purchased products will be paid at the final price.")}
@@ -65,13 +99,7 @@ export default function SummaryContainer({ items.map((item, index) => (
{item.name} - - {currSign && currSignLoc - ? currSignLoc === "L" - ? `${currSign} ${item.value}` - : `${item.value} ${currSign}` - : " - "} - + {item.value}
)) ))} @@ -81,13 +109,13 @@ export default function SummaryContainer({
{$L("Estimated Total")}
{productList && - (productList.auctProdYn === "Y" + (productList.auctProdYn === "Y" && !productList.auctFinalPriceChgDt ? "-" - : currSign && currSignLoc - ? currSignLoc === "L" - ? `${currSign} ${priceTotalData?.ordPmtReqAmt || "-"}` - : `${priceTotalData?.ordPmtReqAmt || "-"} ${currSign}` - : " - ")} + : formatCurrencyValue( + priceTotalData?.ordPmtReqAmt, + currSign, + currSignLoc + ))}
diff --git a/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.jsx b/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.jsx index af9fcddf..775b069d 100644 --- a/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.jsx +++ b/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.jsx @@ -48,6 +48,7 @@ export default function ConfirmPanel({ spotlightId }) { totDlvrAmt, } = panelInfo?.orderInfo || {}; const auctProdYn = panelInfo?.auctProdYn || {}; + const auctFinalPriceChgDt = panelInfo?.auctFinalPriceChgDt || {}; const logInfo = panelInfo?.logInfo || {}; useEffect(() => { @@ -138,7 +139,7 @@ export default function ConfirmPanel({ spotlightId }) {

{$L("ESTIMATED TOTAL")}

- {auctProdYn && auctProdYn === "Y" ? ( + {auctProdYn && auctProdYn === "Y" && !auctFinalPriceChgDt ? ( {$L("Purchased products will be paid at the final price.")} diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/MyOrders.jsx b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/MyOrders.jsx index 300b0416..93d27097 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/MyOrders.jsx +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/MyOrders.jsx @@ -31,6 +31,10 @@ import { setShowPopup, setShowSecondaryPopup, } from "../../../../actions/commonActions"; +import { + sendLogOrderBtnClick, + sendLogOrderChange, +} from "../../../../actions/logActions"; // getMyinfoOrderSearch : 회원 주문 정보 조회 // getMyinfoOrderDetailSearch : 회원 주문 상세 정보 조회 - 디테일 // getMyinfoOrderShippingSearch : 회원 주문 배송 상세 정보 조회 @@ -58,6 +62,7 @@ import * as Config from "../../../../utils/Config"; import { GET_MY_INFO_ORDER_SEARCH_LIMIT } from "../../../../utils/Config"; import { $L, + formatCurrencyValue, getFormattingDate, isElementInContainer, } from "../../../../utils/helperMethods"; @@ -65,7 +70,6 @@ import { SpotlightIds } from "../../../../utils/SpotlightIds"; import NoOrderList from "./components/NoOrderList"; import OrderListCard from "./components/OrderListCard"; import css from "./MyOrders.module.less"; -import { sendLogOrderBtnClick, sendLogOrderChange } from "../../../../actions/logActions"; const Container = SpotlightContainerDecorator("div"); const ListContainer = SpotlightContainerDecorator("div"); @@ -117,6 +121,16 @@ export default function MyOrders({ title, panelInfo, isOnTop }) { const orderInfo = orderInfoData?.orderInfo || {}; const cancelOrderInfo = cancelOrderInfoData?.orderInfo || {}; + const { + currSign, + currSignLoc, + totProdPrc, + totDcAmt, + totDlvrAmt, + ordPmtReqAmt, + ordPmtNoTaxAmt, + ordTotTaxAmt, + } = orderDetailData || {}; const cbChangePageRef = useRef(null); const focusedContainerIdRef = useRef(null); @@ -445,12 +459,9 @@ export default function MyOrders({ title, panelInfo, isOnTop }) { }; }, [popup.secondaryPopup, popup.secondaryPopupVisible, preventKeyDown]); - const doSendLogOrderBtnClick = useCallback( - (btnNm) => { - dispatch(sendLogOrderBtnClick({ btnNm })); - }, - [] - ); + const doSendLogOrderBtnClick = useCallback((btnNm) => { + dispatch(sendLogOrderBtnClick({ btnNm })); + }, []); return ( <> @@ -647,8 +658,11 @@ export default function MyOrders({ title, panelInfo, isOnTop }) {
  • {$L("Items")} - {orderDetailData.currSign}{" "} - {orderDetailData.totProdPrc} + {formatCurrencyValue( + totProdPrc, + currSign, + currSignLoc + )}
  • @@ -662,7 +676,12 @@ export default function MyOrders({ title, panelInfo, isOnTop }) { {$L("Your Coupon Savings")} - {orderDetailData.currSign} {orderDetailData.totDcAmt} + {formatCurrencyValue( + totDcAmt, + currSign, + currSignLoc, + true + )}
  • @@ -670,8 +689,11 @@ export default function MyOrders({ title, panelInfo, isOnTop }) { {$L("Shipping & Handling")} - {orderDetailData.currSign}{" "} - {orderDetailData.totDlvrAmt} + {formatCurrencyValue( + totDlvrAmt, + currSign, + currSignLoc + )}
  • @@ -679,8 +701,11 @@ export default function MyOrders({ title, panelInfo, isOnTop }) { {$L("TOTAL (before Tax)")} - {orderDetailData.currSign}{" "} - {orderDetailData.totProdPrc} + {formatCurrencyValue( + ordPmtNoTaxAmt, + currSign, + currSignLoc + )}
  • @@ -688,8 +713,11 @@ export default function MyOrders({ title, panelInfo, isOnTop }) { {$L("Estimated Sales Tax")} - {orderDetailData.currSign}{" "} - {orderDetailData.ordTotTaxAmt} + {formatCurrencyValue( + ordTotTaxAmt, + currSign, + currSignLoc + )}
    • @@ -698,8 +726,11 @@ export default function MyOrders({ title, panelInfo, isOnTop }) { {$L("Item Order Total")} - {orderDetailData.currSign}{" "} - {orderDetailData.ordPmtReqAmt} + {formatCurrencyValue( + ordPmtReqAmt, + currSign, + currSignLoc + )}
    diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/components/OrderListCard.jsx b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/components/OrderListCard.jsx index 4009fb60..08826e34 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/components/OrderListCard.jsx +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/components/OrderListCard.jsx @@ -56,6 +56,7 @@ export default memo(function OrderListCard({ ordTotTaxAmt, currSign, currSignLoc, + ordPmtReqAmt, }; return ( @@ -78,6 +79,7 @@ export default memo(function OrderListCard({
    @@ -125,7 +141,7 @@ export default function OrderListCardStatus({ } const onClickViewOrderDetailsButton = useCallback(() => { - if (auctProdYn === "Y") { + if (auctProdYn === "Y" && !auctFinalPriceChgDt) { dispatch(setShowPopup(Config.ACTIVE_POPUP.errorPopup)); } else { dispatch( @@ -216,10 +232,12 @@ export default function OrderListCardStatus({

    - {currSign} {prodPrc} + {formatCurrencyValue(ordPmtReqAmt, currSign, currSignLoc)} {" "} - | {$L("OPTIONS TOTAL")}: {currSign} {prdtOptPrc} | {$L("S&H")} - : {currSign} {dlvrAmt} + | {$L("OPTIONS TOTAL")}:{" "} + {formatCurrencyValue(totOptPrc, currSign, currSignLoc)} |{" "} + {$L("S&H")}:{" "} + {formatCurrencyValue(totDlvrAmt, currSign, currSignLoc)}

    diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/components/OrderListCardTopContents.jsx b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/components/OrderListCardTopContents.jsx index 7dbaa142..05750e41 100644 --- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/components/OrderListCardTopContents.jsx +++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyOrders/components/OrderListCardTopContents.jsx @@ -1,4 +1,4 @@ -import React, { memo } from "react"; +import React, { memo, useCallback } from "react"; import { useSelector } from "react-redux"; @@ -6,6 +6,7 @@ import { convertUtcToLocal } from "../../../../../components/MediaPlayer/util"; import { $L, convertToTimeFormat, + formatCurrencyValue, getFormattingCardNo, } from "../../../../../utils/helperMethods"; import css from "./OrderListCardTopContents.module.less"; @@ -51,20 +52,12 @@ export default memo(function OrderListCardTopContents({ paymentInfo }) { {totProdQty} + {formatCurrencyValue(totProdPrc, currSign, currSignLoc)} + {formatCurrencyValue(totOptPrc, currSign, currSignLoc)} + {formatCurrencyValue(totDlvrAmt, currSign, currSignLoc)} + {formatCurrencyValue(ordTotTaxAmt, currSign, currSignLoc)} - {currSign} {totProdPrc} - - - {currSign} {totDcAmt} - - - {currSign} {totOptPrc} - - - {currSign} {totDlvrAmt} - - - {currSign} {ordTotTaxAmt} + {formatCurrencyValue(totDcAmt, currSign, currSignLoc, true)}