From 048a3dd951a0826a2ac46a72e2a67d1e656b4346 Mon Sep 17 00:00:00 2001
From: Karan Takalkar <karant@iitk.ac.in>
Date: Fri, 14 Aug 2020 19:05:26 +0530
Subject: [PATCH] refactor: organization module (#1203)

See: #1196
---
 .../adhoc-query/adhoc-query.component.html    |  2 +-
 .../create-adhoc-query.component.html         |  2 +-
 .../edit-adhoc-query.component.html           |  2 +-
 .../view-adhoc-query.component.html           |  4 +--
 .../bulk-import/bulk-import.component.html    | 35 ++++++++++---------
 .../view-bulk-import/bulk-imports.ts          | 19 ++++++++++
 .../view-bulk-import.component.html           |  4 +--
 .../bulk-loan-reassignmnet.component.html     |  2 +-
 .../currencies/currencies.component.html      |  2 +-
 .../manage-currencies.component.html          |  4 +--
 .../create-employee.component.html            |  2 +-
 .../edit-employee.component.html              |  2 +-
 .../employees/employees.component.html        |  4 +--
 .../view-employee.component.html              |  2 +-
 .../entity-data-table-checks.component.html   |  4 +--
 .../create-holiday.component.html             |  2 +-
 .../edit-holiday/edit-holiday.component.html  |  2 +-
 .../holidays/holidays.component.html          |  2 +-
 .../view-holidays.component.html              | 14 ++++----
 ...-loan-provisioning-criteria.component.html |  2 +-
 ...-loan-provisioning-criteria.component.html |  2 +-
 .../loan-provisioning-criteria.component.html |  2 +-
 ...-loan-provisioning-criteria.component.html |  4 +--
 .../manage-funds/manage-funds.component.html  |  4 +--
 .../create-office.component.html              |  2 +-
 .../edit-office/edit-office.component.html    |  2 +-
 .../offices/offices.component.html            |  4 +--
 .../organization/organization.component.html  | 34 +++++++++---------
 .../password-preferences.component.html       |  2 +-
 .../create-payment-type.component.html        |  2 +-
 .../edit-payment-type.component.html          |  2 +-
 .../payment-types.component.html              |  2 +-
 .../sms-campaigns.component.html              |  2 +-
 ...anding-instructions-history.component.html |  2 +-
 .../allocate-cash.component.html              |  2 +-
 .../tellers/cashiers/cashiers.component.html  |  8 ++---
 .../create-cashier.component.html             |  2 +-
 .../edit-cashier/edit-cashier.component.html  |  2 +-
 .../settle-cash/settle-cash.component.html    |  2 +-
 .../transactions/transactions.component.html  |  4 +--
 .../view-cashier/view-cashier.component.html  |  4 +--
 .../create-teller.component.html              |  2 +-
 .../edit-teller/edit-teller.component.html    |  2 +-
 .../tellers/tellers.component.html            |  2 +-
 .../view-teller/view-teller.component.html    |  4 +--
 .../working-days/working-days.component.html  |  2 +-
 46 files changed, 118 insertions(+), 96 deletions(-)

diff --git a/src/app/organization/adhoc-query/adhoc-query.component.html b/src/app/organization/adhoc-query/adhoc-query.component.html
index 6e1d17f0f..fd582ceb2 100644
--- a/src/app/organization/adhoc-query/adhoc-query.component.html
+++ b/src/app/organization/adhoc-query/adhoc-query.component.html
@@ -1,5 +1,5 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
-  <button mat-raised-button color="primary" [routerLink]="['create']">
+  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_ADHOC'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Create AdHoc Query
   </button>
diff --git a/src/app/organization/adhoc-query/create-adhoc-query/create-adhoc-query.component.html b/src/app/organization/adhoc-query/create-adhoc-query/create-adhoc-query.component.html
index b088c2d95..02f6b1f17 100644
--- a/src/app/organization/adhoc-query/create-adhoc-query/create-adhoc-query.component.html
+++ b/src/app/organization/adhoc-query/create-adhoc-query/create-adhoc-query.component.html
@@ -78,7 +78,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!adhocQueryForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!adhocQueryForm.valid" *mifosxHasPermission="'CREATE_ADHOC'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/adhoc-query/edit-adhoc-query/edit-adhoc-query.component.html b/src/app/organization/adhoc-query/edit-adhoc-query/edit-adhoc-query.component.html
index 3fd626ea3..a4274d3c7 100644
--- a/src/app/organization/adhoc-query/edit-adhoc-query/edit-adhoc-query.component.html
+++ b/src/app/organization/adhoc-query/edit-adhoc-query/edit-adhoc-query.component.html
@@ -78,7 +78,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!editAdhocQueryForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!editAdhocQueryForm.valid" *mifosxHasPermission="'UPDATE_ADHOC'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/adhoc-query/view-adhoc-query/view-adhoc-query.component.html b/src/app/organization/adhoc-query/view-adhoc-query/view-adhoc-query.component.html
index 3b0d25c77..ef695b7f3 100644
--- a/src/app/organization/adhoc-query/view-adhoc-query/view-adhoc-query.component.html
+++ b/src/app/organization/adhoc-query/view-adhoc-query/view-adhoc-query.component.html
@@ -1,9 +1,9 @@
 <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
-  <button mat-raised-button color="primary" [routerLink]="['edit']">
+  <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_ADHOC'">
     <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
     Edit
   </button>
-  <button mat-raised-button color="warn" (click)="deleteAdhocQuery()">
+  <button mat-raised-button color="warn" (click)="deleteAdhocQuery()" *mifosxHasPermission="'DELETE_ADHOC'">
     <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
     Delete
   </button>
diff --git a/src/app/organization/bulk-import/bulk-import.component.html b/src/app/organization/bulk-import/bulk-import.component.html
index 3c78e33d6..65f077ea7 100644
--- a/src/app/organization/bulk-import/bulk-import.component.html
+++ b/src/app/organization/bulk-import/bulk-import.component.html
@@ -1,3 +1,4 @@
+<!-- TODO: Refactor Permissions -->
 <div class="container">
 
   <mat-card>
@@ -8,56 +9,56 @@
 
         <mat-nav-list>
 
-          <mat-list-item [routerLink]="['Offices']">
+          <mat-list-item [routerLink]="['Offices']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="building" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Offices</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Users']">
+          <mat-list-item [routerLink]="['Users']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="user" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Users</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Groups']">
+          <mat-list-item [routerLink]="['Groups']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="users" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Groups</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Loan Accounts']">
+          <mat-list-item [routerLink]="['Loan Accounts']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="money-bill-alt" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Loan Accounts</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Savings Accounts']">
+          <mat-list-item [routerLink]="['Savings Accounts']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="money-bill-alt" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Savings Accounts</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Fixed Deposit Accounts']">
+          <mat-list-item [routerLink]="['Fixed Deposit Accounts']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="money-bill-alt" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Fixed Deposit Accounts</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Chart of Accounts']">
+          <mat-list-item [routerLink]="['Chart of Accounts']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="money-bill-alt" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Chart of Accounts</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Share Accounts']">
+          <mat-list-item [routerLink]="['Share Accounts']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="money-bill-alt" size="sm"></fa-icon>
             </mat-icon>
@@ -72,7 +73,7 @@
 
         <mat-nav-list>
 
-          <mat-list-item [routerLink]="['Employees']">
+          <mat-list-item [routerLink]="['Employees']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="user" size="sm"></fa-icon>
             </mat-icon>
@@ -80,56 +81,56 @@
           </mat-list-item>
 
 
-          <mat-list-item [routerLink]="['Clients']">
+          <mat-list-item [routerLink]="['Clients']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="user" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Clients</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Centers']">
+          <mat-list-item [routerLink]="['Centers']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="users" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Centers</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Loan Repayments']">
+          <mat-list-item [routerLink]="['Loan Repayments']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="chevron-right" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Loan Repayments</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Savings Transactions']">
+          <mat-list-item [routerLink]="['Savings Transactions']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="chevron-right" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Savings Transactions</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Fixed Deposit Transactions']">
+          <mat-list-item [routerLink]="['Fixed Deposit Transactions']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="chevron-right" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Fixed Deposit Transactions</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Recurring Deposit Transactions']">
+          <mat-list-item [routerLink]="['Recurring Deposit Transactions']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="chevron-right" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Recurring Deposit Transactions</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Journal Entries']">
+          <mat-list-item [routerLink]="['Journal Entries']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="chevron-right" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Journal Entries</h4>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['Guarantors']">
+          <mat-list-item [routerLink]="['Guarantors']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="chevron-right" size="sm"></fa-icon>
             </mat-icon>
diff --git a/src/app/organization/bulk-import/view-bulk-import/bulk-imports.ts b/src/app/organization/bulk-import/view-bulk-import/bulk-imports.ts
index c7c908daf..0a05d454f 100644
--- a/src/app/organization/bulk-import/view-bulk-import/bulk-imports.ts
+++ b/src/app/organization/bulk-import/view-bulk-import/bulk-imports.ts
@@ -1,110 +1,129 @@
+/** TODO: Refactor Permissions */
 export const BulkImports = [
     {
       name: 'Offices',
       entityType: 'offices',
       urlSuffix: '/offices',
+      permission: 'READ_OFFICE',
       formFields: 0
     },
     {
       name: 'Users',
       entityType: 'users',
       urlSuffix: '/users',
+      permission: 'READ_CLIENT',
       formFields: 2
     },
     {
       name: 'Groups',
       entityType: 'groups',
       urlSuffix: '/groups',
+      permission: 'READ_CLIENT',
       formFields: 2
     },
     {
       name: 'Centers',
       entityType: 'centers',
       urlSuffix: '/centers',
+      permission: 'READ_CENTERS',
       formFields: 2
     },
     {
       name: 'Clients',
       entityType: 'client',
       urlSuffix: '/clients',
+      permission: 'READ_CLIENT',
       formFields: 3
     },
     {
       name: 'Employees',
       entityType: 'staff',
       urlSuffix: '/staff',
+      permission: 'READ_CLIENT',
       formFields: 1
     },
     {
       name: 'Guarantors',
       entityType: 'guarantors',
       urlSuffix: '/loans/1/guarantors',
+      permission: 'READ_CLIENT',
       formFields: 1
     },
     {
       name: 'Journal Entries',
       entityType: 'gljournalentries',
       urlSuffix: '/journalentries',
+      permission: 'READ_CLIENT',
       formFields: 1
     },
     {
       name: 'Loan Accounts',
       entityType: 'loans',
       urlSuffix: '/loans',
+      permission: 'READ_CLIENT',
       formFields: 2
     },
     {
       name: 'Savings Accounts',
       entityType: 'savingsaccount',
       urlSuffix: '/savingsaccounts',
+      permission: 'READ_CLIENT',
       formFields: 2
     },
     {
       name: 'Fixed Deposit Accounts',
       entityType: 'fixeddepositaccounts',
       urlSuffix: '/fixeddepositaccounts',
+      permission: 'READ_CLIENT',
       formFields: 2
     },
     {
       name: 'Reccuring Deposit Accounts',
       entityType: 'recurringdeposits',
       urlSuffix: '/recurringdepositaccounts',
+      permission: 'READ_CLIENT',
       formFields: 2
     },
     {
       name: 'Chart of Accounts',
       entityType: 'chartofaccounts',
       urlSuffix: '/glaccounts',
+      permission: 'READ_CLIENT',
       formFields: 2
     },
     {
       name: 'Share Accounts',
       entityType: 'shareaccounts',
       urlSuffix: '/accounts/share',
+      permission: 'READ_CLIENT',
       formFields: 1
     },
     {
       name: 'Loan Repayments',
       entityType: 'loantransactions',
       urlSuffix: '/loans/repayments',
+      permission: 'READ_CLIENT',
       formFields: 1
     },
     {
       name: 'Savings Transactions',
       entityType: 'savingstransactions',
       urlSuffix: '/savingsaccounts/transactions',
+      permission: 'READ_CLIENT',
       formFields: 1
     },
     {
       name: 'Fixed Deposit Transactions',
       entityType: 'fixeddeposittransactions',
       urlSuffix: '/fixeddepositaccounts/transaction',
+      permission: 'READ_CLIENT',
       formFields: 1
     },
     {
       name: 'Recurring Deposit Transactions',
       entityType: 'recurringdepositstransactions',
       urlSuffix: '/recurringdepositaccounts/transactions',
+      permission: 'READ_CLIENT',
       formFields: 1
     },
   ];
diff --git a/src/app/organization/bulk-import/view-bulk-import/view-bulk-import.component.html b/src/app/organization/bulk-import/view-bulk-import/view-bulk-import.component.html
index 9e1ad33bf..220e32919 100644
--- a/src/app/organization/bulk-import/view-bulk-import/view-bulk-import.component.html
+++ b/src/app/organization/bulk-import/view-bulk-import/view-bulk-import.component.html
@@ -47,7 +47,7 @@
       </form>
       
       <div fxFlex="13%">
-        <button mat-raised-button color="primary" (click)="downloadTemplate()">
+        <button mat-raised-button color="primary" (click)="downloadTemplate()" *mifosxHasPermission="bulkImport.permission">
           <i class="fa fa-download"></i>&nbsp;&nbsp;Download
         </button>
       </div>
@@ -130,7 +130,7 @@
         <ng-container matColumnDef="download">
           <th mat-header-cell *matHeaderCellDef mat-sort-header> Download </th>
           <td mat-cell *matCellDef="let import">
-            <button mat-icon-button (click)="downloadDocument(import.name, import.importId)">
+            <button mat-icon-button (click)="downloadDocument(import.name, import.importId)" *mifosxHasPermission="'READ_DOCUMENT'">
               <fa-icon icon="cloud-download-alt"></fa-icon>
             </button>
           </td>
diff --git a/src/app/organization/bulk-loan-reassignmnet/bulk-loan-reassignmnet.component.html b/src/app/organization/bulk-loan-reassignmnet/bulk-loan-reassignmnet.component.html
index 30c2babf3..eb6235cd6 100644
--- a/src/app/organization/bulk-loan-reassignmnet/bulk-loan-reassignmnet.component.html
+++ b/src/app/organization/bulk-loan-reassignmnet/bulk-loan-reassignmnet.component.html
@@ -149,7 +149,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!bulkLoanForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!bulkLoanForm.valid" *mifosxHasPermission="'BULKREASSIGN_LOAN'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/currencies/currencies.component.html b/src/app/organization/currencies/currencies.component.html
index 571946c19..46d5809a7 100644
--- a/src/app/organization/currencies/currencies.component.html
+++ b/src/app/organization/currencies/currencies.component.html
@@ -1,5 +1,5 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
-  <button mat-raised-button color="primary" [routerLink]="'manage'">
+  <button mat-raised-button color="primary" [routerLink]="'manage'" *mifosxHasPermission="'UPDATE_CURRENCY'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Add/Edit
   </button>
diff --git a/src/app/organization/currencies/manage-currencies/manage-currencies.component.html b/src/app/organization/currencies/manage-currencies/manage-currencies.component.html
index b53b77d69..d6e64c2c2 100644
--- a/src/app/organization/currencies/manage-currencies/manage-currencies.component.html
+++ b/src/app/organization/currencies/manage-currencies/manage-currencies.component.html
@@ -20,7 +20,7 @@
         </mat-form-field>
 
         <button mat-raised-button fxFlex color="primary" 
-          [disabled]="!currencyForm.valid">
+          [disabled]="!currencyForm.valid" *mifosxHasPermission="'UPDATE_CURRENCY'">
           <fa-icon icon="plus"></fa-icon>
         </button>
 
@@ -35,7 +35,7 @@
         <input matInput [value]="currency.name">
 
         <div fxLayout="row" fxLayoutAlign="flex-start">
-          <button mat-button color="warn" (click)="deleteCurrency(currency.code, i)">
+          <button mat-button color="warn" (click)="deleteCurrency(currency.code, i)" *mifosxHasPermission="'UPDATE_CURRENCY'">
             <fa-icon icon="trash"></fa-icon>
           </button>
         </div>
diff --git a/src/app/organization/employees/create-employee/create-employee.component.html b/src/app/organization/employees/create-employee/create-employee.component.html
index 5720bb1e2..fded79dcf 100644
--- a/src/app/organization/employees/create-employee/create-employee.component.html
+++ b/src/app/organization/employees/create-employee/create-employee.component.html
@@ -67,7 +67,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!employeeForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!employeeForm.valid" *mifosxHasPermission="'CREATE_STAFF'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/employees/edit-employee/edit-employee.component.html b/src/app/organization/employees/edit-employee/edit-employee.component.html
index 5a5ee5bd5..a7ea4ffb8 100644
--- a/src/app/organization/employees/edit-employee/edit-employee.component.html
+++ b/src/app/organization/employees/edit-employee/edit-employee.component.html
@@ -71,7 +71,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!editEmployeeForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!editEmployeeForm.valid" *mifosxHasPermission="'UPDATE_STAFF'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/employees/employees.component.html b/src/app/organization/employees/employees.component.html
index 402b05086..959b76470 100644
--- a/src/app/organization/employees/employees.component.html
+++ b/src/app/organization/employees/employees.component.html
@@ -1,11 +1,11 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
 
-  <button mat-raised-button color="primary">
+  <button mat-raised-button color="primary" *mifosxHasPermission="'CREATE_STAFF'" [routerLink]="['../', 'organization', 'bulk-import', 'Employees']">
     <fa-icon icon="upload"></fa-icon>&nbsp;&nbsp;
     Import Employees
   </button>
 
-  <button mat-raised-button color="primary" [routerLink]="['create']">
+  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_STAFF'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Create Employee
   </button>
diff --git a/src/app/organization/employees/view-employee/view-employee.component.html b/src/app/organization/employees/view-employee/view-employee.component.html
index 4be6193d9..be6847645 100644
--- a/src/app/organization/employees/view-employee/view-employee.component.html
+++ b/src/app/organization/employees/view-employee/view-employee.component.html
@@ -1,5 +1,5 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
-  <button mat-raised-button color="primary" [routerLink]="['edit']">
+  <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_STAFF'">
     <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
     Edit
   </button>
diff --git a/src/app/organization/entity-data-table-checks/entity-data-table-checks.component.html b/src/app/organization/entity-data-table-checks/entity-data-table-checks.component.html
index 38c4dff6f..64b676220 100644
--- a/src/app/organization/entity-data-table-checks/entity-data-table-checks.component.html
+++ b/src/app/organization/entity-data-table-checks/entity-data-table-checks.component.html
@@ -1,6 +1,6 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
 
-  <button mat-raised-button color="primary" [routerLink]="['create']">
+  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_ENTITY_DATATABLE_CHECK'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Create
   </button>
@@ -53,7 +53,7 @@
       <ng-container matColumnDef="actions">
         <th mat-header-cell *matHeaderCellDef> Actions </th>
         <td mat-cell *matCellDef="let entityDataTableCheck">
-          <button mat-button (click)="deleteEntityDataTableCheck(entityDataTableCheck.id)" color="warn">
+          <button mat-button (click)="deleteEntityDataTableCheck(entityDataTableCheck.id)" color="warn" *mifosxHasPermission="'DELETE_ENTITY_DATATABLE_CHECK'">
             <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;Delete
           </button>
         </td>
diff --git a/src/app/organization/holidays/create-holiday/create-holiday.component.html b/src/app/organization/holidays/create-holiday/create-holiday.component.html
index 088d31e8e..00cad5f78 100644
--- a/src/app/organization/holidays/create-holiday/create-holiday.component.html
+++ b/src/app/organization/holidays/create-holiday/create-holiday.component.html
@@ -82,7 +82,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!holidayForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!holidayForm.valid" *mifosxHasPermission="'CREATE_HOLIDAY'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/holidays/edit-holiday/edit-holiday.component.html b/src/app/organization/holidays/edit-holiday/edit-holiday.component.html
index e6e6c0ba4..2a2dfa419 100644
--- a/src/app/organization/holidays/edit-holiday/edit-holiday.component.html
+++ b/src/app/organization/holidays/edit-holiday/edit-holiday.component.html
@@ -69,7 +69,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!holidayForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!holidayForm.valid" *mifosxHasPermission="'UPDATE_HOLIDAY'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/holidays/holidays.component.html b/src/app/organization/holidays/holidays.component.html
index ed8be2255..e853dde8e 100644
--- a/src/app/organization/holidays/holidays.component.html
+++ b/src/app/organization/holidays/holidays.component.html
@@ -1,6 +1,6 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
 
-  <button mat-raised-button color="primary" [routerLink]="['create']">
+  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_HOLIDAY'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Create Holiday
   </button>
diff --git a/src/app/organization/holidays/view-holidays/view-holidays.component.html b/src/app/organization/holidays/view-holidays/view-holidays.component.html
index cc69ea576..3a2c872ae 100644
--- a/src/app/organization/holidays/view-holidays/view-holidays.component.html
+++ b/src/app/organization/holidays/view-holidays/view-holidays.component.html
@@ -1,13 +1,15 @@
 <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
-  <button mat-raised-button color="accent" *ngIf="holidayData.status.value !== 'Active'">
-    <fa-icon icon="lock-open"></fa-icon>&nbsp;&nbsp;
-    Activate
-  </button>
-  <button mat-raised-button color="primary" [routerLink]="['edit']">
+  <span *mifosxHasPermission="'ACTIVATE_HOLIDAY'">
+    <button mat-raised-button color="accent" *ngIf="holidayData.status.value !== 'Active'">
+      <fa-icon icon="lock-open"></fa-icon>&nbsp;&nbsp;
+      Activate
+    </button>
+  </span>
+  <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_HOLIDAY'">
     <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
     Edit
   </button>
-  <button mat-raised-button color="warn" (click)="deleteHoliday()">
+  <button mat-raised-button color="warn" (click)="deleteHoliday()" *mifosxHasPermission="'DELETE_HOLIDAY'">
     <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
     Delete
   </button>
diff --git a/src/app/organization/loan-provisioning-criteria/create-loan-provisioning-criteria/create-loan-provisioning-criteria.component.html b/src/app/organization/loan-provisioning-criteria/create-loan-provisioning-criteria/create-loan-provisioning-criteria.component.html
index 3b4f75a3a..3d3643d25 100644
--- a/src/app/organization/loan-provisioning-criteria/create-loan-provisioning-criteria/create-loan-provisioning-criteria.component.html
+++ b/src/app/organization/loan-provisioning-criteria/create-loan-provisioning-criteria/create-loan-provisioning-criteria.component.html
@@ -86,7 +86,7 @@
 
     <div class="m-t-20" fxLayout="row" fxLayoutAlign="center" fxLayoutGap="20px">
       <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-      <button mat-raised-button color="primary" [disabled]="!provisioningCriteriaFormValid" (click)="submit()">Submit</button>
+      <button mat-raised-button color="primary" [disabled]="!provisioningCriteriaFormValid" (click)="submit()" *mifosxHasPermission="'CREATE_PROVISIONING_CRITERIA'">Submit</button>
     </div>
 
   </mat-card>
diff --git a/src/app/organization/loan-provisioning-criteria/edit-loan-provisioning-criteria/edit-loan-provisioning-criteria.component.html b/src/app/organization/loan-provisioning-criteria/edit-loan-provisioning-criteria/edit-loan-provisioning-criteria.component.html
index b55e1d11b..3dcbbe391 100644
--- a/src/app/organization/loan-provisioning-criteria/edit-loan-provisioning-criteria/edit-loan-provisioning-criteria.component.html
+++ b/src/app/organization/loan-provisioning-criteria/edit-loan-provisioning-criteria/edit-loan-provisioning-criteria.component.html
@@ -86,7 +86,7 @@
 
     <div class="m-t-20" fxLayout="row" fxLayoutAlign="center" fxLayoutGap="20px">
       <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-      <button mat-raised-button color="primary" [disabled]="!provisioningCriteriaFormValid" (click)="submit()">Submit</button>
+      <button mat-raised-button color="primary" [disabled]="!provisioningCriteriaFormValid" (click)="submit()" *mifosxHasPermission="'UPDATE_CRITERIA'">Submit</button>
     </div>
 
   </mat-card>
diff --git a/src/app/organization/loan-provisioning-criteria/loan-provisioning-criteria.component.html b/src/app/organization/loan-provisioning-criteria/loan-provisioning-criteria.component.html
index 3200a51c1..377c91ef3 100644
--- a/src/app/organization/loan-provisioning-criteria/loan-provisioning-criteria.component.html
+++ b/src/app/organization/loan-provisioning-criteria/loan-provisioning-criteria.component.html
@@ -1,5 +1,5 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
-  <button mat-raised-button color="primary" [routerLink]="['create']">
+  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_PROVISIONING_CRITERIA'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Create Provisioning Criteria
   </button>
diff --git a/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.html b/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.html
index 285893ef5..6b46324ce 100644
--- a/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.html
+++ b/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.html
@@ -1,9 +1,9 @@
 <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
-  <button mat-raised-button color="primary" [routerLink]="['edit']">
+  <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_CRITERIA'">
     <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
     Edit
   </button>
-  <button mat-raised-button color="warn" (click)="deleteCriteria()">
+  <button mat-raised-button color="warn" (click)="deleteCriteria()" *mifosxHasPermission="'DELETE_CRITERIA'">
     <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
     Delete
   </button>
diff --git a/src/app/organization/manage-funds/manage-funds.component.html b/src/app/organization/manage-funds/manage-funds.component.html
index 95293b37b..9896bb815 100644
--- a/src/app/organization/manage-funds/manage-funds.component.html
+++ b/src/app/organization/manage-funds/manage-funds.component.html
@@ -5,7 +5,7 @@
     <div>
 
       <form #formRef="ngForm" [formGroup]="fundForm" fxLayout="row" fxLayoutAlign="start baseline" fxLayoutGap="20px"
-        (ngSubmit)="addFund()">
+        (ngSubmit)="addFund()" *mifosxHasPermission="'CREATE_FUND'">
 
         <mat-form-field fxFlex="calc(90%-20px)">
           <textarea formControlName="name" matInput placeholder="New Fund"></textarea>
@@ -29,7 +29,7 @@
         <input matInput [value]="fund.name">
 
         <div fxLayout="row" fxLayoutAlign="flex-start">
-          <button mat-button color="primary" (click)="editFund(fund.id,fund.name,i)">
+          <button mat-button color="primary" (click)="editFund(fund.id,fund.name,i)" *mifosxHasPermission="'UPDATE_FUND'">
             <fa-icon icon="edit"></fa-icon>
           </button>
         </div>
diff --git a/src/app/organization/offices/create-office/create-office.component.html b/src/app/organization/offices/create-office/create-office.component.html
index 47be8051e..99fd74050 100644
--- a/src/app/organization/offices/create-office/create-office.component.html
+++ b/src/app/organization/offices/create-office/create-office.component.html
@@ -49,7 +49,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!officeForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!officeForm.valid" *mifosxHasPermission="'CREATE_OFFICE'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/offices/edit-office/edit-office.component.html b/src/app/organization/offices/edit-office/edit-office.component.html
index ab456602d..36bb6a2bf 100644
--- a/src/app/organization/offices/edit-office/edit-office.component.html
+++ b/src/app/organization/offices/edit-office/edit-office.component.html
@@ -49,7 +49,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../general']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!officeForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!officeForm.valid" *mifosxHasPermission="'UPDATE_OFFICE'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/offices/offices.component.html b/src/app/organization/offices/offices.component.html
index b04c7858f..c7754a5e4 100644
--- a/src/app/organization/offices/offices.component.html
+++ b/src/app/organization/offices/offices.component.html
@@ -5,12 +5,12 @@
     Tree View
   </button>
 
-  <button mat-raised-button color="primary" [routerLink]="['create']">
+  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_OFFICE'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Create Office
   </button>
 
-  <button mat-raised-button color="primary">
+  <button mat-raised-button color="primary" *mifosxHasPermission="'CREATE_OFFICE'" [routerLink]="['../', 'organization', 'bulk-import', 'Offices']">
     <fa-icon icon="upload"></fa-icon>&nbsp;&nbsp;
     Import Offices
   </button>
diff --git a/src/app/organization/organization.component.html b/src/app/organization/organization.component.html
index 4ceb67a05..890520647 100644
--- a/src/app/organization/organization.component.html
+++ b/src/app/organization/organization.component.html
@@ -8,7 +8,7 @@
 
         <mat-nav-list>
 
-          <mat-list-item [routerLink]="['offices']">
+          <mat-list-item [routerLink]="['offices']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="building" size="sm"></fa-icon>
             </mat-icon>
@@ -16,7 +16,7 @@
             <p matLine>Add new office or modify or deactivate office or modify hierarchy</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['holidays']">
+          <mat-list-item [routerLink]="['holidays']" *mifosxHasPermission="'READ_HOLIDAY'">
             <mat-icon matListIcon>
               <fa-icon icon="calendar-alt" size="sm"></fa-icon>
             </mat-icon>
@@ -24,7 +24,7 @@
             <p matLine>Define holidays for office</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['employees']">
+          <mat-list-item [routerLink]="['employees']" *mifosxHasPermission="'READ_STAFF'">
             <mat-icon matListIcon>
               <fa-icon icon="user" size="sm"></fa-icon>
             </mat-icon>
@@ -32,7 +32,7 @@
             <p matLine>An employee represents loan officers with no access to systems</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['standing-instructions-history']">
+          <mat-list-item [routerLink]="['standing-instructions-history']" *mifosxHasPermission="'READ_STANDINGINSTRUCTION'">
             <mat-icon matListIcon>
               <fa-icon icon="book" size="sm"></fa-icon>
             </mat-icon>
@@ -40,7 +40,7 @@
             <p matLine>View logged history of standing instructions</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['fund-mapping']">
+          <mat-list-item [routerLink]="['fund-mapping']" *mifosxHasPermission="'READ_OFFICE'">
             <mat-icon matListIcon>
               <fa-icon icon="money-bill-alt" size="sm"></fa-icon>
             </mat-icon>
@@ -48,7 +48,7 @@
             <p matLine>Bulk entry screen for mapping fund sources to loans</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['password-preferences']">
+          <mat-list-item [routerLink]="['password-preferences']" *mifosxHasPermission="'READ_PASSWORD_VALIDATION_POLICY'">
             <mat-icon matListIcon>
               <fa-icon icon="lock" size="sm"></fa-icon>
             </mat-icon>
@@ -56,7 +56,7 @@
             <p matLine>Define standards for enforcing the usage of stronger passwords</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['provisioning-criteria']">
+          <mat-list-item [routerLink]="['provisioning-criteria']" *mifosxHasPermission="'VIEW_PROVISIONS'">
             <mat-icon matListIcon>
               <fa-icon icon="edit" size="sm"></fa-icon>
             </mat-icon>
@@ -64,7 +64,7 @@
             <p matLine>Define Loan Provisioning Criteria for Organization</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['entity-data-table-checks']">
+          <mat-list-item [routerLink]="['entity-data-table-checks']" *mifosxHasPermission="'READ_ENTITY_DATATABLE_CHECK'">
             <mat-icon matListIcon>
               <fa-icon icon="check" size="sm"></fa-icon>
             </mat-icon>
@@ -80,7 +80,7 @@
 
         <mat-nav-list>
 
-          <mat-list-item [routerLink]="['currencies']">
+          <mat-list-item [routerLink]="['currencies']" *mifosxHasPermission="'READ_CURRENCY'">
             <mat-icon matListIcon>
               <fa-icon icon="cogs" size="sm"></fa-icon>
             </mat-icon>
@@ -89,7 +89,7 @@
           </mat-list-item>
 
 
-          <mat-list-item [routerLink]="['manage-funds']">
+          <mat-list-item [routerLink]="['manage-funds']" *mifosxHasPermission="'READ_FUND'">
             <mat-icon matListIcon>
               <fa-icon icon="money-bill-alt" size="sm"></fa-icon>
             </mat-icon>
@@ -97,7 +97,7 @@
             <p matLine>Funds are associated with loans</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['bulkloan']">
+          <mat-list-item [routerLink]="['bulkloan']" *mifosxHasPermission="'BULKREASSIGN_LOAN'">
             <mat-icon matListIcon>
               <fa-icon icon="money-bill-alt" size="sm"></fa-icon>
             </mat-icon>
@@ -105,7 +105,7 @@
             <p matLine>Easy way to reassign all the loan from one LO to another LO</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['tellers']">
+          <mat-list-item [routerLink]="['tellers']" *mifosxHasPermission="'READ_TELLER'">
             <mat-icon matListIcon>
               <fa-icon icon="money-bill-alt" size="sm"></fa-icon>
             </mat-icon>
@@ -113,7 +113,7 @@
             <p matLine>Manage Tellers / Cashiers and Cash Allocation and Settlement</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['working-days']">
+          <mat-list-item [routerLink]="['working-days']" *mifosxHasPermission="'READ_WORKINGDAYS'">
             <mat-icon matListIcon>
               <fa-icon icon="calendar-alt" size="sm"></fa-icon>
             </mat-icon>
@@ -121,7 +121,7 @@
             <p matLine>Define working days and configure behaviour of payments due on holidays</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['payment-types']">
+          <mat-list-item [routerLink]="['payment-types']" *mifosxHasPermission="'READ_PAYMENTTYPE'">
             <mat-icon matListIcon>
               <fa-icon icon="dollar-sign" size="sm"></fa-icon>
             </mat-icon>
@@ -129,7 +129,7 @@
             <p matLine>Manage payment types</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['sms-campaigns']">
+          <mat-list-item [routerLink]="['sms-campaigns']" *mifosxHasPermission="'VIEW_SMSCAMPAIGNS'">
             <mat-icon matListIcon>
               <fa-icon icon="envelope" size="sm"></fa-icon>
             </mat-icon>
@@ -137,7 +137,7 @@
             <p matLine>Define SMS Campaigns for Organization</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['adhoc-query']">
+          <mat-list-item [routerLink]="['adhoc-query']" *mifosxHasPermission="'VIEW_ADHOC'">
             <mat-icon matListIcon>
               <fa-icon icon="chevron-right" size="sm"></fa-icon>
             </mat-icon>
@@ -145,7 +145,7 @@
             <p matLine>Define AdHocQuery for Organization</p>
           </mat-list-item>
 
-          <mat-list-item [routerLink]="['bulk-import']">
+          <mat-list-item [routerLink]="['bulk-import']" *mifosxHasPermission="'VIEW_BULKIMPORT'">
             <mat-icon matListIcon>
               <fa-icon icon="upload" size="sm"></fa-icon>
             </mat-icon>
diff --git a/src/app/organization/password-preferences/password-preferences.component.html b/src/app/organization/password-preferences/password-preferences.component.html
index b9ab03b2a..87e6bcecc 100644
--- a/src/app/organization/password-preferences/password-preferences.component.html
+++ b/src/app/organization/password-preferences/password-preferences.component.html
@@ -16,7 +16,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="passwordPreferencesForm.pristine">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="passwordPreferencesForm.pristine" *mifosxHasPermission="'UPDATE_PASSWORD_VALIDATION_POLICY'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/payment-types/create-payment-type/create-payment-type.component.html b/src/app/organization/payment-types/create-payment-type/create-payment-type.component.html
index 860aa9c5f..acd3e128e 100644
--- a/src/app/organization/payment-types/create-payment-type/create-payment-type.component.html
+++ b/src/app/organization/payment-types/create-payment-type/create-payment-type.component.html
@@ -39,7 +39,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!paymentTypeForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!paymentTypeForm.valid" *mifosxHasPermission="'CREATE_PAYMENTTYPE'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/payment-types/edit-payment-type/edit-payment-type.component.html b/src/app/organization/payment-types/edit-payment-type/edit-payment-type.component.html
index 65f6d7a41..4fd34ae08 100644
--- a/src/app/organization/payment-types/edit-payment-type/edit-payment-type.component.html
+++ b/src/app/organization/payment-types/edit-payment-type/edit-payment-type.component.html
@@ -39,7 +39,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!paymentTypeForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!paymentTypeForm.valid" *mifosxHasPermission="'UPDATE_PAYMENTTYPE'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/payment-types/payment-types.component.html b/src/app/organization/payment-types/payment-types.component.html
index 5f95f3d27..724f6c418 100644
--- a/src/app/organization/payment-types/payment-types.component.html
+++ b/src/app/organization/payment-types/payment-types.component.html
@@ -1,6 +1,6 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
 
-  <button mat-raised-button color="primary" [routerLink]="['create']">
+  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_PAYMENTTYPE'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Create Payment Type
   </button>
diff --git a/src/app/organization/sms-campaigns/sms-campaigns.component.html b/src/app/organization/sms-campaigns/sms-campaigns.component.html
index d5daa0374..b1db4fa6f 100644
--- a/src/app/organization/sms-campaigns/sms-campaigns.component.html
+++ b/src/app/organization/sms-campaigns/sms-campaigns.component.html
@@ -1,6 +1,6 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
 
-  <button mat-raised-button color="primary" [routerLink]="['create']">
+  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_SMSCAMPAIGN'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Create SMS Campaign
   </button>
diff --git a/src/app/organization/standing-instructions-history/standing-instructions-history.component.html b/src/app/organization/standing-instructions-history/standing-instructions-history.component.html
index 484446f7d..4513f744a 100644
--- a/src/app/organization/standing-instructions-history/standing-instructions-history.component.html
+++ b/src/app/organization/standing-instructions-history/standing-instructions-history.component.html
@@ -61,7 +61,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary">
+        <button mat-raised-button color="primary" *mifosxHasPermission="'READ_STANDINGINSTRUCTION'">
           <fa-icon icon="search"></fa-icon>
           &nbsp; Search Instructions
         </button>
diff --git a/src/app/organization/tellers/cashiers/allocate-cash/allocate-cash.component.html b/src/app/organization/tellers/cashiers/allocate-cash/allocate-cash.component.html
index a19db977e..8d1f4bf5a 100644
--- a/src/app/organization/tellers/cashiers/allocate-cash/allocate-cash.component.html
+++ b/src/app/organization/tellers/cashiers/allocate-cash/allocate-cash.component.html
@@ -72,7 +72,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!allocateCashForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!allocateCashForm.valid" *mifosxHasPermission="'ALLOCATECASHIER_TELLER'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/tellers/cashiers/cashiers.component.html b/src/app/organization/tellers/cashiers/cashiers.component.html
index 1e7ca871b..cd7a92eba 100644
--- a/src/app/organization/tellers/cashiers/cashiers.component.html
+++ b/src/app/organization/tellers/cashiers/cashiers.component.html
@@ -1,6 +1,6 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
 
-  <button mat-raised-button color="primary" [routerLink]="['create']">
+  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_CASHIERS_FOR_TELLER'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     New Cashier
   </button>
@@ -39,15 +39,15 @@
         <th mat-header-cell *matHeaderCellDef mat-sort-header> Vault Actions </th>
         <td mat-cell *matCellDef="let cashier">
           <button class="cashier-action-button" mat-raised-button color="accent" matTooltip="Allocate Cash"
-            (click)="routeEdit($event)" [routerLink]="[cashier.id, 'allocate']">
+            (click)="routeEdit($event)" [routerLink]="[cashier.id, 'allocate']" *mifosxHasPermission="'ALLOCATECASHIER_TELLER'">
             <i class="fa fa-arrow-up"></i>
           </button>
           <button class="cashier-action-button" mat-raised-button color="warn" matTooltip="Settle Cash"
-            (click)="routeEdit($event)" [routerLink]="[cashier.id, 'settle']">
+            (click)="routeEdit($event)" [routerLink]="[cashier.id, 'settle']" *mifosxHasPermission="'SETTLECASHIER_TELLER'">
             <i class="fa fa-arrow-down"></i>
           </button>
           <button class="cashier-action-button" mat-raised-button color="primary" matTooltip="View Transactions"
-            (click)="routeEdit($event)" [routerLink]="[cashier.id, 'transactions']">
+            (click)="routeEdit($event)" [routerLink]="[cashier.id, 'transactions']" *mifosxHasPermission="'ALLOCATECASHIER_TELLER'">
             <i class="fa fa-eye"></i>
           </button>   
         </td>
diff --git a/src/app/organization/tellers/cashiers/create-cashier/create-cashier.component.html b/src/app/organization/tellers/cashiers/create-cashier/create-cashier.component.html
index d10b27780..ed0c468dd 100644
--- a/src/app/organization/tellers/cashiers/create-cashier/create-cashier.component.html
+++ b/src/app/organization/tellers/cashiers/create-cashier/create-cashier.component.html
@@ -67,7 +67,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!createCashierForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!createCashierForm.valid" *mifosxHasPermission="'UPDATECASHIERALLOCATION_TELLER'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/tellers/cashiers/edit-cashier/edit-cashier.component.html b/src/app/organization/tellers/cashiers/edit-cashier/edit-cashier.component.html
index f13fc735c..92b7003a7 100644
--- a/src/app/organization/tellers/cashiers/edit-cashier/edit-cashier.component.html
+++ b/src/app/organization/tellers/cashiers/edit-cashier/edit-cashier.component.html
@@ -73,7 +73,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!editCashierForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!editCashierForm.valid" *mifosxHasPermission="'UPDATECASHIERALLOCATION_TELLER'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/tellers/cashiers/settle-cash/settle-cash.component.html b/src/app/organization/tellers/cashiers/settle-cash/settle-cash.component.html
index cea6c168a..366fcdd64 100644
--- a/src/app/organization/tellers/cashiers/settle-cash/settle-cash.component.html
+++ b/src/app/organization/tellers/cashiers/settle-cash/settle-cash.component.html
@@ -72,7 +72,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!settleCashForm.valid">Settle Cash</button>
+        <button mat-raised-button color="primary" [disabled]="!settleCashForm.valid" *mifosxHasPermission="'SETTLECASHFROMCASHIER_TELLER'">Settle Cash</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/tellers/cashiers/transactions/transactions.component.html b/src/app/organization/tellers/cashiers/transactions/transactions.component.html
index e617a0021..f44a1712f 100644
--- a/src/app/organization/tellers/cashiers/transactions/transactions.component.html
+++ b/src/app/organization/tellers/cashiers/transactions/transactions.component.html
@@ -1,9 +1,9 @@
 <div fxLayout="row" fxLayoutGap="1%" fxLayoutAlign="end" class="container m-b-20">
-  <button mat-raised-button color="accent" [routerLink]="['../allocate']">
+  <button mat-raised-button color="accent" [routerLink]="['../allocate']" *mifosxHasPermission="'ALLOCATECASHIER_TELLER'">
       <fa-icon icon="arrow-up"></fa-icon>&nbsp;&nbsp;
       Allocate Cash
   </button>
-  <button mat-raised-button color="warn" [routerLink]="['../settle']">
+  <button mat-raised-button color="warn" [routerLink]="['../settle']" *mifosxHasPermission="'SETTLECASHFROMCASHIER_TELLER'">
       <fa-icon icon="arrow-down"></fa-icon>&nbsp;&nbsp;
       Settle Cash
   </button>
diff --git a/src/app/organization/tellers/cashiers/view-cashier/view-cashier.component.html b/src/app/organization/tellers/cashiers/view-cashier/view-cashier.component.html
index 00ca44eb5..a85011e07 100644
--- a/src/app/organization/tellers/cashiers/view-cashier/view-cashier.component.html
+++ b/src/app/organization/tellers/cashiers/view-cashier/view-cashier.component.html
@@ -1,9 +1,9 @@
 <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
-  <button mat-raised-button color="primary" [routerLink]="['edit']">
+  <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_CASHIER'">
     <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
     Edit
   </button>
-  <button mat-raised-button color="warn" (click)="deleteCashier()">
+  <button mat-raised-button color="warn" (click)="deleteCashier()" *mifosxHasPermission="'DELETECASHIER_TELLER'">
     <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
     Delete
   </button>
diff --git a/src/app/organization/tellers/create-teller/create-teller.component.html b/src/app/organization/tellers/create-teller/create-teller.component.html
index 05cf03236..9f6fd9839 100644
--- a/src/app/organization/tellers/create-teller/create-teller.component.html
+++ b/src/app/organization/tellers/create-teller/create-teller.component.html
@@ -71,7 +71,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!tellerForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!tellerForm.valid" *mifosxHasPermission="'CREATE_TELLER'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/tellers/edit-teller/edit-teller.component.html b/src/app/organization/tellers/edit-teller/edit-teller.component.html
index ac5992151..490fdf227 100644
--- a/src/app/organization/tellers/edit-teller/edit-teller.component.html
+++ b/src/app/organization/tellers/edit-teller/edit-teller.component.html
@@ -68,7 +68,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="!tellerForm.valid">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="!tellerForm.valid" *mifosxHasPermission="'UPDATE_TELLER'">Submit</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/organization/tellers/tellers.component.html b/src/app/organization/tellers/tellers.component.html
index c029895d6..036c6e4f7 100644
--- a/src/app/organization/tellers/tellers.component.html
+++ b/src/app/organization/tellers/tellers.component.html
@@ -1,6 +1,6 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
 
-  <button mat-raised-button color="primary" [routerLink]="['create']">
+  <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_TELLER'">
     <fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
     Create Teller
   </button>
diff --git a/src/app/organization/tellers/view-teller/view-teller.component.html b/src/app/organization/tellers/view-teller/view-teller.component.html
index 723cfa2a5..431589cf9 100644
--- a/src/app/organization/tellers/view-teller/view-teller.component.html
+++ b/src/app/organization/tellers/view-teller/view-teller.component.html
@@ -1,9 +1,9 @@
 <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
-  <button mat-raised-button color="primary" [routerLink]="['edit']">
+  <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_TELLER'">
     <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
     Edit
   </button>
-  <button mat-raised-button color="warn" (click)="deleteTeller()">
+  <button mat-raised-button color="warn" (click)="deleteTeller()" *mifosxHasPermission="'DELETE_TELLER'">
     <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
     Delete
   </button>
diff --git a/src/app/organization/working-days/working-days.component.html b/src/app/organization/working-days/working-days.component.html
index 89f48d6db..d10feff08 100644
--- a/src/app/organization/working-days/working-days.component.html
+++ b/src/app/organization/working-days/working-days.component.html
@@ -38,7 +38,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button mat-raised-button [routerLink]="['../']">Cancel</button>
-        <button mat-raised-button color="primary" [disabled]="workingDaysForm.pristine">Submit</button>
+        <button mat-raised-button color="primary" [disabled]="workingDaysForm.pristine" *mifosxHasPermission="'UPDATE_WORKINGDAYS'">Submit</button>
       </mat-card-actions>
 
     </form>