lithic 0.1.0.pre.alpha.55 → 0.1.0.pre.alpha.56

data/sig/lithic/models/financial_transaction.rbs

@@ -7,7 +7,7 @@ module Lithic
         created: Time,
         currency: String,
         descriptor: String,
-        events: ::Array[Lithic::FinancialTransaction::Event],
+        events: ::Array[Lithic::FinancialEvent],
         pending_amount: Integer,
         result: Lithic::Models::FinancialTransaction::result,
         settled_amount: Integer,
@@ -26,7 +26,7 @@ module Lithic
 
       attr_accessor descriptor: String
 
-      attr_accessor events: ::Array[Lithic::FinancialTransaction::Event]
+      attr_accessor events: ::Array[Lithic::FinancialEvent]
 
       attr_accessor pending_amount: Integer
 
@@ -44,7 +44,7 @@ module Lithic
         created: Time,
         currency: String,
         descriptor: String,
-        events: ::Array[Lithic::FinancialTransaction::Event],
+        events: ::Array[Lithic::FinancialEvent],
         pending_amount: Integer,
         result: Lithic::Models::FinancialTransaction::result,
         settled_amount: Integer,
@@ -58,7 +58,7 @@ module Lithic
         created: Time,
         currency: String,
         descriptor: String,
-        events: ::Array[Lithic::FinancialTransaction::Event],
+        events: ::Array[Lithic::FinancialEvent],
         pending_amount: Integer,
         result: Lithic::Models::FinancialTransaction::result,
         settled_amount: Integer,
@@ -79,219 +79,6 @@ module Lithic
         def self?.values: -> ::Array[Lithic::Models::FinancialTransaction::category]
       end
 
-      type event =
-        {
-          token: String,
-          amount: Integer,
-          created: Time,
-          result: Lithic::Models::FinancialTransaction::Event::result,
-          type: Lithic::Models::FinancialTransaction::Event::type_
-        }
-
-      class Event < Lithic::Internal::Type::BaseModel
-        attr_reader token: String?
-
-        def token=: (String) -> String
-
-        attr_reader amount: Integer?
-
-        def amount=: (Integer) -> Integer
-
-        attr_reader created: Time?
-
-        def created=: (Time) -> Time
-
-        attr_reader result: Lithic::Models::FinancialTransaction::Event::result?
-
-        def result=: (
-          Lithic::Models::FinancialTransaction::Event::result
-        ) -> Lithic::Models::FinancialTransaction::Event::result
-
-        attr_reader type: Lithic::Models::FinancialTransaction::Event::type_?
-
-        def type=: (
-          Lithic::Models::FinancialTransaction::Event::type_
-        ) -> Lithic::Models::FinancialTransaction::Event::type_
-
-        def initialize: (
-          ?token: String,
-          ?amount: Integer,
-          ?created: Time,
-          ?result: Lithic::Models::FinancialTransaction::Event::result,
-          ?type: Lithic::Models::FinancialTransaction::Event::type_
-        ) -> void
-
-        def to_hash: -> {
-          token: String,
-          amount: Integer,
-          created: Time,
-          result: Lithic::Models::FinancialTransaction::Event::result,
-          type: Lithic::Models::FinancialTransaction::Event::type_
-        }
-
-        type result = :APPROVED | :DECLINED
-
-        module Result
-          extend Lithic::Internal::Type::Enum
-
-          APPROVED: :APPROVED
-          DECLINED: :DECLINED
-
-          def self?.values: -> ::Array[Lithic::Models::FinancialTransaction::Event::result]
-        end
-
-        type type_ =
-          :ACH_ORIGINATION_CANCELLED
-          | :ACH_ORIGINATION_INITIATED
-          | :ACH_ORIGINATION_PROCESSED
-          | :ACH_ORIGINATION_RELEASED
-          | :ACH_ORIGINATION_REJECTED
-          | :ACH_ORIGINATION_REVIEWED
-          | :ACH_ORIGINATION_SETTLED
-          | :ACH_RECEIPT_PROCESSED
-          | :ACH_RECEIPT_RELEASED
-          | :ACH_RECEIPT_SETTLED
-          | :ACH_RETURN_INITIATED
-          | :ACH_RETURN_PROCESSED
-          | :ACH_RETURN_REJECTED
-          | :ACH_RETURN_SETTLED
-          | :AUTHORIZATION
-          | :AUTHORIZATION_ADVICE
-          | :AUTHORIZATION_EXPIRY
-          | :AUTHORIZATION_REVERSAL
-          | :BALANCE_INQUIRY
-          | :BILLING_ERROR
-          | :BILLING_ERROR_REVERSAL
-          | :CARD_TO_CARD
-          | :CASH_BACK
-          | :CASH_BACK_REVERSAL
-          | :CLEARING
-          | :COLLECTION
-          | :CORRECTION_CREDIT
-          | :CORRECTION_DEBIT
-          | :CREDIT_AUTHORIZATION
-          | :CREDIT_AUTHORIZATION_ADVICE
-          | :CURRENCY_CONVERSION
-          | :CURRENCY_CONVERSION_REVERSAL
-          | :DISPUTE_WON
-          | :EXTERNAL_ACH_CANCELED
-          | :EXTERNAL_ACH_INITIATED
-          | :EXTERNAL_ACH_RELEASED
-          | :EXTERNAL_ACH_REVERSED
-          | :EXTERNAL_ACH_SETTLED
-          | :EXTERNAL_CHECK_CANCELED
-          | :EXTERNAL_CHECK_INITIATED
-          | :EXTERNAL_CHECK_RELEASED
-          | :EXTERNAL_CHECK_REVERSED
-          | :EXTERNAL_CHECK_SETTLED
-          | :EXTERNAL_TRANSFER_CANCELED
-          | :EXTERNAL_TRANSFER_INITIATED
-          | :EXTERNAL_TRANSFER_RELEASED
-          | :EXTERNAL_TRANSFER_REVERSED
-          | :EXTERNAL_TRANSFER_SETTLED
-          | :EXTERNAL_WIRE_CANCELED
-          | :EXTERNAL_WIRE_INITIATED
-          | :EXTERNAL_WIRE_RELEASED
-          | :EXTERNAL_WIRE_REVERSED
-          | :EXTERNAL_WIRE_SETTLED
-          | :FINANCIAL_AUTHORIZATION
-          | :FINANCIAL_CREDIT_AUTHORIZATION
-          | :INTEREST
-          | :INTEREST_REVERSAL
-          | :INTERNAL_ADJUSTMENT
-          | :LATE_PAYMENT
-          | :LATE_PAYMENT_REVERSAL
-          | :LOSS_WRITE_OFF
-          | :PROVISIONAL_CREDIT
-          | :PROVISIONAL_CREDIT_REVERSAL
-          | :SERVICE
-          | :RETURN
-          | :RETURN_REVERSAL
-          | :TRANSFER
-          | :TRANSFER_INSUFFICIENT_FUNDS
-          | :RETURNED_PAYMENT
-          | :RETURNED_PAYMENT_REVERSAL
-          | :LITHIC_NETWORK_PAYMENT
-
-        module Type
-          extend Lithic::Internal::Type::Enum
-
-          ACH_ORIGINATION_CANCELLED: :ACH_ORIGINATION_CANCELLED
-          ACH_ORIGINATION_INITIATED: :ACH_ORIGINATION_INITIATED
-          ACH_ORIGINATION_PROCESSED: :ACH_ORIGINATION_PROCESSED
-          ACH_ORIGINATION_RELEASED: :ACH_ORIGINATION_RELEASED
-          ACH_ORIGINATION_REJECTED: :ACH_ORIGINATION_REJECTED
-          ACH_ORIGINATION_REVIEWED: :ACH_ORIGINATION_REVIEWED
-          ACH_ORIGINATION_SETTLED: :ACH_ORIGINATION_SETTLED
-          ACH_RECEIPT_PROCESSED: :ACH_RECEIPT_PROCESSED
-          ACH_RECEIPT_RELEASED: :ACH_RECEIPT_RELEASED
-          ACH_RECEIPT_SETTLED: :ACH_RECEIPT_SETTLED
-          ACH_RETURN_INITIATED: :ACH_RETURN_INITIATED
-          ACH_RETURN_PROCESSED: :ACH_RETURN_PROCESSED
-          ACH_RETURN_REJECTED: :ACH_RETURN_REJECTED
-          ACH_RETURN_SETTLED: :ACH_RETURN_SETTLED
-          AUTHORIZATION: :AUTHORIZATION
-          AUTHORIZATION_ADVICE: :AUTHORIZATION_ADVICE
-          AUTHORIZATION_EXPIRY: :AUTHORIZATION_EXPIRY
-          AUTHORIZATION_REVERSAL: :AUTHORIZATION_REVERSAL
-          BALANCE_INQUIRY: :BALANCE_INQUIRY
-          BILLING_ERROR: :BILLING_ERROR
-          BILLING_ERROR_REVERSAL: :BILLING_ERROR_REVERSAL
-          CARD_TO_CARD: :CARD_TO_CARD
-          CASH_BACK: :CASH_BACK
-          CASH_BACK_REVERSAL: :CASH_BACK_REVERSAL
-          CLEARING: :CLEARING
-          COLLECTION: :COLLECTION
-          CORRECTION_CREDIT: :CORRECTION_CREDIT
-          CORRECTION_DEBIT: :CORRECTION_DEBIT
-          CREDIT_AUTHORIZATION: :CREDIT_AUTHORIZATION
-          CREDIT_AUTHORIZATION_ADVICE: :CREDIT_AUTHORIZATION_ADVICE
-          CURRENCY_CONVERSION: :CURRENCY_CONVERSION
-          CURRENCY_CONVERSION_REVERSAL: :CURRENCY_CONVERSION_REVERSAL
-          DISPUTE_WON: :DISPUTE_WON
-          EXTERNAL_ACH_CANCELED: :EXTERNAL_ACH_CANCELED
-          EXTERNAL_ACH_INITIATED: :EXTERNAL_ACH_INITIATED
-          EXTERNAL_ACH_RELEASED: :EXTERNAL_ACH_RELEASED
-          EXTERNAL_ACH_REVERSED: :EXTERNAL_ACH_REVERSED
-          EXTERNAL_ACH_SETTLED: :EXTERNAL_ACH_SETTLED
-          EXTERNAL_CHECK_CANCELED: :EXTERNAL_CHECK_CANCELED
-          EXTERNAL_CHECK_INITIATED: :EXTERNAL_CHECK_INITIATED
-          EXTERNAL_CHECK_RELEASED: :EXTERNAL_CHECK_RELEASED
-          EXTERNAL_CHECK_REVERSED: :EXTERNAL_CHECK_REVERSED
-          EXTERNAL_CHECK_SETTLED: :EXTERNAL_CHECK_SETTLED
-          EXTERNAL_TRANSFER_CANCELED: :EXTERNAL_TRANSFER_CANCELED
-          EXTERNAL_TRANSFER_INITIATED: :EXTERNAL_TRANSFER_INITIATED
-          EXTERNAL_TRANSFER_RELEASED: :EXTERNAL_TRANSFER_RELEASED
-          EXTERNAL_TRANSFER_REVERSED: :EXTERNAL_TRANSFER_REVERSED
-          EXTERNAL_TRANSFER_SETTLED: :EXTERNAL_TRANSFER_SETTLED
-          EXTERNAL_WIRE_CANCELED: :EXTERNAL_WIRE_CANCELED
-          EXTERNAL_WIRE_INITIATED: :EXTERNAL_WIRE_INITIATED
-          EXTERNAL_WIRE_RELEASED: :EXTERNAL_WIRE_RELEASED
-          EXTERNAL_WIRE_REVERSED: :EXTERNAL_WIRE_REVERSED
-          EXTERNAL_WIRE_SETTLED: :EXTERNAL_WIRE_SETTLED
-          FINANCIAL_AUTHORIZATION: :FINANCIAL_AUTHORIZATION
-          FINANCIAL_CREDIT_AUTHORIZATION: :FINANCIAL_CREDIT_AUTHORIZATION
-          INTEREST: :INTEREST
-          INTEREST_REVERSAL: :INTEREST_REVERSAL
-          INTERNAL_ADJUSTMENT: :INTERNAL_ADJUSTMENT
-          LATE_PAYMENT: :LATE_PAYMENT
-          LATE_PAYMENT_REVERSAL: :LATE_PAYMENT_REVERSAL
-          LOSS_WRITE_OFF: :LOSS_WRITE_OFF
-          PROVISIONAL_CREDIT: :PROVISIONAL_CREDIT
-          PROVISIONAL_CREDIT_REVERSAL: :PROVISIONAL_CREDIT_REVERSAL
-          SERVICE: :SERVICE
-          RETURN: :RETURN
-          RETURN_REVERSAL: :RETURN_REVERSAL
-          TRANSFER: :TRANSFER
-          TRANSFER_INSUFFICIENT_FUNDS: :TRANSFER_INSUFFICIENT_FUNDS
-          RETURNED_PAYMENT: :RETURNED_PAYMENT
-          RETURNED_PAYMENT_REVERSAL: :RETURNED_PAYMENT_REVERSAL
-          LITHIC_NETWORK_PAYMENT: :LITHIC_NETWORK_PAYMENT
-
-          def self?.values: -> ::Array[Lithic::Models::FinancialTransaction::Event::type_]
-        end
-      end
-
       type result = :APPROVED | :DECLINED
 
       module Result

data/sig/lithic/models/management_operation_list_params.rbs

@@ -103,7 +103,8 @@ module Lithic
         def self?.values: -> ::Array[Lithic::Models::ManagementOperationListParams::category]
       end
 
-      type status = :PENDING | :SETTLED | :DECLINED | :REVERSED | :CANCELED
+      type status =
+        :PENDING | :SETTLED | :DECLINED | :REVERSED | :CANCELED | :RETURNED
 
       module Status
         extend Lithic::Internal::Type::Enum
@@ -113,6 +114,7 @@ module Lithic
         DECLINED: :DECLINED
         REVERSED: :REVERSED
         CANCELED: :CANCELED
+        RETURNED: :RETURNED
 
         def self?.values: -> ::Array[Lithic::Models::ManagementOperationListParams::status]
       end

data/sig/lithic/models/management_operation_transaction.rbs

@@ -17,7 +17,7 @@ module Lithic
         result: Lithic::Models::ManagementOperationTransaction::result,
         settled_amount: Integer,
         transaction_series: Lithic::ManagementOperationTransaction::TransactionSeries?,
-        user_defined_id: String
+        user_defined_id: String?
       }
 
     class ManagementOperationTransaction < Lithic::Internal::Type::BaseModel
@@ -79,9 +79,7 @@ module Lithic
 
       attr_accessor transaction_series: Lithic::ManagementOperationTransaction::TransactionSeries?
 
-      attr_reader user_defined_id: String?
-
-      def user_defined_id=: (String) -> String
+      attr_accessor user_defined_id: String?
 
       def initialize: (
         token: String,
@@ -99,7 +97,7 @@ module Lithic
         ?result: Lithic::Models::ManagementOperationTransaction::result,
         ?settled_amount: Integer,
         ?transaction_series: Lithic::ManagementOperationTransaction::TransactionSeries?,
-        ?user_defined_id: String
+        ?user_defined_id: String?
       ) -> void
 
       def to_hash: -> {
@@ -118,10 +116,11 @@ module Lithic
         result: Lithic::Models::ManagementOperationTransaction::result,
         settled_amount: Integer,
         transaction_series: Lithic::ManagementOperationTransaction::TransactionSeries?,
-        user_defined_id: String
+        user_defined_id: String?
       }
 
-      type status = :PENDING | :SETTLED | :DECLINED | :REVERSED | :CANCELED
+      type status =
+        :PENDING | :SETTLED | :DECLINED | :REVERSED | :CANCELED | :RETURNED
 
       module Status
         extend Lithic::Internal::Type::Enum
@@ -131,6 +130,7 @@ module Lithic
         DECLINED: :DECLINED
         REVERSED: :REVERSED
         CANCELED: :CANCELED
+        RETURNED: :RETURNED
 
         def self?.values: -> ::Array[Lithic::Models::ManagementOperationTransaction::status]
       end
@@ -175,7 +175,7 @@ module Lithic
           memo: String,
           result: Lithic::Models::ManagementOperationTransaction::Event::result,
           type: Lithic::Models::ManagementOperationTransaction::Event::type_,
-          subtype: String
+          subtype: String?
         }
 
       class Event < Lithic::Internal::Type::BaseModel
@@ -195,9 +195,7 @@ module Lithic
 
         attr_accessor type: Lithic::Models::ManagementOperationTransaction::Event::type_
 
-        attr_reader subtype: String?
-
-        def subtype=: (String) -> String
+        attr_accessor subtype: String?
 
         def initialize: (
           token: String,
@@ -208,7 +206,7 @@ module Lithic
           memo: String,
           result: Lithic::Models::ManagementOperationTransaction::Event::result,
           type: Lithic::Models::ManagementOperationTransaction::Event::type_,
-          ?subtype: String
+          ?subtype: String?
         ) -> void
 
         def to_hash: -> {
@@ -220,7 +218,7 @@ module Lithic
           memo: String,
           result: Lithic::Models::ManagementOperationTransaction::Event::result,
           type: Lithic::Models::ManagementOperationTransaction::Event::type_,
-          subtype: String
+          subtype: String?
         }
 
         type detailed_result = :APPROVED | :INSUFFICIENT_FUNDS

data/sig/lithic/models/merchant.rbs

@@ -0,0 +1,50 @@
+module Lithic
+  module Models
+    type merchant =
+      {
+        acceptor_id: String,
+        acquiring_institution_id: String,
+        city: String,
+        country: String,
+        descriptor: String,
+        mcc: String,
+        state: String
+      }
+
+    class Merchant < Lithic::Internal::Type::BaseModel
+      attr_accessor acceptor_id: String
+
+      attr_accessor acquiring_institution_id: String
+
+      attr_accessor city: String
+
+      attr_accessor country: String
+
+      attr_accessor descriptor: String
+
+      attr_accessor mcc: String
+
+      attr_accessor state: String
+
+      def initialize: (
+        acceptor_id: String,
+        acquiring_institution_id: String,
+        city: String,
+        country: String,
+        descriptor: String,
+        mcc: String,
+        state: String
+      ) -> void
+
+      def to_hash: -> {
+        acceptor_id: String,
+        acquiring_institution_id: String,
+        city: String,
+        country: String,
+        descriptor: String,
+        mcc: String,
+        state: String
+      }
+    end
+  end
+end

data/sig/lithic/models/payment.rbs

@@ -13,7 +13,7 @@ module Lithic
         method_: Lithic::Models::Payment::method_,
         method_attributes: Lithic::Models::Payment::method_attributes,
         pending_amount: Integer,
-        related_account_tokens: Lithic::Payment::RelatedAccountTokens,
+        related_account_tokens: Lithic::Payment::RelatedAccountTokens?,
         result: Lithic::Models::Payment::result,
         settled_amount: Integer,
         source: Lithic::Models::Payment::source,
@@ -49,7 +49,7 @@ module Lithic
 
       attr_accessor pending_amount: Integer
 
-      attr_accessor related_account_tokens: Lithic::Payment::RelatedAccountTokens
+      attr_accessor related_account_tokens: Lithic::Payment::RelatedAccountTokens?
 
       attr_accessor result: Lithic::Models::Payment::result
 
@@ -88,7 +88,7 @@ module Lithic
         method_: Lithic::Models::Payment::method_,
         method_attributes: Lithic::Models::Payment::method_attributes,
         pending_amount: Integer,
-        related_account_tokens: Lithic::Payment::RelatedAccountTokens,
+        related_account_tokens: Lithic::Payment::RelatedAccountTokens?,
         result: Lithic::Models::Payment::result,
         settled_amount: Integer,
         source: Lithic::Models::Payment::source,
@@ -114,7 +114,7 @@ module Lithic
         method_: Lithic::Models::Payment::method_,
         method_attributes: Lithic::Models::Payment::method_attributes,
         pending_amount: Integer,
-        related_account_tokens: Lithic::Payment::RelatedAccountTokens,
+        related_account_tokens: Lithic::Payment::RelatedAccountTokens?,
         result: Lithic::Models::Payment::result,
         settled_amount: Integer,
         source: Lithic::Models::Payment::source,
@@ -278,6 +278,7 @@ module Lithic
 
         type detailed_result =
           :APPROVED
+          | :DECLINED
           | :FUNDS_INSUFFICIENT
           | :ACCOUNT_INVALID
           | :PROGRAM_TRANSACTION_LIMIT_EXCEEDED
@@ -288,6 +289,7 @@ module Lithic
           extend Lithic::Internal::Type::Enum
 
           APPROVED: :APPROVED
+          DECLINED: :DECLINED
           FUNDS_INSUFFICIENT: :FUNDS_INSUFFICIENT
           ACCOUNT_INVALID: :ACCOUNT_INVALID
           PROGRAM_TRANSACTION_LIMIT_EXCEEDED: :PROGRAM_TRANSACTION_LIMIT_EXCEEDED
@@ -483,7 +485,8 @@ module Lithic
         def self?.values: -> ::Array[Lithic::Models::Payment::source]
       end
 
-      type status = :PENDING | :SETTLED | :DECLINED | :REVERSED | :CANCELED
+      type status =
+        :PENDING | :SETTLED | :DECLINED | :REVERSED | :CANCELED | :RETURNED
 
       module Status
         extend Lithic::Internal::Type::Enum
@@ -493,6 +496,7 @@ module Lithic
         DECLINED: :DECLINED
         REVERSED: :REVERSED
         CANCELED: :CANCELED
+        RETURNED: :RETURNED
 
         def self?.values: -> ::Array[Lithic::Models::Payment::status]
       end

data/sig/lithic/models/payment_return_params.rbs

@@ -0,0 +1,46 @@
+module Lithic
+  module Models
+    type payment_return_params =
+      {
+        financial_account_token: String,
+        return_reason_code: String,
+        addenda: String?,
+        date_of_death: Date?,
+        memo: String?
+      }
+      & Lithic::Internal::Type::request_parameters
+
+    class PaymentReturnParams < Lithic::Internal::Type::BaseModel
+      extend Lithic::Internal::Type::RequestParameters::Converter
+      include Lithic::Internal::Type::RequestParameters
+
+      attr_accessor financial_account_token: String
+
+      attr_accessor return_reason_code: String
+
+      attr_accessor addenda: String?
+
+      attr_accessor date_of_death: Date?
+
+      attr_accessor memo: String?
+
+      def initialize: (
+        financial_account_token: String,
+        return_reason_code: String,
+        ?addenda: String?,
+        ?date_of_death: Date?,
+        ?memo: String?,
+        ?request_options: Lithic::request_opts
+      ) -> void
+
+      def to_hash: -> {
+        financial_account_token: String,
+        return_reason_code: String,
+        addenda: String?,
+        date_of_death: Date?,
+        memo: String?,
+        request_options: Lithic::RequestOptions
+      }
+    end
+  end
+end

data/sig/lithic/models/statement_totals.rbs

@@ -0,0 +1,76 @@
+module Lithic
+  module Models
+    type statement_totals =
+      {
+        balance_transfers: Integer,
+        cash_advances: Integer,
+        credits: Integer,
+        debits: Integer,
+        fees: Integer,
+        interest: Integer,
+        payments: Integer,
+        purchases: Integer,
+        credit_details: top,
+        debit_details: top,
+        payment_details: top
+      }
+
+    class StatementTotals < Lithic::Internal::Type::BaseModel
+      attr_accessor balance_transfers: Integer
+
+      attr_accessor cash_advances: Integer
+
+      attr_accessor credits: Integer
+
+      attr_accessor debits: Integer
+
+      attr_accessor fees: Integer
+
+      attr_accessor interest: Integer
+
+      attr_accessor payments: Integer
+
+      attr_accessor purchases: Integer
+
+      attr_reader credit_details: top?
+
+      def credit_details=: (top) -> top
+
+      attr_reader debit_details: top?
+
+      def debit_details=: (top) -> top
+
+      attr_reader payment_details: top?
+
+      def payment_details=: (top) -> top
+
+      def initialize: (
+        balance_transfers: Integer,
+        cash_advances: Integer,
+        credits: Integer,
+        debits: Integer,
+        fees: Integer,
+        interest: Integer,
+        payments: Integer,
+        purchases: Integer,
+        ?credit_details: top,
+        ?debit_details: top,
+        ?payment_details: top
+      ) -> void
+
+      def to_hash: -> {
+        balance_transfers: Integer,
+        cash_advances: Integer,
+        credits: Integer,
+        debits: Integer,
+        fees: Integer,
+        interest: Integer,
+        payments: Integer,
+        purchases: Integer,
+        credit_details: top,
+        debit_details: top,
+        payment_details: top
+      }
+    end
+  end
+end

data/sig/lithic/models/transaction.rbs

@@ -15,7 +15,7 @@ module Lithic
         cardholder_authentication: Lithic::Transaction::CardholderAuthentication?,
         created: Time,
         financial_account_token: String?,
-        merchant: Lithic::Transaction::Merchant,
+        merchant: Lithic::Merchant,
         merchant_amount: Integer?,
         merchant_authorization_amount: Integer?,
         merchant_currency: String,
@@ -57,7 +57,7 @@ module Lithic
 
       attr_accessor financial_account_token: String?
 
-      attr_accessor merchant: Lithic::Transaction::Merchant
+      attr_accessor merchant: Lithic::Merchant
 
       attr_accessor merchant_amount: Integer?
 
@@ -101,7 +101,7 @@ module Lithic
         cardholder_authentication: Lithic::Transaction::CardholderAuthentication?,
         created: Time,
         financial_account_token: String?,
-        merchant: Lithic::Transaction::Merchant,
+        merchant: Lithic::Merchant,
         merchant_amount: Integer?,
         merchant_authorization_amount: Integer?,
         merchant_currency: String,
@@ -130,7 +130,7 @@ module Lithic
         cardholder_authentication: Lithic::Transaction::CardholderAuthentication?,
         created: Time,
         financial_account_token: String?,
-        merchant: Lithic::Transaction::Merchant,
+        merchant: Lithic::Merchant,
         merchant_amount: Integer?,
         merchant_authorization_amount: Integer?,
         merchant_currency: String,
@@ -344,53 +344,6 @@ module Lithic
         end
       end
 
-      type merchant =
-        {
-          acceptor_id: String,
-          acquiring_institution_id: String,
-          city: String,
-          country: String,
-          descriptor: String,
-          mcc: String,
-          state: String
-        }
-
-      class Merchant < Lithic::Internal::Type::BaseModel
-        attr_accessor acceptor_id: String
-
-        attr_accessor acquiring_institution_id: String
-
-        attr_accessor city: String
-
-        attr_accessor country: String
-
-        attr_accessor descriptor: String
-
-        attr_accessor mcc: String
-
-        attr_accessor state: String
-
-        def initialize: (
-          acceptor_id: String,
-          acquiring_institution_id: String,
-          city: String,
-          country: String,
-          descriptor: String,
-          mcc: String,
-          state: String
-        ) -> void
-
-        def to_hash: -> {
-          acceptor_id: String,
-          acquiring_institution_id: String,
-          city: String,
-          country: String,
-          descriptor: String,
-          mcc: String,
-          state: String
-        }
-      end
-
       type network =
         :AMEX | :INTERLINK | :MAESTRO | :MASTERCARD | :UNKNOWN | :VISA