Merge pull request #6039 from bcgov/dev-AH-FOIMOD-release22.2-qafixes

Ticket 4161: Observation 1,3 and 6 fixes

Author: Aman-Hundal

forms-flow-web/src/components/FOI/customComponents/Fees/BottomButtonGroup.tsx

@@ -12,6 +12,7 @@ export const BottomButtonGroup = ({
   disableNewCfrFormBtn,
   handleGenerateInvoice,
   cfrStatus,
+  isProcessingFeeSubTab,
 }: any) => {
   const generateInvoiceDisabled: boolean = cfrStatus !== "approved";
   return (
@@ -37,7 +38,7 @@ export const BottomButtonGroup = ({
       >
         + Create New Processing Fee Form
       </button>}
-      {!isMinistry && 
+      {isProcessingFeeSubTab && !isMinistry && 
       <Tooltip
         title={
           generateInvoiceDisabled && 

forms-flow-web/src/components/FOI/customComponents/Fees/index.tsx

@@ -925,6 +925,7 @@ export const Fees = ({
                   disableNewCfrFormBtn={disableNewCfrFormBtn}
                   handleGenerateInvoice={handleGenerateInvoice}
                   cfrStatus={initialCFRState.status}
+                  isProcessingFeeSubTab={selectedSubtab == FeesSubtabValues.PROCESSINGFEE}
                 />
               </div>
           </div>

request-management-api/request_api/receipt_templates/cfr_fee_invoice.docx

@@ -4,8 +4,8 @@
 from request_api.auth import AuthHelper
 from datetime import datetime as datetime2
 
-INVOICE_MEMO = "You have 20 business days to respond to this fee statement or your file will be closed as Abandoned. If the total estimate is over $200 you are only required to pay a 50% deposit, otherwise you are required to pay the full amount."
-OUTSTANDING_INVOICE_MEMO = "You have 20 business days to respond to this fee statement or your file will be closed as Abandoned."
+INVOICE_MEMO = "You have 20 business days to respond to this fee statement or your file will be closed as Abandoned. If the total estimate is over $200 you are only required to pay a 50% deposit, otherwise you are required to pay the full amount. The first 3 hours of 'Location & Retrieving' are free and is represented as $90 in the 'Waived $' column."
+OUTSTANDING_INVOICE_MEMO = "You have 20 business days to respond to this fee statement or your file will be closed as Abandoned. The first 3 hours of 'Location & Retrieving' are free and is represented as $90 in the 'Waived $' column."
 
 class foiinvoiceservice:
     def generate_invoice(self, invoice, userid):