active_zuora 1.3.0 → 1.4.0

data/lib/active_zuora/rate_plan_charge_data.rb

@@ -0,0 +1,4 @@
+module Zuora
+  class RatePlanChargeData < ZObject
+  end
+end

data/lib/active_zuora/rate_plan_charge_tier.rb

@@ -0,0 +1,4 @@
+module Zuora
+  class RatePlanChargeTier < ZObject
+  end
+end

data/lib/active_zuora/refund.rb

@@ -0,0 +1,4 @@
+module Zuora
+  class Refund < ZObject
+  end
+end

data/lib/active_zuora/subscribe_request.rb

@@ -0,0 +1,13 @@
+module Zuora
+  class SubscribeRequest < ZObject
+    def self.create(args={})
+      self.client.subscribe([self.new(args).to_zobject])
+    end
+
+    def save
+      result = self.class.client.subscribe([self.to_zobject])
+      self.account.id = result.accountId
+      result.success
+    end
+  end
+end

data/lib/active_zuora/subscription.rb

@@ -0,0 +1,17 @@
+module Zuora
+  class Subscription < ZObject
+
+    def account
+      @account ||= Account.find(self.accountId)
+    end
+
+    def rate_plans
+      @rate_plans ||= RatePlan.where(:subscriptionId => self.id)
+    end
+
+    def unload_rate_plans
+      @rate_plans = nil
+    end
+
+  end
+end

data/lib/active_zuora/usage.rb

@@ -0,0 +1,4 @@
+module Zuora
+  class Usage < ZObject
+  end
+end

data/lib/active_zuora/zobject.rb

@@ -0,0 +1,156 @@
+module Zuora
+  class ZObject < SimpleDelegator
+    def initialize(attributes={})
+      super(self.class.zobject_class.new).tap do |zobject|
+        attributes.each do |attr, value|
+          zobject.send("#{attr}=", self.class.convert_date(value))
+        end
+      end
+    end
+
+    def self.new_from_zobject(zobject)
+      self.new.tap do |active_zobject|
+        active_zobject.__setobj__(zobject)
+      end
+    end
+
+    def to_zobject
+      __getobj__
+    end
+
+    def id
+      __getobj__.id
+    end
+
+    def type
+      __getobj__.type
+    end
+
+    def ==(another)
+      id == another.id && another.respond_to?(:zobject_class) && zobject_class == another.zobject_class
+    end
+
+    def attributes
+      Hash.new.tap do |hash|
+        self.class.attribute_names.each do |attr|
+          hash[attr] = __getobj__.send(attr)
+        end
+      end
+    end
+
+    # Any attributes that are Dates should be created as a 
+    # DateTime in the PST timezone.
+    # Zuora doesn't actually use the time portion of any Datetime field.
+    # All that matters is the date.
+    def self.convert_date(value)
+      if value.is_a?(Date) || value.is_a?(DateTime) || value.is_a?(Time)
+        DateTime.new(value.year, value.month, value.day, 0, 0, 0, "-0800")
+      else
+        value
+      end
+    end
+
+    def destroy
+      self.class.destroy(id)
+    end
+
+    def self.destroy(ids)
+      self.client.delete(self.klass_name, [ids].flatten)
+    end
+
+    def self.create(attributes={})
+      self.client.create([self.new(attributes).to_zobject])
+    end
+
+    def self.update_attributes(attributes={})
+      self.client.update([self.new(attributes).to_zobject])
+    end
+
+    def self.zobject_class
+      return @zobject_class if @zobject_class
+
+      if ZUORA.const_defined?(self.klass_name)
+        @zobject_class = ZUORA.const_get(self.klass_name)
+      else
+        @zobject_class = self.superclass.respond_to?(:zobject_class) ? self.superclass.zobject_class : ZUORA.const_missing(self.klass_name)
+      end
+    end
+
+    def zobject_class
+      self.class.zobject_class
+    end
+
+    def self.klass_name
+      @klass_name ||= name.split("::").last
+    end
+
+    #TODO: This sucks attributes need to be clearly defined
+    def self.attribute_names
+      @attribute_names ||= zobject_class.instance_variable_get("@attributes")
+    end
+
+    def self.query_attribute_names(options={})
+      excluded_attributes = []
+      excluded_attributes.concat excluded_query_attributes unless options[:include_excluded]
+      excluded_attributes.concat extra_attributes unless options[:include_extras]
+      attribute_names - excluded_attributes
+    end
+
+    def self.exclude_query_attributes(*attributes)
+      excluded_query_attributes.concat attributes
+    end
+
+    def self.excluded_query_attributes
+      @excluded_query_attributes ||= [:fieldsToNull]
+    end
+
+    def self.extra_attributes(attributes=[])
+      attributes
+    end
+
+    def self.where(conditions={}, options={})
+      # You can give a hash or a string for the conditions
+      conditions = build_filter_statments(conditions) if conditions.is_a? Hash
+      query = "select #{self.query_attribute_names(options).join(", ")} from #{self.name.gsub(/Zuora::/,"")} where #{conditions}"
+      puts query if $DEBUG
+      zobjects = self.client.query(query)
+      zobjects.map{|zobject| self.new_from_zobject zobject }
+    end
+
+    def self.build_filter_statments(filter_statments)
+      filter_statments.map{|key, value|
+        value = "'#{value}'" if value.kind_of?(String)
+        value = "null" if value.nil?
+        "#{key} = #{value}"
+      }.join(" and ")
+    end
+
+    def self.find(id)
+      nil unless valid_id(id)
+      query = "select #{query_attribute_names(:include_extras => true).join(", ")} from #{self.name.gsub(/Zuora::/,"")} where Id = '#{id}'"
+      puts query if $DEBUG
+      zobject = client.query(query).first
+      new_from_zobject zobject if zobject
+    end
+
+    def self.valid_id(id)
+      id.to_s.size == 32 && id.hex.to_s(16) == id
+    end
+
+    def self.all(options={})
+      zobjects = client.query("select #{query_attribute_names(options).join(", ")} from #{self.name.gsub(/Zuora::/,"")}")
+      zobjects.map{|zobject| self.new_from_zobject zobject }
+    end
+
+    def self.client
+      return @client if @client && self.valid_session?
+      @session_start_time = Time.now
+      @client = Zuora::Client.new
+    end
+
+    def self.valid_session?
+      #session is valid if it has been running for less than 8 hours
+      @session_start_time + 28800 > Time.now
+    end
+  end
+end

data/lib/zuora/ZUORA.rb

@@ -29,6 +29,7 @@ end
 #   fieldsToNull - SOAP::SOAPString
 #   id - (any)
 #   accountNumber - SOAP::SOAPString
+#   additionalEmailAddresses - SOAP::SOAPString
 #   allowInvoiceEdit - SOAP::SOAPBoolean
 #   autoPay - SOAP::SOAPBoolean
 #   batch - SOAP::SOAPString
@@ -51,6 +52,7 @@ class Account < ZObject
   attr_accessor :fieldsToNull
   attr_accessor :id
   attr_accessor :accountNumber
+  attr_accessor :additionalEmailAddresses
   attr_accessor :allowInvoiceEdit
   attr_accessor :autoPay
   attr_accessor :batch
@@ -72,10 +74,11 @@ class Account < ZObject
   attr_accessor :updatedDate
   attr_accessor :invoiceDeliveryPrefsEmail
 
-  def initialize(fieldsToNull = [], id = nil, accountNumber = nil, allowInvoiceEdit = nil, autoPay = nil, batch = nil, billCycleDay = nil, billToId = nil, createdDate = nil, crmId = nil, currency = nil, customerServiceRepName = nil, defaultPaymentMethodId = nil, paymentGateway = nil, name = nil, notes = nil, paymentTerm = nil, purchaseOrderNumber = nil, salesRepName = nil, soldToId = nil, status = nil, updatedDate = nil)
+  def initialize(fieldsToNull = [], id = nil, accountNumber = nil, additionalEmailAddresses = nil, allowInvoiceEdit = nil, autoPay = nil, batch = nil, billCycleDay = nil, billToId = nil, createdDate = nil, crmId = nil, currency = nil, customerServiceRepName = nil, defaultPaymentMethodId = nil, paymentGateway = nil, name = nil, notes = nil, paymentTerm = nil, purchaseOrderNumber = nil, salesRepName = nil, soldToId = nil, status = nil, updatedDate = nil)
     @fieldsToNull = fieldsToNull
     @id = id
     @accountNumber = accountNumber
+    @additionalEmailAddresses = additionalEmailAddresses
     @allowInvoiceEdit = allowInvoiceEdit
     @autoPay = autoPay
     @batch = batch
@@ -144,6 +147,7 @@ end
 # {http://object.api.zuora.com/}Amendment
 #   fieldsToNull - SOAP::SOAPString
 #   id - (any)
+#   autoRenew - SOAP::SOAPBoolean
 #   contractEffectiveDate - SOAP::SOAPDateTime
 #   customerAcceptanceDate - SOAP::SOAPDateTime
 #   description - SOAP::SOAPString
@@ -154,12 +158,12 @@ end
 #   serviceActivationDate - SOAP::SOAPDateTime
 #   status - SOAP::SOAPString
 #   subscriptionId - (any)
-#   termCommitment - SOAP::SOAPString
 #   termStartDate - SOAP::SOAPDateTime
 #   type - SOAP::SOAPString
 class Amendment < ZObject
   attr_accessor :fieldsToNull
   attr_accessor :id
+  attr_accessor :autoRenew
   attr_accessor :contractEffectiveDate
   attr_accessor :customerAcceptanceDate
   attr_accessor :description
@@ -167,17 +171,18 @@ class Amendment < ZObject
   attr_accessor :initialTerm
   attr_accessor :name
   attr_accessor :renewalTerm
+  attr_accessor :termType
   attr_accessor :serviceActivationDate
   attr_accessor :status
   attr_accessor :subscriptionId
-  attr_accessor :termCommitment
   attr_accessor :termStartDate
   attr_accessor :type
   attr_accessor :ratePlanData
 
-  def initialize(fieldsToNull = [], id = nil, contractEffectiveDate = nil, customerAcceptanceDate = nil, description = nil, effectiveDate = nil, initialTerm = nil, name = nil, renewalTerm = nil, serviceActivationDate = nil, status = nil, subscriptionId = nil, termCommitment = nil, termStartDate = nil, type = nil, ratePlanData =[])
+  def initialize(fieldsToNull = [], id = nil, autoRenew = nil, contractEffectiveDate = nil, customerAcceptanceDate = nil, description = nil, effectiveDate = nil, initialTerm = nil, name = nil, renewalTerm = nil, termType = nil, serviceActivationDate = nil, status = nil, subscriptionId = nil, termStartDate = nil, type = nil, ratePlanData =[])
     @fieldsToNull = fieldsToNull
     @id = id
+    @autoRenew = autoRenew
     @contractEffectiveDate = contractEffectiveDate
     @customerAcceptanceDate = customerAcceptanceDate
     @description = description
@@ -185,10 +190,10 @@ class Amendment < ZObject
     @initialTerm = initialTerm
     @name = name
     @renewalTerm = renewalTerm
+    @termType = termType
     @serviceActivationDate = serviceActivationDate
     @status = status
     @subscriptionId = subscriptionId
-    @termCommitment = termCommitment
     @termStartDate = termStartDate
     @type = type
     @ratePlanData = ratePlanData
@@ -308,6 +313,54 @@ class Invoice < ZObject
   end
 end
 
+class InvoiceItem < ZObject
+  attr_accessor :fieldsToNull
+  attr_accessor :id
+  attr_accessor :chargeAmount
+  attr_accessor :chargeDate
+  attr_accessor :chargeDescription
+  attr_accessor :chargeName
+  attr_accessor :chargeNumber
+  attr_accessor :invoiceId
+  attr_accessor :processingType
+  attr_accessor :productId
+  attr_accessor :productDescription
+  attr_accessor :productName
+  attr_accessor :quantity
+  attr_accessor :ratePlanChargeId
+  attr_accessor :serviceEndDate
+  attr_accessor :serviceStartDate
+  attr_accessor :subscriptionId
+  attr_accessor :subscriptionNumber
+  attr_accessor :taxAmount
+  attr_accessor :taxExemptAmount
+  attr_accessor :unitPrice
+
+  def initialize(fieldsToNull=[], id=nil, chargeAmount=nil, chargeDate=nil, chargeDescription=nil, chargeName=nil, chargeNumber=nil, invoiceId=nil, processingType=nil, productId=nil, productDescription=nil, productName=nil, quantity=nil, ratePlanChargeId=nil, serviceEndDate=nil, serviceStartDate=nil, subscriptionId=nil, subscriptionNumber=nil, taxAmount=nil, taxExemptAmount=nil, unitPrice=nil)
+    @fieldsToNull = fieldsToNull
+    @id = id
+    @chargeAmount = chargeAmount
+    @chargeDate = chargeDate
+    @chargeDescription = chargeDescription
+    @chargeName = chargeName
+    @chargeNumber = chargeNumber
+    @invoiceId = invoiceId
+    @processingType = processingType
+    @productId = productId
+    @productDescription = productDescription
+    @productName = productName
+    @quantity = quantity
+    @ratePlanChargeId = ratePlanChargeId
+    @serviceEndDate = serviceEndDate
+    @serviceStartDate = serviceStartDate
+    @subscriptionId = subscriptionId
+    @subscriptionNumber = subscriptionNumber
+    @taxAmount = taxAmount
+    @taxExemptAmount = taxExemptAmount
+    @unitPrice = unitPrice
+  end
+end
+
 class InvoiceItemAdjustment < ZObject
   attr_accessor :fieldsToNull
   attr_accessor :id
@@ -360,6 +413,8 @@ end
 #   id - (any)
 #   accountId - (any)
 #   amount - SOAP::SOAPDouble
+#   appliedInvoiceAmount - SOAP::SOAPDouble
+#   invoiceId - (any)
 #   comment - SOAP::SOAPString
 #   effectiveDate - SOAP::SOAPDateTime
 #   paymentMethodId - (any)
@@ -371,24 +426,44 @@ class Payment < ZObject
   attr_accessor :id
   attr_accessor :accountId
   attr_accessor :amount
+  attr_accessor :appliedInvoiceAmount
+  attr_accessor :cancelledOn
+  attr_accessor :createdDate
+  attr_accessor :gatewayResponse
+  attr_accessor :gatewayResponseCode
+  attr_accessor :gatewayState
+  attr_accessor :invoiceId
   attr_accessor :comment
   attr_accessor :effectiveDate
   attr_accessor :paymentMethodId
   attr_accessor :referenceId
+  attr_accessor :refundAmount
   attr_accessor :status
+  attr_accessor :settledOn
   attr_accessor :type
+  attr_accessor :updatedDate
 
-  def initialize(fieldsToNull = [], id = nil, accountId = nil, amount = nil, comment = nil, effectiveDate = nil, paymentMethodId = nil, referenceId = nil, status = nil, type = nil)
+  def initialize(fieldsToNull = [], id = nil, accountId = nil, amount = nil, appliedInvoiceAmount = nil, cancelledOn = nil, createdDate = nil, gatewayResponse = nil, gatewayResponseCode = nil, gatewayState = nil, invoiceId = nil, comment = nil, effectiveDate = nil, paymentMethodId = nil, referenceId = nil, refundAmount = nil, status = nil, settledOn = nil, type = nil, updatedDate = nil)
     @fieldsToNull = fieldsToNull
     @id = id
     @accountId = accountId
     @amount = amount
+    @appliedInvoiceAmount = appliedInvoiceAmount
+    @cancelledOn = cancelledOn
+    @createdDate = createdDate
+    @gatewayResponse = gatewayResponse
+    @gatewayResponseCode = gatewayResponseCode
+    @gatewayState = gatewayState
+    @invoiceId = invoiceId
     @comment = comment
     @effectiveDate = effectiveDate
     @paymentMethodId = paymentMethodId
     @referenceId = referenceId
+    @refundAmount = refundAmount
     @status = status
+    @settledOn = settledOn
     @type = type
+    @updatedDate = updatedDate
   end
 end
 
@@ -589,10 +664,8 @@ class ProductRatePlanCharge < ZObject
   attr_accessor :description
   attr_accessor :maxQuantity
   attr_accessor :minQuantity
-  attr_accessor :model
   attr_accessor :name
   attr_accessor :productRatePlanId
-  attr_accessor :type
   attr_accessor :uOM
   attr_accessor :chargeModel
   attr_accessor :revRecCode
@@ -600,11 +673,9 @@ class ProductRatePlanCharge < ZObject
   attr_accessor :chargeType
   attr_accessor :billingPeriod
   attr_accessor :billCycleType
-  attr_accessor :billingPeriodAlignement
   attr_accessor :revRecTriggerCondition
-  attr_accessor :productRatePlanChargeTierData
 
-  def initialize(fieldsToNull = [], id = nil, accountingCode = nil, defaultQuantity = nil, description = nil, maxQuantity = nil, minQuantity = nil, model = nil, name = nil, productRatePlanId = nil, type = nil, uOM = nil, chargeModel = nil, revRecCode=nil, triggerEvent=nil, chargeType=nil, billingPeriod=nil, billCycleType=nil, billingPeriodAlignement=nil, revRecTriggerCondition=nil, productRatePlanChargeTierData=nil)
+  def initialize(fieldsToNull = [], id = nil, accountingCode = nil, defaultQuantity = nil, description = nil, maxQuantity = nil, minQuantity = nil, name = nil, productRatePlanId = nil, uOM = nil, chargeModel = nil, revRecCode=nil, triggerEvent=nil, chargeType=nil, billingPeriod=nil, billCycleType=nil, revRecTriggerCondition=nil)
     @fieldsToNull = fieldsToNull
     @id = id
     @accountingCode = accountingCode
@@ -612,10 +683,8 @@ class ProductRatePlanCharge < ZObject
     @description = description
     @maxQuantity = maxQuantity
     @minQuantity = minQuantity
-    @model = model
     @name = name
     @productRatePlanId = productRatePlanId
-    @type = type
     @uOM = uOM
     @chargeModel = chargeModel
     @revRecCode=revRecCode,
@@ -623,9 +692,7 @@ class ProductRatePlanCharge < ZObject
     @chargeType=chargeType,
     @billingPeriod=billingPeriod,
     @billCycleType=billCycleType,
-    @billingPeriodAlignement=billingPeriodAlignement
     @revRecTriggerCondition=revRecTriggerCondition
-    @productRatePlanChargeTierData=productRatePlanChargeTierData
   end
 end
 
@@ -727,6 +794,8 @@ class RatePlanCharge < ZObject
   attr_accessor :fieldsToNull
   attr_accessor :id
   attr_accessor :accountingCode
+  attr_accessor :billCycleDay
+  attr_accessor :billCycleType
   attr_accessor :chargeModel
   attr_accessor :chargeNumber
   attr_accessor :chargeType
@@ -734,6 +803,7 @@ class RatePlanCharge < ZObject
   attr_accessor :dMRC
   attr_accessor :dTCV
   attr_accessor :includedUnits
+  attr_accessor :isLastSegment
   attr_accessor :mRR
   attr_accessor :name
   attr_accessor :numberOfPeriods
@@ -743,14 +813,17 @@ class RatePlanCharge < ZObject
   attr_accessor :quantity
   attr_accessor :ratePlanId
   attr_accessor :tCV
+  attr_accessor :triggerDate
   attr_accessor :triggerEvent
   attr_accessor :uOM
   attr_accessor :chargedThroughDate
 
-  def initialize(fieldsToNull = [], id = nil, accountingCode = nil, chargeModel = nil, chargeNumber = nil, chargeType = nil, description = nil, dMRC = nil, dTCV = nil, includedUnits = nil, mRR = nil, name = nil, numberOfPeriods = nil, overagePrice = nil, price = nil, productRatePlanChargeId = nil, quantity = nil, ratePlanId = nil, tCV = nil, triggerEvent = nil, uOM = nil, chargedThroughDate = nil)
+  def initialize(fieldsToNull = [], id = nil, accountingCode = nil, billCycleDay = nil, billCycleType = nil,  chargeModel = nil, chargeNumber = nil, chargeType = nil, description = nil, dMRC = nil, dTCV = nil, includedUnits = nil, isLastSegment = nil, mRR = nil, name = nil, numberOfPeriods = nil, overagePrice = nil, price = nil, productRatePlanChargeId = nil, quantity = nil, ratePlanId = nil, tCV = nil, triggerDate = nil, triggerEvent = nil, uOM = nil, chargedThroughDate = nil)
     @fieldsToNull = fieldsToNull
     @id = id
     @accountingCode = accountingCode
+    @billCycleDay = billCycleDay
+    @billCycleType = billCycleType
     @chargeModel = chargeModel
     @chargeNumber = chargeNumber
     @chargeType = chargeType
@@ -758,6 +831,7 @@ class RatePlanCharge < ZObject
     @dMRC = dMRC
     @dTCV = dTCV
     @includedUnits = includedUnits
+    @isLastSegment = isLastSegment
     @mRR = mRR
     @name = name
     @numberOfPeriods = numberOfPeriods
@@ -767,6 +841,7 @@ class RatePlanCharge < ZObject
     @quantity = quantity
     @ratePlanId = ratePlanId
     @tCV = tCV
+    @triggerDate = triggerDate
     @triggerEvent = triggerEvent
     @uOM = uOM
     @chargedThroughDate = chargedThroughDate
@@ -816,12 +891,13 @@ end
 #   initialTerm - SOAP::SOAPInt
 #   name - SOAP::SOAPString
 #   notes - SOAP::SOAPString
-#   originalSubscriptionId - SOAP::SOAPString
-#   previousSubscriptionId - SOAP::SOAPString
+#   originalId - (any)
+#   previousSubscriptionId - (any)
 #   renewalTerm - SOAP::SOAPInt
 #   serviceActivationDate - SOAP::SOAPDateTime
 #   status - SOAP::SOAPString
 #   termStartDate - SOAP::SOAPDateTime
+#   termEndDate - SOAP::SOAPDateTime
 #   version - SOAP::SOAPInt
 class Subscription < ZObject
   attr_accessor :fieldsToNull
@@ -829,40 +905,44 @@ class Subscription < ZObject
   attr_accessor :accountId
   attr_accessor :autoRenew
   attr_accessor :cancelledDate
+  attr_accessor :createdDate
   attr_accessor :contractAcceptanceDate
   attr_accessor :contractEffectiveDate
-  attr_accessor :currency
   attr_accessor :initialTerm
   attr_accessor :name
   attr_accessor :notes
-  attr_accessor :originalSubscriptionId
+  attr_accessor :originalId
   attr_accessor :previousSubscriptionId
   attr_accessor :renewalTerm
   attr_accessor :serviceActivationDate
   attr_accessor :subscriptionEndDate
   attr_accessor :status
   attr_accessor :termStartDate
+  attr_accessor :termEndDate
+  attr_accessor :termType
   attr_accessor :version
 
-  def initialize(fieldsToNull = [], id = nil, accountId = nil, autoRenew = nil, cancelledDate = nil, contractAcceptanceDate = nil, contractEffectiveDate = nil, currency = nil, initialTerm = nil, name = nil, notes = nil, originalSubscriptionId = nil, previousSubscriptionId = nil, renewalTerm = nil, serviceActivationDate = nil, subscriptionEndDate = nil, status = nil, termStartDate = nil, version = nil)
+  def initialize(fieldsToNull = [], id = nil, accountId = nil, autoRenew = nil, cancelledDate = nil, createdDate = nil, contractAcceptanceDate = nil, contractEffectiveDate = nil, initialTerm = nil, name = nil, notes = nil, originalId = nil, previousSubscriptionId = nil, renewalTerm = nil, serviceActivationDate = nil, subscriptionEndDate = nil, status = nil, termStartDate = nil, termEndDate = nil, termType = nil, version = nil)
     @fieldsToNull = fieldsToNull
     @id = id
     @accountId = accountId
     @autoRenew = autoRenew
     @cancelledDate = cancelledDate
+    @createdDate = createdDate
     @contractAcceptanceDate = contractAcceptanceDate
     @contractEffectiveDate = contractEffectiveDate
-    @currency = currency
     @initialTerm = initialTerm
     @name = name
     @notes = notes
-    @originalSubscriptionId = originalSubscriptionId
+    @originalId = originalId
     @previousSubscriptionId = previousSubscriptionId
     @renewalTerm = renewalTerm
     @serviceActivationDate = serviceActivationDate
     @subscriptionEndDate= subscriptionEndDate
     @status = status
     @termStartDate = termStartDate
+    @termEndDate = termEndDate
+    @termType = termType
     @version = version
   end
 end
@@ -885,7 +965,9 @@ class Usage < ZObject
   attr_accessor :fieldsToNull
   attr_accessor :id
   attr_accessor :accountId
+  attr_accessor :chargeId
   attr_accessor :chargeNumber
+  attr_accessor :description
   attr_accessor :endDateTime
   attr_accessor :quantity
   attr_accessor :rbeStatus
@@ -896,11 +978,13 @@ class Usage < ZObject
   attr_accessor :subscriptionNumber
   attr_accessor :uOM
 
-  def initialize(fieldsToNull = [], id = nil, accountId = nil, chargeNumber = nil, endDateTime = nil, quantity = nil, rbeStatus = nil, sourceName = nil, sourceType = nil, startDateTime = nil, submissionDateTime = nil, subscriptionNumber = nil, uOM = nil)
+  def initialize(fieldsToNull = [], id = nil, accountId = nil, chargeId = nil, chargeNumber = nil, description = nil, endDateTime = nil, quantity = nil, rbeStatus = nil, sourceName = nil, sourceType = nil, startDateTime = nil, submissionDateTime = nil, subscriptionNumber = nil, uOM = nil)
     @fieldsToNull = fieldsToNull
     @id = id
     @accountId = accountId
+    @chargeId = chargeId
     @chargeNumber = chargeNumber
+    @description = description
     @endDateTime = endDateTime
     @quantity = quantity
     @rbeStatus = rbeStatus
@@ -998,12 +1082,10 @@ end
 #   ratePlanCharge - ZUORA::RatePlanCharge
 class RatePlanData
   attr_accessor :ratePlan
-  attr_accessor :ratePlanCharge
   attr_accessor :ratePlanChargeData
 
-  def initialize(ratePlan = nil, ratePlanCharge = nil, ratePlanChargeData = [])
+  def initialize(ratePlan = nil, ratePlanChargeData = [])
     @ratePlan = ratePlan
-    @ratePlanCharge = ratePlanCharge
     @ratePlanChargeData = ratePlanChargeData
   end
 end
@@ -1052,6 +1134,51 @@ class SubscribeResult
   end
 end
 
+class AmendRequest
+  attr_accessor :amendment, :amendOptions, :previewOptions
+
+  def initialize(amendment = nil, amendOptions = nil, previewOptions = nil)
+    @amendment, @amendOptions, @previewOptions = amendment, amendOptions, previewOptions
+  end
+end
+
+class AmendOptions
+  attr_accessor :generateInvoice, :invoiceProcessingOptions, :processPayments
+
+  def initialize(generateInvoice = nil, invoiceProcessingOptions = nil, processPayments = nil)
+    @generateInvoice, @invoiceProcessingOptions, @processPayments = 
+      generateInvoice, invoiceProcessingOptions, processPayments
+  end
+end
+
+class InvoiceProcessingOptions
+  attr_accessor :invoiceTargetDate
+
+  def initialize(invoiceTargetDate = nil)
+    @invoiceTargetDate = invoiceTargetDate
+  end
+end
+
+class PreviewOptions
+  attr_accessor :enablePreviewMode, :numberOfPeriods
+
+  def initialize(enablePreviewMode = nil, numberOfPeriods = nil)
+    @enablePreviewMode, @numberOfPeriods = enablePreviewMode, numberOfPeriods
+  end
+end
+
+class AmendResult
+  attr_accessor :amendmentIds
+  attr_accessor :errors
+  attr_accessor :success
+
+  def initialize(amendmentIds = [], errors = [], success = nil)
+    @amendmentIds = amendmentIds
+    @errors = errors
+    @success = success
+  end
+end
+
 # {http://api.zuora.com/}SaveResult
 #   errors - ZUORA::Error
 #   id - (any)
@@ -1265,6 +1392,12 @@ end
 class SubscribeResponse < ::Array
 end
 
+class Amend < ::Array
+end
+
+class AmendResponse < ::Array
+end
+
 # {http://api.zuora.com/}create
 class Create < ::Array
 end
@@ -1326,6 +1459,26 @@ class QueryResponse
   end
 end
 
+# {http://api.zuora.com/}queryMore
+#   queryLocator - SOAP::SOAPString
+class QueryMore
+  attr_accessor :queryLocator
+
+  def initialize(queryLocator = nil)
+    @queryLocator = queryLocator
+  end
+end
+
+# {http://api.zuora.com/}queryMoreResponse
+#   result - ZUORA::QueryResult
+class QueryMoreResponse
+  attr_accessor :result
+
+  def initialize(result = nil)
+    @result = result
+  end
+end
+
 # {http://api.zuora.com/}SessionHeader
 #   session - SOAP::SOAPString
 class SessionHeader