esi_client 0.7.6.2 → 0.8.5.0

data/lib/esi_client/models/get_corporations_corporation_id_wallets_division_journal_200_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.0-SNAPSHOT
@@ -15,43 +15,44 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetCorporationsCorporationIdWalletsDivisionJournal200Ok
-    # Date and time of transaction
-    attr_accessor :date
-
-    # Unique journal reference ID
-    attr_accessor :ref_id
+    # The amount of ISK given or taken from the wallet as a result of the given transaction. Positive when ISK is deposited into the wallet and negative when ISK is withdrawn
+    attr_accessor :amount
 
-    # Transaction type, different type of transaction will populate different fields in `extra_info` Note: If you have an existing XML API application that is using ref_types, you will need to know which string ESI ref_type maps to which integer. You can use the following gist to see string->int mappings: https://gist.github.com/ccp-zoetrope/c03db66d90c2148724c06171bc52e0ec
-    attr_accessor :ref_type
+    # Wallet balance after transaction occurred
+    attr_accessor :balance
 
-    # first_party_id integer
-    attr_accessor :first_party_id
+    # An ID that gives extra context to the particular transaction. Because of legacy reasons the context is completely different per ref_type and means different things. It is also possible to not have a context_id
+    attr_accessor :context_id
 
-    # first_party_type string
-    attr_accessor :first_party_type
+    # The type of the given context_id if present
+    attr_accessor :context_id_type
 
-    # second_party_id integer
-    attr_accessor :second_party_id
+    # Date and time of transaction
+    attr_accessor :date
 
-    # second_party_type string
-    attr_accessor :second_party_type
+    # The reason for the transaction, mirrors what is seen in the client
+    attr_accessor :description
 
-    # Transaction amount. Positive when value transferred to the first party. Negative otherwise
-    attr_accessor :amount
+    # The id of the first party involved in the transaction. This attribute has no consistency and is different or non existant for particular ref_types. The description attribute will help make sense of what this attribute means. For more info about the given ID it can be dropped into the /universe/names/ ESI route to determine its type and name
+    attr_accessor :first_party_id
 
-    # Wallet balance after transaction occurred
-    attr_accessor :balance
+    # Unique journal reference ID
+    attr_accessor :id
 
-    # reason string
+    # The user stated reason for the transaction. Only applies to some ref_types
     attr_accessor :reason
 
-    # the corporation ID receiving any tax paid
-    attr_accessor :tax_receiver_id
+    # The transaction type for the given transaction. Different transaction types will populate different attributes. Note: If you have an existing XML API application that is using ref_types, you will need to know which string ESI ref_type maps to which integer. You can look at the following file to see string->int mappings: https://github.com/ccpgames/eve-glue/blob/master/eve_glue/wallet_journal_ref.py
+    attr_accessor :ref_type
+
+    # The id of the second party involved in the transaction. This attribute has no consistency and is different or non existant for particular ref_types. The description attribute will help make sense of what this attribute means. For more info about the given ID it can be dropped into the /universe/names/ ESI route to determine its type and name
+    attr_accessor :second_party_id
 
-    # Tax amount received for tax related transactions
+    # Tax amount received. Only applies to tax related transactions
     attr_accessor :tax
 
-    attr_accessor :extra_info
+    # The corporation ID receiving any tax paid. Only applies to tax related transactions
+    attr_accessor :tax_receiver_id
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -78,38 +79,38 @@ module ESIClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'date' => :'date',
-        :'ref_id' => :'ref_id',
-        :'ref_type' => :'ref_type',
-        :'first_party_id' => :'first_party_id',
-        :'first_party_type' => :'first_party_type',
-        :'second_party_id' => :'second_party_id',
-        :'second_party_type' => :'second_party_type',
         :'amount' => :'amount',
         :'balance' => :'balance',
+        :'context_id' => :'context_id',
+        :'context_id_type' => :'context_id_type',
+        :'date' => :'date',
+        :'description' => :'description',
+        :'first_party_id' => :'first_party_id',
+        :'id' => :'id',
         :'reason' => :'reason',
-        :'tax_receiver_id' => :'tax_receiver_id',
+        :'ref_type' => :'ref_type',
+        :'second_party_id' => :'second_party_id',
         :'tax' => :'tax',
-        :'extra_info' => :'extra_info'
+        :'tax_receiver_id' => :'tax_receiver_id'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'date' => :'DateTime',
-        :'ref_id' => :'Integer',
-        :'ref_type' => :'String',
-        :'first_party_id' => :'Integer',
-        :'first_party_type' => :'String',
-        :'second_party_id' => :'Integer',
-        :'second_party_type' => :'String',
         :'amount' => :'Float',
         :'balance' => :'Float',
+        :'context_id' => :'Integer',
+        :'context_id_type' => :'String',
+        :'date' => :'DateTime',
+        :'description' => :'String',
+        :'first_party_id' => :'Integer',
+        :'id' => :'Integer',
         :'reason' => :'String',
-        :'tax_receiver_id' => :'Integer',
+        :'ref_type' => :'String',
+        :'second_party_id' => :'Integer',
         :'tax' => :'Float',
-        :'extra_info' => :'GetCorporationsCorporationIdWalletsDivisionJournalExtraInfo'
+        :'tax_receiver_id' => :'Integer'
       }
     end
 
@@ -121,56 +122,56 @@ module ESIClient
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'date')
-        self.date = attributes[:'date']
-      end
-
-      if attributes.has_key?(:'ref_id')
-        self.ref_id = attributes[:'ref_id']
+      if attributes.has_key?(:'amount')
+        self.amount = attributes[:'amount']
       end
 
-      if attributes.has_key?(:'ref_type')
-        self.ref_type = attributes[:'ref_type']
+      if attributes.has_key?(:'balance')
+        self.balance = attributes[:'balance']
       end
 
-      if attributes.has_key?(:'first_party_id')
-        self.first_party_id = attributes[:'first_party_id']
+      if attributes.has_key?(:'context_id')
+        self.context_id = attributes[:'context_id']
       end
 
-      if attributes.has_key?(:'first_party_type')
-        self.first_party_type = attributes[:'first_party_type']
+      if attributes.has_key?(:'context_id_type')
+        self.context_id_type = attributes[:'context_id_type']
       end
 
-      if attributes.has_key?(:'second_party_id')
-        self.second_party_id = attributes[:'second_party_id']
+      if attributes.has_key?(:'date')
+        self.date = attributes[:'date']
       end
 
-      if attributes.has_key?(:'second_party_type')
-        self.second_party_type = attributes[:'second_party_type']
+      if attributes.has_key?(:'description')
+        self.description = attributes[:'description']
       end
 
-      if attributes.has_key?(:'amount')
-        self.amount = attributes[:'amount']
+      if attributes.has_key?(:'first_party_id')
+        self.first_party_id = attributes[:'first_party_id']
       end
 
-      if attributes.has_key?(:'balance')
-        self.balance = attributes[:'balance']
+      if attributes.has_key?(:'id')
+        self.id = attributes[:'id']
       end
 
       if attributes.has_key?(:'reason')
         self.reason = attributes[:'reason']
       end
 
-      if attributes.has_key?(:'tax_receiver_id')
-        self.tax_receiver_id = attributes[:'tax_receiver_id']
+      if attributes.has_key?(:'ref_type')
+        self.ref_type = attributes[:'ref_type']
+      end
+
+      if attributes.has_key?(:'second_party_id')
+        self.second_party_id = attributes[:'second_party_id']
       end
 
       if attributes.has_key?(:'tax')
         self.tax = attributes[:'tax']
       end
 
-      if attributes.has_key?(:'extra_info')
-        self.extra_info = attributes[:'extra_info']
+      if attributes.has_key?(:'tax_receiver_id')
+        self.tax_receiver_id = attributes[:'tax_receiver_id']
       end
     end
 
@@ -182,8 +183,12 @@ module ESIClient
         invalid_properties.push('invalid value for "date", date cannot be nil.')
       end
 
-      if @ref_id.nil?
-        invalid_properties.push('invalid value for "ref_id", ref_id cannot be nil.')
+      if @description.nil?
+        invalid_properties.push('invalid value for "description", description cannot be nil.')
+      end
+
+      if @id.nil?
+        invalid_properties.push('invalid value for "id", id cannot be nil.')
       end
 
       if @ref_type.nil?
@@ -196,18 +201,27 @@ module ESIClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      context_id_type_validator = EnumAttributeValidator.new('String', ['structure_id', 'station_id', 'market_transaction_id', 'character_id', 'corporation_id', 'alliance_id', 'eve_system', 'industry_job_id', 'contract_id', 'planet_id', 'system_id', 'type_id'])
+      return false unless context_id_type_validator.valid?(@context_id_type)
       return false if @date.nil?
-      return false if @ref_id.nil?
+      return false if @description.nil?
+      return false if @id.nil?
       return false if @ref_type.nil?
       ref_type_validator = EnumAttributeValidator.new('String', ['acceleration_gate_fee', 'advertisement_listing_fee', 'agent_donation', 'agent_location_services', 'agent_miscellaneous', 'agent_mission_collateral_paid', 'agent_mission_collateral_refunded', 'agent_mission_reward', 'agent_mission_reward_corporation_tax', 'agent_mission_time_bonus_reward', 'agent_mission_time_bonus_reward_corporation_tax', 'agent_security_services', 'agent_services_rendered', 'agents_preward', 'alliance_maintainance_fee', 'alliance_registration_fee', 'asset_safety_recovery_tax', 'bounty', 'bounty_prize', 'bounty_prize_corporation_tax', 'bounty_prizes', 'bounty_reimbursement', 'bounty_surcharge', 'brokers_fee', 'clone_activation', 'clone_transfer', 'contraband_fine', 'contract_auction_bid', 'contract_auction_bid_corp', 'contract_auction_bid_refund', 'contract_auction_sold', 'contract_brokers_fee', 'contract_brokers_fee_corp', 'contract_collateral', 'contract_collateral_deposited_corp', 'contract_collateral_payout', 'contract_collateral_refund', 'contract_deposit', 'contract_deposit_corp', 'contract_deposit_refund', 'contract_deposit_sales_tax', 'contract_price', 'contract_price_payment_corp', 'contract_reversal', 'contract_reward', 'contract_reward_deposited', 'contract_reward_deposited_corp', 'contract_reward_refund', 'contract_sales_tax', 'copying', 'corporate_reward_payout', 'corporate_reward_tax', 'corporation_account_withdrawal', 'corporation_bulk_payment', 'corporation_dividend_payment', 'corporation_liquidation', 'corporation_logo_change_cost', 'corporation_payment', 'corporation_registration_fee', 'courier_mission_escrow', 'cspa', 'cspaofflinerefund', 'datacore_fee', 'dna_modification_fee', 'docking_fee', 'duel_wager_escrow', 'duel_wager_payment', 'duel_wager_refund', 'factory_slot_rental_fee', 'gm_cash_transfer', 'industry_job_tax', 'infrastructure_hub_maintenance', 'inheritance', 'insurance', 'jump_clone_activation_fee', 'jump_clone_installation_fee', 'kill_right_fee', 'lp_store', 'manufacturing', 'market_escrow', 'market_fine_paid', 'market_transaction', 'medal_creation', 'medal_issued', 'mission_completion', 'mission_cost', 'mission_expiration', 'mission_reward', 'office_rental_fee', 'operation_bonus', 'opportunity_reward', 'planetary_construction', 'planetary_export_tax', 'planetary_import_tax', 'player_donation', 'player_trading', 'project_discovery_reward', 'project_discovery_tax', 'reaction', 'release_of_impounded_property', 'repair_bill', 'reprocessing_tax', 'researching_material_productivity', 'researching_technology', 'researching_time_productivity', 'resource_wars_reward', 'reverse_engineering', 'security_processing_fee', 'shares', 'sovereignity_bill', 'store_purchase', 'store_purchase_refund', 'transaction_tax', 'upkeep_adjustment_fee', 'war_ally_contract', 'war_fee', 'war_fee_surrender'])
       return false unless ref_type_validator.valid?(@ref_type)
-      first_party_type_validator = EnumAttributeValidator.new('String', ['character', 'corporation', 'alliance', 'faction', 'system'])
-      return false unless first_party_type_validator.valid?(@first_party_type)
-      second_party_type_validator = EnumAttributeValidator.new('String', ['character', 'corporation', 'alliance', 'faction', 'system'])
-      return false unless second_party_type_validator.valid?(@second_party_type)
       true
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] context_id_type Object to be assigned
+    def context_id_type=(context_id_type)
+      validator = EnumAttributeValidator.new('String', ['structure_id', 'station_id', 'market_transaction_id', 'character_id', 'corporation_id', 'alliance_id', 'eve_system', 'industry_job_id', 'contract_id', 'planet_id', 'system_id', 'type_id'])
+      unless validator.valid?(context_id_type)
+        fail ArgumentError, 'invalid value for "context_id_type", must be one of #{validator.allowable_values}.'
+      end
+      @context_id_type = context_id_type
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] ref_type Object to be assigned
     def ref_type=(ref_type)
@@ -218,44 +232,24 @@ module ESIClient
       @ref_type = ref_type
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] first_party_type Object to be assigned
-    def first_party_type=(first_party_type)
-      validator = EnumAttributeValidator.new('String', ['character', 'corporation', 'alliance', 'faction', 'system'])
-      unless validator.valid?(first_party_type)
-        fail ArgumentError, 'invalid value for "first_party_type", must be one of #{validator.allowable_values}.'
-      end
-      @first_party_type = first_party_type
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] second_party_type Object to be assigned
-    def second_party_type=(second_party_type)
-      validator = EnumAttributeValidator.new('String', ['character', 'corporation', 'alliance', 'faction', 'system'])
-      unless validator.valid?(second_party_type)
-        fail ArgumentError, 'invalid value for "second_party_type", must be one of #{validator.allowable_values}.'
-      end
-      @second_party_type = second_party_type
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          date == o.date &&
-          ref_id == o.ref_id &&
-          ref_type == o.ref_type &&
-          first_party_id == o.first_party_id &&
-          first_party_type == o.first_party_type &&
-          second_party_id == o.second_party_id &&
-          second_party_type == o.second_party_type &&
           amount == o.amount &&
           balance == o.balance &&
+          context_id == o.context_id &&
+          context_id_type == o.context_id_type &&
+          date == o.date &&
+          description == o.description &&
+          first_party_id == o.first_party_id &&
+          id == o.id &&
           reason == o.reason &&
-          tax_receiver_id == o.tax_receiver_id &&
+          ref_type == o.ref_type &&
+          second_party_id == o.second_party_id &&
           tax == o.tax &&
-          extra_info == o.extra_info
+          tax_receiver_id == o.tax_receiver_id
     end
 
     # @see the `==` method
@@ -267,7 +261,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [date, ref_id, ref_type, first_party_id, first_party_type, second_party_id, second_party_type, amount, balance, reason, tax_receiver_id, tax, extra_info].hash
+      [amount, balance, context_id, context_id_type, date, description, first_party_id, id, reason, ref_type, second_party_id, tax, tax_receiver_id].hash
     end
 
     # Builds the object from hash

data/lib/esi_client/models/get_corporations_corporation_id_wallets_division_journal_extra_info.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.7.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.0-SNAPSHOT

data/lib/esi_client/models/get_corporations_corporation_id_wallets_division_transactions_200_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.0-SNAPSHOT
@@ -15,60 +15,60 @@ require 'date'
 module ESIClient
   # wallet transaction
   class GetCorporationsCorporationIdWalletsDivisionTransactions200Ok
-    # Unique transaction ID
-    attr_accessor :transaction_id
+    # client_id integer
+    attr_accessor :client_id
 
     # Date and time of transaction
     attr_accessor :date
 
-    # type_id integer
-    attr_accessor :type_id
+    # is_buy boolean
+    attr_accessor :is_buy
+
+    # -1 if there is no corresponding wallet journal entry
+    attr_accessor :journal_ref_id
 
     # location_id integer
     attr_accessor :location_id
 
-    # Amount paid per unit
-    attr_accessor :unit_price
-
     # quantity integer
     attr_accessor :quantity
 
-    # client_id integer
-    attr_accessor :client_id
+    # Unique transaction ID
+    attr_accessor :transaction_id
 
-    # is_buy boolean
-    attr_accessor :is_buy
+    # type_id integer
+    attr_accessor :type_id
 
-    # journal_ref_id integer
-    attr_accessor :journal_ref_id
+    # Amount paid per unit
+    attr_accessor :unit_price
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'transaction_id' => :'transaction_id',
+        :'client_id' => :'client_id',
         :'date' => :'date',
-        :'type_id' => :'type_id',
+        :'is_buy' => :'is_buy',
+        :'journal_ref_id' => :'journal_ref_id',
         :'location_id' => :'location_id',
-        :'unit_price' => :'unit_price',
         :'quantity' => :'quantity',
-        :'client_id' => :'client_id',
-        :'is_buy' => :'is_buy',
-        :'journal_ref_id' => :'journal_ref_id'
+        :'transaction_id' => :'transaction_id',
+        :'type_id' => :'type_id',
+        :'unit_price' => :'unit_price'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'transaction_id' => :'Integer',
+        :'client_id' => :'Integer',
         :'date' => :'DateTime',
-        :'type_id' => :'Integer',
+        :'is_buy' => :'BOOLEAN',
+        :'journal_ref_id' => :'Integer',
         :'location_id' => :'Integer',
-        :'unit_price' => :'Float',
         :'quantity' => :'Integer',
-        :'client_id' => :'Integer',
-        :'is_buy' => :'BOOLEAN',
-        :'journal_ref_id' => :'Integer'
+        :'transaction_id' => :'Integer',
+        :'type_id' => :'Integer',
+        :'unit_price' => :'Float'
       }
     end
 
@@ -80,40 +80,40 @@ module ESIClient
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'transaction_id')
-        self.transaction_id = attributes[:'transaction_id']
+      if attributes.has_key?(:'client_id')
+        self.client_id = attributes[:'client_id']
       end
 
       if attributes.has_key?(:'date')
         self.date = attributes[:'date']
       end
 
-      if attributes.has_key?(:'type_id')
-        self.type_id = attributes[:'type_id']
+      if attributes.has_key?(:'is_buy')
+        self.is_buy = attributes[:'is_buy']
       end
 
-      if attributes.has_key?(:'location_id')
-        self.location_id = attributes[:'location_id']
+      if attributes.has_key?(:'journal_ref_id')
+        self.journal_ref_id = attributes[:'journal_ref_id']
       end
 
-      if attributes.has_key?(:'unit_price')
-        self.unit_price = attributes[:'unit_price']
+      if attributes.has_key?(:'location_id')
+        self.location_id = attributes[:'location_id']
       end
 
       if attributes.has_key?(:'quantity')
         self.quantity = attributes[:'quantity']
       end
 
-      if attributes.has_key?(:'client_id')
-        self.client_id = attributes[:'client_id']
+      if attributes.has_key?(:'transaction_id')
+        self.transaction_id = attributes[:'transaction_id']
       end
 
-      if attributes.has_key?(:'is_buy')
-        self.is_buy = attributes[:'is_buy']
+      if attributes.has_key?(:'type_id')
+        self.type_id = attributes[:'type_id']
       end
 
-      if attributes.has_key?(:'journal_ref_id')
-        self.journal_ref_id = attributes[:'journal_ref_id']
+      if attributes.has_key?(:'unit_price')
+        self.unit_price = attributes[:'unit_price']
       end
     end
 
@@ -121,40 +121,40 @@ module ESIClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @transaction_id.nil?
-        invalid_properties.push('invalid value for "transaction_id", transaction_id cannot be nil.')
+      if @client_id.nil?
+        invalid_properties.push('invalid value for "client_id", client_id cannot be nil.')
       end
 
       if @date.nil?
         invalid_properties.push('invalid value for "date", date cannot be nil.')
       end
 
-      if @type_id.nil?
-        invalid_properties.push('invalid value for "type_id", type_id cannot be nil.')
+      if @is_buy.nil?
+        invalid_properties.push('invalid value for "is_buy", is_buy cannot be nil.')
       end
 
-      if @location_id.nil?
-        invalid_properties.push('invalid value for "location_id", location_id cannot be nil.')
+      if @journal_ref_id.nil?
+        invalid_properties.push('invalid value for "journal_ref_id", journal_ref_id cannot be nil.')
       end
 
-      if @unit_price.nil?
-        invalid_properties.push('invalid value for "unit_price", unit_price cannot be nil.')
+      if @location_id.nil?
+        invalid_properties.push('invalid value for "location_id", location_id cannot be nil.')
       end
 
       if @quantity.nil?
         invalid_properties.push('invalid value for "quantity", quantity cannot be nil.')
       end
 
-      if @client_id.nil?
-        invalid_properties.push('invalid value for "client_id", client_id cannot be nil.')
+      if @transaction_id.nil?
+        invalid_properties.push('invalid value for "transaction_id", transaction_id cannot be nil.')
       end
 
-      if @is_buy.nil?
-        invalid_properties.push('invalid value for "is_buy", is_buy cannot be nil.')
+      if @type_id.nil?
+        invalid_properties.push('invalid value for "type_id", type_id cannot be nil.')
       end
 
-      if @journal_ref_id.nil?
-        invalid_properties.push('invalid value for "journal_ref_id", journal_ref_id cannot be nil.')
+      if @unit_price.nil?
+        invalid_properties.push('invalid value for "unit_price", unit_price cannot be nil.')
       end
 
       invalid_properties
@@ -163,15 +163,15 @@ module ESIClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @transaction_id.nil?
-      return false if @date.nil?
-      return false if @type_id.nil?
-      return false if @location_id.nil?
-      return false if @unit_price.nil?
-      return false if @quantity.nil?
       return false if @client_id.nil?
+      return false if @date.nil?
       return false if @is_buy.nil?
       return false if @journal_ref_id.nil?
+      return false if @location_id.nil?
+      return false if @quantity.nil?
+      return false if @transaction_id.nil?
+      return false if @type_id.nil?
+      return false if @unit_price.nil?
       true
     end
 
@@ -180,15 +180,15 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          transaction_id == o.transaction_id &&
+          client_id == o.client_id &&
           date == o.date &&
-          type_id == o.type_id &&
+          is_buy == o.is_buy &&
+          journal_ref_id == o.journal_ref_id &&
           location_id == o.location_id &&
-          unit_price == o.unit_price &&
           quantity == o.quantity &&
-          client_id == o.client_id &&
-          is_buy == o.is_buy &&
-          journal_ref_id == o.journal_ref_id
+          transaction_id == o.transaction_id &&
+          type_id == o.type_id &&
+          unit_price == o.unit_price
     end
 
     # @see the `==` method
@@ -200,7 +200,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [transaction_id, date, type_id, location_id, unit_price, quantity, client_id, is_buy, journal_ref_id].hash
+      [client_id, date, is_buy, journal_ref_id, location_id, quantity, transaction_id, type_id, unit_price].hash
     end
 
     # Builds the object from hash