dont generate charges if they are nil

calos0921 · Oct 17, 2012 · 7783fd6 · 7783fd6
1 parent 056fdaf
commit 7783fd6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/zuora/objects/amend_request.rb b/lib/zuora/objects/amend_request.rb
@@ -12,7 +12,7 @@ class AmendRequest < Base
     validate do |request|
       self.validation_errors = Array.new
       self.validation_errors << request.must_be_present(:amendment)
-      self.validation_errors << request.must_be_present(:plans_and_charges)
+      self.validation_errors << request.must_be_present(:plans_and_charges) unless amendment.type == "TermsAndConditions" || amendment.type == "Renewal"
     end
 
     def must_be_present(ref)
@@ -33,7 +33,7 @@ def create
           r.__send__(zns, :AmendOptions) do |so|
             generate_amend_options(so)
           end unless amend_options.blank?
-          
+
           r.__send__(zns, :PreviewOptions) do |so|
             generate_preview_options(so)
           end unless preview_options.blank?

diff --git a/lib/zuora/objects/subscribe_request.rb b/lib/zuora/objects/subscribe_request.rb
@@ -19,7 +19,7 @@ class SubscribeRequest < Base
       self.validation_errors = Array.new
       self.validation_errors << request.must_have_usable(:account)
       #request.must_have_usable(:payment_method) if :preview_options["enable_preview_mode"] != true
-      #request.must_have_usable(:bill_to_contact)
+      request.must_have_usable(:bill_to_contact)
       #request.must_have_usable(:product_rate_plans)
       self.validation_errors << request.must_have_new(:subscription)
     end
@@ -94,7 +94,7 @@ def create
                       rpc.__send__(ons, :Quantity, charge.quantity)
                     end
                   end
-                end
+                end unless charges.nil?
               end
             end unless plans_and_charges.nil?