Merge branch 'dev-pending-01-02-2026' into PRE-PRODUCTION-2026-OSHO

src/app/transaction-logs/transaction-logs.component.html

@@ -184,9 +184,9 @@
                                 <th scope="col">{{ "crAccount" | translate }}</th>
                                 <th scope="col">{{ "drPcaGlacode" | translate }}</th>
                                 <th scope="col">{{ "crPcaglacode" | translate }}</th>
-                                <th scope="col">{{ "transactionUri" | translate }}</th>
                                 <th scope="col">{{ "transactionCode" | translate }}</th>
-                                <th scope="col">{{ "paymentMode" | translate }}</th>
+                                <th scope="col">{{ "transactionUri" | translate }}</th>
+                                <!-- <th scope="col">{{ "paymentMode" | translate }}</th> -->
                                 <th scope="col">{{ "date" | translate }}</th>
                                 <th scope="col">{{ "channel" | translate }}</th>
                                 <th scope="col">{{ "createdAt" | translate }}</th>
@@ -203,7 +203,7 @@
                                     'crPcaglacode',
                                     'transactionUri',
                                     'transactionCode',
-                                    'ppmPymdcode',
+                                    
                                     'sgtGntrdate',
                                     'channelCode',
                                     'createdAt'
@@ -217,7 +217,7 @@
                                 <td>{{ log.crPcaglacode || '-' }}</td>
                                 <td><small class="text-muted">{{ log.transactionUri || 'N/A' }}</small></td>
                                 <td><span class="badge bg-secondary">{{ log.transactionCode || 'N/A' }}</span></td>
-                                <td>{{ log.ppmPymdcode || '-' }}</td>
+                                <!-- <td>{{ log.ppmPymdcode || '-' }}</td> -->
                                 <td>{{ log.sgtGntrdate | date: 'MMM dd, yyyy' }}</td>
                                 <td>{{ log.channelCode || '-' }}</td>
                                 <td>{{ log.createdAt | date: 'MMM dd, yyyy HH:mm' }}</td>

src/app/user-management/setup-user/setup-user.component.html

@@ -203,9 +203,10 @@
                                   <div
                                     class="password-wrapper position-relative w-100"
                                   >
+                                  <div class="password-wrapper">
                                      <input
                                       id="defaultPassword"
-                                      type="password"
+                                      [type]="passwordType"
                                       class="form-control"
                                       formControlName="defaultPassword"
                                       name="defaultPassword"
@@ -214,7 +215,10 @@
                                       }}"
                                       appNoWhitespaces
                                     />
+                                    <app-password-hide-show #passShowSetupUser class="password-eye align-items" [showPassword]="true"
+                                        (onEyeClick)="toggleSetupPass()"></app-password-hide-show>
 
+                                  </div>                                 
                                     <div
                                       class="text-danger"
                                       *ngIf="

src/app/user-management/setup-user/setup-user.component.ts

@@ -1,5 +1,5 @@
 import { CommonModule } from '@angular/common';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { TranslateModule } from '@ngx-translate/core';
@@ -15,11 +15,12 @@ import { HttpURIService } from '../../app.http.uri.service';
 import { I18NService } from '../../services/i18n.service';
 import { SuccessMessages, ErrorMessages } from '../../utils/enums';
 import { ResetPasswordModalComponent } from '../reset-password-modal/reset-password-modal.component';
+import { PasswordHideShowComponent } from '../../shared/components/password-hide-show/password-hide-show.component';
 
 @Component({
   selector: 'app-setup-user',
   standalone: true,
-  imports: [TranslateModule, ReactiveFormsModule, FormsModule, CommonModule, NgSelectModule, TableFilterPipe, ResetPasswordModalComponent],
+  imports: [TranslateModule, ReactiveFormsModule, FormsModule, CommonModule, NgSelectModule, TableFilterPipe, ResetPasswordModalComponent, PasswordHideShowComponent],
   templateUrl: './setup-user.component.html',
   styleUrl: './setup-user.component.scss'
 })
@@ -39,7 +40,7 @@ export class SetupUserComponent implements OnInit {
   renewalDataExpanded: boolean = true;
   totalCount: number = 0;
   mode: 'create' | 'edit' = 'create';
-
+  passwordType: string = 'password';
   userSetupDataExpanded: boolean = true;
   buttonPermissions: any;
   isLoading: boolean = false;
@@ -52,6 +53,7 @@ export class SetupUserComponent implements OnInit {
     { label: 'Admin', value: 'ADMIN' },
     { label: 'User', value: 'USER' },
   ];
+    @ViewChild('passShowSetupUser') passwordHideShow?: PasswordHideShowComponent;
 
   constructor(
     private fb: FormBuilder,
@@ -61,6 +63,9 @@ export class SetupUserComponent implements OnInit {
     private i18nService: I18NService
   ) {}
 
+  toggleSetupPass() {
+    this.passwordType = this.passwordHideShow?.showPassword ? 'password' : 'text';
+  }
   onSearch(value: string): void {
     this.searchText = value;
   }

src/assets/i18n/Arabic.json

@@ -297,8 +297,6 @@
   "expand": "توسيع",
   "entries": "إدخالات",
   "dateFilter": "تصفية التاريخ",
-  "fromDate": "من تاريخ",
-  "toDate": "إلى تاريخ",
   "clearFilter": "مسح التصفية",
   "activeFilter": "التصفية نشطة",
   "from": "من",

src/assets/i18n/English.json

@@ -1,4 +1,5 @@
 {
+
     "logintoAccount":"Login to your account",
     "userName":"Username",
     "userNamePlaceHolder":"Enter Username",
@@ -191,11 +192,11 @@
     "noTransactionLogsFound": "No transaction logs found.",
     "logID": "Log ID",
     "organization": "Organization",
-  "transactionID": "Transaction ID",
+    "transactionID": "Tran ID",
     "drAccount": "DR Account",
     "crAccount": "CR Account",
-  "crPcaglacode": "CR GL Account",
+    "crPcaglacode": "CR GL",
-  "drPcaGlacode": "DR GL Account",
+    "drPcaGlacode": "DR GL",
     "paymentMode": "Payment Mode",
     "channel": "Channel",
     "createdAt": "Created At",
@@ -233,6 +234,7 @@
     "next": "Next",
     "LOGIN_SUCCESSFULLY":"Login SucessFully",
     "RESET_PASSWORD_SUCCESS":"Password Reset Successfully",
+    "RESET_PASSWORD_FAILED":"New password cannot be the same as previous password",
     "CHANGE_PASSWORD_SUCCESS":"Password Changed Successfully",
     "ALREADY_LOGGED_IN": "User Already Logged In",
     "ACCESS_DENIED" : "Access Denied",
@@ -271,8 +273,8 @@
     "oldAndNewPass":"Old password and new password cannot be the same",
     "activityLogs": "Activity Logs",
     "activityLogDetails": "Activity Log Details",
-  "transactionCode": "Transaction Code",
+    "transactionCode": "Tran Code",
-  "transactionUri": "Transaction URI",
+    "transactionUri": "Tran URI",
     "resetPasswordButton": "Reset Password",
     "dateTime": "Date Time",
     "responseCode": "Response Code",
@@ -298,19 +300,6 @@
     "collapse": "Collapse",
     "expand": "Expand",
     "dateFilter": "Date Filter",
-  "clearFilter": "Clear Filter",
+    "showDateFilters":"Show Date Filter",
-  "activeFilter": "Active Filter",
+    "hideDateFilters":"Hide Date Filter"
-  "from": "From",
-  "to": "to",
-  "last7Days": "Last 7 Days",
-  "last30Days": "Last 30 Days",
-  "thisMonth": "This Month",
-  "last3Months": "Last 3 Months",
-  "hideDateFilters": "Hide Date Filters",
-  "showDateFilters": "Show Date Filters",
-  "filteringByDate": "Filtering by date range...",
-  "tryAdjustingFilters": "Try adjusting your date filters or search terms",
-  "noDataInRange": "No transactions found in the selected date range",
-  "dateRangeError": "Please select a valid date range",
-  "exportAllData": "Export All Data"
 }