Merge branch 'feature/associated-payment-transactions' into develop

This commit is contained in:
elforjani13
2021-12-14 13:06:05 +02:00
27 changed files with 775 additions and 63 deletions

View File

@@ -1497,5 +1497,6 @@
"users.column.role_name":"دور المستخدم",
"roles.error.you_cannot_edit_predefined_roles":"لا يمكنك تعديل أدوار المستخدم المحددة مسبقا.",
"roles.error.you_cannot_delete_predefined_roles":"لا يمكنك حذف أدوار المستخدم المحددة مسبقا",
"roles.error.you_cannot_delete_role_that_associated_to_users":"لا يمكن حذف دور المستخدم لأنه لديه مستخدمين مرتبطة به."
"roles.error.you_cannot_delete_role_that_associated_to_users":"لا يمكن حذف دور المستخدم لأنه لديه مستخدمين مرتبطة به.",
"payment_transactions":"معاملات الدفع"
}

View File

@@ -1632,6 +1632,6 @@
"transactions_locking.of_the_module_locked_to": "Transactions of the module locked to <strong>{value}</strong>.",
"transactions_locking.lock_reason": "Lock Reason: <strong>{value}</strong>.",
"transactions_locking.partial_unlocked_from": "Partial unlocked from <strong>{fromDate}</strong> to <strong>{toDate}</strong>.",
"transactions_locking.unlock_reason":"<strong>Unlock Reason:</strong> {value}."
"transactions_locking.unlock_reason":"<strong>Unlock Reason:</strong> {value}.",
"payment_transactions":"Payment transactions"
}