smartpay 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0cd94594c52188072ee764c3d9abbab864773af324310b3f0a6e5747570e04e
-  data.tar.gz: 7fe589e25744b8891af1b91786d26c4f7e67e13fcf4ba80c9d847ea31461181f
+  metadata.gz: 446eb4c4c827e38b97a57ecbceee0b43a932d53cdb11a6bd22215250c5897583
+  data.tar.gz: a6e513f1be63893df11793c7b74c66cea109e715423c2f0fbbb25c8869ed5089
 SHA512:
-  metadata.gz: 8973913b6c40ddd9fa7449d43696c823b25ac36483f070c3fe1a6cafffe8f030b70171ee2ff7c8ae9876b336a820efaf17b1de85f0bc2b0245b2d6add321f47e
-  data.tar.gz: 6b7e1721a942ace0254e701c23186f0b2c0eaa6d2821e9fd5bf4339b782e58b8eaa9d2b6aa39e40b6c1babbb462c199f964f4bf9a9f2ec4664f8d39b9bef25d8
+  metadata.gz: a274f5a5917cb8bef8bdabe0360f284436be5bc8f8052f7db9b6233eb6f7a18cfd798f4d1a63bd3d0a57e8e8cae1defc8f477e7e7bfe388531f13384e59245ce
+  data.tar.gz: 58c21a2d55b9fac38a560ac032d6af7f27f8bc2a61a6477fd1dcd2e884b2791d20f734c79dcd7be8c2b5b49f32eafec8f26604438cc55bf84313a46e5d864a3d

data/lib/smartpay/requests/checkout_session.rb

@@ -6,6 +6,7 @@ module Smartpay
       attr_accessor :payload
 
       REQUIREMENT_KEY_NAME = [:successUrl, :cancelUrl, :customer, :currency, :items].freeze
+      LINE_ITEM_KINDS = %w[product tax discount].freeze
       CAN_FALLBACK_KEYS = [:customer].freeze
 
       def initialize(raw_payload)
@@ -32,11 +33,8 @@ module Smartpay
           shipping_info[:feeCurrency] = payload.dig(:currency)
         end
 
-        total_amount = get_total_amount
-
-        {
+        normalized = {
           customerInfo: normalize_customer_info(payload.dig(:customerInfo) || payload.dig(:customer) || {}),
-          amount: total_amount,
           captureMethod: payload.dig(:captureMethod),
           currency: payload.dig(:currency),
           description: payload.dig(:description),
@@ -47,6 +45,10 @@ module Smartpay
           successUrl: payload.dig(:successUrl),
           cancelUrl: payload.dig(:cancelUrl),
         }
+
+        normalized[:amount] = get_total_amount(normalized)
+
+        return normalized
       end
 
       def normalize_customer_info(info)
@@ -111,29 +113,32 @@ module Smartpay
             productDescription: line_item.dig(:productDescription),
             metadata: line_item.dig(:metadata),
             productMetadata: line_item.dig(:productMetadata),
-            priceMetadata: line_item.dig(:priceMetadata)
+            priceMetadata: line_item.dig(:priceMetadata),
+            kind: LINE_ITEM_KINDS.include?(line_item.dig(:kind)) ? line_item.dig(:kind) : nil
           }
         end
       end
 
+      def get_total_amount(raw_payload = nil)
+        total_amount = raw_payload.dig(:amount) || raw_payload.dig("amount")
+        return total_amount if total_amount
 
-      def get_total_amount
-        total_amount = payload.dig(:amount) || payload.dig('amount')
+        items = raw_payload.dig(:items)
 
-        if total_amount.nil?
-          items = payload.dig(:items)
-
-          if !items.nil? && items.count > 0
-            total_amount = items.inject(0) { |sum, item| sum + (item[:amount] || item['amount'] || 0) }
-          end
-
-          shipping_fee = payload.dig(:shippingInfo, :feeAmount) ||
-                          payload.dig(:shippingInfo, 'feeAmount') ||
-                          0
-          total_amount = shipping_fee + (total_amount || 0)
+        if !items.nil? && items.count.positive?
+          total_amount = items.inject(0) { |sum, item|
+            amount = item[:amount] || item["amount"] || 0
+            amount = -amount if item[:kind] == "discount"
+            sum + amount
+          }
         end
 
-        total_amount
+        shipping_fee = raw_payload.dig(:shippingInfo, :feeAmount) ||
+                       raw_payload.dig(:shippingInfo, "feeAmount") ||
+                       0
+        total_amount += shipping_fee
+
+        return total_amount
       end
     end
   end

data/lib/smartpay/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Smartpay
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartpay
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Smartpay
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description:
+description: 
 email:
 - uxe@smartpay.co
 executables: []
@@ -78,7 +78,7 @@ metadata:
   homepage_uri: https://smartpay.co
   source_code_uri: https://github.com/smartpay-co/sdk-ruby
   changelog_uri: https://github.com/smartpay-co/sdk-ruby/blob/main/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: The Smartpay Ruby SDK offers easy access to Smartpay API from applications
   written in Ruby.