Merge branch 'release/0.1'

Gemfile

@@ -6,6 +6,8 @@ gem 'rails', '3.0.4'
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 gem 'mysql2', "~> 0.2.6"
+gem 'haml'
+gem 'guid'
 
 gem 'activemerchant', :require => "active_merchant"
 gem 'activemerchant_patch_for_china', '0.1.6'

Gemfile.lock

@@ -40,6 +40,8 @@ GEM
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    guid (0.1.1)
+    haml (3.0.23)
     i18n (0.5.0)
     mail (2.2.15)
       activesupport (>= 2.3.6)
@@ -79,5 +81,7 @@ PLATFORMS
 DEPENDENCIES
   activemerchant
   activemerchant_patch_for_china (= 0.1.6)
+  guid
+  haml
   mysql2 (~> 0.2.6)
   rails (= 3.0.4)

app/controllers/donates_controller.rb

@@ -0,0 +1,15 @@
+class DonatesController < ApplicationController
+  def index
+    @donate = Donate.new
+  end
+
+  def create
+    @donate = Donate.new(params[:donate])
+    if @donate.valid?
+      @donate.number = Guid.new.to_s.gsub('-', '')
+      render :confirm
+    else
+      render :index
+    end
+  end
+end

app/controllers/transactions_controller.rb

@@ -1,11 +1,35 @@
 class TransactionsController < ApplicationController
   def notify
-  end
+    notification = ActiveMerchant::Billing::Integrations::Alipay::Notification.new(request.raw_post)
 
-  def done
-  end
+    transaction_attributes = {
+      :total_fee    => notification.total_fee,
+      :trade_status => notification.trade_status,
+      :trade_no     => notification.trade_no,
+      :notify_time  => notification.notify_time,
+      :raw_post     => request.raw_post
+    }
 
-  def show
+    if transaction = Transaction.find_by_notify_id(notification_notify_id)
+      result = transaction.update_attributes(transaction_attributes)
+    else
+      transaction_attributes.merge!(:notify_id => notification.notify_id)
+      result = Transaction.create(transacation_attributes)
+    end
+
+    if result
+      render :text => "success"
+    else
+      render :text => "failure"
+    end
   end
 
+  def done
+    request = ActiveMerchant::Billing::Integrations::Alipay::Return.new(request.query_string)
+    if request.success?
+      flash[:notice] = '捐助成功！'
+    else
+      flash[:error] = '捐助失败！'
+    end
+  end
 end

app/helpers/donates_helper.rb

@@ -0,0 +1,2 @@
+module DonatesHelper
+end

app/models/donate.rb

@@ -0,0 +1,18 @@
+class Donate
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  extend ActiveModel::Naming
+
+  attr_accessor :amount, :number
+  validates_numericality_of :amount, :greater_than => 0
+
+  def initialize(attributes = {})
+    attributes.each do |name, value|
+      send("#{name}=", value)
+    end
+  end
+
+  def persisted?
+    false
+  end
+end

app/views/donates/confirm.html.haml

@@ -0,0 +1,17 @@
+%h1 捐款确认
+
+%p 捐款金额: ¥#{@donate.amount}
+
+- payment_service_for @donate.number, AlipayConfig[:account], :service => :alipay, :html => { :id => 'payment-form', :method => :get } do |service|
+  - service.total_fee @donate.amount
+  - service.seller :email => AlipayConfig[:email]
+  - service.notify_url url_for(:only_path => false, :controller => 'transactions', :action => 'notify')
+  - service.return_url url_for(:only_path => false, :controller => 'transactions', :action => 'done')
+  - service.charset "utf-8"
+  - service.service ActiveMerchant::Billing::Integrations::Alipay::Helper::CREATE_DIRECT_PAY_BY_USER
+  - service.payment_type 1
+  - service.subject '捐助activemerchat_ptch_for_china项目'
+  - service.sign
+
+= button_to_function "确认", "document.getElementById('payment-form').firstChild.remove();document.getElementById('payment-form').submit()"
+

app/views/donates/index.html.haml

@@ -0,0 +1,6 @@
+%h1 捐款
+
+- form_for @donate do |f|
+  = f.label :amount, '金额: '
+  = f.text_field :amount
+  = f.submit '捐款'

app/views/layouts/application.html.haml

@@ -0,0 +1,9 @@
+!!!
+%html
+  %head
+    %title Donatecn
+    = stylesheet_link_tag :all
+    = javascript_include_tag :defaults
+    = csrf_meta_tag
+  %body
+    = yield

config/routes.rb

@@ -1,11 +1,9 @@
 Donatecn::Application.routes.draw do
   get "transactions/notify"
-
   get "transactions/done"
 
-  get "transactions/show"
-
-  root :to => "home#index"
+  resources :donates
+  root :to => "donates#index"
 
   # The priority is based upon order of creation:
   # first created -> highest priority.

test/functional/donates_controller_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class DonatesControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

test/unit/helpers/donates_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class DonatesHelperTest < ActionView::TestCase
+end