focas-client 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ee135e6e235cece01fd3a79c3734433e6d44aa5e71c260c3685516c5f324c9
-  data.tar.gz: 7a804b5355c42126635453e4412f9c259bd72d0bb3f7891149d08c1efec724fb
+  metadata.gz: 669f15d07af72519ab202c2a7e23fbc9dc0d71fe5378ea9d2df3aed07d897d75
+  data.tar.gz: 1a41cc58bb6def738004ecbcf17bc5e8cb23cfb8683a1cefa2f8291791405271
 SHA512:
-  metadata.gz: 286f429762664df2516d5077cef22209c150235ef160b276d412483b525cd5063111db658ac8cfa1f65d3afd900eed0dc054e78a544f89119e6d70d3d45c2d78
-  data.tar.gz: 47e3a463d22bc59f5a0c1dc079655ba51731d9c20420165e7c3b719d029fa6aa900b5067a58567e7e3ee6538fd4a002313e25ae640aff7aa52f5ff43fdf08f98
+  metadata.gz: 83440f5576fb35d9f97c0f0ec7bd04676b035838adc93126fe8cead7a45f3bce9d85e9217d9389f8cc8b4272ae96033e2dbb4a346f502b984a1a3ab7291547b9
+  data.tar.gz: 1d7f634f7b1c29fbb9db6e1bcd468c31e698861c837d31e69a3f374f4e3829421802f71033c4e263b96ef3fee3cee56efbb8f98561ebd312e04967bc1989f01a

data/CHANGELOG.md

@@ -1 +1 @@
-## 0.1.5 (開發中)
+## 0.1.7 (開發中)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    focas-client (0.1.5)
+    focas-client (0.1.7)
       activesupport (>= 4.0)
 
 GEM

data/lib/focas/payment.rb

@@ -53,13 +53,12 @@ module Focas
       ret = data.transform_keys(&:to_sym).to_h
       return false if not ret[:respToken].present?
 
-
       begin
         # to hash
         resp_token = ret[:respToken]
 
         options = Config.options
-        settings = options.transform_keys(&:to_sym).to_h
+        settings = options.transform_keys(&:to_sym)
 
         # 檢查 ret[:status] 成功或失敗
         if ret[:status] == '0'
@@ -70,8 +69,8 @@ module Focas
           #{settings[:token]}
           #{ret[:authCode]}
           #{ret[:authRespTime]}
-          #{settings[:merchant_id]}
-          #{settings[:terminal_id]}
+          #{settings[:MerchantID]}
+          #{settings[:TerminalID]}
           )
 
           hash_string = tmp_arr.join('&')
@@ -83,8 +82,8 @@ module Focas
           #{ret[:lidm]}
           #{settings[:token]}
           #{ret[:authRespTime]}
-          #{settings[:merchant_id]}
-          #{settings[:terminal_id]}
+          #{settings[:MerchantID]}
+          #{settings[:TerminalID]}
           )
         end
 
@@ -100,16 +99,23 @@ module Focas
 
     def set_trade_info
       options = Config.options
-      @trade_info = options.transform_keys(&:to_sym).to_h
-      # 應移除 token，不該曝光
-      @trade_info.delete(:token)
+      @trade_info = options.transform_keys(&:to_sym)
 
       local_date = Time.now.strftime('%Y%m%d')
       local_time = Time.now.strftime('%H%M%S')
       trade_time = "#{local_date}#{local_time}"
-
+        
       # 訂單編號&交易金額&驗證參數&特店代號&端末代號&交易時間
-      hash_string = "#{@lidm}#{@purch_amt}#{@trade_info[:token]}#{@trade_info[:merchant_id]}#{@trade_info[:terminal_id]}#{trade_time}"
+      tmp_arr = %W(
+        #{@lidm}
+        #{@purch_amt}
+        #{@trade_info[:token]}
+        #{@trade_info[:MerchantID]}
+        #{@trade_info[:TerminalID]}
+        #{trade_time}
+      )
+
+      hash_string = tmp_arr.join('&')
 
       req_token = Digest::SHA256.hexdigest(hash_string).upcase
 
@@ -124,10 +130,8 @@ module Focas
         LocalTime: local_time
       }
 
-      individual_trade_info.merge!(options[:trade_info]) if options[:trade_info]
-
-      # 同是 hash 再來 merge
-      @trade_info = (options.to_h.merge!(individual_trade_info)).transform_keys(&:to_sym)
+      # 應移除 token，不該曝光
+      @trade_info.merge!(individual_trade_info).delete(:token)
     end
   end
 end

data/lib/focas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Focas
-  VERSION = '0.1.5'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: focas-client
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Daniel Lin (pct)