focas-client 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f4c2dd2a7ee103cb94df29d1a5533b61c54cbbe8fa647b9adec894fe7f5c1f1
-  data.tar.gz: 0ded5275be6dc6d829d6e1f419cc6fd8d1cc6760e483d043f4f10c39e2f4e313
+  metadata.gz: 669f15d07af72519ab202c2a7e23fbc9dc0d71fe5378ea9d2df3aed07d897d75
+  data.tar.gz: 1a41cc58bb6def738004ecbcf17bc5e8cb23cfb8683a1cefa2f8291791405271
 SHA512:
-  metadata.gz: 101f07e62ccb8deaff3d828c3ace67c5c74f0cb999a621f001a0d13023e6675bc1de301a43e2e82ff089ccaf20e14debd34b2d2ca254d054ff68668fb7454b33
-  data.tar.gz: eebd858ae046191478d553db46e455c4b1bdd98358564c08328cd18d59c93a42569099953f5c85e48f8bb6315de3809b53e1ea0f201071ae65a5422e97851972
+  metadata.gz: 83440f5576fb35d9f97c0f0ec7bd04676b035838adc93126fe8cead7a45f3bce9d85e9217d9389f8cc8b4272ae96033e2dbb4a346f502b984a1a3ab7291547b9
+  data.tar.gz: 1d7f634f7b1c29fbb9db6e1bcd468c31e698861c837d31e69a3f374f4e3829421802f71033c4e263b96ef3fee3cee56efbb8f98561ebd312e04967bc1989f01a

data/CHANGELOG.md

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    focas-client (0.1.6)
+    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,21 +99,19 @@ 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}"
-
+        
       # 訂單編號&交易金額&驗證參數&特店代號&端末代號&交易時間
       tmp_arr = %W(
         #{@lidm}
         #{@purch_amt}
-        #{options[:token]}
-        #{options[:merchant_id]}
-        #{options[:terminal_id]}
+        #{@trade_info[:token]}
+        #{@trade_info[:MerchantID]}
+        #{@trade_info[:TerminalID]}
         #{trade_time}
       )
 
@@ -133,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.6'
+  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.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Daniel Lin (pct)