Skip to content

Commit

Permalink
Add vertical related fields to line items
Browse files Browse the repository at this point in the history
  • Loading branch information
Mauricio Murga committed Sep 8, 2015
1 parent dbf7fe0 commit 4707ed1
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 6 deletions.
Binary file modified .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![alt tag](https://raw.github.com/conekta/conekta-java/master/readme_files/cover.png)

# Conekta Java 1.0.1
# Conekta Java 2.0.0

This is a java library that allows interaction with https://api.conekta.io API.

Expand Down
2 changes: 1 addition & 1 deletion build/built-jar.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Tue, 17 Mar 2015 16:24:57 -0600
#Tue, 08 Sep 2015 16:35:26 -0500


/Users/mauriciomurga/rails_projects/conekta-java=
Binary file modified build/classes/com/conekta/Conekta.class
Binary file not shown.
Binary file modified build/classes/com/conekta/ConektaObject.class
Binary file not shown.
Binary file modified build/classes/com/conekta/LineItems.class
Binary file not shown.
Binary file modified build/classes/com/conekta/Requestor.class
Binary file not shown.
Binary file modified dist/.DS_Store
Binary file not shown.
Binary file modified dist/ConektaJava.jar
Binary file not shown.
1 change: 0 additions & 1 deletion nbproject/private/private.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<group>
<file>file:/Users/mauriciomurga/rails_projects/conekta-java/src/com/conekta/Requestor.java</file>
<file>file:/Users/mauriciomurga/rails_projects/conekta-java/src/com/conekta/Error.java</file>
<file>file:/Users/mauriciomurga/rails_projects/conekta-java/src/com/conekta/Card.java</file>
<file>file:/Users/mauriciomurga/rails_projects/conekta-java/src/com/conekta/Conekta.java</file>
<file>file:/Users/mauriciomurga/rails_projects/conekta-java/test/com/conekta/ErrorTest.java</file>
</group>
Expand Down
2 changes: 1 addition & 1 deletion src/com/conekta/Conekta.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public abstract class Conekta {
public static String apiKey;
public static String apiBase = "https://api.conekta.io";
public static String apiVersion = "1.0.0";
public static final String VERSION = "1.0.9";
public static final String VERSION = "2.0.0";

public static void setApiKey(String apiKey) {
Conekta.apiKey = apiKey;
Expand Down
6 changes: 5 additions & 1 deletion src/com/conekta/ConektaObject.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,11 @@ public void loadFromObject(JSONObject jsonObject) throws Exception {
}
} catch (Exception e) {
// No field found
//System.out.println(e.toString());
if (this.getClass().getCanonicalName().equals("com.conekta.LineItems")) {
// Vertical related fields
((LineItems)this).addVerticalRelatedField(key, obj.toString());
this.setVal(key, obj);
}
}
}

Expand Down
22 changes: 22 additions & 0 deletions src/com/conekta/LineItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

package com.conekta;

import java.lang.reflect.Field;
import java.util.HashMap;

/**
*
* @author mauricio
Expand All @@ -17,4 +20,23 @@ public class LineItems extends Resource {
public Integer quantity;
public String type;
public String category;
public HashMap vertical_related_fields = new HashMap();

// Helper method to access line item fields
public String get(String key) {
try {
Field field;
field = this.getClass().getField(key);
return (String) field.get(this);
} catch(NoSuchFieldException e) {
return (String) vertical_related_fields.get(key);
} catch(IllegalAccessException e) {
return "";
}
}

// Helper method to push key values to vertical related fields
public void addVerticalRelatedField(String key, String value) {
vertical_related_fields.put(key, value);
}
}
2 changes: 1 addition & 1 deletion test/com/conekta/ChargeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public void testUnsuccesfulRefund() throws Exception {
charge.refund(30000);
//assertTrue(false);
} catch(Error e) {
assertTrue(e.message.equals("The order does not exist or the amount to refund is invalid."));
assertTrue(e.message.equals("The amount to refund exceeds the charge total."));
}
}

Expand Down

0 comments on commit 4707ed1

Please sign in to comment.