Merge branch 'dev-pending-01-02-2026' of https://ct.mfsys.com.pk/aConnect/aConnect-UX into mazdak/UX-2368

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/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,7 +234,7 @@
     "next": "Next",
     "LOGIN_SUCCESSFULLY":"Login SucessFully",
     "RESET_PASSWORD_SUCCESS":"Password Reset Successfully",
-  "RESET_PASSWORD_FAILED": "New password cannot be same as previous password",
+    "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",
@@ -272,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",
@@ -299,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"
 }