From a1ef6ce6dbc7cd5695fdc598dce0f4a3e5670d84 Mon Sep 17 00:00:00 2001 From: nagarajaPC-AOT Date: Fri, 13 Dec 2024 10:22:17 -0800 Subject: [PATCH] Removed on hold other check causing issue FOIMOD-3655 --- .../FOI/FOIRequest/BottomButtonGroup/index.js | 2 +- .../services/foirequest/requestservicegetter.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/forms-flow-web/src/components/FOI/FOIRequest/BottomButtonGroup/index.js b/forms-flow-web/src/components/FOI/FOIRequest/BottomButtonGroup/index.js index e3650b0bb..6ac4f863d 100644 --- a/forms-flow-web/src/components/FOI/FOIRequest/BottomButtonGroup/index.js +++ b/forms-flow-web/src/components/FOI/FOIRequest/BottomButtonGroup/index.js @@ -375,7 +375,7 @@ const BottomButtonGroup = React.memo( (statusValue) => statusValue.name === currentSelectedStatus ); saveRequestObject.requeststatuslabel = status.label; - if ((currentSelectedStatus === StateEnum.onhold.name || currentSelectedStatus === StateEnum.onholdother.name) && !saveRequestObject.paymentExpiryDate) { + if ((currentSelectedStatus === StateEnum.onhold.name) && !saveRequestObject.paymentExpiryDate) { saveRequestObject.paymentExpiryDate = dueDateCalculation(new Date(), PAYMENT_EXPIRY_DAYS); } break; diff --git a/request-management-api/request_api/services/foirequest/requestservicegetter.py b/request-management-api/request_api/services/foirequest/requestservicegetter.py index 2cc78f46c..b2fcfbde1 100644 --- a/request-management-api/request_api/services/foirequest/requestservicegetter.py +++ b/request-management-api/request_api/services/foirequest/requestservicegetter.py @@ -128,13 +128,13 @@ def getrequestdetails(self,foirequestid, foiministryrequestid): else: requestdetails['cfrfee']['feedata']["totalamountdue"] = '{:.2f}'.format(requestdetails['cfrfee']['feedata']["estimatedtotaldue"]) - if payment is not None and payment != {}: - paidamount = float(payment['paidamount']) if payment['paidamount'] != None else 0 - requestdetails['cfrfee']['feedata']['paidamount'] = '{:.2f}'.format(paidamount) - # depositpaid field is only accurate and used for outstanding email and receipts - requestdetails['cfrfee']['feedata']['depositpaid'] = '{:.2f}'.format(float(cfrfee['feedata']['amountpaid']) - paidamount) - requestdetails['cfrfee']['feedata']['paymenturl'] = payment['paymenturl'] - requestdetails['cfrfee']['feedata']['paymentdate'] = payment['created_at'][:10] + if payment is not None and payment != {}: + paidamount = float(payment['paidamount']) if payment['paidamount'] != None else 0 + requestdetails['cfrfee']['feedata']['paidamount'] = '{:.2f}'.format(paidamount) + # depositpaid field is only accurate and used for outstanding email and receipts + requestdetails['cfrfee']['feedata']['depositpaid'] = '{:.2f}'.format(float(cfrfee['feedata']['amountpaid']) - paidamount) + requestdetails['cfrfee']['feedata']['paymenturl'] = payment['paymenturl'] + requestdetails['cfrfee']['feedata']['paymentdate'] = payment['created_at'][:10] return requestdetails def __preparebaseinfo(self,request,foiministryrequestid,requestministry,requestministrydivisions):