alipay 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cba89bf78148b68186fbd85be4e3a3706e9984e6
-  data.tar.gz: 73fb6cda8aeadaf9e2ae410f8f57ef0caa114a26
+  metadata.gz: 2ab4182025a5c424e036fc878d9a2ff04f200ee0
+  data.tar.gz: 617a08da13708da51031f937dd28afebcf22b45b
 SHA512:
-  metadata.gz: f42e34e9bc32e03aee68c35f9362ecca8b0301ca083ee154b8ce4fedda2144a93988a0fb19e5504e23458b2e962aa0938801158deb4068821652548da81adba6
-  data.tar.gz: 0f83397abf71b492a9882809dbf84adf697e15c7dea85be1257c17988b282493798e504f9790a3ff73503863f320d4e2bca6a974ac157257a3ed9f7f6422e924
+  metadata.gz: ed830a42c1b9126097d744f5eb7502265f235bf9420f2c93149c2325d7d6325b48e6265e5c18f7aea855700e094bd13e21a8a850aa4133b19b128ec24efe66d8
+  data.tar.gz: d643dbe25d39935f954002ce4ebf476545bb41b25a06e1fda0b764058139d97e3b5233ded2d7f5d69ff3f1542474bc2fb51bf235d7f41b10e2e1163bbe0eaad4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.7.1 (2015-04-10)
+
+- Don't warning when `rmb_fee` is used in forex_refund_url method.
+
 ## v0.7.0 (2015-04-07)
 
 - Remove Alipay.seller_email setting, it can be replaced by seller_id, than same with pid.

data/README.md

@@ -9,7 +9,7 @@ Alipay official document: https://b.alipay.com/order/techService.htm .
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'alipay', '~> 0.7.0'
+gem 'alipay', '~> 0.7.1'
 ```
 
 And then execute:
@@ -315,9 +315,11 @@ Alipay::Service.create_forex_trade_url(
 | out_trade_no | required | Order number in your application. |
 | subject | required | Order subject. |
 | currency | required | Abbreviated currency name. |
-| total_fee | required | Order total price. |
+| total_fee | required * | Order total price. |
 | notify_url | optional | Alipay asyn notify url. |
 
+\* total_fee can be replace by rmb_fee.
+
 ### 境外收单单笔退款接口
 
 #### Name

data/lib/alipay/service.rb

@@ -42,8 +42,8 @@ module Alipay
       params = Utils.stringify_keys(params)
       check_required_params(params, CREATE_DIRECT_PAY_BY_USER_REQUIRED_PARAMS)
 
-      if params['total_fee'].nil? and (params['price'].nil? || params['quantity'].nil?)
-        warn("Ailpay Warn: total_fee or (price && quantiry) must have one")
+      if Alipay.debug_mode? and params['total_fee'].nil? and (params['price'].nil? || params['quantity'].nil?)
+        warn("Alipay Warn: total_fee or (price && quantity) must be set")
       end
 
       params = {
@@ -103,13 +103,11 @@ module Alipay
     end
 
     SEND_GOODS_CONFIRM_BY_PLATFORM_REQUIRED_PARAMS = %w( trade_no logistics_name )
+    SEND_GOODS_CONFIRM_BY_PLATFORM_OPTIONAL_PARAMS = %w( transport_type create_transport_type )
     def self.send_goods_confirm_by_platform(params, options = {})
       params = Utils.stringify_keys(params)
       check_required_params(params, SEND_GOODS_CONFIRM_BY_PLATFORM_REQUIRED_PARAMS)
-
-      if params['transport_type'].nil? and params['create_transport_type'].nil?
-        warn("Ailpay Warn: transport_type or create_transport_type must have one")
-      end
+      check_optional_params(params, SEND_GOODS_CONFIRM_BY_PLATFORM_OPTIONAL_PARAMS)
 
       params = {
         'service'        => 'send_goods_confirm_by_platform',
@@ -120,10 +118,12 @@ module Alipay
       Net::HTTP.get(request_uri(params, options))
     end
 
-    CREATE_FOREX_TRADE_REQUIRED_PARAMS = %w( notify_url subject out_trade_no currency total_fee)
+    CREATE_FOREX_TRADE_REQUIRED_PARAMS = %w( notify_url subject out_trade_no currency )
+    CREATE_FOREX_TRADE_OPTIONAL_PARAMS = %w( total_fee rmb_fee )
     def self.create_forex_trade_url(params, options = {})
       params = Utils.stringify_keys(params)
       check_required_params(params, CREATE_FOREX_TRADE_REQUIRED_PARAMS)
+      check_optional_params(params, CREATE_FOREX_TRADE_OPTIONAL_PARAMS)
 
       params = {
         'service'         => 'create_forex_trade',
@@ -197,13 +197,14 @@ module Alipay
       return if !Alipay.debug_mode?
 
       names.each do |name|
-        warn("Ailpay Warn: missing required option: #{name}") unless params.has_key?(name)
+        warn("Alipay Warn: missing required option: #{name}") unless params.has_key?(name)
       end
     end
 
     def self.check_optional_params(params, names)
       return if !Alipay.debug_mode?
-      warn("Ailpay Warn: must specify either #{names.join(' or ')}") if names.all? {|name| params[name].nil? }
+
+      warn("Alipay Warn: must specify either #{names.join(' or ')}") if names.all? {|name| params[name].nil? }
     end
   end
 end

data/lib/alipay/version.rb

@@ -1,3 +1,3 @@
 module Alipay
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alipay
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Rei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler