Prosoft Git

killbill-aplcache

Merge remote-tracking branch 'upstream/hierarchical-accounts' …

1/8/2016 2:45:13 PM
Matias Aguero

Matias Aguero

Commit: c4be0ae

Tree: a58ca09

Parents: 340abc4
5b41ae2

Changes

account/pom.xml 2(+1 -1)

api/pom.xml 2(+1 -1)

beatrix/pom.xml 2(+1 -1)

catalog/pom.xml 2(+1 -1)

currency/pom.xml 2(+1 -1)

entitlement/pom.xml 2(+1 -1)

invoice/pom.xml 2(+1 -1)

jaxrs/pom.xml 2(+1 -1)

junction/pom.xml 2(+1 -1)

overdue/pom.xml 2(+1 -1)

payment/pom.xml 2(+1 -1)

payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentStateMachineHelper.java 9(+9 -0)

pom.xml 2(+1 -1)

profiles/killbill/pom.xml 2(+1 -1)

profiles/killpay/pom.xml 2(+1 -1)

profiles/pom.xml 2(+1 -1)

subscription/pom.xml 2(+1 -1)

tenant/pom.xml 2(+1 -1)

usage/pom.xml 2(+1 -1)

util/pom.xml 2(+1 -1)

Details

account/pom.xml 2(+1 -1) 

diff --git a/account/pom.xml b/account/pom.xml
index d28390d..7fba8b6 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-account</artifactId>

api/pom.xml 2(+1 -1) 

diff --git a/api/pom.xml b/api/pom.xml
index 3ef8182..f79179d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-internal-api</artifactId>

beatrix/pom.xml 2(+1 -1) 

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 37aa74e..5be9267 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-beatrix</artifactId>

catalog/pom.xml 2(+1 -1) 

diff --git a/catalog/pom.xml b/catalog/pom.xml
index 714169b..43a8dc7 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-catalog</artifactId>

currency/pom.xml 2(+1 -1) 

diff --git a/currency/pom.xml b/currency/pom.xml
index dfec699..d92f21a 100644
--- a/currency/pom.xml
+++ b/currency/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-currency</artifactId>

entitlement/pom.xml 2(+1 -1) 

diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index c66ead0..344e94d 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-entitlement</artifactId>

invoice/pom.xml 2(+1 -1) 

diff --git a/invoice/pom.xml b/invoice/pom.xml
index ddba6d5..370a515 100644
--- a/invoice/pom.xml
+++ b/invoice/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-invoice</artifactId>

jaxrs/pom.xml 2(+1 -1) 

diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index 0921bda..5ef9eb0 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-jaxrs</artifactId>

junction/pom.xml 2(+1 -1) 

diff --git a/junction/pom.xml b/junction/pom.xml
index 8d3bcb6..814efd2 100644
--- a/junction/pom.xml
+++ b/junction/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-junction</artifactId>

overdue/pom.xml 2(+1 -1) 

diff --git a/overdue/pom.xml b/overdue/pom.xml
index c04472b..2bf3d41 100644
--- a/overdue/pom.xml
+++ b/overdue/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-overdue</artifactId>

payment/pom.xml 2(+1 -1) 

diff --git a/payment/pom.xml b/payment/pom.xml
index 97119a8..ee8bf1f 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-payment</artifactId>

payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentStateMachineHelper.java 9(+9 -0) 

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentStateMachineHelper.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentStateMachineHelper.java
index db1e2fa..dd94638 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentStateMachineHelper.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentStateMachineHelper.java
@@ -58,9 +58,12 @@ public class PaymentStateMachineHelper {
     private static final String CHARGEBACK_SUCCESS = "CHARGEBACK_SUCCESS";
 
     private static final String AUTHORIZE_PENDING = "AUTH_PENDING";
+    private static final String CAPTURE_PENDING = "CAPTURE_PENDING";
     private static final String PURCHASE_PENDING = "PURCHASE_PENDING";
     private static final String REFUND_PENDING = "REFUND_PENDING";
     private static final String CREDIT_PENDING = "CREDIT_PENDING";
+    private static final String VOID_PENDING = "VOID_PENDING";
+    private static final String CHARGEBACK_PENDING = "CHARGEBACK_PENDING";
 
     private static final String AUTHORIZE_FAILED = "AUTH_FAILED";
     private static final String CAPTURE_FAILED = "CAPTURE_FAILED";
@@ -119,12 +122,18 @@ public class PaymentStateMachineHelper {
         switch (transactionType) {
             case AUTHORIZE:
                 return AUTHORIZE_PENDING;
+            case CAPTURE:
+                return CAPTURE_PENDING;
             case PURCHASE:
                 return PURCHASE_PENDING;
             case REFUND:
                 return REFUND_PENDING;
             case CREDIT:
                 return CREDIT_PENDING;
+            case VOID:
+                return VOID_PENDING;
+            case CHARGEBACK:
+                return CHARGEBACK_PENDING;
             default:
                 throw new IllegalStateException("No PENDING state for transaction type " + transactionType);
         }

pom.xml 2(+1 -1) 

diff --git a/pom.xml b/pom.xml
index a85090e..48dc569 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <version>0.80-SNAPSHOT</version>
     </parent>
     <artifactId>killbill</artifactId>
-    <version>0.16.1-SNAPSHOT</version>
+    <version>0.17.0.ha-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>killbill</name>
     <description>Library for managing recurring subscriptions and the associated billing</description>

profiles/killbill/pom.xml 2(+1 -1) 

diff --git a/profiles/killbill/pom.xml b/profiles/killbill/pom.xml
index 62c6d0c..a81d4b9 100644
--- a/profiles/killbill/pom.xml
+++ b/profiles/killbill/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill-profiles</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles-killbill</artifactId>

profiles/killpay/pom.xml 2(+1 -1) 

diff --git a/profiles/killpay/pom.xml b/profiles/killpay/pom.xml
index 98b792d..41c282b 100644
--- a/profiles/killpay/pom.xml
+++ b/profiles/killpay/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>killbill-profiles</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles-killpay</artifactId>

profiles/pom.xml 2(+1 -1) 

diff --git a/profiles/pom.xml b/profiles/pom.xml
index 5bbaef8..c6712c4 100644
--- a/profiles/pom.xml
+++ b/profiles/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles</artifactId>

subscription/pom.xml 2(+1 -1) 

diff --git a/subscription/pom.xml b/subscription/pom.xml
index 0b9f959..3b14906 100644
--- a/subscription/pom.xml
+++ b/subscription/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-subscription</artifactId>

tenant/pom.xml 2(+1 -1) 

diff --git a/tenant/pom.xml b/tenant/pom.xml
index 793b2ce..33910f5 100644
--- a/tenant/pom.xml
+++ b/tenant/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-tenant</artifactId>

usage/pom.xml 2(+1 -1) 

diff --git a/usage/pom.xml b/usage/pom.xml
index 5861678..1993042 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-usage</artifactId>

util/pom.xml 2(+1 -1) 

diff --git a/util/pom.xml b/util/pom.xml
index 9a981a5..ec7183f 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.16.1-SNAPSHOT</version>
+        <version>0.17.0.ha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-util</artifactId>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github