Fix function name & improve addon support

Author: Manuel Huez

processout/addon.py

@@ -277,15 +277,44 @@ def fill_with_data(self, data):
 
         return self
 
-    def apply(self, subscription_id, options = {}):
-        """Apply a new addon to the given subscription ID.
+    def fetch_subscription_addons(self, subscription_id, options = {}):
+        """Get the addons applied to the subscription.
         Keyword argument:
         subscription_id -- ID of the subscription
         options -- Options for the request"""
         self.fill_with_data(options)
 
         request = Request(self._client)
         path    = "/subscriptions/" + quote_plus(subscription_id) + "/addons"
+        data    = {
+
+        }
+
+        response = Response(request.get(path, data, options))
+        return_values = []
+        
+        a    = []
+        body = response.body
+        for v in body['addons']:
+            tmp = processout.Addon(self._client)
+            tmp.fill_with_data(v)
+            a.append(tmp)
+
+        return_values.append(a)
+            
+
+        
+        return return_values[0]
+
+    def create(self, options = {}):
+        """Create a new addon to the given subscription ID.
+        Keyword argument:
+        
+        options -- Options for the request"""
+        self.fill_with_data(options)
+
+        request = Request(self._client)
+        path    = "/subscriptions/" + quote_plus(self.subscription_id) + "/addons"
         data    = {
             'plan_id': self.plan_id, 
             'type': self.type, 
@@ -374,16 +403,15 @@ def save(self, options = {}):
 
         return return_values[0]
 
-    def remove(self, subscription_id, addon_id, options = {}):
-        """Remove an addon applied to a subscription.
+    def delete(self, options = {}):
+        """Delete an addon applied to a subscription.
         Keyword argument:
-        subscription_id -- ID of the subscription on which the addon was applied
-        addon_id -- ID of the addon
+        
         options -- Options for the request"""
         self.fill_with_data(options)
 
         request = Request(self._client)
-        path    = "/subscriptions/" + quote_plus(subscription_id) + "/addons/" + quote_plus(addon_id) + ""
+        path    = "/subscriptions/" + quote_plus(self.subscription_id) + "/addons/" + quote_plus(self.id) + ""
         data    = {
             'prorate': options.get("prorate"), 
             'proration_date': options.get("proration_date"), 

processout/authorizationrequest.py

@@ -317,21 +317,21 @@ def fetch_customer(self, options = {}):
 
         return return_values[0]
 
-    def create(self, customer_id, options = {}):
+    def create(self, options = {}):
         """Create a new authorization request for the given customer ID.
         Keyword argument:
-        customer_id -- ID of the customer
+        
         options -- Options for the request"""
         self.fill_with_data(options)
 
         request = Request(self._client)
         path    = "/authorization-requests"
         data    = {
+            'customer_id': self.customer_id, 
             'name': self.name, 
             'currency': self.currency, 
             'return_url': self.return_url, 
-            'cancel_url': self.cancel_url, 
-            'customer_id': customer_id
+            'cancel_url': self.cancel_url
         }
 
         response = Response(request.post(path, data, options))

processout/discount.py

@@ -277,15 +277,44 @@ def fill_with_data(self, data):
 
         return self
 
-    def apply(self, subscription_id, options = {}):
-        """Apply a new discount to the given subscription ID.
+    def fetch_subscription_discounts(self, subscription_id, options = {}):
+        """Get the discounts applied to the subscription.
         Keyword argument:
         subscription_id -- ID of the subscription
         options -- Options for the request"""
         self.fill_with_data(options)
 
         request = Request(self._client)
         path    = "/subscriptions/" + quote_plus(subscription_id) + "/discounts"
+        data    = {
+
+        }
+
+        response = Response(request.get(path, data, options))
+        return_values = []
+        
+        a    = []
+        body = response.body
+        for v in body['discounts']:
+            tmp = processout.Discount(self._client)
+            tmp.fill_with_data(v)
+            a.append(tmp)
+
+        return_values.append(a)
+            
+
+        
+        return return_values[0]
+
+    def create(self, options = {}):
+        """Create a new discount for the given subscription ID.
+        Keyword argument:
+        
+        options -- Options for the request"""
+        self.fill_with_data(options)
+
+        request = Request(self._client)
+        path    = "/subscriptions/" + quote_plus(self.subscription_id) + "/discounts"
         data    = {
             'coupon_id': self.coupon_id, 
             'name': self.name, 
@@ -335,16 +364,15 @@ def find(self, subscription_id, discount_id, options = {}):
 
         return return_values[0]
 
-    def remove(self, subscription_id, discount_id, options = {}):
-        """Remove a discount applied to a subscription.
+    def delete(self, options = {}):
+        """Delete a discount applied to a subscription.
         Keyword argument:
-        subscription_id -- ID of the subscription on which the discount was applied
-        discount_id -- ID of the discount
+        
         options -- Options for the request"""
         self.fill_with_data(options)
 
         request = Request(self._client)
-        path    = "/subscriptions/" + quote_plus(subscription_id) + "/discounts/" + quote_plus(discount_id) + ""
+        path    = "/subscriptions/" + quote_plus(self.subscription_id) + "/discounts/" + quote_plus(self.id) + ""
         data    = {
 
         }

processout/refund.py

@@ -195,6 +195,35 @@ def fill_with_data(self, data):
 
         return self
 
+    def fetch_transaction_refunds(self, transaction_id, options = {}):
+        """Get the transaction's refunds.
+        Keyword argument:
+        transaction_id -- ID of the transaction
+        options -- Options for the request"""
+        self.fill_with_data(options)
+
+        request = Request(self._client)
+        path    = "/transactions/" + quote_plus(transaction_id) + "/refunds"
+        data    = {
+
+        }
+
+        response = Response(request.get(path, data, options))
+        return_values = []
+        
+        a    = []
+        body = response.body
+        for v in body['refunds']:
+            tmp = processout.Refund(self._client)
+            tmp.fill_with_data(v)
+            a.append(tmp)
+
+        return_values.append(a)
+            
+
+        
+        return return_values[0]
+
     def find(self, transaction_id, refund_id, options = {}):
         """Find a transaction's refund by its ID.
         Keyword argument:
@@ -223,15 +252,15 @@ def find(self, transaction_id, refund_id, options = {}):
 
         return return_values[0]
 
-    def apply(self, transaction_id, options = {}):
-        """Apply a refund to a transaction.
+    def create(self, options = {}):
+        """Create a refund for a transaction.
         Keyword argument:
-        transaction_id -- ID of the transaction
+        
         options -- Options for the request"""
         self.fill_with_data(options)
 
         request = Request(self._client)
-        path    = "/transactions/" + quote_plus(transaction_id) + "/refunds"
+        path    = "/transactions/" + quote_plus(self.transaction_id) + "/refunds"
         data    = {
             'amount': self.amount, 
             'metadata': self.metadata, 

processout/subscription.py

@@ -711,8 +711,8 @@ def find_addon(self, addon_id, options = {}):
 
         return return_values[0]
 
-    def remove_addon(self, addon_id, options = {}):
-        """Remove an addon applied to a subscription.
+    def delete_addon(self, addon_id, options = {}):
+        """Delete an addon applied to a subscription.
         Keyword argument:
         addon_id -- ID of the addon or plan to be removed from the subscription
         options -- Options for the request"""
@@ -811,8 +811,8 @@ def find_discount(self, discount_id, options = {}):
 
         return return_values[0]
 
-    def remove_discount(self, discount_id, options = {}):
-        """Remove a discount applied to a subscription.
+    def delete_discount(self, discount_id, options = {}):
+        """Delete a discount applied to a subscription.
         Keyword argument:
         discount_id -- ID of the discount or coupon to be removed from the subscription
         options -- Options for the request"""
@@ -890,10 +890,10 @@ def all(self, options = {}):
 
         return return_values[0]
 
-    def create(self, customer_id, options = {}):
+    def create(self, options = {}):
         """Create a new subscription for the given customer.
         Keyword argument:
-        customer_id -- ID of the customer
+        
         options -- Options for the request"""
         self.fill_with_data(options)
 
@@ -908,11 +908,11 @@ def create(self, customer_id, options = {}):
             'metadata': self.metadata, 
             'interval': self.interval, 
             'trial_end_at': self.trial_end_at, 
+            'customer_id': self.customer_id, 
             'return_url': self.return_url, 
             'cancel_url': self.cancel_url, 
             'source': options.get("source"), 
-            'coupon_id': options.get("coupon_id"), 
-            'customer_id': customer_id
+            'coupon_id': options.get("coupon_id")
         }
 
         response = Response(request.post(path, data, options))
@@ -991,19 +991,19 @@ def save(self, options = {}):
 
         return return_values[0]
 
-    def cancel(self, cancellation_reason, options = {}):
+    def cancel(self, options = {}):
         """Cancel a subscription. The reason may be provided as well.
         Keyword argument:
-        cancellation_reason -- Cancellation reason
+        
         options -- Options for the request"""
         self.fill_with_data(options)
 
         request = Request(self._client)
         path    = "/subscriptions/" + quote_plus(self.id) + ""
         data    = {
             'cancel_at': self.cancel_at, 
-            'cancel_at_end': options.get("cancel_at_end"), 
-            'cancellation_reason': cancellation_reason
+            'cancellation_reason': self.cancellation_reason, 
+            'cancel_at_end': options.get("cancel_at_end")
         }
 
         response = Response(request.delete(path, data, options))

processout/token.py

@@ -245,80 +245,78 @@ def fill_with_data(self, data):
 
         return self
 
-    def find(self, customer_id, token_id, options = {}):
-        """Find a customer's token by its ID.
+    def fetch_customer_tokens(self, customer_id, options = {}):
+        """Get the customer's tokens.
         Keyword argument:
         customer_id -- ID of the customer
-        token_id -- ID of the token
         options -- Options for the request"""
         self.fill_with_data(options)
 
         request = Request(self._client)
-        path    = "/customers/" + quote_plus(customer_id) + "/tokens/" + quote_plus(token_id) + ""
+        path    = "/customers/" + quote_plus(customer_id) + "/tokens"
         data    = {
 
         }
 
         response = Response(request.get(path, data, options))
         return_values = []
 
+        a    = []
         body = response.body
-        body = body["token"]
-                
-                
-        obj = processout.Token(self._client)
-        return_values.append(obj.fill_with_data(body))
-                
+        for v in body['tokens']:
+            tmp = processout.Token(self._client)
+            tmp.fill_with_data(v)
+            a.append(tmp)
+
+        return_values.append(a)
+            
 
 
         return return_values[0]
 
-    def create(self, customer_id, source, options = {}):
-        """Create a new token for the given customer ID.
+    def find(self, customer_id, token_id, options = {}):
+        """Find a customer's token by its ID.
         Keyword argument:
         customer_id -- ID of the customer
-        source -- Source used to create the token (most likely a card token generated by ProcessOut.js)
+        token_id -- ID of the token
         options -- Options for the request"""
         self.fill_with_data(options)
 
         request = Request(self._client)
-        path    = "/customers/" + quote_plus(customer_id) + "/tokens"
+        path    = "/customers/" + quote_plus(customer_id) + "/tokens/" + quote_plus(token_id) + ""
         data    = {
-            'metadata': self.metadata, 
-            'settings': options.get("settings"), 
-            'target': options.get("target"), 
-            'source': source
+
         }
 
-        response = Response(request.post(path, data, options))
+        response = Response(request.get(path, data, options))
         return_values = []
 
         body = response.body
         body = body["token"]
 
 
-        return_values.append(self.fill_with_data(body))
+        obj = processout.Token(self._client)
+        return_values.append(obj.fill_with_data(body))
 
 
 
         return return_values[0]
 
-    def create_from_request(self, customer_id, source, target, options = {}):
-        """Create a new token for the given customer ID from an authorization request
+    def create(self, options = {}):
+        """Create a new token for the given customer ID.
         Keyword argument:
-        customer_id -- ID of the customer
-        source -- Source used to create the token (most likely a card token generated by ProcessOut.js)
-        target -- Authorization request ID
+        
         options -- Options for the request"""
         self.fill_with_data(options)
 
         request = Request(self._client)
-        path    = "/customers/" + quote_plus(customer_id) + "/tokens"
+        path    = "/customers/" + quote_plus(self.customer_id) + "/tokens"
         data    = {
             'metadata': self.metadata, 
+            'source': options.get("source"), 
             'settings': options.get("settings"), 
-            'source': source, 
-            'target': target
+            'target': options.get("target"), 
+            'set_default': options.get("set_default")
         }
 
         response = Response(request.post(path, data, options))