wallee-ruby-sdk 2.2.3 → 3.0.5

data/lib/wallee-ruby-sdk/api_client.rb

@@ -20,7 +20,7 @@ require 'json'
 require 'logger'
 require 'tempfile'
 require 'typhoeus'
-require 'uri'
+require 'addressable/uri'
 require 'base64'
 require 'time'
 require 'openssl'
@@ -71,7 +71,7 @@ module Wallee
                             :message => response.return_message)
         else
           fail ApiError.new(:code => response.code,
-                            :response_headers => response.headers,
+                            :response_headers => response.headers.to_h,
                             :response_body => response.body),
                response.status_message
         end
@@ -108,6 +108,8 @@ module Wallee
 
       header_params  = header_params.merge(get_authentication_headers(http_method, path, query_params))
 
+
+
       req_opts = {
         :method => http_method,
         :headers => header_params,
@@ -145,7 +147,8 @@ module Wallee
     # @return [Hash] the authentication headers
     def get_authentication_headers(http_method, path, query)
       base_url = URI(@config.base_url)
-      completed_path = "#{base_url.path}#{path}"+'?'+query.map{|k,v| "#{k}=#{v}"}.join('&')
+      completed_path = "#{base_url.path}#{path}"
+      completed_path += "?" + query.map{|k,v| "#{k}=#{v}"}.join('&') unless query.empty?
       version = "1"
       timestamp = Time.now.to_i
       securedData = "#{version}|#{@config.user_id}|#{timestamp}|#{http_method.upcase}|#{completed_path}"
@@ -292,7 +295,7 @@ module Wallee
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
+	  Addressable::URI.encode(@config.base_url + path)
     end
 
     # Builds the HTTP request body

data/lib/wallee-ruby-sdk/configuration.rb

@@ -15,7 +15,7 @@ limitations under the License.
 
 =end
 
-require 'uri'
+require 'addressable/uri'
 
 module Wallee
   class Configuration
@@ -133,7 +133,7 @@ module Wallee
 
     def base_url
       url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
-      URI.encode(url)
+   	  Addressable::URI.encode(url)
     end
 
   end

data/lib/wallee-ruby-sdk/models/abstract_account_update.rb

@@ -19,6 +19,9 @@ require 'date'
 
 module Wallee
   class AbstractAccountUpdate
+    # 
+    attr_accessor :last_modified_date
+
     # The name of the account identifies the account within the administrative interface.
     attr_accessor :name
 
@@ -28,6 +31,7 @@ module Wallee
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'last_modified_date' => :'lastModifiedDate',
         :'name' => :'name',
         :'subaccount_limit' => :'subaccountLimit'
       }
@@ -36,6 +40,7 @@ module Wallee
     # Attribute type mapping.
     def self.swagger_types
       {
+        :'last_modified_date' => :'DateTime',
         :'name' => :'String',
         :'subaccount_limit' => :'Integer'
       }
@@ -49,6 +54,10 @@ module Wallee
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
+      if attributes.has_key?(:'lastModifiedDate')
+        self.last_modified_date = attributes[:'lastModifiedDate']
+      end
+
       if attributes.has_key?(:'name')
         self.name = attributes[:'name']
       end
@@ -100,6 +109,7 @@ module Wallee
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          last_modified_date == o.last_modified_date &&
           name == o.name &&
           subaccount_limit == o.subaccount_limit
     end
@@ -113,7 +123,7 @@ module Wallee
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [name, subaccount_limit].hash
+      [last_modified_date, name, subaccount_limit].hash
     end
 
     # Builds the object from hash

data/lib/wallee-ruby-sdk/models/abstract_payment_link_update.rb

@@ -31,8 +31,8 @@ module Wallee
     # The available from date defines the latest date on which the payment link can be used to initialize a transaction. When no date is specified there will be no restriction.
     attr_accessor :available_until
 
-    # By making the billing address required the transaction can only be created when a billing address is provided within the request.
-    attr_accessor :billing_address_required
+    # The billing address handling mode controls if the address is collected or not and how it is collected.
+    attr_accessor :billing_address_handling_mode
 
     # The currency defines in which currency the payment is executed in. If no currency is defined it has to be specified within the request parameter 'currency'.
     attr_accessor :currency
@@ -49,8 +49,8 @@ module Wallee
     # The payment link name is used internally to identify the payment link. For example the name is used within search fields and hence it should be distinct and descriptive.
     attr_accessor :name
 
-    # By making the shipping address required the transaction can only be created when a shipping address is provided within the request.
-    attr_accessor :shipping_address_required
+    # The shipping address handling mode controls if the address is collected or not and how it is collected.
+    attr_accessor :shipping_address_handling_mode
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
@@ -59,13 +59,13 @@ module Wallee
         :'applied_space_view' => :'appliedSpaceView',
         :'available_from' => :'availableFrom',
         :'available_until' => :'availableUntil',
-        :'billing_address_required' => :'billingAddressRequired',
+        :'billing_address_handling_mode' => :'billingAddressHandlingMode',
         :'currency' => :'currency',
         :'language' => :'language',
         :'line_items' => :'lineItems',
         :'maximal_number_of_transactions' => :'maximalNumberOfTransactions',
         :'name' => :'name',
-        :'shipping_address_required' => :'shippingAddressRequired'
+        :'shipping_address_handling_mode' => :'shippingAddressHandlingMode'
       }
     end
 
@@ -76,13 +76,13 @@ module Wallee
         :'applied_space_view' => :'Integer',
         :'available_from' => :'DateTime',
         :'available_until' => :'DateTime',
-        :'billing_address_required' => :'BOOLEAN',
+        :'billing_address_handling_mode' => :'PaymentLinkAddressHandlingMode',
         :'currency' => :'String',
         :'language' => :'String',
         :'line_items' => :'Array<LineItemCreate>',
         :'maximal_number_of_transactions' => :'Integer',
         :'name' => :'String',
-        :'shipping_address_required' => :'BOOLEAN'
+        :'shipping_address_handling_mode' => :'PaymentLinkAddressHandlingMode'
       }
     end
 
@@ -112,8 +112,8 @@ module Wallee
         self.available_until = attributes[:'availableUntil']
       end
 
-      if attributes.has_key?(:'billingAddressRequired')
-        self.billing_address_required = attributes[:'billingAddressRequired']
+      if attributes.has_key?(:'billingAddressHandlingMode')
+        self.billing_address_handling_mode = attributes[:'billingAddressHandlingMode']
       end
 
       if attributes.has_key?(:'currency')
@@ -138,8 +138,8 @@ module Wallee
         self.name = attributes[:'name']
       end
 
-      if attributes.has_key?(:'shippingAddressRequired')
-        self.shipping_address_required = attributes[:'shippingAddressRequired']
+      if attributes.has_key?(:'shippingAddressHandlingMode')
+        self.shipping_address_handling_mode = attributes[:'shippingAddressHandlingMode']
       end
     end
 
@@ -180,13 +180,13 @@ module Wallee
           applied_space_view == o.applied_space_view &&
           available_from == o.available_from &&
           available_until == o.available_until &&
-          billing_address_required == o.billing_address_required &&
+          billing_address_handling_mode == o.billing_address_handling_mode &&
           currency == o.currency &&
           language == o.language &&
           line_items == o.line_items &&
           maximal_number_of_transactions == o.maximal_number_of_transactions &&
           name == o.name &&
-          shipping_address_required == o.shipping_address_required
+          shipping_address_handling_mode == o.shipping_address_handling_mode
     end
 
     # @see the `==` method
@@ -198,7 +198,7 @@ module Wallee
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [allowed_payment_method_configurations, applied_space_view, available_from, available_until, billing_address_required, currency, language, line_items, maximal_number_of_transactions, name, shipping_address_required].hash
+      [allowed_payment_method_configurations, applied_space_view, available_from, available_until, billing_address_handling_mode, currency, language, line_items, maximal_number_of_transactions, name, shipping_address_handling_mode].hash
     end
 
     # Builds the object from hash

data/lib/wallee-ruby-sdk/models/{abstract_shopify_subscription_product_active.rb → abstract_shopify_subscription_product_update.rb}

@@ -18,7 +18,7 @@ limitations under the License.
 require 'date'
 
 module Wallee
-  class AbstractShopifySubscriptionProductActive
+  class AbstractShopifySubscriptionProductUpdate
     # 
     attr_accessor :absolute_price_adjustment
 
@@ -52,9 +52,6 @@ module Wallee
     # 
     attr_accessor :relative_price_adjustment
 
-    # 
-    attr_accessor :state
-
     # Define whether the order confirmation email of the Shopify shop is sent to the customer for recurring orders.
     attr_accessor :store_order_confirmation_email_enabled
 
@@ -78,7 +75,6 @@ module Wallee
         :'minimal_billing_cycles' => :'minimalBillingCycles',
         :'pricing_option' => :'pricingOption',
         :'relative_price_adjustment' => :'relativePriceAdjustment',
-        :'state' => :'state',
         :'store_order_confirmation_email_enabled' => :'storeOrderConfirmationEmailEnabled',
         :'subscriber_suspension_allowed' => :'subscriberSuspensionAllowed',
         :'termination_billing_cycles' => :'terminationBillingCycles'
@@ -99,7 +95,6 @@ module Wallee
         :'minimal_billing_cycles' => :'Integer',
         :'pricing_option' => :'ShopifySubscriptionProductPricingOption',
         :'relative_price_adjustment' => :'Float',
-        :'state' => :'ShopifySubscriptionProductState',
         :'store_order_confirmation_email_enabled' => :'BOOLEAN',
         :'subscriber_suspension_allowed' => :'BOOLEAN',
         :'termination_billing_cycles' => :'Integer'
@@ -158,10 +153,6 @@ module Wallee
         self.relative_price_adjustment = attributes[:'relativePriceAdjustment']
       end
 
-      if attributes.has_key?(:'state')
-        self.state = attributes[:'state']
-      end
-
       if attributes.has_key?(:'storeOrderConfirmationEmailEnabled')
         self.store_order_confirmation_email_enabled = attributes[:'storeOrderConfirmationEmailEnabled']
       end
@@ -204,7 +195,6 @@ module Wallee
           minimal_billing_cycles == o.minimal_billing_cycles &&
           pricing_option == o.pricing_option &&
           relative_price_adjustment == o.relative_price_adjustment &&
-          state == o.state &&
           store_order_confirmation_email_enabled == o.store_order_confirmation_email_enabled &&
           subscriber_suspension_allowed == o.subscriber_suspension_allowed &&
           termination_billing_cycles == o.termination_billing_cycles
@@ -219,7 +209,7 @@ module Wallee
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [absolute_price_adjustment, billing_day_of_month, billing_interval_amount, billing_interval_unit, billing_weekday, fixed_price, maximal_billing_cycles, maximal_suspendable_cycles, minimal_billing_cycles, pricing_option, relative_price_adjustment, state, store_order_confirmation_email_enabled, subscriber_suspension_allowed, termination_billing_cycles].hash
+      [absolute_price_adjustment, billing_day_of_month, billing_interval_amount, billing_interval_unit, billing_weekday, fixed_price, maximal_billing_cycles, maximal_suspendable_cycles, minimal_billing_cycles, pricing_option, relative_price_adjustment, store_order_confirmation_email_enabled, subscriber_suspension_allowed, termination_billing_cycles].hash
     end
 
     # Builds the object from hash

data/lib/wallee-ruby-sdk/models/abstract_space_update.rb

@@ -19,6 +19,9 @@ require 'date'
 
 module Wallee
   class AbstractSpaceUpdate
+    # 
+    attr_accessor :last_modified_date
+
     # The space name is used internally to identify the space in administrative interfaces. For example it is used within search fields and hence it should be distinct and descriptive.
     attr_accessor :name
 
@@ -43,6 +46,7 @@ module Wallee
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'last_modified_date' => :'lastModifiedDate',
         :'name' => :'name',
         :'postal_address' => :'postalAddress',
         :'primary_currency' => :'primaryCurrency',
@@ -56,6 +60,7 @@ module Wallee
     # Attribute type mapping.
     def self.swagger_types
       {
+        :'last_modified_date' => :'DateTime',
         :'name' => :'String',
         :'postal_address' => :'SpaceAddressCreate',
         :'primary_currency' => :'String',
@@ -74,6 +79,10 @@ module Wallee
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
+      if attributes.has_key?(:'lastModifiedDate')
+        self.last_modified_date = attributes[:'lastModifiedDate']
+      end
+
       if attributes.has_key?(:'name')
         self.name = attributes[:'name']
       end
@@ -147,6 +156,7 @@ module Wallee
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          last_modified_date == o.last_modified_date &&
           name == o.name &&
           postal_address == o.postal_address &&
           primary_currency == o.primary_currency &&
@@ -165,7 +175,7 @@ module Wallee
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [name, postal_address, primary_currency, request_limit, state, technical_contact_addresses, time_zone].hash
+      [last_modified_date, name, postal_address, primary_currency, request_limit, state, technical_contact_addresses, time_zone].hash
     end
 
     # Builds the object from hash

data/lib/wallee-ruby-sdk/models/abstract_subscription_product_active.rb

@@ -28,6 +28,9 @@ module Wallee
     # The product name is used internally to identify the configuration in administrative interfaces. For example it is used within search fields and hence it should be distinct and descriptive.
     attr_accessor :name
 
+    # Marks the product as locked. Meaning that customer can not change away from this product or change to this product later on.
+    attr_accessor :product_locked
+
     # The sort order controls in which order the product is listed. The sort order is used to order the products in ascending order.
     attr_accessor :sort_order
 
@@ -40,6 +43,7 @@ module Wallee
         :'allowed_payment_method_configurations' => :'allowedPaymentMethodConfigurations',
         :'failed_payment_suspension_period' => :'failedPaymentSuspensionPeriod',
         :'name' => :'name',
+        :'product_locked' => :'productLocked',
         :'sort_order' => :'sortOrder',
         :'state' => :'state'
       }
@@ -51,6 +55,7 @@ module Wallee
         :'allowed_payment_method_configurations' => :'Array<Integer>',
         :'failed_payment_suspension_period' => :'String',
         :'name' => :'String',
+        :'product_locked' => :'BOOLEAN',
         :'sort_order' => :'Integer',
         :'state' => :'SubscriptionProductState'
       }
@@ -78,6 +83,10 @@ module Wallee
         self.name = attributes[:'name']
       end
 
+      if attributes.has_key?(:'productLocked')
+        self.product_locked = attributes[:'productLocked']
+      end
+
       if attributes.has_key?(:'sortOrder')
         self.sort_order = attributes[:'sortOrder']
       end
@@ -123,6 +132,7 @@ module Wallee
           allowed_payment_method_configurations == o.allowed_payment_method_configurations &&
           failed_payment_suspension_period == o.failed_payment_suspension_period &&
           name == o.name &&
+          product_locked == o.product_locked &&
           sort_order == o.sort_order &&
           state == o.state
     end
@@ -136,7 +146,7 @@ module Wallee
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [allowed_payment_method_configurations, failed_payment_suspension_period, name, sort_order, state].hash
+      [allowed_payment_method_configurations, failed_payment_suspension_period, name, product_locked, sort_order, state].hash
     end
 
     # Builds the object from hash

data/lib/wallee-ruby-sdk/models/abstract_transaction_pending.rb

@@ -28,6 +28,9 @@ module Wallee
     # 
     attr_accessor :billing_address
 
+    # The completion behavior controls when the transaction is completed.
+    attr_accessor :completion_behavior
+
     # 
     attr_accessor :currency
 
@@ -79,6 +82,7 @@ module Wallee
         :'allowed_payment_method_brands' => :'allowedPaymentMethodBrands',
         :'allowed_payment_method_configurations' => :'allowedPaymentMethodConfigurations',
         :'billing_address' => :'billingAddress',
+        :'completion_behavior' => :'completionBehavior',
         :'currency' => :'currency',
         :'customer_email_address' => :'customerEmailAddress',
         :'customer_id' => :'customerId',
@@ -103,6 +107,7 @@ module Wallee
         :'allowed_payment_method_brands' => :'Array<PaymentMethodBrand>',
         :'allowed_payment_method_configurations' => :'Array<Integer>',
         :'billing_address' => :'AddressCreate',
+        :'completion_behavior' => :'TransactionCompletionBehavior',
         :'currency' => :'String',
         :'customer_email_address' => :'String',
         :'customer_id' => :'String',
@@ -145,6 +150,10 @@ module Wallee
         self.billing_address = attributes[:'billingAddress']
       end
 
+      if attributes.has_key?(:'completionBehavior')
+        self.completion_behavior = attributes[:'completionBehavior']
+      end
+
       if attributes.has_key?(:'currency')
         self.currency = attributes[:'currency']
       end
@@ -218,6 +227,14 @@ module Wallee
         invalid_properties.push('invalid value for "customer_email_address", the character length must be smaller than or equal to 254.')
       end
 
+      if !@failed_url.nil? && @failed_url.to_s.length > 1000
+        invalid_properties.push('invalid value for "failed_url", the character length must be smaller than or equal to 1000.')
+      end
+
+      if !@failed_url.nil? && @failed_url.to_s.length < 9
+        invalid_properties.push('invalid value for "failed_url", the character length must be great than or equal to 9.')
+      end
+
       if !@invoice_merchant_reference.nil? && @invoice_merchant_reference.to_s.length > 100
         invalid_properties.push('invalid value for "invoice_merchant_reference", the character length must be smaller than or equal to 100.')
       end
@@ -230,6 +247,14 @@ module Wallee
         invalid_properties.push('invalid value for "shipping_method", the character length must be smaller than or equal to 200.')
       end
 
+      if !@success_url.nil? && @success_url.to_s.length > 1000
+        invalid_properties.push('invalid value for "success_url", the character length must be smaller than or equal to 1000.')
+      end
+
+      if !@success_url.nil? && @success_url.to_s.length < 9
+        invalid_properties.push('invalid value for "success_url", the character length must be great than or equal to 9.')
+      end
+
       invalid_properties
     end
 
@@ -237,9 +262,13 @@ module Wallee
     # @return true if the model is valid
     def valid?
       return false if !@customer_email_address.nil? && @customer_email_address.to_s.length > 254
+      return false if !@failed_url.nil? && @failed_url.to_s.length > 1000
+      return false if !@failed_url.nil? && @failed_url.to_s.length < 9
       return false if !@invoice_merchant_reference.nil? && @invoice_merchant_reference.to_s.length > 100
       return false if !@merchant_reference.nil? && @merchant_reference.to_s.length > 100
       return false if !@shipping_method.nil? && @shipping_method.to_s.length > 200
+      return false if !@success_url.nil? && @success_url.to_s.length > 1000
+      return false if !@success_url.nil? && @success_url.to_s.length < 9
       true
     end
 
@@ -253,6 +282,20 @@ module Wallee
       @customer_email_address = customer_email_address
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] failed_url Value to be assigned
+    def failed_url=(failed_url)
+      if !failed_url.nil? && failed_url.to_s.length > 1000
+        fail ArgumentError, 'invalid value for "failed_url", the character length must be smaller than or equal to 1000.'
+      end
+
+      if !failed_url.nil? && failed_url.to_s.length < 9
+        fail ArgumentError, 'invalid value for "failed_url", the character length must be great than or equal to 9.'
+      end
+
+      @failed_url = failed_url
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] invoice_merchant_reference Value to be assigned
     def invoice_merchant_reference=(invoice_merchant_reference)
@@ -283,6 +326,20 @@ module Wallee
       @shipping_method = shipping_method
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] success_url Value to be assigned
+    def success_url=(success_url)
+      if !success_url.nil? && success_url.to_s.length > 1000
+        fail ArgumentError, 'invalid value for "success_url", the character length must be smaller than or equal to 1000.'
+      end
+
+      if !success_url.nil? && success_url.to_s.length < 9
+        fail ArgumentError, 'invalid value for "success_url", the character length must be great than or equal to 9.'
+      end
+
+      @success_url = success_url
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -291,6 +348,7 @@ module Wallee
           allowed_payment_method_brands == o.allowed_payment_method_brands &&
           allowed_payment_method_configurations == o.allowed_payment_method_configurations &&
           billing_address == o.billing_address &&
+          completion_behavior == o.completion_behavior &&
           currency == o.currency &&
           customer_email_address == o.customer_email_address &&
           customer_id == o.customer_id &&
@@ -317,7 +375,7 @@ module Wallee
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [allowed_payment_method_brands, allowed_payment_method_configurations, billing_address, currency, customer_email_address, customer_id, failed_url, invoice_merchant_reference, language, line_items, merchant_reference, meta_data, shipping_address, shipping_method, success_url, time_zone, token, tokenization_mode].hash
+      [allowed_payment_method_brands, allowed_payment_method_configurations, billing_address, completion_behavior, currency, customer_email_address, customer_id, failed_url, invoice_merchant_reference, language, line_items, merchant_reference, meta_data, shipping_address, shipping_method, success_url, time_zone, token, tokenization_mode].hash
     end
 
     # Builds the object from hash