activemerchant_patch_for_china 0.1.4 → 0.1.5

data/README.textile

@@ -47,136 +47,11 @@ require 'active_merchant/billing/integrations/action_view_helper'
 ActionView::Base.send(:include, ActiveMerchant::Billing::Integrations::ActionViewHelper)
 </code></pre>
 
-then define your api key, account and email
-
-<pre><code>
-ActiveMerchant::Billing::Integrations::Alipay::KEY
-ActiveMerchant::Billing::Integrations::Alipay::ACCOUNT
-ActiveMerchant::Billing::Integrations::Alipay::EMAIL
-</code></pre>
-
 **************************************************************************
 
 h2. Usage
 
-*Alipay*
-
-Request Form:
-
-<pre><code>
-<% payment_service_for 'payment code', ActiveMerchant::Billing::Integrations::Alipay::ACCOUNT,
-                            :service => :alipay,
-                            :html => { :id => 'payment-form', :method => :get } do |service| %>
-  <% service.total_fee 0.02 %>
-  <%# service.price 0.01 %>
-  <%# service.quantity 2 %>
-  <% service.seller :email => ActiveMerchant::Billing::Integrations::Alipay::EMAIL %>
-  <% service.notify_url url_for(:only_path => false, :action => 'notify') %>
-  <% service.return_url url_for(:only_path => false, :action => 'done') %>
-  <% service.show_url url_for(:only_path => false, :action => 'show') %>
-  <% service.body 'payment body' %>
-  <% service.charset "utf-8" %>
-  <% service.service "create_direct_pay_by_user" %>
-  <% service.payment_type 1 %>
-  <% service.subject 'payment subject' %>
-  <% service.sign %>
-<% end %>
-<%= button_to_function "Submit", "document.getElementById('payment-form').submit();" %>
-</code></pre>
-
-*payment code is the out_trade_no, it must be unique.*
-amount is the total_fee.
-payment body is the body of the payment.
-payment subject is the subject of the payment.
-
-
-Notify action:
-
-<pre><code>
-notification = ActiveMerchant::Billing::Integrations::Alipay::Notification.new(request.raw_post)
-
-txn = AlipayTxn.create(:notify_id => notification.notify_id, 
-                       :total_fee => notification.total_fee, 
-                       :status => notification.trade_status, 
-                       :trade_no => notification.trade_no, 
-                       :received_at => notification.notify_time)
-
-if notification.complete?
-  txn.pay!
-else
-  txn.pending!
-end
-</code></pre>
-
-Return action:
-
-<pre><code>
-def done
-  r = ActiveMerchant::Billing::Integrations::Alipay::Return.new(request.query_string)  
-  unless @result = r.success?  
-    logger.warn(r.message)  
-  end  
-end
-</code></pre>
-
-**************************************************************************
-
-h2. Interface
-
-*Alipay*
-
-for helper
-
-<pre><code>
-mapping :account, 'partner'
-mapping :total_fee, 'total_fee'
-mapping :price, 'price'
-mapping :quantity, 'quantity'
-mapping :order, 'out_trade_no'
-mapping :seller, :email => 'seller_email',
-                 :id => 'seller_id'
-mapping :buyer, :email => 'buyer_email',
-                :id => 'buyer_id'
-mapping :notify_url, 'notify_url'
-mapping :return_url, 'return_url'
-mapping :show_url, 'show_url'
-mapping :body, 'body'
-mapping :subject, 'subject'
-mapping :charset, '_input_charset'
-mapping :service, 'service'
-mapping :payment_type, 'payment_type'
-mapping :paymethod, 'paymethod'
-mapping :defaultbank, 'defaultbank'
-mapping :royalty_type, 'royalty_type'
-mapping :royalty_parameters, 'royalty_parameters'
-mapping :it_b_pay, 'it_b_pay'
-</code></pre>
-
-for notification
-
-<pre><code>
-notify_type
-notify_id
-notify_time
-out_trade_no
-trade_no
-payment_type
-subject
-body
-price
-quantity
-total_fee
-trade_status
-refund_status
-seller_email
-seller_id
-buyer_email
-buyer_id
-gmt_create
-gmt_payment
-gmt_close
-gmt_refund
-</code></pre>
+"Alipay (支付宝)":http://wiki.github.com/flyerhzm/activemerchant_patch_for_china/alipay
 
 **************************************************************************
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/activemerchant_patch_for_china.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activemerchant_patch_for_china}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-11-26}
+  s.date = %q{2009-12-16}
   s.description = %q{A rails plugin to add an active_merchant patch for china online payment platform}
   s.email = %q{flyerhzm@gmail.com}
   s.extra_rdoc_files = [

data/lib/active_merchant/billing/integrations/alipay/helper.rb

@@ -39,17 +39,17 @@ module ActiveMerchant #:nodoc:
           mapping :it_b_pay, 'it_b_pay'
           
           #################################################
-          # create partner trade by buyer or trade create by user
+          # create partner trade by buyer and trade create by user
           #################################################
           mapping :price, 'price'
           mapping :quantity, 'quantity'
           mapping :discount, 'discount'
           ['', '_1', '_2', '_3'].each do |postfix|
-          self.class_eval <<-EOF
+            self.class_eval <<-EOF
             mapping :logistics#{postfix}, :type => 'logistics_type#{postfix}',
                                           :fee => 'logistics_fee#{postfix}',
                                           :payment => 'logistics_payment#{postfix}'
-          EOF
+            EOF
           end
           mapping :receive, :name => 'receive_name',
                             :address => 'receive_address',

data/lib/active_merchant/billing/integrations/alipay/notification.rb

@@ -9,104 +9,62 @@ module ActiveMerchant #:nodoc:
           include Sign
 
           def complete?
-            if trade_status != "TRADE_FINISHED"
-              return false
-            end
-
-            unless verify_sign
-              @message = "Alipay Error: ILLEGAL_SIGN"
-              return false
-            end
-
-            true
-          end
-
-          def message
-            @message
-          end
-          
-          def notify_type
-            params['notify_type']
-          end
-
-          def notify_id
-            params['notify_id']
-          end
-          
-          def notify_time
-            Time.parse params['notify_time']
-          end
-
-          def out_trade_no
-            params['out_trade_no']
-          end
-
-          def trade_no
-            params['trade_no']
+            trade_status == "TRADE_FINISHED"
           end
           
-          def payment_type
-            params['payment_type']
+          def pending?
+            trade_status == 'WAIT_BUYER_PAY'
           end
           
-          def subject
-            params['subject']
-          end
-          
-          def body
-            params['body']
+          def status
+            trade_status
           end
 
-          def price
-            params['price']
-          end
-          
-          def quantity
-            params['quantity']
-          end
-
-          def total_fee
-            params["total_fee"]
+          def acknowledge
+            raise StandardError.new("Faulty alipay result: ILLEGAL_SIGN") unless verify_sign
+            true
           end
 
-          def trade_status
-            params['trade_status']
-          end
-          
-          def refund_status
-            params['refund_status']
+          ['notify_type', 'notify_id', 'out_trade_no', 'trade_no', 'payment_type', 'subject', 'body',
+            'seller_email', 'seller_id', 'buyer_email', 'buyer_id', 'logistics_type', 'logistics_payment',
+            'receive_name', 'receive_address', 'receive_zip', 'receive_phone', 'receive_mobile'].each do |param|
+            self.class_eval <<-EOF
+              def #{param}
+                params['#{param}']
+              end
+            EOF
           end
           
-          def seller_email
-            params['seller_email']
+          ['price', 'discount', 'quantity', 'total_fee', 'coupon_discount', 'logistics_fee'].each do |param|
+            self.class_eval <<-EOF
+              def #{param}
+                params['#{param}']
+              end
+            EOF
           end
           
-          def seller_id
-            params['seller_id']
+          ['trade_status', 'refund_status', 'logistics_status'].each do |param|
+            self.class_eval <<-EOF
+              def #{param}
+                params['#{param}']
+              end
+            EOF
           end
 
-          def buyer_email
-            params['buyer_email']
+          ['notify_time', 'gmt_create', 'gmt_payment', 'gmt_close', 'gmt_refund', 'gmt_send_goods', 'gmt_logistics_modify'].each do |param|
+            self.class_eval <<-EOF
+              def #{param}
+                Time.parse params['#{param}']
+              end
+            EOF
           end
 
-          def buyer_id
-            params['buyer_id']
-          end
-          
-          def gmt_create
-            Time.parse params['gmt_create']
-          end
-          
-          def gmt_payment
-            Time.parse params['gmt_payment']
-          end
-          
-          def gmt_close
-            Time.parse params['gmt_close']
-          end
-          
-          def gmt_refund
-            Time.parse params['gmt_reund']
+          ['use_coupon', 'is_total_fee_adjust'].each do |param|
+            self.class_eval <<-EOF
+              def #{param}?
+                'T' == params['#{param}']
+              end
+            EOF
           end
           
           private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant_patch_for_china
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +08:00
+date: 2009-12-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency