Merge pull request #5480 from bcgov/dev-NC-FOIMOD-3655

Dev nc foimod 3655
bcgov · Dec 13, 2024 · 02953ef · 02953ef
2 parents d9e02d0 + a1ef6ce
commit 02953ef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 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
@@ -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
@@ -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):