Skip to content

Commit e95979e

Browse files
authored
Merge pull request #16 from intuit/SDK-550
SDK-550
2 parents 5b0206e + 8d13230 commit e95979e

File tree

11 files changed

+189
-21
lines changed

11 files changed

+189
-21
lines changed

ipp-java-qbapihelper/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<parent>
2222
<artifactId>ipp-v3-java-devkit-pom</artifactId>
2323
<groupId>com.intuit.quickbooks-online</groupId>
24-
<version>2.9.3</version>
24+
<version>2.9.4</version>
2525
</parent>
2626
<artifactId>ipp-java-qbapihelper</artifactId>
27-
<version>2.9.3</version>
27+
<version>2.9.4</version>
2828
<packaging>jar</packaging>
2929
<name>Quickbooks API Helper for Oauth</name>
3030
<description>Quickbooks API Helper Project for OAuth, Disconnect and Reconnect</description>

ipp-v3-java-data/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<parent>
55
<groupId>com.intuit.quickbooks-online</groupId>
66
<artifactId>ipp-v3-java-devkit-pom</artifactId>
7-
<version>2.9.3</version>
7+
<version>2.9.4</version>
88
</parent>
99

1010
<artifactId>ipp-v3-java-data</artifactId>
1111
<name>IPP V3 Java - Data Project</name>
1212
<description>IPP Java V3 DevKit Data project - FMS Entities generation</description>
13-
<version>2.9.3</version>
13+
<version>2.9.4</version>
1414

1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

ipp-v3-java-devkit-assembly/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
<parent>
1616
<groupId>com.intuit.quickbooks-online</groupId>
1717
<artifactId>ipp-v3-java-devkit-pom</artifactId>
18-
<version>2.9.3</version>
18+
<version>2.9.4</version>
1919
</parent>
2020

2121
<artifactId>ipp-v3-java-devkit-assembly</artifactId>
2222
<packaging>pom</packaging>
2323
<name>IPP Java Devkit Assembly (${project.version})</name>
2424
<description>IPP Java V3 DevKit assembly</description>
25-
<version>2.9.3</version>
25+
<version>2.9.4</version>
2626
<properties>
27-
<release.devkit.version>2.9.3</release.devkit.version>
28-
<release.data.version>2.9.3</release.data.version>
27+
<release.devkit.version>2.9.4</release.devkit.version>
28+
<release.data.version>2.9.4</release.data.version>
2929
</properties>
3030
<dependencies>
3131
<!-- Main artifacts -->

ipp-v3-java-devkit-shaded-assembly/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
<parent>
1616
<groupId>com.intuit.quickbooks-online</groupId>
1717
<artifactId>ipp-v3-java-devkit-pom</artifactId>
18-
<version>2.9.2</version>
18+
<version>2.9.4</version>
1919
</parent>
2020

2121
<artifactId>ipp-v3-java-devkit-shaded-assembly</artifactId>
2222
<packaging>pom</packaging>
2323
<name>IPP Java Devkit Assembly Shaded (${project.version})</name>
2424
<description>IPP Java V3 DevKit assembly</description>
25-
<version>2.9.3</version>
25+
<version>2.9.4</version>
2626
<properties>
27-
<release.devkit.version>2.9.3</release.devkit.version>
28-
<release.data.version>2.9.3</release.data.version>
27+
<release.devkit.version>2.9.4</release.devkit.version>
28+
<release.data.version>2.9.4</release.data.version>
2929
</properties>
3030
<dependencies>
3131
<!-- Main artifacts -->

ipp-v3-java-devkit/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<artifactId>ipp-v3-java-devkit-pom</artifactId>
88
<groupId>com.intuit.quickbooks-online</groupId>
9-
<version>2.9.3</version>
9+
<version>2.9.4</version>
1010
</parent>
1111

1212
<artifactId>ipp-v3-java-devkit</artifactId>
13-
<version>2.9.3</version>
13+
<version>2.9.4</version>
1414
<packaging>jar</packaging>
1515
<name>IPP V3 Java Devkit - Development Project</name>
1616
<description>IPP Java V3 DevKit Project - Core</description>
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>com.intuit.quickbooks-online</groupId>
2727
<artifactId>ipp-v3-java-data</artifactId>
28-
<version>2.9.3</version>
28+
<version>2.9.4</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>javax.xml.bind</groupId>

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/PrepareRequestInterceptor.java

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,45 @@ private boolean isKeyValueExpected(String key) {
438438
|| key.equals(RequestElements.REPORT_PARAM_AGING_PERIOD)
439439
|| key.equals(RequestElements.REPORT_PARAM_NUM_PERIOD)
440440
|| key.equals(RequestElements.REPORT_PARAM_REPORT_DT)
441-
|| key.equals(RequestElements.REPORT_PARAM_COLUMNS);
441+
|| key.equals(RequestElements.REPORT_PARAM_COLUMNS)
442+
|| key.equals(RequestElements.REPORT_PARAM_ACCOUNT)
443+
|| key.equals(RequestElements.REPORT_PARAM_ACCOUNT_TYPE)
444+
|| key.equals(RequestElements.REPORT_PARAM_SOURCE_ACCOUNT_TYPE)
445+
|| key.equals(RequestElements.REPORT_PARAM_SORT_BY)
446+
|| key.equals(RequestElements.REPORT_PARAM_SORT_ORDER)
447+
|| key.equals(RequestElements.REPORT_PARAM_SOURCE_ACCOUNT)
448+
|| key.equals(RequestElements.REPORT_PARAM_PAYMENT_METHOD)
449+
|| key.equals(RequestElements.REPORT_PARAM_START_DUE_DT)
450+
|| key.equals(RequestElements.REPORT_PARAM_END_DUE_DT)
451+
|| key.equals(RequestElements.REPORT_PARAM_APPAID)
452+
|| key.equals(RequestElements.REPORT_PARAM_ARPAID)
453+
|| key.equals(RequestElements.REPORT_PARAM_BOTH_AMT)
454+
|| key.equals(RequestElements.REPORT_PARAM_CLEARED)
455+
|| key.equals(RequestElements.REPORT_PARAM_CREATE_DT_MACRO)
456+
|| key.equals(RequestElements.REPORT_PARAM_DOC_NUM)
457+
|| key.equals(RequestElements.REPORT_PARAM_DUE_DT_MACRO)
458+
|| key.equals(RequestElements.REPORT_PARAM_GROUP_BY)
459+
|| key.equals(RequestElements.REPORT_PARAM_MEMO)
460+
|| key.equals(RequestElements.REPORT_PARAM_MOD_DT_MACRO)
461+
|| key.equals(RequestElements.REPORT_PARAM_NAME)
462+
|| key.equals(RequestElements.REPORT_PARAM_PRINTED)
463+
|| key.equals(RequestElements.REPORT_PARAM_END_MOD_DT)
464+
|| key.equals(RequestElements.REPORT_PARAM_START_MOD_DT)
465+
|| key.equals(RequestElements.REPORT_PARAM_TERM)
466+
|| key.equals(RequestElements.REPORT_PARAM_TRANSACTION_TYPE)
467+
|| key.equals(RequestElements.REPORT_PARAM_AGING_METHOD)
468+
|| key.equals(RequestElements.REPORT_PARAM_PAST_DUE)
469+
|| key.equals(RequestElements.REPORT_PARAM_CREATE_DT_MACRO)
470+
|| key.equals(RequestElements.REPORT_PARAM_END_CREATED_DT)
471+
|| key.equals(RequestElements.REPORT_PARAM_START_CREATED_DT)
472+
|| key.equals(RequestElements.REPORT_PARAM_JOURNAL_CODE)
473+
|| key.equals(RequestElements.REPORT_PARAM_EMPLOYEE)
474+
|| key.equals(RequestElements.REPORT_PARAM_AGENCY_ID)
475+
|| key.equals(RequestElements.REPORT_PARAM_CUSTOM1)
476+
|| key.equals(RequestElements.REPORT_PARAM_CUSTOM2)
477+
|| key.equals(RequestElements.REPORT_PARAM_CUSTOM3)
478+
|| key.equals(RequestElements.REPORT_PARAM_SHIPVIA)
479+
|| key.equals(RequestElements.REPORT_PARAM_ACCOUNT_STATUS);
442480
}
443481

444482
/**

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/RequestElements.java

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ public class RequestElements {
119119
/**
120120
* variable REPORT_PARAM_END_CREATED_DT
121121
*/
122-
public static final String REPORT_PARAM_END_CREATED_DT = "end_createddate";
122+
public static final String REPORT_PARAM_END_CREATED_DT = "end_createdate";
123123
/**
124124
* variable REPORT_PARAM_START_CREATED_DT
125125
*/
126-
public static final String REPORT_PARAM_START_CREATED_DT = "start_createddate";
126+
public static final String REPORT_PARAM_START_CREATED_DT = "start_createdate";
127127

128128
/**
129129
* variable REPORT_PARAM_DT_MACRO
@@ -347,6 +347,22 @@ public class RequestElements {
347347
* Vendor,Employee,Location,Payment Method,Day,Week,Month,Quarter,Year,None
348348
*/
349349
public static final String REPORT_PARAM_GROUP_BY = "group_by";
350+
351+
public static final String REPORT_PARAM_JOURNAL_CODE = "journal_code";
352+
353+
public static final String REPORT_PARAM_EMPLOYEE = "employee";
354+
355+
public static final String REPORT_PARAM_AGENCY_ID = "agency_id";
356+
357+
public static final String REPORT_PARAM_CUSTOM1 = "custom1";
358+
359+
public static final String REPORT_PARAM_CUSTOM2 = "custom2";
360+
361+
public static final String REPORT_PARAM_CUSTOM3 = "custom3";
362+
363+
public static final String REPORT_PARAM_SHIPVIA = "shipvia";
364+
365+
public static final String REPORT_PARAM_ACCOUNT_STATUS = "account_status";
350366

351367
/**
352368
* variable REQ_PARAM_ENTITIES

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/services/ReportService.java

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,22 @@ public class ReportService {
242242
* variable doc_num
243243
*/
244244
private String doc_num = null;
245+
246+
private String journal_code = null;
247+
248+
private String employee = null;
249+
250+
private String agency_id = null;
251+
252+
private String custom1 = null;
253+
254+
private String custom2 = null;
255+
256+
private String custom3 = null;
257+
258+
private String shipvia = null;
259+
260+
private String account_status = null;
245261

246262

247263

@@ -483,6 +499,38 @@ private IntuitMessage prepareReport(String reportName) throws FMSException {
483499
{
484500
requestParameters.put(RequestElements.REPORT_PARAM_DOC_NUM, getDoc_num());
485501
}
502+
if (getJournal_code() != null)
503+
{
504+
requestParameters.put(RequestElements.REPORT_PARAM_JOURNAL_CODE, getJournal_code());
505+
}
506+
if (getEmployee() != null)
507+
{
508+
requestParameters.put(RequestElements.REPORT_PARAM_EMPLOYEE, getEmployee());
509+
}
510+
if (getAgency_id() != null)
511+
{
512+
requestParameters.put(RequestElements.REPORT_PARAM_AGENCY_ID, getAgency_id());
513+
}
514+
if (getCustom1() != null)
515+
{
516+
requestParameters.put(RequestElements.REPORT_PARAM_CUSTOM1, getCustom1());
517+
}
518+
if (getCustom2() != null)
519+
{
520+
requestParameters.put(RequestElements.REPORT_PARAM_CUSTOM2, getCustom2());
521+
}
522+
if (getCustom3() != null)
523+
{
524+
requestParameters.put(RequestElements.REPORT_PARAM_CUSTOM3, getCustom3());
525+
}
526+
if (getShipvia() != null)
527+
{
528+
requestParameters.put(RequestElements.REPORT_PARAM_SHIPVIA, getShipvia());
529+
}
530+
if (getAccount_status() != null)
531+
{
532+
requestParameters.put(RequestElements.REPORT_PARAM_ACCOUNT_STATUS, getAccount_status());
533+
}
486534

487535

488536
requestElements.setAction(OperationType.REPORTS.toString() + "/" + reportName);
@@ -1059,4 +1107,70 @@ public String getDoc_num() {
10591107
public void setDoc_num(String doc_num) {
10601108
this.doc_num = doc_num;
10611109
}
1110+
1111+
public String getJournal_code() {
1112+
return journal_code;
1113+
}
1114+
1115+
public void setJournal_code(String journal_code) {
1116+
this.journal_code = journal_code;
1117+
}
1118+
1119+
public String getEmployee() {
1120+
return employee;
1121+
}
1122+
1123+
public void setEmployee(String employee) {
1124+
this.employee = employee;
1125+
}
1126+
1127+
public String getAgency_id() {
1128+
return agency_id;
1129+
}
1130+
1131+
public void setAgency_id(String agency_id) {
1132+
this.agency_id = agency_id;
1133+
}
1134+
1135+
public String getCustom1() {
1136+
return custom1;
1137+
}
1138+
1139+
public void setCustom1(String custom1) {
1140+
this.custom1 = custom1;
1141+
}
1142+
1143+
public String getCustom2() {
1144+
return custom2;
1145+
}
1146+
1147+
public void setCustom2(String custom2) {
1148+
this.custom2 = custom2;
1149+
}
1150+
1151+
public String getCustom3() {
1152+
return custom3;
1153+
}
1154+
1155+
public void setCustom3(String custom3) {
1156+
this.custom3 = custom3;
1157+
}
1158+
1159+
public String getShipvia() {
1160+
return shipvia;
1161+
}
1162+
1163+
public void setShipvia(String shipvia) {
1164+
this.shipvia = shipvia;
1165+
}
1166+
1167+
public String getAccount_status() {
1168+
return account_status;
1169+
}
1170+
1171+
public void setAccount_status(String account_status) {
1172+
this.account_status = account_status;
1173+
}
1174+
1175+
10621176
}

ipp-v3-java-devkit/src/main/resources/ippdevkit.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Devkit Version
44
# This version has to be updated according to the pom version
5-
version = 2.9.3
5+
version = 2.9.4
66

77
# This is to have the request source to be sent to IDS request header
88
request.source = V3JavaSDK

ipp-v3-java-devkit/src/test/resources/ippdevkit.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### IPP Dev Kit helper properties
22

33
## Devkit version
4-
version = 2.9.3
4+
version = 2.9.4
55

66
# This is to have the request source to be sent to IDS request header
77
request.source = V3JavaSDK

0 commit comments

Comments
 (0)