From 8d1323022d5452c77f5f673874e474bfa0a020b2 Mon Sep 17 00:00:00 2001 From: Diana De Rose Date: Fri, 23 Jun 2017 11:53:13 -0700 Subject: [PATCH] SDK-550 --- ipp-java-qbapihelper/pom.xml | 4 +- ipp-v3-java-data/pom.xml | 4 +- ipp-v3-java-devkit-assembly/pom.xml | 8 +- ipp-v3-java-devkit-shaded-assembly/pom.xml | 8 +- ipp-v3-java-devkit/pom.xml | 6 +- .../PrepareRequestInterceptor.java | 40 +++++- .../ipp/interceptors/RequestElements.java | 20 ++- .../intuit/ipp/services/ReportService.java | 114 ++++++++++++++++++ .../src/main/resources/ippdevkit.properties | 2 +- .../src/test/resources/ippdevkit.properties | 2 +- pom.xml | 2 +- 11 files changed, 189 insertions(+), 21 deletions(-) diff --git a/ipp-java-qbapihelper/pom.xml b/ipp-java-qbapihelper/pom.xml index 7d9aa7ed..f9ec9f95 100644 --- a/ipp-java-qbapihelper/pom.xml +++ b/ipp-java-qbapihelper/pom.xml @@ -21,10 +21,10 @@ ipp-v3-java-devkit-pom com.intuit.quickbooks-online - 2.9.3 + 2.9.4 ipp-java-qbapihelper - 2.9.3 + 2.9.4 jar Quickbooks API Helper for Oauth Quickbooks API Helper Project for OAuth, Disconnect and Reconnect diff --git a/ipp-v3-java-data/pom.xml b/ipp-v3-java-data/pom.xml index ff38682e..3f8469b2 100755 --- a/ipp-v3-java-data/pom.xml +++ b/ipp-v3-java-data/pom.xml @@ -4,13 +4,13 @@ com.intuit.quickbooks-online ipp-v3-java-devkit-pom - 2.9.3 + 2.9.4 ipp-v3-java-data IPP V3 Java - Data Project IPP Java V3 DevKit Data project - FMS Entities generation - 2.9.3 + 2.9.4 UTF-8 diff --git a/ipp-v3-java-devkit-assembly/pom.xml b/ipp-v3-java-devkit-assembly/pom.xml index ad8107eb..2b0e98de 100755 --- a/ipp-v3-java-devkit-assembly/pom.xml +++ b/ipp-v3-java-devkit-assembly/pom.xml @@ -15,17 +15,17 @@ com.intuit.quickbooks-online ipp-v3-java-devkit-pom - 2.9.3 + 2.9.4 ipp-v3-java-devkit-assembly pom IPP Java Devkit Assembly (${project.version}) IPP Java V3 DevKit assembly - 2.9.3 + 2.9.4 - 2.9.3 - 2.9.3 + 2.9.4 + 2.9.4 diff --git a/ipp-v3-java-devkit-shaded-assembly/pom.xml b/ipp-v3-java-devkit-shaded-assembly/pom.xml index 0451ac9e..f2b260a6 100755 --- a/ipp-v3-java-devkit-shaded-assembly/pom.xml +++ b/ipp-v3-java-devkit-shaded-assembly/pom.xml @@ -15,17 +15,17 @@ com.intuit.quickbooks-online ipp-v3-java-devkit-pom - 2.9.2 + 2.9.4 ipp-v3-java-devkit-shaded-assembly pom IPP Java Devkit Assembly Shaded (${project.version}) IPP Java V3 DevKit assembly - 2.9.3 + 2.9.4 - 2.9.3 - 2.9.3 + 2.9.4 + 2.9.4 diff --git a/ipp-v3-java-devkit/pom.xml b/ipp-v3-java-devkit/pom.xml index 91130fec..4867faf1 100755 --- a/ipp-v3-java-devkit/pom.xml +++ b/ipp-v3-java-devkit/pom.xml @@ -6,11 +6,11 @@ ipp-v3-java-devkit-pom com.intuit.quickbooks-online - 2.9.3 + 2.9.4 ipp-v3-java-devkit - 2.9.3 + 2.9.4 jar IPP V3 Java Devkit - Development Project IPP Java V3 DevKit Project - Core @@ -25,7 +25,7 @@ com.intuit.quickbooks-online ipp-v3-java-data - 2.9.3 + 2.9.4 javax.xml.bind diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/PrepareRequestInterceptor.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/PrepareRequestInterceptor.java index a5e36400..ddd3d9cd 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/PrepareRequestInterceptor.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/PrepareRequestInterceptor.java @@ -438,7 +438,45 @@ private boolean isKeyValueExpected(String key) { || key.equals(RequestElements.REPORT_PARAM_AGING_PERIOD) || key.equals(RequestElements.REPORT_PARAM_NUM_PERIOD) || key.equals(RequestElements.REPORT_PARAM_REPORT_DT) - || key.equals(RequestElements.REPORT_PARAM_COLUMNS); + || key.equals(RequestElements.REPORT_PARAM_COLUMNS) + || key.equals(RequestElements.REPORT_PARAM_ACCOUNT) + || key.equals(RequestElements.REPORT_PARAM_ACCOUNT_TYPE) + || key.equals(RequestElements.REPORT_PARAM_SOURCE_ACCOUNT_TYPE) + || key.equals(RequestElements.REPORT_PARAM_SORT_BY) + || key.equals(RequestElements.REPORT_PARAM_SORT_ORDER) + || key.equals(RequestElements.REPORT_PARAM_SOURCE_ACCOUNT) + || key.equals(RequestElements.REPORT_PARAM_PAYMENT_METHOD) + || key.equals(RequestElements.REPORT_PARAM_START_DUE_DT) + || key.equals(RequestElements.REPORT_PARAM_END_DUE_DT) + || key.equals(RequestElements.REPORT_PARAM_APPAID) + || key.equals(RequestElements.REPORT_PARAM_ARPAID) + || key.equals(RequestElements.REPORT_PARAM_BOTH_AMT) + || key.equals(RequestElements.REPORT_PARAM_CLEARED) + || key.equals(RequestElements.REPORT_PARAM_CREATE_DT_MACRO) + || key.equals(RequestElements.REPORT_PARAM_DOC_NUM) + || key.equals(RequestElements.REPORT_PARAM_DUE_DT_MACRO) + || key.equals(RequestElements.REPORT_PARAM_GROUP_BY) + || key.equals(RequestElements.REPORT_PARAM_MEMO) + || key.equals(RequestElements.REPORT_PARAM_MOD_DT_MACRO) + || key.equals(RequestElements.REPORT_PARAM_NAME) + || key.equals(RequestElements.REPORT_PARAM_PRINTED) + || key.equals(RequestElements.REPORT_PARAM_END_MOD_DT) + || key.equals(RequestElements.REPORT_PARAM_START_MOD_DT) + || key.equals(RequestElements.REPORT_PARAM_TERM) + || key.equals(RequestElements.REPORT_PARAM_TRANSACTION_TYPE) + || key.equals(RequestElements.REPORT_PARAM_AGING_METHOD) + || key.equals(RequestElements.REPORT_PARAM_PAST_DUE) + || key.equals(RequestElements.REPORT_PARAM_CREATE_DT_MACRO) + || key.equals(RequestElements.REPORT_PARAM_END_CREATED_DT) + || key.equals(RequestElements.REPORT_PARAM_START_CREATED_DT) + || key.equals(RequestElements.REPORT_PARAM_JOURNAL_CODE) + || key.equals(RequestElements.REPORT_PARAM_EMPLOYEE) + || key.equals(RequestElements.REPORT_PARAM_AGENCY_ID) + || key.equals(RequestElements.REPORT_PARAM_CUSTOM1) + || key.equals(RequestElements.REPORT_PARAM_CUSTOM2) + || key.equals(RequestElements.REPORT_PARAM_CUSTOM3) + || key.equals(RequestElements.REPORT_PARAM_SHIPVIA) + || key.equals(RequestElements.REPORT_PARAM_ACCOUNT_STATUS); } /** diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/RequestElements.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/RequestElements.java index 90a4b985..feb898fa 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/RequestElements.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/RequestElements.java @@ -119,11 +119,11 @@ public class RequestElements { /** * variable REPORT_PARAM_END_CREATED_DT */ - public static final String REPORT_PARAM_END_CREATED_DT = "end_createddate"; + public static final String REPORT_PARAM_END_CREATED_DT = "end_createdate"; /** * variable REPORT_PARAM_START_CREATED_DT */ - public static final String REPORT_PARAM_START_CREATED_DT = "start_createddate"; + public static final String REPORT_PARAM_START_CREATED_DT = "start_createdate"; /** * variable REPORT_PARAM_DT_MACRO @@ -347,6 +347,22 @@ public class RequestElements { * Vendor,Employee,Location,Payment Method,Day,Week,Month,Quarter,Year,None */ public static final String REPORT_PARAM_GROUP_BY = "group_by"; + + public static final String REPORT_PARAM_JOURNAL_CODE = "journal_code"; + + public static final String REPORT_PARAM_EMPLOYEE = "employee"; + + public static final String REPORT_PARAM_AGENCY_ID = "agency_id"; + + public static final String REPORT_PARAM_CUSTOM1 = "custom1"; + + public static final String REPORT_PARAM_CUSTOM2 = "custom2"; + + public static final String REPORT_PARAM_CUSTOM3 = "custom3"; + + public static final String REPORT_PARAM_SHIPVIA = "shipvia"; + + public static final String REPORT_PARAM_ACCOUNT_STATUS = "account_status"; /** * variable REQ_PARAM_ENTITIES diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/services/ReportService.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/services/ReportService.java index 0a13afd6..77e30ab1 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/services/ReportService.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/services/ReportService.java @@ -242,6 +242,22 @@ public class ReportService { * variable doc_num */ private String doc_num = null; + + private String journal_code = null; + + private String employee = null; + + private String agency_id = null; + + private String custom1 = null; + + private String custom2 = null; + + private String custom3 = null; + + private String shipvia = null; + + private String account_status = null; @@ -483,6 +499,38 @@ private IntuitMessage prepareReport(String reportName) throws FMSException { { requestParameters.put(RequestElements.REPORT_PARAM_DOC_NUM, getDoc_num()); } + if (getJournal_code() != null) + { + requestParameters.put(RequestElements.REPORT_PARAM_JOURNAL_CODE, getJournal_code()); + } + if (getEmployee() != null) + { + requestParameters.put(RequestElements.REPORT_PARAM_EMPLOYEE, getEmployee()); + } + if (getAgency_id() != null) + { + requestParameters.put(RequestElements.REPORT_PARAM_AGENCY_ID, getAgency_id()); + } + if (getCustom1() != null) + { + requestParameters.put(RequestElements.REPORT_PARAM_CUSTOM1, getCustom1()); + } + if (getCustom2() != null) + { + requestParameters.put(RequestElements.REPORT_PARAM_CUSTOM2, getCustom2()); + } + if (getCustom3() != null) + { + requestParameters.put(RequestElements.REPORT_PARAM_CUSTOM3, getCustom3()); + } + if (getShipvia() != null) + { + requestParameters.put(RequestElements.REPORT_PARAM_SHIPVIA, getShipvia()); + } + if (getAccount_status() != null) + { + requestParameters.put(RequestElements.REPORT_PARAM_ACCOUNT_STATUS, getAccount_status()); + } requestElements.setAction(OperationType.REPORTS.toString() + "/" + reportName); @@ -1059,4 +1107,70 @@ public String getDoc_num() { public void setDoc_num(String doc_num) { this.doc_num = doc_num; } + + public String getJournal_code() { + return journal_code; + } + + public void setJournal_code(String journal_code) { + this.journal_code = journal_code; + } + + public String getEmployee() { + return employee; + } + + public void setEmployee(String employee) { + this.employee = employee; + } + + public String getAgency_id() { + return agency_id; + } + + public void setAgency_id(String agency_id) { + this.agency_id = agency_id; + } + + public String getCustom1() { + return custom1; + } + + public void setCustom1(String custom1) { + this.custom1 = custom1; + } + + public String getCustom2() { + return custom2; + } + + public void setCustom2(String custom2) { + this.custom2 = custom2; + } + + public String getCustom3() { + return custom3; + } + + public void setCustom3(String custom3) { + this.custom3 = custom3; + } + + public String getShipvia() { + return shipvia; + } + + public void setShipvia(String shipvia) { + this.shipvia = shipvia; + } + + public String getAccount_status() { + return account_status; + } + + public void setAccount_status(String account_status) { + this.account_status = account_status; + } + + } diff --git a/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties b/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties index 4328ae89..dbaff18f 100755 --- a/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties +++ b/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties @@ -2,7 +2,7 @@ ## Devkit Version # This version has to be updated according to the pom version -version = 2.9.3 +version = 2.9.4 # This is to have the request source to be sent to IDS request header request.source = V3JavaSDK diff --git a/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties b/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties index 504616b1..70d2e79b 100755 --- a/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties +++ b/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties @@ -1,7 +1,7 @@ ### IPP Dev Kit helper properties ## Devkit version -version = 2.9.3 +version = 2.9.4 # This is to have the request source to be sent to IDS request header request.source = V3JavaSDK diff --git a/pom.xml b/pom.xml index e51ed3ee..32a364df 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.intuit.quickbooks-online ipp-v3-java-devkit-pom - 2.9.3 + 2.9.4 pom IPP V3 Java DevKit https://github.com/intuit/QuickBooks-V3-Java-SDK