payabli 2.2.32 → 3.0.0

data/lib/payabli/money_out/client.rb

@@ -22,7 +22,7 @@ module Payabli
       # event.
       #
       # @param request_options [Hash]
-      # @param params [Payabli::MoneyOutTypes::Types::AuthorizePayoutBody]
+      # @param params [Payabli::MoneyOut::Types::RequestOutAuthorize]
       # @option request_options [String] :base_url
       # @option request_options [Hash{String => Object}] :additional_headers
       # @option request_options [Hash{String => Object}] :additional_query_parameters
@@ -33,15 +33,17 @@ module Payabli
       # @option params [Boolean, nil] :force_vendor_creation
       # @option params [String, nil] :idempotency_key
       #
-      # @return [Payabli::MoneyOutTypes::Types::AuthCapturePayoutResponse]
+      # @return [Payabli::Types::AuthCapturePayoutResponse]
       def authorize_out(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
-        query_param_names = %i[allow_duplicated_bills do_not_create_bills force_vendor_creation]
+        request_data = Payabli::MoneyOut::Types::RequestOutAuthorize.new(params).to_h
+        non_body_param_names = %w[allowDuplicatedBills doNotCreateBills forceVendorCreation idempotencyKey]
+        body = request_data.except(*non_body_param_names)
+
         query_params = {}
         query_params["allowDuplicatedBills"] = params[:allow_duplicated_bills] if params.key?(:allow_duplicated_bills)
         query_params["doNotCreateBills"] = params[:do_not_create_bills] if params.key?(:do_not_create_bills)
         query_params["forceVendorCreation"] = params[:force_vendor_creation] if params.key?(:force_vendor_creation)
-        params = params.except(*query_param_names)
 
         headers = {}
         headers["idempotencyKey"] = params[:idempotency_key] if params[:idempotency_key]
@@ -52,7 +54,7 @@ module Payabli
           path: "MoneyOut/authorize",
           headers: headers,
           query: query_params,
-          body: Payabli::MoneyOutTypes::Types::AuthorizePayoutBody.new(params).to_h,
+          body: body,
           request_options: request_options
         )
         begin
@@ -62,7 +64,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::MoneyOutTypes::Types::AuthCapturePayoutResponse.load(response.body)
+          Payabli::Types::AuthCapturePayoutResponse.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -79,7 +81,7 @@ module Payabli
       # @option request_options [Hash{String => Object}] :additional_body_parameters
       # @option request_options [Integer] :timeout_in_seconds
       #
-      # @return [Payabli::MoneyOutTypes::Types::CaptureAllOutResponse]
+      # @return [Payabli::Types::CaptureAllOutResponse]
       def cancel_all_out(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         request = Payabli::Internal::JSON::Request.new(
@@ -96,7 +98,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::MoneyOutTypes::Types::CaptureAllOutResponse.load(response.body)
+          Payabli::Types::CaptureAllOutResponse.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -183,7 +185,7 @@ module Payabli
       # @option request_options [Integer] :timeout_in_seconds
       # @option params [String, nil] :idempotency_key
       #
-      # @return [Payabli::MoneyOutTypes::Types::CaptureAllOutResponse]
+      # @return [Payabli::Types::CaptureAllOutResponse]
       def capture_all_out(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         headers = {}
@@ -204,7 +206,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::MoneyOutTypes::Types::CaptureAllOutResponse.load(response.body)
+          Payabli::Types::CaptureAllOutResponse.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -224,7 +226,7 @@ module Payabli
       # @option params [String] :reference_id
       # @option params [String, nil] :idempotency_key
       #
-      # @return [Payabli::MoneyOutTypes::Types::AuthCapturePayoutResponse]
+      # @return [Payabli::Types::AuthCapturePayoutResponse]
       def capture_out(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         headers = {}
@@ -244,7 +246,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::MoneyOutTypes::Types::AuthCapturePayoutResponse.load(response.body)
+          Payabli::Types::AuthCapturePayoutResponse.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -296,7 +298,7 @@ module Payabli
       # @option request_options [Integer] :timeout_in_seconds
       # @option params [String] :card_token
       #
-      # @return [Payabli::MoneyOutTypes::Types::VCardGetResponse]
+      # @return [Payabli::Types::VCardGetResponse]
       def v_card_get(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         request = Payabli::Internal::JSON::Request.new(
@@ -312,7 +314,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::MoneyOutTypes::Types::VCardGetResponse.load(response.body)
+          Payabli::Types::VCardGetResponse.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -329,7 +331,7 @@ module Payabli
       # @option request_options [Hash{String => Object}] :additional_body_parameters
       # @option request_options [Integer] :timeout_in_seconds
       #
-      # @return [Payabli::MoneyOutTypes::Types::OperationResult]
+      # @return [Payabli::Types::OperationResult]
       def send_v_card_link(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         request = Payabli::Internal::JSON::Request.new(
@@ -346,7 +348,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::MoneyOutTypes::Types::OperationResult.load(response.body)
+          Payabli::Types::OperationResult.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -412,7 +414,7 @@ module Payabli
       # @option request_options [Hash{String => Object}] :additional_body_parameters
       # @option request_options [Integer] :timeout_in_seconds
       # @option params [String] :trans_id
-      # @option params [Payabli::MoneyOutTypes::Types::AllowedCheckPaymentStatus] :check_payment_status
+      # @option params [Payabli::Types::AllowedCheckPaymentStatus] :check_payment_status
       #
       # @return [Payabli::Types::PayabliApiResponse00Responsedatanonobject]
       def update_check_payment_status(request_options: {}, **params)
@@ -447,7 +449,7 @@ module Payabli
       # new transactions are linked through their event histories for audit purposes.
       #
       # @param request_options [Hash]
-      # @param params [Payabli::MoneyOutTypes::Types::ReissuePayoutBody]
+      # @param params [Payabli::MoneyOut::Types::ReissueOutRequest]
       # @option request_options [String] :base_url
       # @option request_options [Hash{String => Object}] :additional_headers
       # @option request_options [Hash{String => Object}] :additional_query_parameters
@@ -456,13 +458,15 @@ module Payabli
       # @option params [String] :trans_id
       # @option params [String, nil] :idempotency_key
       #
-      # @return [Payabli::MoneyOutTypes::Types::ReissuePayoutResponse]
+      # @return [Payabli::Types::ReissuePayoutResponse]
       def reissue_out(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
-        query_param_names = %i[trans_id]
+        request_data = Payabli::MoneyOut::Types::ReissueOutRequest.new(params).to_h
+        non_body_param_names = %w[transId idempotencyKey]
+        body = request_data.except(*non_body_param_names)
+
         query_params = {}
         query_params["transId"] = params[:trans_id] if params.key?(:trans_id)
-        params = params.except(*query_param_names)
 
         headers = {}
         headers["idempotencyKey"] = params[:idempotency_key] if params[:idempotency_key]
@@ -473,7 +477,7 @@ module Payabli
           path: "MoneyOut/reissue",
           headers: headers,
           query: query_params,
-          body: Payabli::MoneyOutTypes::Types::ReissuePayoutBody.new(params).to_h,
+          body: body,
           request_options: request_options
         )
         begin
@@ -483,7 +487,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::MoneyOutTypes::Types::ReissuePayoutResponse.load(response.body)
+          Payabli::Types::ReissuePayoutResponse.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)

data/lib/payabli/money_out/types/reissue_out_request.rb

@@ -8,7 +8,7 @@ module Payabli
 
         field :idempotency_key, -> { String }, optional: true, nullable: false, api_name: "idempotencyKey"
 
-        field :body, -> { Payabli::MoneyOutTypes::Types::ReissuePayoutBody }, optional: false, nullable: false
+        field :payment_method, -> { Payabli::Types::ReissuePaymentMethod }, optional: false, nullable: false, api_name: "paymentMethod"
       end
     end
   end

data/lib/payabli/money_out/types/request_out_authorize.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Payabli
+  module MoneyOut
+    module Types
+      class RequestOutAuthorize < Internal::Types::Model
+        field :allow_duplicated_bills, -> { Internal::Types::Boolean }, optional: true, nullable: false, api_name: "allowDuplicatedBills"
+
+        field :do_not_create_bills, -> { Internal::Types::Boolean }, optional: true, nullable: false, api_name: "doNotCreateBills"
+
+        field :force_vendor_creation, -> { Internal::Types::Boolean }, optional: true, nullable: false, api_name: "forceVendorCreation"
+
+        field :idempotency_key, -> { String }, optional: true, nullable: false, api_name: "idempotencyKey"
+
+        field :entry_point, -> { String }, optional: false, nullable: false, api_name: "entryPoint"
+
+        field :source, -> { String }, optional: true, nullable: false
+
+        field :order_id, -> { String }, optional: true, nullable: false, api_name: "orderId"
+
+        field :order_description, -> { String }, optional: true, nullable: false, api_name: "orderDescription"
+
+        field :payment_method, -> { Payabli::Types::AuthorizePaymentMethod }, optional: false, nullable: false, api_name: "paymentMethod"
+
+        field :payment_details, -> { Payabli::Types::RequestOutAuthorizePaymentDetails }, optional: false, nullable: false, api_name: "paymentDetails"
+
+        field :vendor_data, -> { Payabli::Types::RequestOutAuthorizeVendorData }, optional: false, nullable: false, api_name: "vendorData"
+
+        field :invoice_data, -> { Internal::Types::Array[Payabli::Types::RequestOutAuthorizeInvoiceData] }, optional: false, nullable: false, api_name: "invoiceData"
+
+        field :account_id, -> { String }, optional: true, nullable: false, api_name: "accountId"
+
+        field :subdomain, -> { String }, optional: true, nullable: false
+
+        field :subscription_id, -> { Integer }, optional: true, nullable: false, api_name: "subscriptionId"
+
+        field :auto_capture, -> { Internal::Types::Boolean }, optional: true, nullable: false, api_name: "autoCapture"
+      end
+    end
+  end
+end

data/lib/payabli/notification/client.rb

@@ -13,7 +13,7 @@ module Payabli
       # Create a new notification or auto-generated report.
       #
       # @param request_options [Hash]
-      # @param params [Payabli::Notification::Types::AddNotificationRequest]
+      # @param params [Payabli::Types::AddNotificationRequest]
       # @option request_options [String] :base_url
       # @option request_options [Hash{String => Object}] :additional_headers
       # @option request_options [Hash{String => Object}] :additional_query_parameters
@@ -27,7 +27,7 @@ module Payabli
           base_url: request_options[:base_url],
           method: "POST",
           path: "Notification",
-          body: Payabli::Notification::Types::AddNotificationRequest.new(params).to_h,
+          body: Payabli::Types::AddNotificationRequest.new(params).to_h,
           request_options: request_options
         )
         begin
@@ -44,7 +44,7 @@ module Payabli
         end
       end
 
-      # Deletes a single notification or auto-generated report.
+      # Retrieves a single notification or auto-generated report's details.
       #
       # @param request_options [Hash]
       # @param params [Hash]
@@ -55,12 +55,12 @@ module Payabli
       # @option request_options [Integer] :timeout_in_seconds
       # @option params [String] :n_id
       #
-      # @return [Payabli::Types::PayabliApiResponseNotifications]
-      def delete_notification(request_options: {}, **params)
+      # @return [Payabli::Types::NotificationQueryRecord]
+      def get_notification(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         request = Payabli::Internal::JSON::Request.new(
           base_url: request_options[:base_url],
-          method: "DELETE",
+          method: "GET",
           path: "Notification/#{URI.encode_uri_component(params[:n_id].to_s)}",
           request_options: request_options
         )
@@ -71,17 +71,17 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::Types::PayabliApiResponseNotifications.load(response.body)
+          Payabli::Types::NotificationQueryRecord.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
         end
       end
 
-      # Retrieves a single notification or auto-generated report's details.
+      # Update a notification or auto-generated report.
       #
       # @param request_options [Hash]
-      # @param params [Hash]
+      # @param params [Payabli::Types::UpdateNotificationRequest]
       # @option request_options [String] :base_url
       # @option request_options [Hash{String => Object}] :additional_headers
       # @option request_options [Hash{String => Object}] :additional_query_parameters
@@ -89,13 +89,14 @@ module Payabli
       # @option request_options [Integer] :timeout_in_seconds
       # @option params [String] :n_id
       #
-      # @return [Payabli::Types::NotificationQueryRecord]
-      def get_notification(request_options: {}, **params)
+      # @return [Payabli::Types::PayabliApiResponseNotifications]
+      def update_notification(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         request = Payabli::Internal::JSON::Request.new(
           base_url: request_options[:base_url],
-          method: "GET",
+          method: "PUT",
           path: "Notification/#{URI.encode_uri_component(params[:n_id].to_s)}",
+          body: Payabli::Types::UpdateNotificationRequest.new(params).to_h,
           request_options: request_options
         )
         begin
@@ -105,17 +106,17 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::Types::NotificationQueryRecord.load(response.body)
+          Payabli::Types::PayabliApiResponseNotifications.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
         end
       end
 
-      # Update a notification or auto-generated report.
+      # Deletes a single notification or auto-generated report.
       #
       # @param request_options [Hash]
-      # @param params [Payabli::Notification::Types::UpdateNotificationRequest]
+      # @param params [Hash]
       # @option request_options [String] :base_url
       # @option request_options [Hash{String => Object}] :additional_headers
       # @option request_options [Hash{String => Object}] :additional_query_parameters
@@ -124,13 +125,12 @@ module Payabli
       # @option params [String] :n_id
       #
       # @return [Payabli::Types::PayabliApiResponseNotifications]
-      def update_notification(request_options: {}, **params)
+      def delete_notification(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         request = Payabli::Internal::JSON::Request.new(
           base_url: request_options[:base_url],
-          method: "PUT",
+          method: "DELETE",
           path: "Notification/#{URI.encode_uri_component(params[:n_id].to_s)}",
-          body: Payabli::Notification::Types::UpdateNotificationRequest.new(params).to_h,
           request_options: request_options
         )
         begin

data/lib/payabli/notificationlogs/client.rb

@@ -17,7 +17,7 @@ module Payabli
       # This endpoint requires the `notifications_create` OR `notifications_read` permission.
       #
       # @param request_options [Hash]
-      # @param params [Payabli::Notificationlogs::Types::NotificationLogSearchRequest]
+      # @param params [Payabli::Notificationlogs::Types::SearchNotificationLogsRequest]
       # @option request_options [String] :base_url
       # @option request_options [Hash{String => Object}] :additional_headers
       # @option request_options [Hash{String => Object}] :additional_query_parameters
@@ -26,21 +26,23 @@ module Payabli
       # @option params [Integer, nil] :page_size
       # @option params [Integer, nil] :page
       #
-      # @return [Array[Payabli::Notificationlogs::Types::NotificationLog]]
+      # @return [Array[Payabli::Types::NotificationLog]]
       def search_notification_logs(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
-        query_param_names = %i[page_size page]
+        request_data = Payabli::Notificationlogs::Types::SearchNotificationLogsRequest.new(params).to_h
+        non_body_param_names = %w[PageSize Page]
+        body = request_data.except(*non_body_param_names)
+
         query_params = {}
         query_params["PageSize"] = params[:page_size] if params.key?(:page_size)
         query_params["Page"] = params[:page] if params.key?(:page)
-        params = params.except(*query_param_names)
 
         request = Payabli::Internal::JSON::Request.new(
           base_url: request_options[:base_url],
           method: "POST",
-          path: "/v2/notificationlogs",
+          path: "v2/notificationlogs",
           query: query_params,
-          body: Payabli::Notificationlogs::Types::NotificationLogSearchRequest.new(params).to_h,
+          body: body,
           request_options: request_options
         )
         begin
@@ -67,13 +69,13 @@ module Payabli
       # @option request_options [Integer] :timeout_in_seconds
       # @option params [String] :uuid
       #
-      # @return [Payabli::Notificationlogs::Types::NotificationLogDetail]
+      # @return [Payabli::Types::NotificationLogDetail]
       def get_notification_log(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         request = Payabli::Internal::JSON::Request.new(
           base_url: request_options[:base_url],
           method: "GET",
-          path: "/v2/notificationlogs/#{URI.encode_uri_component(params[:uuid].to_s)}",
+          path: "v2/notificationlogs/#{URI.encode_uri_component(params[:uuid].to_s)}",
           request_options: request_options
         )
         begin
@@ -83,7 +85,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::Notificationlogs::Types::NotificationLogDetail.load(response.body)
+          Payabli::Types::NotificationLogDetail.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -103,13 +105,13 @@ module Payabli
       # @option request_options [Integer] :timeout_in_seconds
       # @option params [String] :uuid
       #
-      # @return [Payabli::Notificationlogs::Types::NotificationLogDetail]
+      # @return [Payabli::Types::NotificationLogDetail]
       def retry_notification_log(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         request = Payabli::Internal::JSON::Request.new(
           base_url: request_options[:base_url],
           method: "GET",
-          path: "/v2/notificationlogs/#{URI.encode_uri_component(params[:uuid].to_s)}/retry",
+          path: "v2/notificationlogs/#{URI.encode_uri_component(params[:uuid].to_s)}/retry",
           request_options: request_options
         )
         begin
@@ -119,7 +121,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::Notificationlogs::Types::NotificationLogDetail.load(response.body)
+          Payabli::Types::NotificationLogDetail.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -132,7 +134,7 @@ module Payabli
       # This endpoint requires the `notifications_create` permission.
       #
       # @param request_options [Hash]
-      # @param params [Payabli::Notificationlogs::Types::BulkRetryRequest]
+      # @param params [Payabli::Types::BulkRetryRequest]
       # @option request_options [String] :base_url
       # @option request_options [Hash{String => Object}] :additional_headers
       # @option request_options [Hash{String => Object}] :additional_query_parameters
@@ -145,7 +147,7 @@ module Payabli
         request = Payabli::Internal::JSON::Request.new(
           base_url: request_options[:base_url],
           method: "POST",
-          path: "/v2/notificationlogs/retry",
+          path: "v2/notificationlogs/retry",
           body: params,
           request_options: request_options
         )

data/lib/payabli/notificationlogs/types/search_notification_logs_request.rb

@@ -8,7 +8,17 @@ module Payabli
 
         field :page, -> { Integer }, optional: true, nullable: false, api_name: "Page"
 
-        field :body, -> { Payabli::Notificationlogs::Types::NotificationLogSearchRequest }, optional: false, nullable: false
+        field :start_date, -> { String }, optional: false, nullable: false, api_name: "startDate"
+
+        field :end_date, -> { String }, optional: false, nullable: false, api_name: "endDate"
+
+        field :notification_event, -> { String }, optional: true, nullable: false, api_name: "notificationEvent"
+
+        field :succeeded, -> { Internal::Types::Boolean }, optional: true, nullable: false
+
+        field :org_id, -> { Integer }, optional: true, nullable: false, api_name: "orgId"
+
+        field :paypoint_id, -> { Integer }, optional: true, nullable: false, api_name: "paypointId"
       end
     end
   end

data/lib/payabli/ocr/client.rb

@@ -16,22 +16,22 @@ module Payabli
       # number, vendor information, bill items, and more.
       #
       # @param request_options [Hash]
-      # @param params [Payabli::Ocr::Types::FileContentImageOnly]
+      # @param params [Payabli::Types::FileContentImageOnly]
       # @option request_options [String] :base_url
       # @option request_options [Hash{String => Object}] :additional_headers
       # @option request_options [Hash{String => Object}] :additional_query_parameters
       # @option request_options [Hash{String => Object}] :additional_body_parameters
       # @option request_options [Integer] :timeout_in_seconds
-      # @option params [Payabli::Ocr::Types::TypeResult] :type_result
+      # @option params [Payabli::Types::TypeResult] :type_result
       #
-      # @return [Payabli::Ocr::Types::PayabliApiResponseOcr]
+      # @return [Payabli::Types::PayabliApiResponseOcr]
       def ocr_document_form(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         request = Payabli::Internal::JSON::Request.new(
           base_url: request_options[:base_url],
           method: "POST",
-          path: "/Import/ocrDocumentForm/#{URI.encode_uri_component(params[:type_result].to_s)}",
-          body: Payabli::Ocr::Types::FileContentImageOnly.new(params).to_h,
+          path: "Import/ocrDocumentForm/#{URI.encode_uri_component(params[:type_result].to_s)}",
+          body: Payabli::Types::FileContentImageOnly.new(params).to_h,
           request_options: request_options
         )
         begin
@@ -41,7 +41,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::Ocr::Types::PayabliApiResponseOcr.load(response.body)
+          Payabli::Types::PayabliApiResponseOcr.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
@@ -54,22 +54,22 @@ module Payabli
       # bill number, vendor information, bill items, and more.
       #
       # @param request_options [Hash]
-      # @param params [Payabli::Ocr::Types::FileContentImageOnly]
+      # @param params [Payabli::Types::FileContentImageOnly]
       # @option request_options [String] :base_url
       # @option request_options [Hash{String => Object}] :additional_headers
       # @option request_options [Hash{String => Object}] :additional_query_parameters
       # @option request_options [Hash{String => Object}] :additional_body_parameters
       # @option request_options [Integer] :timeout_in_seconds
-      # @option params [Payabli::Ocr::Types::TypeResult] :type_result
+      # @option params [Payabli::Types::TypeResult] :type_result
       #
-      # @return [Payabli::Ocr::Types::PayabliApiResponseOcr]
+      # @return [Payabli::Types::PayabliApiResponseOcr]
       def ocr_document_json(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         request = Payabli::Internal::JSON::Request.new(
           base_url: request_options[:base_url],
           method: "POST",
-          path: "/Import/ocrDocumentJson/#{URI.encode_uri_component(params[:type_result].to_s)}",
-          body: Payabli::Ocr::Types::FileContentImageOnly.new(params).to_h,
+          path: "Import/ocrDocumentJson/#{URI.encode_uri_component(params[:type_result].to_s)}",
+          body: Payabli::Types::FileContentImageOnly.new(params).to_h,
           request_options: request_options
         )
         begin
@@ -79,7 +79,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::Ocr::Types::PayabliApiResponseOcr.load(response.body)
+          Payabli::Types::PayabliApiResponseOcr.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)

data/lib/payabli/organization/client.rb

@@ -21,7 +21,7 @@ module Payabli
       # @option request_options [Integer] :timeout_in_seconds
       # @option params [String, nil] :idempotency_key
       #
-      # @return [Payabli::Organization::Types::AddOrganizationResponse]
+      # @return [Payabli::Types::AddOrganizationResponse]
       def add_organization(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
         request_data = Payabli::Organization::Types::AddOrganizationRequest.new(params).to_h
@@ -46,17 +46,17 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::Organization::Types::AddOrganizationResponse.load(response.body)
+          Payabli::Types::AddOrganizationResponse.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
         end
       end
 
-      # Delete an organization by ID.
+      # Updates an organization's details by ID.
       #
       # @param request_options [Hash]
-      # @param params [Hash]
+      # @param params [Payabli::Organization::Types::OrganizationData]
       # @option request_options [String] :base_url
       # @option request_options [Hash{String => Object}] :additional_headers
       # @option request_options [Hash{String => Object}] :additional_query_parameters
@@ -64,13 +64,18 @@ module Payabli
       # @option request_options [Integer] :timeout_in_seconds
       # @option params [Integer] :org_id
       #
-      # @return [Payabli::Organization::Types::DeleteOrganizationResponse]
-      def delete_organization(request_options: {}, **params)
+      # @return [Payabli::Types::EditOrganizationResponse]
+      def edit_organization(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
+        request_data = Payabli::Organization::Types::OrganizationData.new(params).to_h
+        non_body_param_names = %w[orgId]
+        body = request_data.except(*non_body_param_names)
+
         request = Payabli::Internal::JSON::Request.new(
           base_url: request_options[:base_url],
-          method: "DELETE",
+          method: "PUT",
           path: "Organization/#{URI.encode_uri_component(params[:org_id].to_s)}",
+          body: body,
           request_options: request_options
         )
         begin
@@ -80,17 +85,17 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::Organization::Types::DeleteOrganizationResponse.load(response.body)
+          Payabli::Types::EditOrganizationResponse.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)
         end
       end
 
-      # Updates an organization's details by ID.
+      # Delete an organization by ID.
       #
       # @param request_options [Hash]
-      # @param params [Payabli::Organization::Types::OrganizationData]
+      # @param params [Hash]
       # @option request_options [String] :base_url
       # @option request_options [Hash{String => Object}] :additional_headers
       # @option request_options [Hash{String => Object}] :additional_query_parameters
@@ -98,18 +103,13 @@ module Payabli
       # @option request_options [Integer] :timeout_in_seconds
       # @option params [Integer] :org_id
       #
-      # @return [Payabli::Organization::Types::EditOrganizationResponse]
-      def edit_organization(request_options: {}, **params)
+      # @return [Payabli::Types::DeleteOrganizationResponse]
+      def delete_organization(request_options: {}, **params)
         params = Payabli::Internal::Types::Utils.normalize_keys(params)
-        request_data = Payabli::Organization::Types::OrganizationData.new(params).to_h
-        non_body_param_names = %w[orgId]
-        body = request_data.except(*non_body_param_names)
-
         request = Payabli::Internal::JSON::Request.new(
           base_url: request_options[:base_url],
-          method: "PUT",
+          method: "DELETE",
           path: "Organization/#{URI.encode_uri_component(params[:org_id].to_s)}",
-          body: body,
           request_options: request_options
         )
         begin
@@ -119,7 +119,7 @@ module Payabli
         end
         code = response.code.to_i
         if code.between?(200, 299)
-          Payabli::Organization::Types::EditOrganizationResponse.load(response.body)
+          Payabli::Types::DeleteOrganizationResponse.load(response.body)
         else
           error_class = Payabli::Errors::ResponseError.subclass_for_code(code)
           raise error_class.new(response.body, code: code)