alipay_global 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d806d2aa21fbbc9eb231773eb0df9e468add4b0
-  data.tar.gz: 8b9c2c7df624401147e1d7187400ac912cddd897
+  metadata.gz: eddedc835b2bfbb0f10a759faea33ab63e9afd95
+  data.tar.gz: 04033f489681672e64d7e653bc312683eaf21d7c
 SHA512:
-  metadata.gz: 9e663a7259a74309f6bf10942dce4eaa37c86b2e96e752f6b108d41a79001db77b677c1b2ed37c52b7ca7892da27eda74e52c3f7616e3938390ef04983a73462
-  data.tar.gz: 27b7cadceb9d7ac35996b3581265fff5542681917eeeba73197280e024b60d93c50721a55be85d47c509a3ea00c95c1c30e8377e6d2eb29c30b1e1ceeb28c721
+  metadata.gz: f8706e2ede93062f2472978a777ada9277870d729ec802d5b288428e53dfd0ba2b7bacfff76d2aca4be00a9c57879c3762f012539e6bf3d0be6f4ec261e3bebc
+  data.tar.gz: 44cfecd9b76dd39396e98b2ec8c165244da4023fd8e55463be7da28d491452d36b4c0b466a997f232ace4257eee59e87a763309a2fe5f9ceabe653be5d5a6917

data/README.md

@@ -103,6 +103,63 @@ 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
+status
+```
+
+#### Definition
+
+```ruby
+AlipayGlobal::Service::Trade.status({ARGUMENTS})
+```
+
+#### Example
+
+```ruby
+AlipayGlobal::Service::Trade.status(
+  out_trade_no: "SAMPLE_TRANSACTION_ID"
+)
+# success => { success: true, message {
+  trade_no: "ALIPAYS_INTERNAL_TRADE_NO",
+  out_trade_no: "YOUR_TRADE_NO_USED",
+  subject: "SUBJECT CONTENT USED IN TRANSACTION",
+  trade_status: "WAIT_BUYER_PAY/TRADE_FINISHED/TRADE_CLOSED"
+} }
+# error => { success: false, message: "ERROR_CODE. # See below" }
+#for production
+```
+
+#### ARGUMENTS
+
+| Key | Requirement | Data Type | Description |
+| --- | ----------- | --------- | ----------- |
+| out_trade_no | required | string | The ID for the original transaction. |
+
+#### RESPONSE
+
+##### Success response
+
+| Trade status | Description |
+| ------------ | ----------- |
+| WAIT_BUYER_PAY | The buyer is expected to make the payment |
+| TRADE_FINISHED | The payment has been made, transaction closes. |
+| TRADE_CLOSED | Transaction closed without payment. |
+
+##### Error response
+Shown when there's an issue with the payment uri created or if the transaction does not exist
+
+| Error Code | Description |
+| ---------- | ----------- |
+| TRADE_NOT_EXIST | This trade number does not exist in Alipay's transaction DB |
+| ILLEGAL_ARGUMENT | Illegal parameters |
+| ILLEGAL_SIGN | Illegal signature |
+| HASH_NO_PRIVILEGE | No sufficient rights to complete the query |
+| ILLEGAL_SERVICE | Service Parameter is incorrect |
+| ILLEGAL_PARTNER | Incorrect Partner ID |
+| ILLEGAL_SIGN_TYPE | Signature is of wrong type. |
+| ILLEGAL_CHARSET | Illegal charset |
+
+
 ```ruby
 refund
 ```
@@ -124,7 +181,7 @@ AlipayGlobal::Service::Trade.refund(
   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
+# => 'https://mapi.alipay.net/gateway.do?service=forex_refund...' #for production
 ```
 
 #### ARGUMENTS

data/alipay_global.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "fakeweb"
-  spec.add_development_dependency "nokogiri"
-  spec.add_development_dependency "rest-client", "~> 1.8.0"
+  spec.add_dependency "nokogiri"
+  spec.add_dependency "rest-client", "~> 1.8.0"
 
-end
+end

data/lib/alipay_global/service/trade.rb

@@ -7,6 +7,7 @@ module AlipayGlobal
   module Service
     module Trade
       BOUNDARY = "AaB03x"
+      CREATE_QUERY_REQUIRED_PARAMS = %w( out_trade_no )
       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 )
 
@@ -27,6 +28,32 @@ module AlipayGlobal
         AlipayGlobal::Service.request_uri(params).to_s
       end
 
+      def self.status(params)
+        resp = Net::HTTP.get(build_query_uri(params))
+
+        alipay_results = Nokogiri::XML(resp).at_xpath('//alipay')
+
+        alipay_success = alipay_results.at_xpath('//is_success').content == "T"
+
+        status_response = process_alipay_trade_response(alipay_success,alipay_results) 
+
+        { success: alipay_success , message: status_response }
+      end
+
+      def self.process_alipay_trade_response(success, alipay_xml)
+        if success
+          response_xml = alipay_xml.at_xpath('//response').at_xpath('//trade')
+          {
+            trade_no: response_xml.at_xpath('//trade_no').content,
+            out_trade_no: response_xml.at_xpath('//out_trade_no').content,
+            subject: response_xml.at_xpath('//subject').content,
+            trade_status: response_xml.at_xpath('//trade_status').content
+          }
+        else
+          alipay_xml.at_xpath('//error').content
+        end
+      end
+
       def self.refund(params)
         resp = Net::HTTP.get(build_refund_uri(params))
 
@@ -40,6 +67,7 @@ module AlipayGlobal
       end
 
       def self.batch_refund(refunds)
+        #DISABLED
         file = build_refund_file(refunds)
 
         params = {
@@ -49,18 +77,8 @@ module AlipayGlobal
 
         uri = AlipayGlobal::Service.request_uri(params)
 
-        #p uri.to_s
-
         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)
-
-        #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)
@@ -72,6 +90,19 @@ module AlipayGlobal
         file.unlink
       end
 
+      def self.build_query_uri(params)
+        params = AlipayGlobal::Utils.stringify_keys(params)
+        AlipayGlobal::Service.check_required_params(params, CREATE_QUERY_REQUIRED_PARAMS)
+
+        params = {
+          'service'         => 'single_trade_query',
+          '_input_charset'  => 'utf-8',
+          'partner'         => AlipayGlobal.api_partner_id
+        }.merge(params)
+
+        AlipayGlobal::Service.request_uri(params)
+      end
+
       def self.build_refund_file(refunds)
         file = Tempfile.new(['refund','.txt'])
         refund_content = AlipayGlobal::Utils.write_refund_content(refunds)

data/lib/alipay_global/version.rb

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

data/test/service/trade_test.rb

@@ -55,6 +55,26 @@ describe "AlipayGlobal::Service::Trade", "Forex trade actions" do
 
   end
 
+  describe "#status" do
+    it "should reject non-existent trade" do
+      params = {
+        out_trade_no: "SAMPLE_TRANSACTION_ID"
+      }
+      expected_result = { success: false, message: "TRADE_NOT_EXIST" }
+
+      assert_equal "https://mapi.alipay.net/gateway.do?service=single_trade_query&_input_charset=utf-8&partner=2088101122136241&out_trade_no=SAMPLE_TRANSACTION_ID&sign_type=MD5&sign=d4d3825356fd0799ee16829acffc1460", @alipay::Service::Trade.build_query_uri(params).to_s
+      assert_equal expected_result, @alipay::Service::Trade.status(params)
+    end
+
+    it "should reject uri with missing out_trade_no" do
+      params = { }
+      expected_result = { success: false, message: "ILLEGAL_ARGUMENT" }
+
+      assert_equal "https://mapi.alipay.net/gateway.do?service=single_trade_query&_input_charset=utf-8&partner=2088101122136241&sign_type=MD5&sign=af7007238531b0b0917f3972e24c6c64", @alipay::Service::Trade.build_query_uri(params).to_s
+      assert_equal expected_result, @alipay::Service::Trade.status(params)
+    end
+  end
+
   describe "#refund" do
     it "should refund correctly for a valid refund url" do
       params = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alipay_global
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Melvrick Goh, Ng Junyang, Grzegorz Witek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -87,7 +87,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: