Repository: incubator-fineract Updated Branches: refs/heads/develop 5fdac2282 -> 9aa4425c4
Removed ALL option from r_enum_value table for loan_type_enum Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/9aa4425c Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/9aa4425c Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/9aa4425c Branch: refs/heads/develop Commit: 9aa4425c487440e9da1dd153e77120cbded55f7f Parents: 5fdac22 Author: Satish <satish.saj...@confluxtechnologies.com> Authored: Tue Nov 15 15:52:13 2016 +0530 Committer: Satish <satish.saj...@confluxtechnologies.com> Committed: Tue Nov 15 17:16:10 2016 +0530 ---------------------------------------------------------------------- .../sms/scheduler/SmsMessageScheduledJobServiceImpl.java | 2 +- .../main/resources/sql/migrations/core_db/V322__sms_campaign.sql | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/9aa4425c/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java ---------------------------------------------------------------------- diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java index 4b34f41..8a7f845 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java @@ -223,7 +223,7 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob if (smsMessageInternalIds.getPageItems().size() > 0) { // make request - Map<String, Object> hostConfig = this.smsConfigUtils.getMessageGateWayRequestURI("sms", new Gson().toJson(smsMessageInternalIds.getPageItems())) ; + Map<String, Object> hostConfig = this.smsConfigUtils.getMessageGateWayRequestURI("sms/report", new Gson().toJson(smsMessageInternalIds.getPageItems())) ; URI uri = (URI)hostConfig.get("uri") ; HttpEntity<?> entity = (HttpEntity<?>)hostConfig.get("entity") ; ResponseEntity<Collection<SmsMessageDeliveryReportData>> responseOne = restTemplate.exchange(uri, HttpMethod.POST, entity, http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/9aa4425c/fineract-provider/src/main/resources/sql/migrations/core_db/V322__sms_campaign.sql ---------------------------------------------------------------------- diff --git a/fineract-provider/src/main/resources/sql/migrations/core_db/V322__sms_campaign.sql b/fineract-provider/src/main/resources/sql/migrations/core_db/V322__sms_campaign.sql index 21664a1..26998d5 100644 --- a/fineract-provider/src/main/resources/sql/migrations/core_db/V322__sms_campaign.sql +++ b/fineract-provider/src/main/resources/sql/migrations/core_db/V322__sms_campaign.sql @@ -178,8 +178,6 @@ INSERT INTO `stretchy_report` (`report_name`, `report_type`, `report_subtype`, ` ('Savings Activated', 'SMS', 'Triggered', 'Savings', 'SELECT \r\nc.id AS "id",\r\nc.firstname AS "firstName",\r\nc.middlename AS "middleName",\r\nc.lastname AS "lastName",\r\nc.display_name AS "fullName",\r\nc.mobile_no AS "mobileNo",\r\ns.account_no AS "savingsAccountNo",\r\nounder.id AS "officeNumber",\r\nounder.name AS "officeName"\r\n\r\nFROM m_office o\r\nJOIN m_office ounder ON ounder.hierarchy LIKE CONCAT(o.hierarchy, \'%\')\r\nJOIN m_client c ON c.office_id = ounder.id\r\nJOIN m_savings_account s ON s.client_id = c.id\r\nJOIN m_savings_product sp ON sp.id = s.product_id\r\nLEFT JOIN m_staff st ON st.id = s.field_officer_id\r\nLEFT JOIN m_currency cur ON cur.code = s.currency_code\r\nWHERE o.id = ${officeId} AND (IFNULL(s.field_officer_id, -10) = ${loanOfficerId} OR "-1" = ${loanOfficerId}) AND s.id = ${savingsId}', 'Savings Activation', '1'); INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`, `enum_type`) -VALUES ('loan_type_enum', '-1', 'All', 'All', '0'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`, `enum_type`) VALUES ('loan_type_enum', '1', 'Individual Loan', 'Individual Loan', '0'); INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`, `enum_type`) VALUES ('loan_type_enum', '2', 'Group Loan', 'Group Loan', '0');
