processout 1.2.2 → 2.0.0

data/lib/processout/product.rb

@@ -9,6 +9,7 @@ module ProcessOut
     
     attr_reader :id
     attr_reader :project
+    attr_reader :project_id
     attr_reader :url
     attr_reader :name
     attr_reader :amount
@@ -27,6 +28,11 @@ module ProcessOut
     end
     
     def project=(val)
+      if val.nil?
+        @project = val
+        return
+      end
+
       if val.instance_of? Project
         @project = val
       else
@@ -37,6 +43,10 @@ module ProcessOut
       
     end
     
+    def project_id=(val)
+      @project_id = val
+    end
+    
     def url=(val)
       @url = val
     end
@@ -91,6 +101,7 @@ module ProcessOut
 
       self.id = data.fetch(:id, nil)
       self.project = data.fetch(:project, nil)
+      self.project_id = data.fetch(:project_id, nil)
       self.url = data.fetch(:url, nil)
       self.name = data.fetch(:name, nil)
       self.amount = data.fetch(:amount, nil)
@@ -123,6 +134,9 @@ module ProcessOut
       if data.include? "project"
         self.project = data["project"]
       end
+      if data.include? "project_id"
+        self.project_id = data["project_id"]
+      end
       if data.include? "url"
         self.url = data["url"]
       end
@@ -169,6 +183,7 @@ module ProcessOut
       end
       self.id = data.fetch(:id, self.id)
       self.project = data.fetch(:project, self.project)
+      self.project_id = data.fetch(:project_id, self.project_id)
       self.url = data.fetch(:url, self.url)
       self.name = data.fetch(:name, self.name)
       self.amount = data.fetch(:amount, self.amount)

data/lib/processout/project.rb

@@ -8,9 +8,15 @@ module ProcessOut
   class Project
     
     attr_reader :id
+    attr_reader :supervisor_project
+    attr_reader :supervisor_project_id
+    attr_reader :api_version
     attr_reader :name
     attr_reader :logo_url
     attr_reader :email
+    attr_reader :default_currency
+    attr_reader :private_key
+    attr_reader :dunning_configuration
     attr_reader :created_at
 
     
@@ -18,6 +24,42 @@ module ProcessOut
       @id = val
     end
     
+    def supervisor_project=(val)
+      if val.nil?
+        @supervisor_project = val
+        return
+      end
+
+      if val.instance_of? Project
+        @supervisor_project = val
+      else
+        obj = Project.new(@client)
+        obj.fill_with_data(val)
+        @supervisor_project = obj
+      end
+      
+    end
+    
+    def supervisor_project_id=(val)
+      @supervisor_project_id = val
+    end
+    
+    def api_version=(val)
+      if val.nil?
+        @api_version = val
+        return
+      end
+
+      if val.instance_of? APIVersion
+        @api_version = val
+      else
+        obj = APIVersion.new(@client)
+        obj.fill_with_data(val)
+        @api_version = obj
+      end
+      
+    end
+    
     def name=(val)
       @name = val
     end
@@ -30,6 +72,34 @@ module ProcessOut
       @email = val
     end
     
+    def default_currency=(val)
+      @default_currency = val
+    end
+    
+    def private_key=(val)
+      @private_key = val
+    end
+    
+    def dunning_configuration=(val)
+      if val.nil?
+        @dunning_configuration = []
+        return
+      end
+
+      if val.length > 0 and val[0].instance_of? DunningAction
+        @dunning_configuration = val
+      else
+        l = Array.new
+        for v in val
+          obj = DunningAction.new(@client)
+          obj.fill_with_data(v)
+          l.push(obj)
+        end
+        @dunning_configuration = l
+      end
+      
+    end
+    
     def created_at=(val)
       @created_at = val
     end
@@ -43,9 +113,15 @@ module ProcessOut
       @client = client
 
       self.id = data.fetch(:id, nil)
+      self.supervisor_project = data.fetch(:supervisor_project, nil)
+      self.supervisor_project_id = data.fetch(:supervisor_project_id, nil)
+      self.api_version = data.fetch(:api_version, nil)
       self.name = data.fetch(:name, nil)
       self.logo_url = data.fetch(:logo_url, nil)
       self.email = data.fetch(:email, nil)
+      self.default_currency = data.fetch(:default_currency, nil)
+      self.private_key = data.fetch(:private_key, nil)
+      self.dunning_configuration = data.fetch(:dunning_configuration, nil)
       self.created_at = data.fetch(:created_at, nil)
       
     end
@@ -65,6 +141,15 @@ module ProcessOut
       if data.include? "id"
         self.id = data["id"]
       end
+      if data.include? "supervisor_project"
+        self.supervisor_project = data["supervisor_project"]
+      end
+      if data.include? "supervisor_project_id"
+        self.supervisor_project_id = data["supervisor_project_id"]
+      end
+      if data.include? "api_version"
+        self.api_version = data["api_version"]
+      end
       if data.include? "name"
         self.name = data["name"]
       end
@@ -74,6 +159,15 @@ module ProcessOut
       if data.include? "email"
         self.email = data["email"]
       end
+      if data.include? "default_currency"
+        self.default_currency = data["default_currency"]
+      end
+      if data.include? "private_key"
+        self.private_key = data["private_key"]
+      end
+      if data.include? "dunning_configuration"
+        self.dunning_configuration = data["dunning_configuration"]
+      end
       if data.include? "created_at"
         self.created_at = data["created_at"]
       end
@@ -89,9 +183,15 @@ module ProcessOut
         return self
       end
       self.id = data.fetch(:id, self.id)
+      self.supervisor_project = data.fetch(:supervisor_project, self.supervisor_project)
+      self.supervisor_project_id = data.fetch(:supervisor_project_id, self.supervisor_project_id)
+      self.api_version = data.fetch(:api_version, self.api_version)
       self.name = data.fetch(:name, self.name)
       self.logo_url = data.fetch(:logo_url, self.logo_url)
       self.email = data.fetch(:email, self.email)
+      self.default_currency = data.fetch(:default_currency, self.default_currency)
+      self.private_key = data.fetch(:private_key, self.private_key)
+      self.dunning_configuration = data.fetch(:dunning_configuration, self.dunning_configuration)
       self.created_at = data.fetch(:created_at, self.created_at)
       
       self

data/lib/processout/refund.rb

@@ -9,9 +9,11 @@ module ProcessOut
     
     attr_reader :id
     attr_reader :transaction
+    attr_reader :transaction_id
+    attr_reader :amount
     attr_reader :reason
     attr_reader :information
-    attr_reader :amount
+    attr_reader :has_failed
     attr_reader :metadata
     attr_reader :sandbox
     attr_reader :created_at
@@ -22,6 +24,11 @@ module ProcessOut
     end
     
     def transaction=(val)
+      if val.nil?
+        @transaction = val
+        return
+      end
+
       if val.instance_of? Transaction
         @transaction = val
       else
@@ -32,6 +39,14 @@ module ProcessOut
       
     end
     
+    def transaction_id=(val)
+      @transaction_id = val
+    end
+    
+    def amount=(val)
+      @amount = val
+    end
+    
     def reason=(val)
       @reason = val
     end
@@ -40,8 +55,8 @@ module ProcessOut
       @information = val
     end
     
-    def amount=(val)
-      @amount = val
+    def has_failed=(val)
+      @has_failed = val
     end
     
     def metadata=(val)
@@ -66,9 +81,11 @@ module ProcessOut
 
       self.id = data.fetch(:id, nil)
       self.transaction = data.fetch(:transaction, nil)
+      self.transaction_id = data.fetch(:transaction_id, nil)
+      self.amount = data.fetch(:amount, nil)
       self.reason = data.fetch(:reason, nil)
       self.information = data.fetch(:information, nil)
-      self.amount = data.fetch(:amount, nil)
+      self.has_failed = data.fetch(:has_failed, nil)
       self.metadata = data.fetch(:metadata, nil)
       self.sandbox = data.fetch(:sandbox, nil)
       self.created_at = data.fetch(:created_at, nil)
@@ -93,14 +110,20 @@ module ProcessOut
       if data.include? "transaction"
         self.transaction = data["transaction"]
       end
+      if data.include? "transaction_id"
+        self.transaction_id = data["transaction_id"]
+      end
+      if data.include? "amount"
+        self.amount = data["amount"]
+      end
       if data.include? "reason"
         self.reason = data["reason"]
       end
       if data.include? "information"
         self.information = data["information"]
       end
-      if data.include? "amount"
-        self.amount = data["amount"]
+      if data.include? "has_failed"
+        self.has_failed = data["has_failed"]
       end
       if data.include? "metadata"
         self.metadata = data["metadata"]
@@ -124,9 +147,11 @@ module ProcessOut
       end
       self.id = data.fetch(:id, self.id)
       self.transaction = data.fetch(:transaction, self.transaction)
+      self.transaction_id = data.fetch(:transaction_id, self.transaction_id)
+      self.amount = data.fetch(:amount, self.amount)
       self.reason = data.fetch(:reason, self.reason)
       self.information = data.fetch(:information, self.information)
-      self.amount = data.fetch(:amount, self.amount)
+      self.has_failed = data.fetch(:has_failed, self.has_failed)
       self.metadata = data.fetch(:metadata, self.metadata)
       self.sandbox = data.fetch(:sandbox, self.sandbox)
       self.created_at = data.fetch(:created_at, self.created_at)

data/lib/processout/subscription.rb

@@ -9,25 +9,35 @@ module ProcessOut
     
     attr_reader :id
     attr_reader :project
-    attr_reader :plan_id
+    attr_reader :project_id
     attr_reader :plan
+    attr_reader :plan_id
+    attr_reader :discounts
+    attr_reader :addons
+    attr_reader :transactions
     attr_reader :customer
+    attr_reader :customer_id
     attr_reader :token
+    attr_reader :token_id
     attr_reader :url
     attr_reader :name
     attr_reader :amount
+    attr_reader :billable_amount
+    attr_reader :discounted_amount
+    attr_reader :addons_amount
     attr_reader :currency
     attr_reader :metadata
     attr_reader :interval
     attr_reader :trial_end_at
     attr_reader :activated
     attr_reader :active
+    attr_reader :cancel_at
     attr_reader :canceled
     attr_reader :cancellation_reason
     attr_reader :pending_cancellation
-    attr_reader :cancel_at
     attr_reader :return_url
     attr_reader :cancel_url
+    attr_reader :unpaid_state
     attr_reader :sandbox
     attr_reader :created_at
     attr_reader :activated_at
@@ -39,6 +49,11 @@ module ProcessOut
     end
     
     def project=(val)
+      if val.nil?
+        @project = val
+        return
+      end
+
       if val.instance_of? Project
         @project = val
       else
@@ -49,11 +64,16 @@ module ProcessOut
       
     end
     
-    def plan_id=(val)
-      @plan_id = val
+    def project_id=(val)
+      @project_id = val
     end
     
     def plan=(val)
+      if val.nil?
+        @plan = val
+        return
+      end
+
       if val.instance_of? Plan
         @plan = val
       else
@@ -64,7 +84,76 @@ module ProcessOut
       
     end
     
+    def plan_id=(val)
+      @plan_id = val
+    end
+    
+    def discounts=(val)
+      if val.nil?
+        @discounts = []
+        return
+      end
+
+      if val.length > 0 and val[0].instance_of? Discount
+        @discounts = val
+      else
+        l = Array.new
+        for v in val
+          obj = Discount.new(@client)
+          obj.fill_with_data(v)
+          l.push(obj)
+        end
+        @discounts = l
+      end
+      
+    end
+    
+    def addons=(val)
+      if val.nil?
+        @addons = []
+        return
+      end
+
+      if val.length > 0 and val[0].instance_of? Addon
+        @addons = val
+      else
+        l = Array.new
+        for v in val
+          obj = Addon.new(@client)
+          obj.fill_with_data(v)
+          l.push(obj)
+        end
+        @addons = l
+      end
+      
+    end
+    
+    def transactions=(val)
+      if val.nil?
+        @transactions = []
+        return
+      end
+
+      if val.length > 0 and val[0].instance_of? Transaction
+        @transactions = val
+      else
+        l = Array.new
+        for v in val
+          obj = Transaction.new(@client)
+          obj.fill_with_data(v)
+          l.push(obj)
+        end
+        @transactions = l
+      end
+      
+    end
+    
     def customer=(val)
+      if val.nil?
+        @customer = val
+        return
+      end
+
       if val.instance_of? Customer
         @customer = val
       else
@@ -75,7 +164,16 @@ module ProcessOut
       
     end
     
+    def customer_id=(val)
+      @customer_id = val
+    end
+    
     def token=(val)
+      if val.nil?
+        @token = val
+        return
+      end
+
       if val.instance_of? Token
         @token = val
       else
@@ -86,6 +184,10 @@ module ProcessOut
       
     end
     
+    def token_id=(val)
+      @token_id = val
+    end
+    
     def url=(val)
       @url = val
     end
@@ -98,6 +200,18 @@ module ProcessOut
       @amount = val
     end
     
+    def billable_amount=(val)
+      @billable_amount = val
+    end
+    
+    def discounted_amount=(val)
+      @discounted_amount = val
+    end
+    
+    def addons_amount=(val)
+      @addons_amount = val
+    end
+    
     def currency=(val)
       @currency = val
     end
@@ -122,6 +236,10 @@ module ProcessOut
       @active = val
     end
     
+    def cancel_at=(val)
+      @cancel_at = val
+    end
+    
     def canceled=(val)
       @canceled = val
     end
@@ -134,10 +252,6 @@ module ProcessOut
       @pending_cancellation = val
     end
     
-    def cancel_at=(val)
-      @cancel_at = val
-    end
-    
     def return_url=(val)
       @return_url = val
     end
@@ -146,6 +260,10 @@ module ProcessOut
       @cancel_url = val
     end
     
+    def unpaid_state=(val)
+      @unpaid_state = val
+    end
+    
     def sandbox=(val)
       @sandbox = val
     end
@@ -172,25 +290,35 @@ module ProcessOut
 
       self.id = data.fetch(:id, nil)
       self.project = data.fetch(:project, nil)
-      self.plan_id = data.fetch(:plan_id, nil)
+      self.project_id = data.fetch(:project_id, nil)
       self.plan = data.fetch(:plan, nil)
+      self.plan_id = data.fetch(:plan_id, nil)
+      self.discounts = data.fetch(:discounts, nil)
+      self.addons = data.fetch(:addons, nil)
+      self.transactions = data.fetch(:transactions, nil)
       self.customer = data.fetch(:customer, nil)
+      self.customer_id = data.fetch(:customer_id, nil)
       self.token = data.fetch(:token, nil)
+      self.token_id = data.fetch(:token_id, nil)
       self.url = data.fetch(:url, nil)
       self.name = data.fetch(:name, nil)
       self.amount = data.fetch(:amount, nil)
+      self.billable_amount = data.fetch(:billable_amount, nil)
+      self.discounted_amount = data.fetch(:discounted_amount, nil)
+      self.addons_amount = data.fetch(:addons_amount, nil)
       self.currency = data.fetch(:currency, nil)
       self.metadata = data.fetch(:metadata, nil)
       self.interval = data.fetch(:interval, nil)
       self.trial_end_at = data.fetch(:trial_end_at, nil)
       self.activated = data.fetch(:activated, nil)
       self.active = data.fetch(:active, nil)
+      self.cancel_at = data.fetch(:cancel_at, nil)
       self.canceled = data.fetch(:canceled, nil)
       self.cancellation_reason = data.fetch(:cancellation_reason, nil)
       self.pending_cancellation = data.fetch(:pending_cancellation, nil)
-      self.cancel_at = data.fetch(:cancel_at, nil)
       self.return_url = data.fetch(:return_url, nil)
       self.cancel_url = data.fetch(:cancel_url, nil)
+      self.unpaid_state = data.fetch(:unpaid_state, nil)
       self.sandbox = data.fetch(:sandbox, nil)
       self.created_at = data.fetch(:created_at, nil)
       self.activated_at = data.fetch(:activated_at, nil)
@@ -216,18 +344,36 @@ module ProcessOut
       if data.include? "project"
         self.project = data["project"]
       end
-      if data.include? "plan_id"
-        self.plan_id = data["plan_id"]
+      if data.include? "project_id"
+        self.project_id = data["project_id"]
       end
       if data.include? "plan"
         self.plan = data["plan"]
       end
+      if data.include? "plan_id"
+        self.plan_id = data["plan_id"]
+      end
+      if data.include? "discounts"
+        self.discounts = data["discounts"]
+      end
+      if data.include? "addons"
+        self.addons = data["addons"]
+      end
+      if data.include? "transactions"
+        self.transactions = data["transactions"]
+      end
       if data.include? "customer"
         self.customer = data["customer"]
       end
+      if data.include? "customer_id"
+        self.customer_id = data["customer_id"]
+      end
       if data.include? "token"
         self.token = data["token"]
       end
+      if data.include? "token_id"
+        self.token_id = data["token_id"]
+      end
       if data.include? "url"
         self.url = data["url"]
       end
@@ -237,6 +383,15 @@ module ProcessOut
       if data.include? "amount"
         self.amount = data["amount"]
       end
+      if data.include? "billable_amount"
+        self.billable_amount = data["billable_amount"]
+      end
+      if data.include? "discounted_amount"
+        self.discounted_amount = data["discounted_amount"]
+      end
+      if data.include? "addons_amount"
+        self.addons_amount = data["addons_amount"]
+      end
       if data.include? "currency"
         self.currency = data["currency"]
       end
@@ -255,6 +410,9 @@ module ProcessOut
       if data.include? "active"
         self.active = data["active"]
       end
+      if data.include? "cancel_at"
+        self.cancel_at = data["cancel_at"]
+      end
       if data.include? "canceled"
         self.canceled = data["canceled"]
       end
@@ -264,15 +422,15 @@ module ProcessOut
       if data.include? "pending_cancellation"
         self.pending_cancellation = data["pending_cancellation"]
       end
-      if data.include? "cancel_at"
-        self.cancel_at = data["cancel_at"]
-      end
       if data.include? "return_url"
         self.return_url = data["return_url"]
       end
       if data.include? "cancel_url"
         self.cancel_url = data["cancel_url"]
       end
+      if data.include? "unpaid_state"
+        self.unpaid_state = data["unpaid_state"]
+      end
       if data.include? "sandbox"
         self.sandbox = data["sandbox"]
       end
@@ -298,25 +456,35 @@ module ProcessOut
       end
       self.id = data.fetch(:id, self.id)
       self.project = data.fetch(:project, self.project)
-      self.plan_id = data.fetch(:plan_id, self.plan_id)
+      self.project_id = data.fetch(:project_id, self.project_id)
       self.plan = data.fetch(:plan, self.plan)
+      self.plan_id = data.fetch(:plan_id, self.plan_id)
+      self.discounts = data.fetch(:discounts, self.discounts)
+      self.addons = data.fetch(:addons, self.addons)
+      self.transactions = data.fetch(:transactions, self.transactions)
       self.customer = data.fetch(:customer, self.customer)
+      self.customer_id = data.fetch(:customer_id, self.customer_id)
       self.token = data.fetch(:token, self.token)
+      self.token_id = data.fetch(:token_id, self.token_id)
       self.url = data.fetch(:url, self.url)
       self.name = data.fetch(:name, self.name)
       self.amount = data.fetch(:amount, self.amount)
+      self.billable_amount = data.fetch(:billable_amount, self.billable_amount)
+      self.discounted_amount = data.fetch(:discounted_amount, self.discounted_amount)
+      self.addons_amount = data.fetch(:addons_amount, self.addons_amount)
       self.currency = data.fetch(:currency, self.currency)
       self.metadata = data.fetch(:metadata, self.metadata)
       self.interval = data.fetch(:interval, self.interval)
       self.trial_end_at = data.fetch(:trial_end_at, self.trial_end_at)
       self.activated = data.fetch(:activated, self.activated)
       self.active = data.fetch(:active, self.active)
+      self.cancel_at = data.fetch(:cancel_at, self.cancel_at)
       self.canceled = data.fetch(:canceled, self.canceled)
       self.cancellation_reason = data.fetch(:cancellation_reason, self.cancellation_reason)
       self.pending_cancellation = data.fetch(:pending_cancellation, self.pending_cancellation)
-      self.cancel_at = data.fetch(:cancel_at, self.cancel_at)
       self.return_url = data.fetch(:return_url, self.return_url)
       self.cancel_url = data.fetch(:cancel_url, self.cancel_url)
+      self.unpaid_state = data.fetch(:unpaid_state, self.unpaid_state)
       self.sandbox = data.fetch(:sandbox, self.sandbox)
       self.created_at = data.fetch(:created_at, self.created_at)
       self.activated_at = data.fetch(:activated_at, self.activated_at)
@@ -325,14 +493,14 @@ module ProcessOut
       self
     end
 
-    # Get the customer owning the subscription.
+    # Get the addons applied to the subscription.
     # Params:
     # +options+:: +Hash+ of options
-    def fetch_customer(options = {})
+    def fetch_addons(options = {})
       self.prefill(options)
 
       request = Request.new(@client)
-      path    = "/subscriptions/" + CGI.escape(@id) + "/customers"
+      path    = "/subscriptions/" + CGI.escape(@id) + "/addons"
       data    = {
 
       }
@@ -340,23 +508,30 @@ module ProcessOut
       response = Response.new(request.get(path, data, options))
       return_values = Array.new
       
+      a    = Array.new
       body = response.body
-      body = body["customer"]
-      customer = Customer.new(@client)
-      return_values.push(customer.fill_with_data(body))
+      for v in body['addons']
+        tmp = Addon.new(@client)
+        tmp.fill_with_data(v)
+        a.push(tmp)
+      end
+
+      return_values.push(a)
+      
 
       
       return_values[0]
     end
 
-    # Get the discounts applied to the subscription.
+    # Find a subscription's addon by its ID.
     # Params:
+    # +addon_id+:: ID of the addon
     # +options+:: +Hash+ of options
-    def fetch_discounts(options = {})
+    def find_addon(addon_id, options = {})
       self.prefill(options)
 
       request = Request.new(@client)
-      path    = "/subscriptions/" + CGI.escape(@id) + "/discounts"
+      path    = "/subscriptions/" + CGI.escape(@id) + "/addons/" + CGI.escape(addon_id) + ""
       data    = {
 
       }
@@ -364,41 +539,88 @@ module ProcessOut
       response = Response.new(request.get(path, data, options))
       return_values = Array.new
       
-      a    = Array.new
       body = response.body
-      for v in body['discounts']
-        tmp = Discount.new(@client)
-        tmp.fill_with_data(v)
-        a.push(tmp)
-      end
+      body = body["addon"]
+      addon = Addon.new(@client)
+      return_values.push(addon.fill_with_data(body))
 
-      return_values.push(a)
       
+      return_values[0]
+    end
+
+    # Remove an addon applied to a subscription.
+    # Params:
+    # +addon_id+:: ID of the addon or plan to be removed from the subscription
+    # +options+:: +Hash+ of options
+    def remove_addon(addon_id, options = {})
+      self.prefill(options)
+
+      request = Request.new(@client)
+      path    = "/subscriptions/" + CGI.escape(@id) + "/addons/" + CGI.escape(addon_id) + ""
+      data    = {
+        "prorate" => options.fetch(:prorate, nil), 
+        "proration_date" => options.fetch(:proration_date, nil), 
+        "preview" => options.fetch(:preview, nil)
+      }
+
+      response = Response.new(request.delete(path, data, options))
+      return_values = Array.new
+      
+      return_values.push(response.success)
 
       
       return_values[0]
     end
 
-    # Apply a coupon on the subscription.
+    # Get the customer owning the subscription.
     # Params:
-    # +coupon_id+:: ID of the coupon
     # +options+:: +Hash+ of options
-    def apply_coupon(coupon_id, options = {})
+    def fetch_customer(options = {})
+      self.prefill(options)
+
+      request = Request.new(@client)
+      path    = "/subscriptions/" + CGI.escape(@id) + "/customers"
+      data    = {
+
+      }
+
+      response = Response.new(request.get(path, data, options))
+      return_values = Array.new
+      
+      body = response.body
+      body = body["customer"]
+      customer = Customer.new(@client)
+      return_values.push(customer.fill_with_data(body))
+
+      
+      return_values[0]
+    end
+
+    # Get the discounts applied to the subscription.
+    # Params:
+    # +options+:: +Hash+ of options
+    def fetch_discounts(options = {})
       self.prefill(options)
 
       request = Request.new(@client)
       path    = "/subscriptions/" + CGI.escape(@id) + "/discounts"
       data    = {
-        "coupon_id" => coupon_id
+
       }
 
-      response = Response.new(request.post(path, data, options))
+      response = Response.new(request.get(path, data, options))
       return_values = Array.new
       
+      a    = Array.new
       body = response.body
-      body = body["discount"]
-      discount = Discount.new(@client)
-      return_values.push(discount.fill_with_data(body))
+      for v in body['discounts']
+        tmp = Discount.new(@client)
+        tmp.fill_with_data(v)
+        a.push(tmp)
+      end
+
+      return_values.push(a)
+      
 
       
       return_values[0]
@@ -445,12 +667,7 @@ module ProcessOut
       response = Response.new(request.delete(path, data, options))
       return_values = Array.new
       
-      body = response.body
-      body = body["discount"]
-      
-      
-      return_values.push(self.fill_with_data(body))
-      
+      return_values.push(response.success)
 
       
       return_values[0]
@@ -552,46 +769,6 @@ module ProcessOut
       
 
       
-      return_values[0]
-    end
-
-    # Create a new subscription for the customer from the given plan ID.
-    # Params:
-    # +customer_id+:: ID of the customer
-    # +plan_id+:: ID of the plan
-    # +options+:: +Hash+ of options
-    def create_from_plan(customer_id, plan_id, options = {})
-      self.prefill(options)
-
-      request = Request.new(@client)
-      path    = "/subscriptions"
-      data    = {
-        "cancel_at" => @cancel_at, 
-        "name" => @name, 
-        "amount" => @amount, 
-        "currency" => @currency, 
-        "metadata" => @metadata, 
-        "interval" => @interval, 
-        "trial_end_at" => @trial_end_at, 
-        "return_url" => @return_url, 
-        "cancel_url" => @cancel_url, 
-        "source" => options.fetch(:source, nil), 
-        "coupon_id" => options.fetch(:coupon_id, nil), 
-        "customer_id" => customer_id, 
-        "plan_id" => plan_id
-      }
-
-      response = Response.new(request.post(path, data, options))
-      return_values = Array.new
-      
-      body = response.body
-      body = body["subscription"]
-      
-      
-      return_values.push(self.fill_with_data(body))
-      
-
-      
       return_values[0]
     end
 
@@ -641,7 +818,8 @@ module ProcessOut
         "coupon_id" => options.fetch(:coupon_id, nil), 
         "source" => options.fetch(:source, nil), 
         "prorate" => options.fetch(:prorate, nil), 
-        "proration_date" => options.fetch(:proration_date, nil)
+        "proration_date" => options.fetch(:proration_date, nil), 
+        "preview" => options.fetch(:preview, nil)
       }
 
       response = Response.new(request.put(path, data, options))
@@ -668,36 +846,8 @@ module ProcessOut
       request = Request.new(@client)
       path    = "/subscriptions/" + CGI.escape(@id) + ""
       data    = {
-        "cancellation_reason" => cancellation_reason
-      }
-
-      response = Response.new(request.delete(path, data, options))
-      return_values = Array.new
-      
-      body = response.body
-      body = body["subscription"]
-      
-      
-      return_values.push(self.fill_with_data(body))
-      
-
-      
-      return_values[0]
-    end
-
-    # Schedule the cancellation of the subscription. The reason may be provided as well.
-    # Params:
-    # +cancel_at+:: Cancellation date, in the form of a string
-    # +cancellation_reason+:: Cancellation reason
-    # +options+:: +Hash+ of options
-    def cancel_at_date(cancel_at, cancellation_reason, options = {})
-      self.prefill(options)
-
-      request = Request.new(@client)
-      path    = "/subscriptions/" + CGI.escape(@id) + ""
-      data    = {
+        "cancel_at" => @cancel_at, 
         "cancel_at_end" => options.fetch(:cancel_at_end, nil), 
-        "cancel_at" => cancel_at, 
         "cancellation_reason" => cancellation_reason
       }