alipay 0.7.0 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cba89bf78148b68186fbd85be4e3a3706e9984e6
4
- data.tar.gz: 73fb6cda8aeadaf9e2ae410f8f57ef0caa114a26
3
+ metadata.gz: 2ab4182025a5c424e036fc878d9a2ff04f200ee0
4
+ data.tar.gz: 617a08da13708da51031f937dd28afebcf22b45b
5
5
  SHA512:
6
- metadata.gz: f42e34e9bc32e03aee68c35f9362ecca8b0301ca083ee154b8ce4fedda2144a93988a0fb19e5504e23458b2e962aa0938801158deb4068821652548da81adba6
7
- data.tar.gz: 0f83397abf71b492a9882809dbf84adf697e15c7dea85be1257c17988b282493798e504f9790a3ff73503863f320d4e2bca6a974ac157257a3ed9f7f6422e924
6
+ metadata.gz: ed830a42c1b9126097d744f5eb7502265f235bf9420f2c93149c2325d7d6325b48e6265e5c18f7aea855700e094bd13e21a8a850aa4133b19b128ec24efe66d8
7
+ data.tar.gz: d643dbe25d39935f954002ce4ebf476545bb41b25a06e1fda0b764058139d97e3b5233ded2d7f5d69ff3f1542474bc2fb51bf235d7f41b10e2e1163bbe0eaad4
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## v0.7.1 (2015-04-10)
2
+
3
+ - Don't warning when `rmb_fee` is used in forex_refund_url method.
4
+
1
5
  ## v0.7.0 (2015-04-07)
2
6
 
3
7
  - Remove Alipay.seller_email setting, it can be replaced by seller_id, than same with pid.
data/README.md CHANGED
@@ -9,7 +9,7 @@ Alipay official document: https://b.alipay.com/order/techService.htm .
9
9
  Add this line to your application's Gemfile:
10
10
 
11
11
  ```ruby
12
- gem 'alipay', '~> 0.7.0'
12
+ gem 'alipay', '~> 0.7.1'
13
13
  ```
14
14
 
15
15
  And then execute:
@@ -315,9 +315,11 @@ Alipay::Service.create_forex_trade_url(
315
315
  | out_trade_no | required | Order number in your application. |
316
316
  | subject | required | Order subject. |
317
317
  | currency | required | Abbreviated currency name. |
318
- | total_fee | required | Order total price. |
318
+ | total_fee | required * | Order total price. |
319
319
  | notify_url | optional | Alipay asyn notify url. |
320
320
 
321
+ \* total_fee can be replace by rmb_fee.
322
+
321
323
  ### 境外收单单笔退款接口
322
324
 
323
325
  #### Name
@@ -42,8 +42,8 @@ module Alipay
42
42
  params = Utils.stringify_keys(params)
43
43
  check_required_params(params, CREATE_DIRECT_PAY_BY_USER_REQUIRED_PARAMS)
44
44
 
45
- if params['total_fee'].nil? and (params['price'].nil? || params['quantity'].nil?)
46
- warn("Ailpay Warn: total_fee or (price && quantiry) must have one")
45
+ if Alipay.debug_mode? and params['total_fee'].nil? and (params['price'].nil? || params['quantity'].nil?)
46
+ warn("Alipay Warn: total_fee or (price && quantity) must be set")
47
47
  end
48
48
 
49
49
  params = {
@@ -103,13 +103,11 @@ module Alipay
103
103
  end
104
104
 
105
105
  SEND_GOODS_CONFIRM_BY_PLATFORM_REQUIRED_PARAMS = %w( trade_no logistics_name )
106
+ SEND_GOODS_CONFIRM_BY_PLATFORM_OPTIONAL_PARAMS = %w( transport_type create_transport_type )
106
107
  def self.send_goods_confirm_by_platform(params, options = {})
107
108
  params = Utils.stringify_keys(params)
108
109
  check_required_params(params, SEND_GOODS_CONFIRM_BY_PLATFORM_REQUIRED_PARAMS)
109
-
110
- if params['transport_type'].nil? and params['create_transport_type'].nil?
111
- warn("Ailpay Warn: transport_type or create_transport_type must have one")
112
- end
110
+ check_optional_params(params, SEND_GOODS_CONFIRM_BY_PLATFORM_OPTIONAL_PARAMS)
113
111
 
114
112
  params = {
115
113
  'service' => 'send_goods_confirm_by_platform',
@@ -120,10 +118,12 @@ module Alipay
120
118
  Net::HTTP.get(request_uri(params, options))
121
119
  end
122
120
 
123
- CREATE_FOREX_TRADE_REQUIRED_PARAMS = %w( notify_url subject out_trade_no currency total_fee)
121
+ CREATE_FOREX_TRADE_REQUIRED_PARAMS = %w( notify_url subject out_trade_no currency )
122
+ CREATE_FOREX_TRADE_OPTIONAL_PARAMS = %w( total_fee rmb_fee )
124
123
  def self.create_forex_trade_url(params, options = {})
125
124
  params = Utils.stringify_keys(params)
126
125
  check_required_params(params, CREATE_FOREX_TRADE_REQUIRED_PARAMS)
126
+ check_optional_params(params, CREATE_FOREX_TRADE_OPTIONAL_PARAMS)
127
127
 
128
128
  params = {
129
129
  'service' => 'create_forex_trade',
@@ -197,13 +197,14 @@ module Alipay
197
197
  return if !Alipay.debug_mode?
198
198
 
199
199
  names.each do |name|
200
- warn("Ailpay Warn: missing required option: #{name}") unless params.has_key?(name)
200
+ warn("Alipay Warn: missing required option: #{name}") unless params.has_key?(name)
201
201
  end
202
202
  end
203
203
 
204
204
  def self.check_optional_params(params, names)
205
205
  return if !Alipay.debug_mode?
206
- warn("Ailpay Warn: must specify either #{names.join(' or ')}") if names.all? {|name| params[name].nil? }
206
+
207
+ warn("Alipay Warn: must specify either #{names.join(' or ')}") if names.all? {|name| params[name].nil? }
207
208
  end
208
209
  end
209
210
  end
@@ -1,3 +1,3 @@
1
1
  module Alipay
2
- VERSION = "0.7.0"
2
+ VERSION = "0.7.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alipay
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rei
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-07 00:00:00.000000000 Z
11
+ date: 2015-04-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler