active_zuora 1.4.12 → 1.4.13

data/VERSION

@@ -1 +1 @@
-1.4.12
+1.4.13

data/active_zuora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "active_zuora"
-  s.version = "1.4.12"
+  s.version = "1.4.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Fleener", "Ed Lebert", "Nate Greene"]
-  s.date = "2014-02-13"
+  s.date = "2014-02-18"
   s.description = "A client for Zuora API"
   s.email = "andy.fleener@tstmedia.com"
   s.extra_rdoc_files = [

data/lib/active_zuora/rate_plan_charge.rb

@@ -1,6 +1,9 @@
 module Zuora
   class RatePlanCharge < ZObject
     
+    #this code only supports flat fee, per unit and volume pricing.   It does not support tiered pricing.
+
+
     exclude_query_attributes :overagePrice, :includedUnits, :discountAmount, :discountPercentage, :price
 
     def rate_plan
@@ -19,7 +22,7 @@ module Zuora
 
     def charge_tier_query(identifier_name, identifier_value)
       query = "#{identifier_name} = '#{identifier_value}'"
-      query += " and endingUnit >= #{charge_quantity} and startingUnit <= #{charge_quantity}" if tiered_pricing_model?
+      query += " and startingUnit <= #{charge_quantity} and endingUnit >= #{charge_quantity}" if chargeModel == "Volume Pricing"
       query
     end
 
@@ -36,10 +39,6 @@ module Zuora
       self
     end
 
-    def tiered_pricing_model?
-      chargeModel == "Volume Pricing" || chargeModel == "Tiered Pricing"
-    end
-
     def charge_quantity
       quantity || 1
     end
@@ -49,7 +48,7 @@ module Zuora
     end
 
     def total_price
-      charge_quantity * price
+      rate_plan_charge_tier.priceFormat == "Flat Fee" ? price : charge_quantity * price
     end
 
     def list_price
@@ -57,7 +56,7 @@ module Zuora
     end
 
     def total_list_price
-      charge_quantity * list_price
+      product_rate_plan_charge_tier.priceFormat == "Flat Fee" ? list_price : charge_quantity * list_price
     end
 
     def discount?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_zuora
 version: !ruby/object:Gem::Version
-  version: 1.4.12
+  version: 1.4.13
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000Z
+date: 2014-02-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumboe-soap4r
-  requirement: &70212804695900 !ruby/object:Gem::Requirement
+  requirement: &70112298032400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70212804695900
+  version_requirements: *70112298032400
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70212804695220 !ruby/object:Gem::Requirement
+  requirement: &70112298031720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70212804695220
+  version_requirements: *70112298031720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70212804694600 !ruby/object:Gem::Requirement
+  requirement: &70112298031160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212804694600
+  version_requirements: *70112298031160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70212804694040 !ruby/object:Gem::Requirement
+  requirement: &70112298024360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212804694040
+  version_requirements: *70112298024360
 - !ruby/object:Gem::Dependency
   name: mumboe-soap4r
-  requirement: &70212804687260 !ruby/object:Gem::Requirement
+  requirement: &70112298023800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 1.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *70212804687260
+  version_requirements: *70112298023800
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70212804686740 !ruby/object:Gem::Requirement
+  requirement: &70112298023240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,7 +78,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70212804686740
+  version_requirements: *70112298023240
 description: A client for Zuora API
 email: andy.fleener@tstmedia.com
 executables: []
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2224501913552757264
+      hash: 2149538698762257273
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: