alipay_global 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad843ac2c3089ede0f911c6430269cdbfd1d4518
-  data.tar.gz: a8c7096d475a52cfa08dbb70f328a096a0e2202e
+  metadata.gz: 8d806d2aa21fbbc9eb231773eb0df9e468add4b0
+  data.tar.gz: 8b9c2c7df624401147e1d7187400ac912cddd897
 SHA512:
-  metadata.gz: c706cda76ad9a1848bbc2ef3ea1653e2d255751254eec9b0b21d78558fa74a012bc5e93d9520e092c8b9d49906c92ca82155075152fe279751b1cc0eb2066b5f
-  data.tar.gz: b07e6fac57ec6d969647eeaaa56ef9d0e9992a1d7ebe67a53fa5a570318b53fee7d8b31a5492aa297b3fae6efa1457c3b37a82fe376cb33d5e1da56aa0b903f6
+  metadata.gz: 9e663a7259a74309f6bf10942dce4eaa37c86b2e96e752f6b108d41a79001db77b677c1b2ed37c52b7ca7892da27eda74e52c3f7616e3938390ef04983a73462
+  data.tar.gz: 27b7cadceb9d7ac35996b3581265fff5542681917eeeba73197280e024b60d93c50721a55be85d47c509a3ea00c95c1c30e8377e6d2eb29c30b1e1ceeb28c721

data/README.md

@@ -19,9 +19,25 @@ AlipayGlobal.api_secret_key = 'YOUR_KEY'
 #AlipayGlobal.debug_mode = true # Enable parameter check. Default is true.
 ```
 
-## Warning
+## Note
 
-### Still in testing phase. Gem is not yet ready for production use and is prone to failures/ bugs. Use at your own peril. Full functionality hasn't been achieved yet too
+### Operational Functions
+
+| Feature | Description |
+| ------- | ----------- |
+| AlipayGlobal::Service::Trade.create | |
+| AlipayGlobal::Service::Trade.refund | |
+| AlipayGlobal::Service::Notification.check | |
+| AlipayGlobal::Service::Reconciliation.request | |
+| AlipayGlobal::Service::Exchange.current_rates | |
+
+### Incomplete/ Untested Functions
+
+| Feature | Description |
+| ------- | ----------- |
+| AlipayGlobal::Sign | RSA | Not tested. I do not have an RSA based relationship with Alipay at the moment to test requests via RSA signing |
+| AlipayGlobal::Sign | DSA | Not implemented |
+| AlipayGlobal::Service::Trade.batch_refund | Awaiting verification and support from Alipay: Issue with signing for multipartforms |
 
 ## Usage
 
@@ -41,9 +57,8 @@ AlipayGlobal::Service::Trade.create({ARGUMENTS})
 
 #### Issues (awaiting resolution)
 
-1. create_forex_trade
-  1. rmb_fee issues with MD5 Signature (awaiting Alipay tech response)
-  2. RSA integration: User needs to work with Alipay team to exchange RSA public keys to properly test the content
+1. create
+  1. RSA integration: User needs to work with Alipay team to exchange RSA public keys to properly test the content
 2. testing environment
   1. Alipay mobile site for testing is down. works in production.
 
@@ -88,6 +103,42 @@ AlipayGlobal::Service::Trade.create(
 
 \*\*\* Attention2:The request parameters can only be accepted by the Alipay system if they are signed according to the signature mechanism specified in this document.The parameter “timeout_rule”, the default value is 12h. If you want to use this parameter to change timing, you need to contact Alipay technical. Otherwise you will have an error.
 
+```ruby
+refund
+```
+
+#### Definition
+
+```ruby
+AlipayGlobal::Service::Trade.refund({ARGUMENTS})
+```
+
+#### Example
+
+```ruby
+AlipayGlobal::Service::Trade.refund(
+  out_return_no: "SAMPLE_REFUND_ID",
+  out_trade_no: "SAMPLE_TRANSACTION_ID",
+  return_rmb_amount: 200.00,
+  reason: "hello",
+  gmt_return: (Time.parse("2015-03-20 12:00").getlocal("+08:00")).strftime("%Y%m%d%H%M%S"),
+  currency: "USD"
+)
+# => 'https://mapi.alipay.com/gateway.do?service=create_forex_trade...' #for production
+```
+
+#### ARGUMENTS
+
+| Key | Requirement | Data Type | Description |
+| --- | ----------- | --------- | ----------- |
+| out_return_no | required | string | The new ID which created for refund. |
+| out_trade_no | required | string | The ID for the original transaction. |
+| return_amount | required | float |  |
+| currency | required | string |  |
+| reason | required | string | Reason for refund, out of supply e.g. |
+| return_rmb_amount | optional* | float | This parameter related the RMB price function in the payment interface |
+
+\* return_rmb_amount: if used, then leave return_amount empty
 
 #### Service::Exchange
 
@@ -247,4 +298,8 @@ AlipayGlobal::Service::Reconciliation.request(params)
 {:partner_transaction_id=>"1326555", :amount=>"2125.25", :currency=>"HKD", :transaction_time=>#<DateTime: 2013-12-19T17:56:37+00:00 ((2456646j,64597s,0n),+0s,2299161j)>, :settlement_time=>"", :transaction_type=>"P", :service_charge=>"21.25", :status=>"P", :remarks=>"Grey Hours Limited (Testing)"}, 
 {:partner_transaction_id=>"1326244", :amount=>"0.01", :currency=>"HKD", :transaction_time=>#<DateTime: 2013-12-19T16:11:26+00:00 ((2456646j,58286s,0n),+0s,2299161j)>, :settlement_time=>"", :transaction_type=>"P", :service_charge=>"0.00", :status=>"P", :remarks=>"MICROS-Fidelio Information Systems Co. Limited (Testing)"}
 ]
-```
+```
+
+### Contributing
+
+Feel free to fork this repo and make a PR.

data/alipay_global.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "fakeweb"
   spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "rest-client", "~> 1.8.0"
+
 end

data/lib/alipay_global/service.rb

@@ -7,7 +7,7 @@ module AlipayGlobal
     def self.request_uri(params, sign = true)
       uri = URI(gateway_url)
       processed_params = sign ? sign_params(params) : params
-      uri.query = URI.encode_www_form(processed_params)
+      uri.query = URI.encode_www_form(AlipayGlobal::Utils.stringify_keys(processed_params))
       uri
     end
 

data/lib/alipay_global/service/notification.rb

@@ -1,4 +1,4 @@
-require 'open-uri'
+require 'net/http'
 
 module AlipayGlobal
   module Service
@@ -10,9 +10,6 @@ module AlipayGlobal
           'partner'         => AlipayGlobal.api_partner_id,
         }.merge(params)
 
-        Rails.logger.debug AlipayGlobal::Service.request_uri(params,false)
-        Rails.logger.debug Net::HTTP.get(AlipayGlobal::Service.request_uri(params,false))
-
         Net::HTTP.get(AlipayGlobal::Service.request_uri(params,false))
       end
       

data/lib/alipay_global/service/trade.rb

@@ -1,11 +1,12 @@
 require "net/http"
+require "rest-client"
 require "uri"
 require "nokogiri"
 
 module AlipayGlobal
   module Service
     module Trade
-
+      BOUNDARY = "AaB03x"
       CREATE_TRADE_REQUIRED_PARAMS = %w( notify_url subject out_trade_no currency )
       CREATE_TRADE_OPTIONAL_PARAMS = %w( return_url body total_fee rmb_fee order_gmt_create order_valid_time timeout_rule auth_token supplier seller_id seller_name seller_industry )
 
@@ -26,7 +27,19 @@ module AlipayGlobal
         AlipayGlobal::Service.request_uri(params).to_s
       end
 
-      def self.refund(refunds)
+      def self.refund(params)
+        resp = Net::HTTP.get(build_refund_uri(params))
+
+        alipay_results = Nokogiri::XML(resp).at_xpath('//alipay')
+
+        alipay_success = alipay_results.at_xpath('//is_success').content == "T"
+
+        alipay_reason = alipay_success ? "" : alipay_results.at_xpath('//error').content
+
+        { success: alipay_success , message: alipay_reason }
+      end
+
+      def self.batch_refund(refunds)
         file = build_refund_file(refunds)
 
         params = {
@@ -38,14 +51,18 @@ module AlipayGlobal
 
         #p uri.to_s
 
-        form_params = { 'partner' => AlipayGlobal.api_partner_id, 'service' => 'forex_refund_file', 'refund_file' => IO.read(file.path) }
+        form_params = { 'partner' => AlipayGlobal.api_partner_id, 'service' => 'forex_refund_file', 'refund_file' => File.read(file.path) }
+
+        #IO.read(file.path)
 
         #p form_params
 
-        resp = Net::HTTP.post_form(uri, form_params)
+        #resp = Net::HTTP.post_form(uri, form_params)
 
         #p resp.body
 
+        resp = RestClient.post uri.to_s, :partner => AlipayGlobal.api_partner_id, :file => File.new(file.path, 'rb'), :service => 'forex_refund_file'
+
         alipay_resp = Nokogiri::XML(resp.body)
 
         alipay_results = alipay_resp.at_xpath('//alipay')
@@ -56,12 +73,24 @@ module AlipayGlobal
       end
 
       def self.build_refund_file(refunds)
-        file = Tempfile.new(['refund_file','.txt'])
+        file = Tempfile.new(['refund','.txt'])
         refund_content = AlipayGlobal::Utils.write_refund_content(refunds)
         file.write(refund_content)
         file.close
         file
       end
+
+      def self.build_refund_uri(refund)
+        refund[:reason] = "no_reason" if !refund[:reason] 
+        refund[:reason] = "no_reason" if refund[:reason].strip.length == 0
+        params = {
+          'service'         => 'forex_refund',
+          '_input_charset'  => 'utf-8',
+          'partner'         => AlipayGlobal.api_partner_id
+        }.merge(refund)
+
+        AlipayGlobal::Service.request_uri(params)
+      end
     end
   end
 end

data/lib/alipay_global/utils.rb

@@ -4,8 +4,7 @@ module AlipayGlobal
       new_hash = {}
       hash.each do |key, value|
         case key
-        when :total_fee, :rmb_fee, :refund_sum
-          value = value.round(2)
+        when :total_fee, :rmb_fee, :refund_sum, :return_rmb_amount, :return_amount
           value = '%.2f' % value
         end
         new_hash[(key.to_s rescue key) || key] = value

data/lib/alipay_global/version.rb

@@ -1,3 +1,3 @@
 module AlipayGlobal
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/service/trade_test.rb

@@ -56,13 +56,59 @@ describe "AlipayGlobal::Service::Trade", "Forex trade actions" do
   end
 
   describe "#refund" do
+    it "should refund correctly for a valid refund url" do
+      params = {
+        out_return_no: "SAMPLE_REFUND_ID",
+        out_trade_no: "SAMPLE_TRANSACTION_ID",
+        return_rmb_amount: 200.00,
+        reason: "hello",
+        gmt_return: (Time.parse("2015-03-20 12:00").getlocal("+08:00")).strftime("%Y%m%d%H%M%S"),
+        currency: "USD"
+      }
+      expected_result = { success: false, message: "PURCHASE_TRADE_NOT_EXIST" }
+
+      assert_equal "https://mapi.alipay.net/gateway.do?service=forex_refund&_input_charset=utf-8&partner=2088101122136241&out_return_no=SAMPLE_REFUND_ID&out_trade_no=SAMPLE_TRANSACTION_ID&return_rmb_amount=200.00&reason=hello&gmt_return=20150320120000&currency=USD&sign_type=MD5&sign=a77e894e71491f41e73ebe40319cc300", @alipay::Service::Trade.build_refund_uri(params).to_s
+      assert_equal  expected_result, @alipay::Service::Trade.refund(params)
+    end
+
+    it "should handle nil reason correctly" do
+      params = {
+        out_return_no: "SAMPLE_REFUND_ID",
+        out_trade_no: "SAMPLE_TRANSACTION_ID",
+        return_rmb_amount: 200.00,
+        gmt_return: (Time.parse("2015-03-20 12:00").getlocal("+08:00")).strftime("%Y%m%d%H%M%S"),
+        currency: "USD"
+      }
+      expected_result = { success: false, message: "PURCHASE_TRADE_NOT_EXIST" }
+
+      assert_equal "https://mapi.alipay.net/gateway.do?service=forex_refund&_input_charset=utf-8&partner=2088101122136241&out_return_no=SAMPLE_REFUND_ID&out_trade_no=SAMPLE_TRANSACTION_ID&return_rmb_amount=200.00&gmt_return=20150320120000&currency=USD&reason=no_reason&sign_type=MD5&sign=c4c09ca3fc78d04b88d9459b02673b1b", @alipay::Service::Trade.build_refund_uri(params).to_s
+      assert_equal  expected_result, @alipay::Service::Trade.refund(params)
+    end
+
+    it "should handle empty reason correctly" do
+      params = {
+        out_return_no: "SAMPLE_REFUND_ID",
+        out_trade_no: "SAMPLE_TRANSACTION_ID",
+        return_rmb_amount: 200.00,
+        gmt_return: (Time.parse("2015-03-20 12:00").getlocal("+08:00")).strftime("%Y%m%d%H%M%S"),
+        reason: " ",
+        currency: "USD"
+      }
+      expected_result = { success: false, message: "PURCHASE_TRADE_NOT_EXIST" }
+
+      assert_equal "https://mapi.alipay.net/gateway.do?service=forex_refund&_input_charset=utf-8&partner=2088101122136241&out_return_no=SAMPLE_REFUND_ID&out_trade_no=SAMPLE_TRANSACTION_ID&return_rmb_amount=200.00&gmt_return=20150320120000&reason=no_reason&currency=USD&sign_type=MD5&sign=c4c09ca3fc78d04b88d9459b02673b1b", @alipay::Service::Trade.build_refund_uri(params).to_s
+      assert_equal  expected_result, @alipay::Service::Trade.refund(params)
+    end
+  end
+
+  describe "#batch_refund" do
     it "should transact refund correctly" do
       sample_refunds = [
         { new_transaction_id: '111222333', old_transaction_id: '444555666', currency: 'USD', refund_sum: 200.00, refund_time: '20120330235959', refund_reason: 'bello minions' },
         { new_transaction_id: '111222333', old_transaction_id: '444555667', currency: 'USD', refund_sum: 150.00, refund_time: '20120330235959', refund_reason: 'monkey' }
       ]
 
-      @alipay::Service::Trade.refund(sample_refunds)
+      @alipay::Service::Trade.batch_refund(sample_refunds)
     end
     
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alipay_global
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Melvrick Goh, Ng Junyang, Grzegorz Witek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 description: An unofficial simple global.alipay gem
 email:
 - melvrickgoh@kaligo.com