Merge pull request #474 from bcgov/mals2-26-fixes-3

Mals2 26 fixes 3
bcgov · Oct 10, 2024 · ffad3f9 · ffad3f9
2 parents 70c871a + fabcba9
commit ffad3f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/client/src/features/licences/LicenceDetailsEdit.jsx b/app/client/src/features/licences/LicenceDetailsEdit.jsx
@@ -36,6 +36,7 @@ import Species from "../lookups/Species";
 import {
   LICENCE_TYPE_ID_GAME_FARM,
   LICENCE_TYPE_ID_FUR_FARM,
+  LICENCE_TYPE_ID_DAIRY_TANK_TRUCK,
 } from "./constants";
 
 import { selectLicenceSpecies } from "../lookups/licenceSpeciesSlice";
@@ -354,18 +355,20 @@ export default function LicenceDetailsEdit({
                     </Form.Control.Feedback>
                   </>
                 )}
-                name={'irmaNumber'}
+                name={"irmaNumber"}
                 control={control}
                 defaultValue={formatIrmaNumber(initialValues.irmaNumber)}
               />
             </Form.Group>
-          ) : (
+          ) : licence.licenceTypeId !== LICENCE_TYPE_ID_DAIRY_TANK_TRUCK ? (
             <CustomDatePicker
               id="expiryDate"
               label="Expiry Date"
               notifyOnChange={handleFieldChange("expiryDate")}
               defaultValue={initialValues.expiryDate}
             />
+          ) : (
+            <></>
           )}
         </Col>
         <Col lg={8}>

diff --git a/app/server/static/templates/certificates/Dairy-Tank-Truck.docx b/app/server/static/templates/certificates/Dairy-Tank-Truck.docx