Merge pull request #1630 from bcgov/development

dev to test merge

auth-api/migrations/versions/c21389f4b51c_update_tos_for_idir.py

@@ -32,7 +32,7 @@ def upgrade():
                <section>
         <header>Definitions</header>
         <p>In this MOU:</p>
-        <p>“Website” means the BC Registry Website at <a hre="https://www.bcregistry.gov.bc.ca">https://www.bcregistry.gov.bc.ca</a> and includes all web pages, content, associated materials and the services provided through the Website.</p>
+        <p>“Website” means the BC Registry Website at <a href="https://www.bcregistry.gov.bc.ca">https://www.bcregistry.gov.bc.ca</a> and includes all web pages, content, associated materials and the services provided through the Website.</p>
         <p>“Ministry Account” refers to a BC Registry account set up to enable a Ministry or a particular branch or group within a Ministry of the BC government to access the services provided through the Website.</p>
       </section>
       <section>
@@ -48,8 +48,8 @@ def upgrade():
       </section>
       <section>
         <header>Online Transactions</header>
-        <p>By creating a Ministry Account, a Ministry accepts that any designated Ministry users using the Ministry Account will be performing transactions that have a financial commitment. The Ministry must ensure that Ministry Account users are not making a commitment that would result in greater expense than a ministry’s current year’s appropriation(s) or available funds, and must not continue to complete transactions if there is a known inability to pay for services when due. Ministries are responsible to ensure that Ministry Account users are aware of their financial responsibilities, as outlined in Core Policy and Procedures, Chapter 7: Revenue and Receivables Management <a hre="https://www2.gov.bc.ca/gov/content/governments/policies-for-government/core-policy/policies/revenue-and-receivables-management">https://www2.gov.bc.ca/gov/content/governments/policies-for-government/core-policy/policies/revenue-and-receivables-management</a>
-          Ministries agree to pay service fees, and statutory fees where applicable, as listed on the Website for any transactions and services ordered under Ministry Accounts and payment will be processed through journal voucher.  All fees listed on the Website are in Canadian dollars and charges will be processed in Canadian dollars.  Ministries are responsible to ensure that general ledger information provided for the Ministry Account is accurate and up to date.</p>
+        <p>By creating a Ministry Account, a Ministry accepts that any designated Ministry users using the Ministry Account will be performing transactions that have a financial commitment. The Ministry must ensure that Ministry Account users are not making a commitment that would result in greater expense than a ministry’s current year’s appropriation(s) or available funds, and must not continue to complete transactions if there is a known inability to pay for services when due. Ministries are responsible to ensure that Ministry Account users are aware of their financial responsibilities, as outlined in Core Policy and Procedures, Chapter 7: Revenue and Receivables Management <a href="https://www2.gov.bc.ca/gov/content/governments/policies-for-government/core-policy/policies/revenue-and-receivables-management">https://www2.gov.bc.ca/gov/content/governments/policies-for-government/core-policy/policies/revenue-and-receivables-management</a>
+          </p><p>Ministries agree to pay service fees, and statutory fees where applicable, as listed on the Website for any transactions and services ordered under Ministry Accounts and payment will be processed through journal voucher.  All fees listed on the Website are in Canadian dollars and charges will be processed in Canadian dollars.  Ministries are responsible to ensure that general ledger information provided for the Ministry Account is accurate and up to date.</p>
         <p>By law, some transactions in BC Registries cannot be reversed. For these types of transactions, no refund or credit can be issued.</p>
         </section>
       <section>

auth-web/src/components/auth/staff/review-task/AccountInformation.vue

@@ -1,14 +1,33 @@
 <template>
   <section>
     <h2 class="mb-3">{{`${tabNumber !== null ?  `${tabNumber}. ` : ''}${title}`}}</h2>
-    <v-row v-if="accountUnderReview.orgType === 'BASIC'">
+    <v-row v-if="accountUnderReview.orgType === Account.BASIC">
       <v-col class="col-12 col-sm-3">
         Account Name
       </v-col>
       <v-col>
         {{ accountUnderReview.name }}
       </v-col>
     </v-row>
+    <!-- for GOVM account showing banch name  -->
+     <v-row v-else-if="accountUnderReview.orgType === Account.PREMIUM && accountUnderReview.accessType === AccessType.GOVM">
+      <v-col class="col-12 col-sm-3">
+       <span> Account Name <br/> &amp; Branch Details</span>
+      </v-col>
+      <v-col>
+        <v-alert dark color="primary" class="bcol-acc mb-0 px-7 py-5">
+          <div class="bcol-acc__name mt-n1">
+            {{ accountUnderReview.name }}
+          </div>
+          <ul class="bcol-acc__meta">
+            <li>
+              Branch Name : {{ accountUnderReview.branchName }}
+            </li>
+          </ul>
+        </v-alert>
+      </v-col>
+    </v-row>
+    <!-- all other accounts -->
     <v-row v-else>
       <v-col class="col-12 col-sm-3">
         <span>Account Name <br/> &amp; BC Online Details</span>
@@ -45,7 +64,8 @@
 </template>
 
 <script lang="ts">
-import { Component, Emit, Prop, Vue } from 'vue-property-decorator'
+import { AccessType, Account } from '@/util/constants'
+import { Component, Prop, Vue } from 'vue-property-decorator'
 import { Address } from '@/models/address'
 
 @Component({})
@@ -56,6 +76,9 @@ export default class AccountInformation extends Vue {
   @Prop({ default: 'Account Information' }) private title: string
   @Prop({ default: {} }) accountUnderReview: any
   @Prop({ default: {} }) accountUnderReviewAddress: Address
+
+  AccessType = AccessType
+  Account = Account
 }
 </script>
 

auth-web/src/components/auth/staff/review-task/ProductFee.vue

@@ -40,7 +40,7 @@
               :disabled="!canSelect"
               >
                 <template slot="selection" slot-scope="data">
-                  $ {{ data.item.amount }}
+                  $ {{ data.item.amount.toFixed(2) }}
                 </template>
                 <template slot="item" slot-scope="data">
                   {{ displayProductFee(data.item.amount) }}

auth-web/src/locales/en.json

@@ -88,6 +88,7 @@
   "passwordResetFailureTitle": "An error has occured",
   "passwordResetFailureText": "An error occurred while attempting to reset this password.\nPlease try again later.",
   "tos_updated": "We have updated our Terms of Use. Please review and accept the new terms to proceed.",
+  "govm_tos_updated":"We have updated our Memorandum of Understanding. Please review and accept the new MOU to proceed.",
   "createBCRegistriesAccount": "Create a BC Registries and Online Services Account",
   "pendingAffidavitReviewTitle": "Thanks for creating the account {team} at BC Registries and Online Services.",
   "pendingAffidvitReviewMessage": "Once your account has been reviewed and approved you will receive\n\nan email allowing you to activate and manage the account. \n\nPlease allow 5 business days for this process.",
@@ -130,5 +131,7 @@
   "bCSCLoginOptionTitle":"Mobile BC Services Card",
   "bCSCLoginOptionDescription":"Login with your BC Services Card.",
   "bCeIDLoginOptionTitle":"BCeID and 2-factor authentication",
-  "bCeIDLoginOptionDescription":"Login with a BCeID combined with a verification code in a mobile or desktop authenticator."
+  "bCeIDLoginOptionDescription":"Login with a BCeID combined with a verification code in a mobile or desktop authenticator.",
+  "govm_tos_title":"Ministry Use Memorandum of Understanding (MOU)",
+  "tos_title":"BC Registry Terms and Conditions"
 }

auth-web/src/views/auth/TermsOfServiceView.vue

@@ -11,9 +11,10 @@
     <div v-if="!isLoading">
       <v-alert type="warning" icon="mdi-alert-circle-outline" class="pa-5 mb-8"
         v-if="showTosBanner"
-      >{{$t('tos_updated')}}
+      >{{$t(isGovmUser ? 'govm_tos_updated' : 'tos_updated')}}
       </v-alert>
-      <h1 class="mb-10">BC Registry Terms and Conditions</h1>
+      <h1 class="mb-10" >{{$t(isGovmUser ? 'govm_tos_title' : 'tos_title')}} </h1>
+
       <v-card flat>
         <v-card-text class="pa-8">
 
@@ -83,13 +84,19 @@ export default class TermsOfServiceView extends Mixins(NextPageMixin) {
   @Prop() token: string
   protected readonly currentUser!: KCUserProfile
   private showTosBanner = false
+  private isGovmUser: boolean = false
 
   private onScroll (e) {
     this.atBottom = (e.target.scrollHeight - e.target.scrollTop) <= (e.target.offsetHeight + 25)
   }
 
   mounted () {
     this.$store.commit('updateHeader')
+    this.isGovmUser = this.isGovmUserLoggedin()
+  }
+
+  isGovmUserLoggedin () {
+    return this.currentUser?.loginSource.toUpperCase() === LoginSource.IDIR.toUpperCase()
   }
 
   showUpdateBanner () {
@@ -108,7 +115,7 @@ export default class TermsOfServiceView extends Mixins(NextPageMixin) {
         await this.syncUser()
         // if this IDIR GOVM , user take him to accept invite itself.
         // IDIR user doesnt have user profile.so next page mixin will yield wrong navigation if used here.
-        const isGovmUser = this.currentUser?.loginSource.toUpperCase() === LoginSource.IDIR.toUpperCase()
+        const isGovmUser = this.isGovmUserLoggedin()
         if (isGovmUser && this.token) {
           this.$router.push(`/confirmtoken/${this.token}/${LoginSource.IDIR}`)
           return