smartpay 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd9d36f1c0b628dcafc5308503663e63f628eb9467f237b750c03d7416e565d8
-  data.tar.gz: 2c8aa53f89d35801c11657357e1cd01c79a647dcb1adb9a58dbb912538506152
+  metadata.gz: 56d3e609ce7f1842742670dff4b7eac351f6e653e199362cdd75b6715ec60501
+  data.tar.gz: 35b80a47568eee0755b4335d3aa68922b5b68767ed8e2371c7a45949783b3269
 SHA512:
-  metadata.gz: 71e24b5936a52552e97675081d462154d527dd9effecf42cba3867dffe18640c6916b48cbffb7140e11c0b9fab50105821ee68271b7746685ad0021ba96b27a4
-  data.tar.gz: f2f84b245783023dad0bb44e203c427d5b57f5d9ce14826c7bec5a312535f735bba133295d7e962f2dec7d8400c9d4760b3ca9c3f62262dd18ae08159c504369
+  metadata.gz: 32ce2b368f3a40956d8fea8929fcf54f3a442688bdc5cb49d3fcb5d1a5b81bb5ba43adcaebd30c0dd1d004fdefa56aeb7e38687bb9912d23157f5d3ead0a33d7
+  data.tar.gz: db3ed60db92f3246636eb173025aefc1aa0f3153e38f67a3a690e4ad381183f6b916d59cc0f88871d0c69544c2f479a85da9eba9d04d06124e9acc1a32b98434

data/lib/generators/smartpay/templates/controller.rb

@@ -4,25 +4,41 @@ class SmartpaysController < ApplicationController
 
   def create
     session = Smartpay::Api.create_checkout_session({
-      items: [
-        {
-          name: "レブロン 18 LOW",
-          amount: 250,
-          currency: "JPY",
-          quantity: 1,
+      items: [{
+        name: "オリジナルス STAN SMITH",
+        amount: 250,
+        currency: "JPY",
+        quantity: 1
+      }],
+      customer: {
+        accountAge: 20,
+        email: "merchant-support@smartpay.co",
+        firstName: "田中",
+        lastName: "太郎",
+        firstNameKana: "たなか",
+        lastNameKana: "たろう",
+        address: {
+          line1: "3-6-7",
+          line2: "青山パラシオタワー 11階",
+          subLocality: "",
+          locality: "港区北青山",
+          administrativeArea: "東京都",
+          postalCode: "107-0061",
+          country: "JP"
         },
-      ],
-
+        dateOfBirth: "1985-06-30",
+        gender: "male"
+      },
       shipping: {
         line1: "line1",
         locality: "locality",
         postalCode: "123",
-        country: "JP",
+        country: "JP"
       },
       reference: "order_ref_1234567",
       successURL: "https://docs.smartpay.co/example-pages/checkout-successful",
       cancelURL: "https://docs.smartpay.co/example-pages/checkout-canceled",
-      test: true,
+      test: true
     })
     redirect_to session.redirect_url
   end

data/lib/smartpay/requests/checkout_session.rb

@@ -27,13 +27,8 @@ module Smartpay
       end
 
       def normalize_payload
-        currency = nil
-        total_amount = 0
-        items = payload.dig(:lineItemData) || payload.dig(:items)
-        if items.count > 0
-          total_amount = items.inject(0) { |sum, item| sum + (item[:amount] || 0) }
-          currency = items.first.dig(:currency)
-        end
+        currency = get_currency
+        total_amount = get_total_amount
 
         {
           customerInfo: normalize_customer_info(payload.dig(:customerInfo) || payload.dig(:customer) || {}),
@@ -44,7 +39,7 @@ module Smartpay
             confirmationMethod: payload.dig(:confirmationMethod),
             coupons: payload.dig(:coupons),
             shippingInfo: payload.dig(:shippingInfo) || normalize_shipping(payload.dig(:shipping)),
-            lineItemData: items,
+            lineItemData: payload.dig(:orderData, :lineItemData) || payload.dig(:items),
             description: payload.dig(:orderDescription),
             metadata: payload.dig(:orderMetadata)
           }),
@@ -165,6 +160,28 @@ module Smartpay
           metadata: product.dig(:metadata)
         }
       end
+
+      def get_currency
+        currency = payload.dig(:orderData, :currency) || payload.dig(:orderData, 'currency')
+        if currency.nil?
+          items = payload.dig(:orderData, :lineItemData, :priceData) || payload.dig(:items)
+          if !items.nil? && items.count > 0
+            currency = items.first.dig(:currency)
+          end
+        end
+        currency
+      end
+
+      def get_total_amount
+        total_amount = payload.dig(:orderData, :amount) || payload.dig(:orderData, 'amount')
+        if total_amount.nil?
+          items = payload.dig(:orderData, :lineItemData, :priceData) || payload.dig(:items)
+          if !items.nil? && items.count > 0
+            total_amount = items.inject(0) { |sum, item| sum + (item[:amount] || 0) }
+          end
+        end
+        total_amount
+      end
     end
   end
 end

data/lib/smartpay/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartpay
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Smartpay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-24 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client