active_zuora 1.4.5 → 1.4.6

data/VERSION

@@ -1 +1 @@
-1.4.4
+1.4.6

data/active_zuora.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "active_zuora"
-  s.version = "1.4.5"
+  s.version = "1.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Fleener", "Ed Lebert", "Nate Greene"]

data/lib/active_zuora/rate_plan_charge.rb

@@ -1,12 +1,28 @@
 module Zuora
   class RatePlanCharge < ZObject
     
-    exclude_query_attributes :overagePrice, :includedUnits, :discountAmount, :discountPercentage
+    exclude_query_attributes :overagePrice, :includedUnits, :discountAmount, :discountPercentage, :price
 
     def rate_plan
       @rate_plan ||= RatePlan.find(self.ratePlanId)
     end
 
+    def rate_plan_charge_tier
+      query = charge_tier_query("ratePlanChargeId", id)
+      @rate_plan_charge_tier ||= RatePlanChargeTier.where(query).first
+    end
+
+    def product_rate_plan_charge_tier
+      query = charge_tier_query("productRatePlanChargeId", productRatePlanChargeId)
+      @product_rate_plan_charge_tier ||= ProductRatePlanChargeTier.where(query).first
+    end
+
+    def charge_model_query(identifier_name, identifier_value)
+      query = "#{identifier_name} = '#{identifier_value}'"
+      query += " and endingUnit >= #{charge_quantity} and startingUnit <= #{charge_quantity}" if chargeModel == "Volume Pricing"
+      query
+    end
+
     def product_rate_plan_charge
       @product_rate_plan_charge ||= ProductRatePlanCharge.find(self.productRatePlanChargeId)
     end
@@ -20,16 +36,24 @@ module Zuora
       self
     end
 
+    def charge_quantity
+      quantity || 1
+    end
+
+    def price
+      rate_plan_charge_tier.price
+    end
+
     def total_price
-      (quantity || 1) * price
+      charge_quantity * price
     end
 
     def list_price
-      product_rate_plan_charge.product_rate_plan_charge_tiers.first.price
+      product_rate_plan_charge_tier.price
     end
 
     def total_list_price
-      (quantity || 1) * 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.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -173,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2769639254206594303
+      hash: -1373981817306604645
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: