Merge branch 'develop' into test

bcgov · Dec 18, 2024 · 88e9a99 · 88e9a99
2 parents 963cb46 + 9fdf3e5
commit 88e9a99
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/...stration/pages/business-licence-renewal-page/business-licence-renewal-page.component.html b/...stration/pages/business-licence-renewal-page/business-licence-renewal-page.component.html
@@ -30,7 +30,8 @@
         </ng-container>
       </app-alert>
 
-      <app-business-licence-expiry [form]="formState.form"></app-business-licence-expiry>
+      <app-business-licence-expiry [form]="formState.form"
+                                   [showExpiryDate]="true"></app-business-licence-expiry>
 
       <ng-container *ngIf="businessLicence.businessLicenceDocument">
 

diff --git a/...gistration/pages/business-licence-renewal-page/business-licence-renewal-page.component.ts b/...gistration/pages/business-licence-renewal-page/business-licence-renewal-page.component.ts
@@ -124,10 +124,11 @@ export class BusinessLicenceRenewalPageComponent extends AbstractCommunitySiteRe
   protected performSubmission(): Observable<void> {
     // Transfer business licence renewal updates
     // to the form state service for submission
-    const { businessLicenceGuid, businessLicenceExpiry, filename } = this.siteFormStateService.businessLicenceFormState;
+    const { businessLicenceGuid, businessLicenceExpiry, filename, deferredLicenceReason } = this.siteFormStateService.businessLicenceFormState;
     businessLicenceGuid.patchValue(this.formState.businessLicenceGuid.value);
     businessLicenceExpiry.patchValue(this.formState.businessLicenceExpiry.value);
     filename.patchValue(this.formState.filename.value);
+    deferredLicenceReason.patchValue("");
 
     this.siteFormStateService.businessLicenceFormState.flagBusinessLicenceUpdated();
 

diff --git a/...ontend/src/app/modules/site-registration/pages/overview-page/overview-page.component.html b/...ontend/src/app/modules/site-registration/pages/overview-page/overview-page.component.html
@@ -3,7 +3,8 @@
   <app-site-progress-indicator [noContent]="this.overviewType === 'organization'"
                                [inProgress]="!isCompleted"></app-site-progress-indicator>
 
-  <app-expiry-alert [expiryDates]="siteExpiryDate">
+  <app-expiry-alert [expiryDates]="siteExpiryDate"
+                    *ngIf="!isBusinessLicenceUpdated">
     <!-- Work around for ngProjectAs not passing class reference to alert when applied to ng-content -->
     <ng-container #alertTitle
                   class="alert-title">

diff --git a/...ntend/src/app/shared/components/site/overview-container/overview-container.component.html b/...ntend/src/app/shared/components/site/overview-container/overview-container.component.html
@@ -97,7 +97,8 @@
     </app-enrollee-property>
 
     <ng-container *ngIf="!admin; else businessLicenceListView">
-      <ng-container *ngIf="site.businessLicence?.businessLicenceDocument; else deferredLicence">
+      <ng-container
+                    *ngIf="(site.businessLicence?.businessLicenceDocument || businessLicenceUpdated); else deferredLicence">
         <app-enrollee-property title="Expiry"
                                [hasError]="site.businessLicence?.expiryDate && withinRenewalPeriod"
                                [errorMessage]="'Please update business licence'">
@@ -232,4 +233,4 @@
                         (route)="onRouteRelative($event)">
     <app-party-review [party]="site?.technicalSupport"></app-party-review>
   </app-overview-section>
-</ng-container>
+</ng-container>
diff --git a/prime-dotnet-webapi/Controllers/SitesController.cs b/prime-dotnet-webapi/Controllers/SitesController.cs
@@ -422,6 +422,7 @@ private async Task<bool> HandleBusinessLicenseUpdateAsync(CommunitySite site, Si
                 var licenceDto = _mapper.Map<BusinessLicence>(existingLicence);
                 licenceDto.Id = 0;
                 licenceDto.ExpiryDate = newLicence.ExpiryDate;
+                licenceDto.DeferredLicenceReason = newLicence.DeferredLicenceReason;
 
                 var licence = await _communitySiteService.AddBusinessLicenceAsync(site.Id, licenceDto, newLicence.DocumentGuid.Value);
                 return licence != null;