maxio-advanced-billing-sdk 5.2.0 → 6.0.0

data/lib/advanced_billing/models/list_subscription_components_filter.rb

@@ -43,13 +43,13 @@ module AdvancedBilling
 
     def initialize(currencies: SKIP, use_site_exchange_rate: SKIP,
                    additional_properties: {})
-      @currencies = currencies unless currencies == SKIP
-      @use_site_exchange_rate = use_site_exchange_rate unless use_site_exchange_rate == SKIP
-
       # Add additional model properties to the instance.
       additional_properties.each do |_name, _value|
         instance_variable_set("@#{_name}", _value)
       end
+
+      @currencies = currencies unless currencies == SKIP
+      @use_site_exchange_rate = use_site_exchange_rate unless use_site_exchange_rate == SKIP
     end
 
     # Creates an instance of the object from a hash.
@@ -62,12 +62,12 @@ module AdvancedBilling
         hash.key?('use_site_exchange_rate') ? hash['use_site_exchange_rate'] : SKIP
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       ListSubscriptionComponentsFilter.new(currencies: currencies,
                                            use_site_exchange_rate: use_site_exchange_rate,
-                                           additional_properties: hash)
+                                           additional_properties: additional_properties)
     end
   end
 end

data/lib/advanced_billing/models/list_subscription_components_for_site_filter.rb

@@ -49,14 +49,14 @@ module AdvancedBilling
 
     def initialize(currencies: SKIP, use_site_exchange_rate: SKIP,
                    subscription: SKIP, additional_properties: {})
-      @currencies = currencies unless currencies == SKIP
-      @use_site_exchange_rate = use_site_exchange_rate unless use_site_exchange_rate == SKIP
-      @subscription = subscription unless subscription == SKIP
-
       # Add additional model properties to the instance.
       additional_properties.each do |_name, _value|
         instance_variable_set("@#{_name}", _value)
       end
+
+      @currencies = currencies unless currencies == SKIP
+      @use_site_exchange_rate = use_site_exchange_rate unless use_site_exchange_rate == SKIP
+      @subscription = subscription unless subscription == SKIP
     end
 
     # Creates an instance of the object from a hash.
@@ -70,13 +70,13 @@ module AdvancedBilling
       subscription = SubscriptionFilter.from_hash(hash['subscription']) if hash['subscription']
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       ListSubscriptionComponentsForSiteFilter.new(currencies: currencies,
                                                   use_site_exchange_rate: use_site_exchange_rate,
                                                   subscription: subscription,
-                                                  additional_properties: hash)
+                                                  additional_properties: additional_properties)
     end
   end
 end

data/lib/advanced_billing/models/list_subscription_components_response.rb

@@ -31,12 +31,12 @@ module AdvancedBilling
     end
 
     def initialize(subscriptions_components:, additional_properties: {})
-      @subscriptions_components = subscriptions_components
-
       # Add additional model properties to the instance.
       additional_properties.each do |_name, _value|
         instance_variable_set("@#{_name}", _value)
       end
+
+      @subscriptions_components = subscriptions_components
     end
 
     # Creates an instance of the object from a hash.
@@ -56,11 +56,11 @@ module AdvancedBilling
       subscriptions_components = nil unless hash.key?('subscriptions_components')
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       ListSubscriptionComponentsResponse.new(subscriptions_components: subscriptions_components,
-                                             additional_properties: hash)
+                                             additional_properties: additional_properties)
     end
   end
 end

data/lib/advanced_billing/models/list_subscription_group_prepayment.rb

@@ -31,12 +31,12 @@ module AdvancedBilling
     end
 
     def initialize(prepayment:, additional_properties: {})
-      @prepayment = prepayment
-
       # Add additional model properties to the instance.
       additional_properties.each do |_name, _value|
         instance_variable_set("@#{_name}", _value)
       end
+
+      @prepayment = prepayment
     end
 
     # Creates an instance of the object from a hash.
@@ -48,11 +48,11 @@ module AdvancedBilling
         hash['prepayment']
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       ListSubscriptionGroupPrepayment.new(prepayment: prepayment,
-                                          additional_properties: hash)
+                                          additional_properties: additional_properties)
     end
   end
 end

data/lib/advanced_billing/models/list_subscription_group_prepayment_response.rb

@@ -31,12 +31,12 @@ module AdvancedBilling
     end
 
     def initialize(prepayments:, additional_properties: {})
-      @prepayments = prepayments
-
       # Add additional model properties to the instance.
       additional_properties.each do |_name, _value|
         instance_variable_set("@#{_name}", _value)
       end
+
+      @prepayments = prepayments
     end
 
     # Creates an instance of the object from a hash.
@@ -56,11 +56,11 @@ module AdvancedBilling
       prepayments = nil unless hash.key?('prepayments')
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       ListSubscriptionGroupPrepaymentResponse.new(prepayments: prepayments,
-                                                  additional_properties: hash)
+                                                  additional_properties: additional_properties)
     end
   end
 end

data/lib/advanced_billing/models/list_subscription_groups_item.rb

@@ -99,6 +99,11 @@ module AdvancedBilling
                    state: SKIP, cancel_at_end_of_period: SKIP,
                    account_balances: SKIP, group_type: SKIP,
                    additional_properties: {})
+      # Add additional model properties to the instance.
+      additional_properties.each do |_name, _value|
+        instance_variable_set("@#{_name}", _value)
+      end
+
       @uid = uid unless uid == SKIP
       @scheme = scheme unless scheme == SKIP
       @customer_id = customer_id unless customer_id == SKIP
@@ -110,11 +115,6 @@ module AdvancedBilling
       @cancel_at_end_of_period = cancel_at_end_of_period unless cancel_at_end_of_period == SKIP
       @account_balances = account_balances unless account_balances == SKIP
       @group_type = group_type unless group_type == SKIP
-
-      # Add additional model properties to the instance.
-      additional_properties.each do |_name, _value|
-        instance_variable_set("@#{_name}", _value)
-      end
     end
 
     # Creates an instance of the object from a hash.
@@ -144,7 +144,7 @@ module AdvancedBilling
       group_type = hash.key?('group_type') ? hash['group_type'] : SKIP
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       ListSubscriptionGroupsItem.new(uid: uid,
@@ -158,7 +158,7 @@ module AdvancedBilling
                                      cancel_at_end_of_period: cancel_at_end_of_period,
                                      account_balances: account_balances,
                                      group_type: group_type,
-                                     additional_properties: hash)
+                                     additional_properties: additional_properties)
     end
 
     def to_custom_next_assessment_at

data/lib/advanced_billing/models/list_subscription_groups_meta.rb

@@ -40,13 +40,13 @@ module AdvancedBilling
 
     def initialize(current_page: SKIP, total_count: SKIP,
                    additional_properties: {})
-      @current_page = current_page unless current_page == SKIP
-      @total_count = total_count unless total_count == SKIP
-
       # Add additional model properties to the instance.
       additional_properties.each do |_name, _value|
         instance_variable_set("@#{_name}", _value)
       end
+
+      @current_page = current_page unless current_page == SKIP
+      @total_count = total_count unless total_count == SKIP
     end
 
     # Creates an instance of the object from a hash.
@@ -58,12 +58,12 @@ module AdvancedBilling
       total_count = hash.key?('total_count') ? hash['total_count'] : SKIP
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       ListSubscriptionGroupsMeta.new(current_page: current_page,
                                      total_count: total_count,
-                                     additional_properties: hash)
+                                     additional_properties: additional_properties)
     end
   end
 end

data/lib/advanced_billing/models/list_subscription_groups_response.rb

@@ -40,13 +40,13 @@ module AdvancedBilling
 
     def initialize(subscription_groups: SKIP, meta: SKIP,
                    additional_properties: {})
-      @subscription_groups = subscription_groups unless subscription_groups == SKIP
-      @meta = meta unless meta == SKIP
-
       # Add additional model properties to the instance.
       additional_properties.each do |_name, _value|
         instance_variable_set("@#{_name}", _value)
       end
+
+      @subscription_groups = subscription_groups unless subscription_groups == SKIP
+      @meta = meta unless meta == SKIP
     end
 
     # Creates an instance of the object from a hash.
@@ -67,12 +67,12 @@ module AdvancedBilling
       meta = ListSubscriptionGroupsMeta.from_hash(hash['meta']) if hash['meta']
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       ListSubscriptionGroupsResponse.new(subscription_groups: subscription_groups,
                                          meta: meta,
-                                         additional_properties: hash)
+                                         additional_properties: additional_properties)
     end
   end
 end

data/lib/advanced_billing/models/metadata.rb

@@ -72,17 +72,17 @@ module AdvancedBilling
     def initialize(id: SKIP, value: SKIP, resource_id: SKIP, name: SKIP,
                    deleted_at: SKIP, metafield_id: SKIP,
                    additional_properties: {})
+      # Add additional model properties to the instance.
+      additional_properties.each do |_name, _value|
+        instance_variable_set("@#{_name}", _value)
+      end
+
       @id = id unless id == SKIP
       @value = value unless value == SKIP
       @resource_id = resource_id unless resource_id == SKIP
       @name = name unless name == SKIP
       @deleted_at = deleted_at unless deleted_at == SKIP
       @metafield_id = metafield_id unless metafield_id == SKIP
-
-      # Add additional model properties to the instance.
-      additional_properties.each do |_name, _value|
-        instance_variable_set("@#{_name}", _value)
-      end
     end
 
     # Creates an instance of the object from a hash.
@@ -102,7 +102,7 @@ module AdvancedBilling
       metafield_id = hash.key?('metafield_id') ? hash['metafield_id'] : SKIP
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       Metadata.new(id: id,
@@ -111,7 +111,7 @@ module AdvancedBilling
                    name: name,
                    deleted_at: deleted_at,
                    metafield_id: metafield_id,
-                   additional_properties: hash)
+                   additional_properties: additional_properties)
     end
 
     def to_custom_deleted_at

data/lib/advanced_billing/models/metafield.rb

@@ -76,17 +76,17 @@ module AdvancedBilling
 
     def initialize(id: SKIP, name: SKIP, scope: SKIP, data_count: SKIP,
                    input_type: SKIP, enum: SKIP, additional_properties: {})
+      # Add additional model properties to the instance.
+      additional_properties.each do |_name, _value|
+        instance_variable_set("@#{_name}", _value)
+      end
+
       @id = id unless id == SKIP
       @name = name unless name == SKIP
       @scope = scope unless scope == SKIP
       @data_count = data_count unless data_count == SKIP
       @input_type = input_type unless input_type == SKIP
       @enum = enum unless enum == SKIP
-
-      # Add additional model properties to the instance.
-      additional_properties.each do |_name, _value|
-        instance_variable_set("@#{_name}", _value)
-      end
     end
 
     # Creates an instance of the object from a hash.
@@ -104,7 +104,7 @@ module AdvancedBilling
       ) : SKIP
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       Metafield.new(id: id,
@@ -113,7 +113,7 @@ module AdvancedBilling
                     data_count: data_count,
                     input_type: input_type,
                     enum: enum,
-                    additional_properties: hash)
+                    additional_properties: additional_properties)
     end
 
     # Validates an instance of the object from a given value.

data/lib/advanced_billing/models/metafield_scope.rb

@@ -74,6 +74,11 @@ module AdvancedBilling
     def initialize(csv: SKIP, invoices: SKIP, statements: SKIP, portal: SKIP,
                    public_show: SKIP, public_edit: SKIP, hosted: SKIP,
                    additional_properties: {})
+      # Add additional model properties to the instance.
+      additional_properties.each do |_name, _value|
+        instance_variable_set("@#{_name}", _value)
+      end
+
       @csv = csv unless csv == SKIP
       @invoices = invoices unless invoices == SKIP
       @statements = statements unless statements == SKIP
@@ -81,11 +86,6 @@ module AdvancedBilling
       @public_show = public_show unless public_show == SKIP
       @public_edit = public_edit unless public_edit == SKIP
       @hosted = hosted unless hosted == SKIP
-
-      # Add additional model properties to the instance.
-      additional_properties.each do |_name, _value|
-        instance_variable_set("@#{_name}", _value)
-      end
     end
 
     # Creates an instance of the object from a hash.
@@ -102,7 +102,7 @@ module AdvancedBilling
       hosted = hash.key?('hosted') ? hash['hosted'] : SKIP
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       MetafieldScope.new(csv: csv,
@@ -112,7 +112,7 @@ module AdvancedBilling
                          public_show: public_show,
                          public_edit: public_edit,
                          hosted: hosted,
-                         additional_properties: hash)
+                         additional_properties: additional_properties)
     end
 
     # Validates an instance of the object from a given value.

data/lib/advanced_billing/models/metered_component.rb

@@ -51,21 +51,11 @@ module AdvancedBilling
     # @return [Array[Price]]
     attr_accessor :prices
 
-    # The type of credit to be created when upgrading/downgrading. Defaults to
-    # the component and then site setting if one is not provided.
-    # Available values: `full`, `prorated`, `none`.
-    # @return [CreditType]
-    attr_accessor :upgrade_charge
-
-    # The type of credit to be created when upgrading/downgrading. Defaults to
-    # the component and then site setting if one is not provided.
-    # Available values: `full`, `prorated`, `none`.
-    # @return [CreditType]
-    attr_accessor :downgrade_credit
-
-    # The type of credit to be created when upgrading/downgrading. Defaults to
-    # the component and then site setting if one is not provided.
-    # Available values: `full`, `prorated`, `none`.
+    # (Not required for ‘per_unit’ pricing schemes) One or more price brackets.
+    # See [Price Bracket
+    # Rules](https://maxio.zendesk.com/hc/en-us/articles/24261149166733-Componen
+    # t-Pricing-Schemes#price-bracket-rules) for an overview of how price
+    # brackets work for different pricing schemes.
     # @return [Array[ComponentPricePointItem]]
     attr_accessor :price_points
 
@@ -89,19 +79,21 @@ module AdvancedBilling
     # @return [TrueClass | FalseClass]
     attr_accessor :hide_date_range_on_invoice
 
-    # deprecated May 2011 - use unit_price instead
-    # @return [String]
-    attr_accessor :price_in_cents
-
-    # deprecated May 2011 - use unit_price instead
+    # (Only available on Relationship Invoicing sites) Boolean flag describing
+    # if the service date range should show for the component on generated
+    # invoices.
     # @return [TrueClass | FalseClass]
     attr_accessor :display_on_hosted_page
 
-    # deprecated May 2011 - use unit_price instead
+    # (Only available on Relationship Invoicing sites) Boolean flag describing
+    # if the service date range should show for the component on generated
+    # invoices.
     # @return [TrueClass | FalseClass]
     attr_accessor :allow_fractional_quantities
 
-    # deprecated May 2011 - use unit_price instead
+    # (Only available on Relationship Invoicing sites) Boolean flag describing
+    # if the service date range should show for the component on generated
+    # invoices.
     # @return [Array[Integer]]
     attr_accessor :public_signup_page_ids
 
@@ -128,13 +120,10 @@ module AdvancedBilling
       @_hash['taxable'] = 'taxable'
       @_hash['pricing_scheme'] = 'pricing_scheme'
       @_hash['prices'] = 'prices'
-      @_hash['upgrade_charge'] = 'upgrade_charge'
-      @_hash['downgrade_credit'] = 'downgrade_credit'
       @_hash['price_points'] = 'price_points'
       @_hash['unit_price'] = 'unit_price'
       @_hash['tax_code'] = 'tax_code'
       @_hash['hide_date_range_on_invoice'] = 'hide_date_range_on_invoice'
-      @_hash['price_in_cents'] = 'price_in_cents'
       @_hash['display_on_hosted_page'] = 'display_on_hosted_page'
       @_hash['allow_fractional_quantities'] = 'allow_fractional_quantities'
       @_hash['public_signup_page_ids'] = 'public_signup_page_ids'
@@ -150,13 +139,10 @@ module AdvancedBilling
         handle
         taxable
         prices
-        upgrade_charge
-        downgrade_credit
         price_points
         unit_price
         tax_code
         hide_date_range_on_invoice
-        price_in_cents
         display_on_hosted_page
         allow_fractional_quantities
         public_signup_page_ids
@@ -168,21 +154,23 @@ module AdvancedBilling
     # An array for nullable fields
     def self.nullables
       %w[
-        upgrade_charge
-        downgrade_credit
         interval_unit
       ]
     end
 
     def initialize(name:, unit_name:, pricing_scheme:, description: SKIP,
                    handle: SKIP, taxable: SKIP, prices: SKIP,
-                   upgrade_charge: SKIP, downgrade_credit: SKIP,
                    price_points: SKIP, unit_price: SKIP, tax_code: SKIP,
-                   hide_date_range_on_invoice: SKIP, price_in_cents: SKIP,
+                   hide_date_range_on_invoice: SKIP,
                    display_on_hosted_page: SKIP,
                    allow_fractional_quantities: SKIP,
                    public_signup_page_ids: SKIP, interval: SKIP,
                    interval_unit: SKIP, additional_properties: {})
+      # Add additional model properties to the instance.
+      additional_properties.each do |_name, _value|
+        instance_variable_set("@#{_name}", _value)
+      end
+
       @name = name
       @unit_name = unit_name
       @description = description unless description == SKIP
@@ -190,8 +178,6 @@ module AdvancedBilling
       @taxable = taxable unless taxable == SKIP
       @pricing_scheme = pricing_scheme
       @prices = prices unless prices == SKIP
-      @upgrade_charge = upgrade_charge unless upgrade_charge == SKIP
-      @downgrade_credit = downgrade_credit unless downgrade_credit == SKIP
       @price_points = price_points unless price_points == SKIP
       @unit_price = unit_price unless unit_price == SKIP
       @tax_code = tax_code unless tax_code == SKIP
@@ -199,7 +185,6 @@ module AdvancedBilling
         @hide_date_range_on_invoice =
           hide_date_range_on_invoice
       end
-      @price_in_cents = price_in_cents unless price_in_cents == SKIP
       @display_on_hosted_page = display_on_hosted_page unless display_on_hosted_page == SKIP
       unless allow_fractional_quantities == SKIP
         @allow_fractional_quantities =
@@ -208,11 +193,6 @@ module AdvancedBilling
       @public_signup_page_ids = public_signup_page_ids unless public_signup_page_ids == SKIP
       @interval = interval unless interval == SKIP
       @interval_unit = interval_unit unless interval_unit == SKIP
-
-      # Add additional model properties to the instance.
-      additional_properties.each do |_name, _value|
-        instance_variable_set("@#{_name}", _value)
-      end
     end
 
     # Creates an instance of the object from a hash.
@@ -237,10 +217,6 @@ module AdvancedBilling
       end
 
       prices = SKIP unless hash.key?('prices')
-      upgrade_charge =
-        hash.key?('upgrade_charge') ? hash['upgrade_charge'] : SKIP
-      downgrade_credit =
-        hash.key?('downgrade_credit') ? hash['downgrade_credit'] : SKIP
       # Parameter is an array, so we need to iterate through it
       price_points = nil
       unless hash['price_points'].nil?
@@ -257,8 +233,6 @@ module AdvancedBilling
       tax_code = hash.key?('tax_code') ? hash['tax_code'] : SKIP
       hide_date_range_on_invoice =
         hash.key?('hide_date_range_on_invoice') ? hash['hide_date_range_on_invoice'] : SKIP
-      price_in_cents =
-        hash.key?('price_in_cents') ? hash['price_in_cents'] : SKIP
       display_on_hosted_page =
         hash.key?('display_on_hosted_page') ? hash['display_on_hosted_page'] : SKIP
       allow_fractional_quantities =
@@ -269,7 +243,7 @@ module AdvancedBilling
       interval_unit = hash.key?('interval_unit') ? hash['interval_unit'] : SKIP
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       MeteredComponent.new(name: name,
@@ -279,19 +253,16 @@ module AdvancedBilling
                            handle: handle,
                            taxable: taxable,
                            prices: prices,
-                           upgrade_charge: upgrade_charge,
-                           downgrade_credit: downgrade_credit,
                            price_points: price_points,
                            unit_price: unit_price,
                            tax_code: tax_code,
                            hide_date_range_on_invoice: hide_date_range_on_invoice,
-                           price_in_cents: price_in_cents,
                            display_on_hosted_page: display_on_hosted_page,
                            allow_fractional_quantities: allow_fractional_quantities,
                            public_signup_page_ids: public_signup_page_ids,
                            interval: interval,
                            interval_unit: interval_unit,
-                           additional_properties: hash)
+                           additional_properties: additional_properties)
     end
 
     # Validates an instance of the object from a given value.

data/lib/advanced_billing/models/metered_usage.rb

@@ -58,17 +58,17 @@ module AdvancedBilling
     def initialize(previous_unit_balance:, new_unit_balance:, usage_quantity:,
                    component_id:, component_handle:, memo:,
                    additional_properties: {})
+      # Add additional model properties to the instance.
+      additional_properties.each do |_name, _value|
+        instance_variable_set("@#{_name}", _value)
+      end
+
       @previous_unit_balance = previous_unit_balance
       @new_unit_balance = new_unit_balance
       @usage_quantity = usage_quantity
       @component_id = component_id
       @component_handle = component_handle
       @memo = memo
-
-      # Add additional model properties to the instance.
-      additional_properties.each do |_name, _value|
-        instance_variable_set("@#{_name}", _value)
-      end
     end
 
     # Creates an instance of the object from a hash.
@@ -88,7 +88,7 @@ module AdvancedBilling
       memo = hash.key?('memo') ? hash['memo'] : nil
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       MeteredUsage.new(previous_unit_balance: previous_unit_balance,
@@ -97,7 +97,7 @@ module AdvancedBilling
                        component_id: component_id,
                        component_handle: component_handle,
                        memo: memo,
-                       additional_properties: hash)
+                       additional_properties: additional_properties)
     end
 
     # Validates an instance of the object from a given value.

data/lib/advanced_billing/models/movement.rb

@@ -85,6 +85,11 @@ module AdvancedBilling
                    amount_formatted: SKIP, description: SKIP, category: SKIP,
                    breakouts: SKIP, line_items: SKIP, subscription_id: SKIP,
                    subscriber_name: SKIP, additional_properties: {})
+      # Add additional model properties to the instance.
+      additional_properties.each do |_name, _value|
+        instance_variable_set("@#{_name}", _value)
+      end
+
       @timestamp = timestamp unless timestamp == SKIP
       @amount_in_cents = amount_in_cents unless amount_in_cents == SKIP
       @amount_formatted = amount_formatted unless amount_formatted == SKIP
@@ -94,11 +99,6 @@ module AdvancedBilling
       @line_items = line_items unless line_items == SKIP
       @subscription_id = subscription_id unless subscription_id == SKIP
       @subscriber_name = subscriber_name unless subscriber_name == SKIP
-
-      # Add additional model properties to the instance.
-      additional_properties.each do |_name, _value|
-        instance_variable_set("@#{_name}", _value)
-      end
     end
 
     # Creates an instance of the object from a hash.
@@ -134,7 +134,7 @@ module AdvancedBilling
         hash.key?('subscriber_name') ? hash['subscriber_name'] : SKIP
 
       # Clean out expected properties from Hash.
-      names.each_value { |k| hash.delete(k) }
+      additional_properties = hash.reject { |k, _| names.value?(k) }
 
       # Create object from extracted values.
       Movement.new(timestamp: timestamp,
@@ -146,7 +146,7 @@ module AdvancedBilling
                    line_items: line_items,
                    subscription_id: subscription_id,
                    subscriber_name: subscriber_name,
-                   additional_properties: hash)
+                   additional_properties: additional_properties)
     end
 
     def to_custom_timestamp