Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v1.0.4 prepare #36

Merged
merged 1 commit into from
Jul 10, 2023
Merged

Release/v1.0.4 prepare #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 51 additions & 29 deletions app/global-translations/locale-en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@
"#Inputs": "..",
"label.input.name": "Name",
"label.input.unittype": "Unit Type",
"label.input.pcttobase": "Percentage To Base",
"label.input.baseprice": "Base Price",
"label.input.pcttobase": "Percentage To Base",
"label.input.baseprice": "Base Price",
"label.input.firstname": "First name",
"label.input.lastname": "Last name",
"label.input.middlename": "Middle name",
Expand Down Expand Up @@ -637,6 +637,7 @@
"label.anchor.advsearch": "Advanced search",
"label.anchor.keyboardshortcut": "Keyboard Shortcuts",
"label.anchor.save": "Save",
"label.anchor.removeblacklist": "Remove From Blacklist",
"#Inputs": "..",
"label.input.searchbyuser": "Search by user",
"label.input.clienttemplate": "Client Template",
Expand All @@ -660,6 +661,7 @@
"label.input.additionalinformation": "Additional information",
"label.input.personalinformation": "Personal information",
"label.input.changelanguage": "Change language:",
"label.input.supportingDocuments": "Supporting Documents",
"#Search": "..",
"label.search.scope.all": "All",
"label.search.scope.clients.and.clientIdentifiers": "Clients",
Expand Down Expand Up @@ -734,6 +736,7 @@
"label.anchor.reactivate": "Reactivate",
"label.anchor.undoReject": "Undo Rejection",
"label.anchor.undoWithdrawn": "Undo Withdrawal",
"label.anchor.uploadDocuments": "Upload Supporting Documents(Zip Format)",
"#Inputs": "..",
"label.input.filterbynameaccno": "Filter display by name/client number/staff/office",
"label.input.searchByNameAccNo": "Find by name/mobile/client number/external ID/identifier",
Expand Down Expand Up @@ -795,6 +798,7 @@
"label.button.viewactiveshares": "View Active Shares",
"label.button.undoReject": "Undo Rejection",
"label.button.undoWithdrawn": "Undo Withdrawal",
"label.button.showinactive": "Show Inactive Blacklist",
"#Misc Labels": "..",
"label.numofloancycles": "Number of loan cycle(s)",
"label.lastloanamount": "Last loan amount",
Expand Down Expand Up @@ -835,6 +839,8 @@
"error.msg.client.duplicate.externalId": "A client with external id `{{params[0].value}}` already exists.",
"error.msg.client.duplicate.accountNo": "A client with account no. `{{params[0].value}}` already exists.",
"error.msg.client.duplicate.dpi": "A client with dpi. `{{params[0].value}}` already exists.",
"error.msg.client.blacklisted": "This person is blacklisted. REASON: `{{params[0].value}}` ",
"error.msg.client.already.blacklisted": "A client with dpi. `{{params[0].value}}` is already blacklisted.",
"error.msg.client.id.invalid": "Client does not exist.",
"error.msg.client.not.active.exception": "The Client with ID `{{params[0].value}}` is not active.",
"validation.msg.clientIdentifier.documentKey.cannot.be.blank": "Identification Number is mandatory.",
Expand Down Expand Up @@ -988,6 +994,7 @@
"label.input.select.groups": "Select and add groups",
"label.input.searchforgroup": "Search for a group",
"label.input.searchByNameExternalId": "Search by name or external ID",
"label.input.searchByNameDpi": "Search by name or DPI",
"#Misc Labels": "..",
"label.selectcenter": "Select center",
"label.selectclients": "Select clients",
Expand Down Expand Up @@ -1115,6 +1122,7 @@
"label.anchor.editfinancialmapping": "Edit Financial Activity Mapping",
"label.anchor.journalentries": "Journal Entries",
"label.anchor.viewjournalentries": "View Journal Entries",
"label.anchor.blacklist": "Blacklist",
"#Inputs": "..",
"label.input.accountingrulename": "Accounting rule name",
"label.input.affectedentries": "Affected entries",
Expand Down Expand Up @@ -1156,7 +1164,14 @@
"label.input.date.of.opening.balances": "Date of opening balances",
"label.input.opening.balances.contra.account": "Opening balances contra",
"label.input.smsprovider": "SMS Provider",
"label.input.dpi": "D.P.I",
"label.input.dpi": "DPI",
"label.input.nit": "NIT",
"label.input.year": "Year",
"label.input.typification": "Typification",
"label.input.agencyid": "Agency ID",
"label.input.balance": "Balance",
"label.input.disbursementAmount": "Disbursement Amount",
"label.addtoblacklist": "Add To Blacklist",
"#journalEntryType code ": ".............",
"journalEntryType.credit": "Credit",
"journalEntrytType.debit": "Debit",
Expand Down Expand Up @@ -1513,6 +1528,7 @@
"label.anchor.unassignsavingsofficer": "Unassign Savings Officer",
"label.anchor.rescheduleLoan": "Reschedule Loan",
"label.anchor.reschedulerequest": "Reschedule Request",
"label.anchor.blacklistClient": "Blacklist Customer",
"#Inputs": "..",
"label.input.grouptotal": "Group total",
"label.input.centertotal": "Center total",
Expand Down Expand Up @@ -1581,6 +1597,12 @@
"label.input.applicationdate": "Application Date",
"label.input.isTopup": "Is Topup Loan",
"label.input.loanIdToClose": "Choose loan to close",
"label.input.typification": "Typification",
"blacklist.option.direct.sanitized": "direct sanitized",
"blacklist.option.indirect.sanitized": "Indirect sanitized",
"blacklist.option.deliquent": "Delinquent",
"blacklist.option.frontman": "Frontman",
"blacklist.option.returns": "Returns",
"#Buttons": "..",
"label.button.addloancharge": "Add Loan Charge",
"label.button.addcollateral": "Add Collateral",
Expand Down Expand Up @@ -4349,31 +4371,31 @@

"#------------------": "------------",

"#TwoFactorAuthentication": "...",
"#TwoFactorAuthentication": "...",

"#Headings": "..",
"label.heading.twofactor": "Two-Factor Authentication",
"label.heading.sms": "SMS",
"label.heading.token": "Token",
"#Headings": "..",
"label.heading.twofactor": "Two-Factor Authentication",
"label.heading.sms": "SMS",
"label.heading.token": "Token",

"#Labels": "..",
"label.otp.token": "Authentication token",
"label.button.otp.request": "Request token",
"label.button.tfa.remember_me": "Remember this computer",
"label.otp.delivery.select.sms": "Send as an SMS to {{target}}",
"label.otp.delivery.select.email": "Send via Email to {{target}}",
"label.otp.delivery.info": "Please select how you would like to receive an authentication token.",
"label.otp.verify.info": "Please enter the authentication token you received.",
"label.anchor.twofactorconfig": "Two-Factor Configuration",
"label.twofactorconfig": "Two-factor authentication configuration settings",
"label.anchor.viewtwofactorconfig":"View Two-Factor Configuration",
"label.anchor.edittwofactorconfig": "Edit Two-Factor Configuration",
"#Labels": "..",
"label.otp.token": "Authentication token",
"label.button.otp.request": "Request token",
"label.button.tfa.remember_me": "Remember this computer",
"label.otp.delivery.select.sms": "Send as an SMS to {{target}}",
"label.otp.delivery.select.email": "Send via Email to {{target}}",
"label.otp.delivery.info": "Please select how you would like to receive an authentication token.",
"label.otp.verify.info": "Please enter the authentication token you received.",
"label.anchor.twofactorconfig": "Two-Factor Configuration",
"label.twofactorconfig": "Two-factor authentication configuration settings",
"label.anchor.viewtwofactorconfig":"View Two-Factor Configuration",
"label.anchor.edittwofactorconfig": "Edit Two-Factor Configuration",

"#Error messages": "..",
"#Error messages": "..",

"error.otp.validate.invalid": "The provided authentication token is invalid",
"error.otp.validate.other": "An error occurred while trying to validate the authentication token",
"error.twofactor.config.disabled": "Two-Factor authentication is disabled or not supported on the server!",
"error.otp.validate.invalid": "The provided authentication token is invalid",
"error.otp.validate.other": "An error occurred while trying to validate the authentication token",
"error.twofactor.config.disabled": "Two-Factor authentication is disabled or not supported on the server!",

"label.tooltip.reportrunfrequncy": "Report Run Frequency",
"label.heading.reportrunfrequncy": "Report Run Frequency",
Expand Down Expand Up @@ -4426,15 +4448,15 @@
"label.anchor.editrate": "Edit Rate",
"label.error.rate.already.exist" : "Rate already exist.",
"label.selectrate" : "Select Rate",
"label.input.street":"Street",
"label.input.street":"Street",

"label.input.fixed.pricipal.percentage.per.installment" : "Fixed Principal % per instalment",
"label.heading.fixed.pricipal.percentage.per.installment" : "Fixed Principal % per instalment",
"label.tooltip.fixed.pricipal.percentage.per.installment" : "Principal portion of the instalments except the last installment will be fixed to this value.",
"label.tooltip.fixed.pricipal.percentage.per.installment" : "Principal portion of the instalments except the last installment will be fixed to this value.",

"label.input.fixed.pricipal.percentage.per.installment" : "Fixed Principal % per instalment",
"label.heading.fixed.pricipal.percentage.per.installment" : "Fixed Principal % per instalment",
"label.tooltip.fixed.pricipal.percentage.per.installment" : "Principal portion of the instalments except the last installment will be fixed to this value.",
"label.tooltip.fixed.pricipal.percentage.per.installment" : "Principal portion of the instalments except the last installment will be fixed to this value.",
"label.input.change.fixed.principal.percentage.per.installment" : "Change Fixed Principal % per instalment",
"label.input.new.fixed.principal.percentage.per.installment" : "New Fixed Principal % per instalment",
"label.cupo": "Cupo",
Expand Down Expand Up @@ -4482,15 +4504,15 @@
"label.heading.isDocument" : "Doc.",
"label.anchor.managemanagecauses" : "Causales",
"label.anchor.addcause" : "Add cause",
"label.heading.addcause" : "Add cause",
"label.heading.addcause" : "Add cause",
"label.button.createcause" : "Create cause",
"label.input.searchByCodeDesc" : "Search by Code or Desc",
"label.heading.cause" : "Cause",
"label.input.codigoAcrm" : "Cod.",
"label.input.allowOverdraft" : "Allow overdraft",
"label.input.isCashOperation" : "Is cash operation",
"label.input.operationType" : "Operation type",
"label.input.sendAcrm" : "Send to CRM",
"label.input.sendAcrm" : "Send to CRM",
"label.input.shortDescription" : "Short description",
"label.input.isDocument" : "Is doc",
"label.heading.editcause" : "Edit Cause",
Expand Down
16 changes: 15 additions & 1 deletion app/global-translations/locale-es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,10 @@
"label.input.searchactivities": "Búsqueda de actividades",
"label.input.additionalinformation": "Información adicional",
"label.input.changelanguage": "Cambiar el idioma:",
"label.input.dpi": "D.P.I",
"label.input.dpi": "DPI",
"label.input.nit": "NIT",
"label.input.searchByNameDpi": "Buscar por nombre o DPI",
"label.addtoblacklist": "Agregar Persona",
"label.search.scope.all": "Todo",
"label.search.scope.clients.and.clientIdentifiers": "Clientes",
"label.search.scope.groups.and.centers": "Grupos",
Expand Down Expand Up @@ -681,6 +684,8 @@
"label.anchor.reactivate": "Reactivar",
"label.anchor.undoReject": "Deshacer Rechazo",
"label.anchor.undoWithdrawn": "Deshacer Retiro",
"label.anchor.blacklistClient": "Cliente de la lista negra",
"label.anchor.blacklist": "lista negra",
"label.input.filterbynameaccno": "Filtrar lo que se muestra por nombre/cliente/personal/oficina",
"label.input.searchByNameAccNo": "Buscar por nombre/móvil/cliente/id. externo/identificador",
"label.input.selectclientimage": "Seleccionar imagen del cliente",
Expand All @@ -696,6 +701,7 @@
"label.input.reactivationdate": "Fecha de reactivación",
"label.input.withdrawaldate": "Fecha de retiro",
"label.input.withdrawalreason": "Razón de retiro",
"label.input.reasons": "Razón",
"label.input.clientName": "Nombre del cliente",
"label.input.clientId": "Id. del cliente",
"label.input.reopeneddate": "ReAbrir Fecha",
Expand Down Expand Up @@ -770,6 +776,7 @@
"error.msg.client.duplicate.externalId": "Un cliente con ID externa `{{params[0].value}}` ya existe.",
"error.msg.client.duplicate.accountNo": "Ya existe un cliente con el número de cuenta `{{params[0].value}}`.",
"error.msg.client.duplicate.dpi": "Un cliente con dpi. `{{params[0].value}}` ya existe.",
"error.msg.client.blacklisted": "Esta persona esta en la lista negra. MOTIVO: `{{params[0].value}}` ",
"error.msg.client.id.invalid": "El cliente no existe.",
"error.msg.client.not.active.exception": "El Cliente con el ID `{{params[0].value}}` no está activo.",
"validation.msg.clientIdentifier.documentKey.cannot.be.blank": "El n.º de identificación es obligatorio.",
Expand Down Expand Up @@ -846,6 +853,7 @@
"label.input.revisedmeetingdates": "Fechas de reuniones revisadas",
"label.input.error": "Error",
"label.input.invaliddaterange": "Selecciona un intervalo de fechas válido",
"label.input.agencyid": "identificador de agencia",
"label.button.creategroup": "Crear grupo",
"label.button.groupsavingapplication": "Grupo de solicitud de ahorro",
"label.button.grouploanapplication": "Grupo de solicitud de préstamo",
Expand Down Expand Up @@ -1020,6 +1028,7 @@
"label.anchor.editfinancialmapping": "Editar mapeo de actividad financiera",
"label.anchor.journalentries": "Entradas de Diario",
"label.anchor.viewjournalentries": "Ver Entradas de Diario",
"label.anchor.removeblacklist": "Eliminar de la lista negra",
"label.input.accountingrulename": "Nombre de la regla de contabilidad",
"label.input.affectedentries": "Entradas afectadas",
"label.input.accountingrules": "Normas de contabilidad",
Expand Down Expand Up @@ -1059,6 +1068,7 @@
"label.input.date.of.opening.balances": "Fecha de saldos de apertura",
"label.input.opening.balances.contra.account": "Saldos de apertura de contra",
"label.input.smsprovider": "Proveedor de SMS",
"label.input.supportingDocuments": "Documentos de respaldo",
"journalEntryType.credit": "Crédito",
"journalEntrytType.debit": "Débito",
"label.button.addfamilymember": "Añadir miembro de la familia",
Expand Down Expand Up @@ -1391,6 +1401,7 @@
"label.anchor.unassignsavingsofficer": "Desasignar agente de ahorros",
"label.anchor.rescheduleLoan": "Reprogramar Préstamo",
"label.anchor.reschedulerequest": "Reschedule Petición",
"label.anchor.uploadDocuments": "Subir documentos de respaldo (formato zip)",
"label.input.grouptotal": "Grupo total",
"label.input.centertotal": "Centro total",
"label.input.charge": "Cargo",
Expand Down Expand Up @@ -1480,6 +1491,7 @@
"label.button.reschedule": "Reprogramar",
"label.button.recreate": "Recrear",
"label.button.foreclosure": "Foreclosure",
"label.button.showinactive": "Mostrar lista negra inactiva",
"label.selectpurpose": "Seleccione propósito",
"label.selectloanproduct": "Seleccione producto de préstamo",
"label.selectsavingsofficer": "Seleccionar agente de ahorros",
Expand Down Expand Up @@ -2935,6 +2947,8 @@
"label.input.principal": "Principal",
"label.input.principalamount": "Monto principal",
"label.input.totalinstallmentamount": "Monto de importe",
"label.input.disbursementAmount": "monto del desembolso",
"label.input.balance": "Saldo Saneado",
"label.input.minimum": "Mínimo",
"label.input.maximum": "Máximo",
"label.input.default": "Predeterminado",
Expand Down
39 changes: 39 additions & 0 deletions app/scripts/controllers/blacklist/AddToBlacklistController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
(function (module) {
mifosX.controllers = _.extend(module, {
AddToBlacklistController: function (scope, routeParams, route, location, resourceFactory, http, $uibModal, API_VERSION, $timeout, $rootScope, Upload) {
scope.client = null;
scope.dpi = null;
scope.typificationOptions = [];
scope.loanProductOptions = [];

scope.formData={};


resourceFactory.blacklistTemplateResource.get(function (data) {
scope.typificationOptions= data.typificationOptions
scope.loanProductOptions= data.loanProducts
});



scope.submit=function (){
this.formData.locale = scope.optlang.code;

resourceFactory.blacklistResource.save(this.formData, function (data) {
location.path('blacklist/'+data.resourceId+'/viewdetails' );
});
}

// scope.routeTo = async ()=>{
// await setTimeout(function (){
// location.path('/blacklist' );
// },3000);
// }

}
});

mifosX.ng.application.controller('AddToBlacklistController', ['$scope', '$routeParams', '$route', '$location', 'ResourceFactory', '$http', '$uibModal', 'API_VERSION', '$timeout', '$rootScope', 'Upload', mifosX.controllers.AddToBlacklistController]).run(function ($log) {
$log.info("AddToBlacklistController initialized");
});
}(mifosX.controllers || {}));
49 changes: 49 additions & 0 deletions app/scripts/controllers/blacklist/BlacklistController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
(function (module) {
mifosX.controllers = _.extend(module, {
BlacklistController: function (scope, routeParams, route, location, resourceFactory, http, $uibModal, API_VERSION, $timeout, $rootScope, Upload) {
scope.blacklist = [];
scope.actualBlacklist = [];
scope.showInactive = false;

scope.formData={};
scope.searchText;
scope.clientsPerPage=20;

scope.getResultsPage = function (pageNumber) {
var items = resourceFactory.blacklistResource.getAllBlacklistClients({
offset: ((pageNumber - 1) * scope.clientsPerPage),
limit: scope.clientsPerPage,
searchText:scope.searchText
}, function (data) {
scope.totalClients = data.totalFilteredRecords;
scope.blacklist = data.pageItems;
});
}

// resourceFactory.blacklistResource.getAllBlacklistClients({
// offset: 0,
// limit: scope.clientsPerPage,
// status: scope.showInactive? 'INACTIVE' : 'ACTIVE',
// searchText:scope.searchText
// }, function (data) {
// scope.totalClients = data.totalFilteredRecords;
// scope.blacklist = data.pageItems;
// });

scope.routeTo = function (path) {
location.path(path);
}

scope.getActiveInactive = function () {
scope.showInactive = !scope.showInactive;
scope.getResultsPage(1);
}

}

});

mifosX.ng.application.controller('BlacklistController', ['$scope', '$routeParams', '$route', '$location', 'ResourceFactory', '$http', '$uibModal', 'API_VERSION', '$timeout', '$rootScope', 'Upload', mifosX.controllers.BlacklistController]).run(function ($log) {
$log.info("BlacklistController initialized");
});
}(mifosX.controllers || {}));
Loading