diff --git a/README.md b/README.md index 25e9a695..3d1305b4 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Add this dependency and repository to your POM.xml <dependency> <groupId>com.xero</groupId> <artifactId>xero-java-sdk</artifactId> - <version>0.6.6</version> + <version>0.6.7</version> </dependency> <repositories> diff --git a/pom.xml b/pom.xml index 9c143d8c..420fa821 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>com.xero</groupId> <artifactId>xero-java-sdk</artifactId> <packaging>jar</packaging> - <version>0.6.6</version> + <version>0.6.7</version> <name>Xero-Java SDK</name> <url>http://maven.apache.org</url> <dependencies> @@ -26,7 +26,7 @@ <dependency> <groupId>com.xero</groupId> <artifactId>xero-accounting-api-schema</artifactId> - <version>0.1.1</version> + <version>0.1.2</version> </dependency> <dependency> <groupId>javax.servlet</groupId> diff --git a/src/main/java/com/xero/api/JsonConfig.java b/src/main/java/com/xero/api/JsonConfig.java index daa02883..bd530493 100644 --- a/src/main/java/com/xero/api/JsonConfig.java +++ b/src/main/java/com/xero/api/JsonConfig.java @@ -106,7 +106,7 @@ public String getAccessTokenUrl() { @Override public String getUserAgent() { - return USER_AGENT + " [Xero-Java-0.6.6]"; + return USER_AGENT + " [Xero-Java-0.6.7]"; } @Override diff --git a/src/main/java/com/xero/example/SampleData.java b/src/main/java/com/xero/example/SampleData.java index 2c16b4fa..75ae1c93 100755 --- a/src/main/java/com/xero/example/SampleData.java +++ b/src/main/java/com/xero/example/SampleData.java @@ -270,18 +270,50 @@ public static ArrayOfManualJournal loadManualJournal() throws IOException { if (accountDirectCosts.size() == 0 ){ System.out.println("no direct cost accounts"); } + + // GET ALL YOUR TRACKING CATEGORIES + List<TrackingCategory> TrackingCategoryList = client.getTrackingCategories(); + + // Create a New Array to Populate with a chosen Tracking Category + ArrayOfTrackingCategory arrayTracking = new ArrayOfTrackingCategory(); + + if (TrackingCategoryList.size() > 0) { + // Get the options for a Tracking Category 1 + ArrayOfTrackingCategoryOption options1 = TrackingCategoryList.get(0).getOptions(); + List<TrackingCategoryOption> optionList1 = options1.getOption(); + // Populate the option 1 with the Name of the Cateogry and Option + TrackingCategory category1 = new TrackingCategory(); + category1.setName(TrackingCategoryList.get(0).getName()); + category1.setOption(optionList1.get(0).getName()); + + arrayTracking.getTrackingCategory().add(category1); + + // Get the options for a Tracking Category 2 + ArrayOfTrackingCategoryOption options2 = TrackingCategoryList.get(1).getOptions(); + List<TrackingCategoryOption> optionList2 = options2.getOption(); + + // Populate the option 2 with the Name of the Cateogry and Option + TrackingCategory category2 = new TrackingCategory(); + category2.setName(TrackingCategoryList.get(1).getName()); + category2.setOption(optionList2.get(1).getName()); + + arrayTracking.getTrackingCategory().add(category2); + + } ManualJournalLine debit = new ManualJournalLine(); debit.setDescription("My MJ Debit"); debit.setAccountCode("400"); debit.setLineAmount(new BigDecimal(10.00)); + debit.setTracking(arrayTracking); arrayOfMJLine.getJournalLine().add(debit); ManualJournalLine credit = new ManualJournalLine(); credit.setDescription("My MJ Credit"); credit.setAccountCode("500"); credit.setLineAmount(new BigDecimal(-10.00)); + credit.setTracking(arrayTracking); arrayOfMJLine.getJournalLine().add(credit); ManualJournal mj = new ManualJournal();