rails_trade 0.0.2 → 0.0.3

data/app/controllers/trade/my/payment_methods_controller.rb

@@ -1,76 +1,59 @@
-class Trade::My::PaymentMethodsController < Trade::My::BaseController
-  before_action :set_payment_method, only: [:show, :edit, :update, :destroy]
+module Trade
+  class My::PaymentMethodsController < My::BaseController
+    before_action :set_payment_method, only: [:show, :edit, :update, :destroy]
 
-  def index
-    @payment_methods = current_buyer.payment_methods
-
-    respond_to do |format|
-      format.html {
+    def index
+      @payment_methods = current_buyer.payment_methods
+    end
 
-      }
-      format.json { render json: @payment_methods.as_json(methods: 'kind') }
+    def new
+      @payment_method = current_buyer.payment_methods.build
     end
-  end
 
-  def new
-    @payment_method = current_buyer.payment_methods.build
-  end
+    def create
+      @payment_method = current_buyer.payment_methods.build(payment_method_params)
 
-  def create
-    @payment_method = current_buyer.payment_methods.build(payment_method_params)
+      unless @payment_method.detective_save
 
-    respond_to do |format|
-      if @payment_method.detective_save
-        format.html
-        format.json { render json: @payment_method.as_json(methods: 'kind') }
-        format.js
-      else
-        format.html { render :new }
-        format.json
-        format.js
       end
     end
-  end
 
-  def show
-  end
+    def show
+    end
 
-  def edit
-  end
+    def edit
+    end
 
-  def update
-    @payment_method.assign_attributes(payment_method_params)
-    if @payment_method.detective_save
-      render 'update'
-    else
-      render :edit
+    def update
+      @payment_method.assign_attributes(payment_method_params)
+
+      if @payment_method.detective_save
+        render 'update'
+      else
+        render :edit
+      end
     end
-  end
 
-  def destroy
-    @payment_method.destroy
+    def destroy
+      @payment_method.destroy
+    end
 
-    respond_to do |format|
-      format.html { head :no_cont }
-      format.js
+    private
+    def set_payment_method
+      @payment_method = PaymentMethod.find(params[:id])
     end
-  end
 
-  private
-  def set_payment_method
-    @payment_method = PaymentMethod.find(params[:id])
-  end
+    def payment_method_params
+      _params = params.fetch(:payment_method, {}).permit(
+        :account_name,
+        :account_num,
+        :bank,
+        :buyer_id,
+        :type,
+        :token
+      )
+      _params.merge(verified: true, myself: true)
+    end
 
-  def payment_method_params
-    _params = params.fetch(:payment_method, {}).permit(
-      :account_name,
-      :account_num,
-      :bank,
-      :buyer_id,
-      :type,
-      :token
-    )
-    _params.merge(verified: true, myself: true)
   end
-
 end

data/app/controllers/trade/my/payments_controller.rb

@@ -0,0 +1,56 @@
+module Trade
+  class My::PaymentsController < My::BaseController
+    before_action :set_payment, only: [:show, :edit, :update, :destroy]
+
+    def index
+      @payments = Payment.page(params[:page])
+    end
+
+    def new
+      @payment = Payment.new
+    end
+
+    def create
+      @payment = Payment.new(payment_params)
+
+      if params[:xx] == 'x' && @payment.save
+        render 'create'
+      else
+        render :new, locals: { model: @payment }, status: :unprocessable_entity
+      end
+    end
+
+    def show
+    end
+
+    def edit
+    end
+
+    def update
+      @payment.assign_attributes(payment_params)
+
+      unless @payment.save
+        render :edit, locals: { model: @payment }, status: :unprocessable_entity
+      end
+    end
+
+    def destroy
+      @payment.destroy
+    end
+
+    private
+    def set_payment
+      @payment = Payment.find(params[:id])
+    end
+
+    def payment_params
+      params.fetch(:payment, {}).permit(
+        :type,
+        :card_id,
+        :total_amount,
+        payment_orders_attributes: [:order_id, :check_amount, :state]
+      )
+    end
+
+  end
+end

data/app/controllers/trade/my/payouts_controller.rb

@@ -0,0 +1,33 @@
+module Trade
+  class My::PayoutsController < My::BaseController
+
+    def index
+      @cash = current_user.cash
+      @payouts = @cash.payouts.order(id: :desc).page(params[:page]).per(params[:per])
+    end
+
+    def list
+      @cash = current_user.cash
+      @payout_lists = RailsTrade.config.payout_list.map { |i| { requested_amount: i } }
+    end
+
+    def create
+      @cash = current_user.cash
+      @payout = @cash.payouts.build(payout_params)
+
+      if @payout.save
+        render 'show', status: :created
+      else
+        process_errors(@payout)
+      end
+    end
+
+    private
+    def payout_params
+      params.fetch(:payout, {}).permit(
+        :requested_amount
+      )
+    end
+
+  end
+end

data/app/controllers/trade/my/trade_items_controller.rb

@@ -1,47 +1,57 @@
-class Trade::My::TradeItemsController < Trade::My::BaseController
-  before_action :set_trade_item, only: [:show, :update, :destroy]
+module Trade
+  class My::TradeItemsController < My::BaseController
+    before_action :set_trade_item, only: [:show, :promote, :update, :toggle, :destroy]
+
+    def create
+      trade_item = current_cart.trade_items.find_or_initialize_by(good_id: params[:good_id], good_type: params[:good_type])
+      trade_item.assign_attributes trade_item_params
+      if trade_item.persisted?
+        params[:number] ||= 1
+        trade_item.number += params[:number].to_i
+      end
+      trade_item.compute_promote
+      trade_item.sum_amount
+      trade_item.save
+
+      @trade_items = @cart.trade_items.page(params[:page])
+      @checked_ids = @cart.trade_items.checked.pluck(:id)
+    end
+
+    def show
+    end
+
+    def promote
+      render layout: false
+    end
+
+    def update
+      @trade_item.assign_attributes(trade_item_params)
+      @trade_item.save
+    end
+
+    def toggle
+      if @trade_item.init?
+        @trade_item.check
+      elsif @trade_item.checked?
+        @trade_item.uncheck
+      end
+    end
+
+    def destroy
+      @trade_item.destroy
+    end
+
+    private
+    def set_trade_item
+      @trade_item = TradeItem.find params[:id]
+      #@trade_item = current_cart.trade_items.find(params[:id])
+    end
+
+    def trade_item_params
+      params.fetch(:trade_item, {}).permit(
+        :number
+      )
+    end
 
-  def index
   end
-
-  def create
-    trade_item = current_cart.trade_items.find_or_initialize_by(good_id: params[:good_id], good_type: params[:good_type])
-    params[:number] ||= 1
-    trade_item.number = trade_item.number + params[:number].to_i
-
-    trade_item.init_amount
-    trade_item.compute_promote
-    trade_item.sum_amount
-    trade_item.save
-
-    @trade_items = current_cart.trade_items.page(params[:page])
-    @checked_ids = current_cart.trade_items.checked.pluck(:id)
-
-    redirect_to my_cart_url
-  end
-
-  def show
-  end
-
-  def update
-    @trade_item.assign_attributes(trade_item_params)
-    @trade_item.save
-  end
-
-  def destroy
-    @trade_item.destroy
-  end
-
-  private
-  def set_trade_item
-    @trade_item = current_cart.trade_items.find(params[:id])
-  end
-
-  def trade_item_params
-    params.fetch(:trade_item, {}).permit(
-      :number,
-      :status
-    )
-  end
-
 end

data/app/controllers/trade/panel/base_controller.rb

@@ -0,0 +1,4 @@
+module Trade
+  class Panel::BaseController < PanelController
+  end
+end

data/app/controllers/trade/panel/exchange_rates_controller.rb

@@ -0,0 +1,53 @@
+module Trade
+  class Panel::ExchangeRatesController < Panel::BaseController
+    before_action :set_exchange_rate, only: [:show, :edit, :update, :destroy]
+
+    def index
+      @exchange_rates = ExchangeRate.page(params[:page])
+    end
+
+    def new
+      @exchange_rate = ExchangeRate.new
+    end
+
+    def create
+      @exchange_rate = ExchangeRate.new(exchange_rate_params)
+
+      unless @exchange_rate.save
+        render :new, locals: { model: @exchange_rate }, status: :unprocessable_entity
+      end
+    end
+
+    def show
+    end
+
+    def edit
+    end
+
+    def update
+      @exchange_rate.assign_attributes(exchange_rate_params)
+
+      unless @exchange_rate.save
+        render :edit, locals: { model: @exchange_rate }, status: :unprocessable_entity
+      end
+    end
+
+    def destroy
+      @exchange_rate.destroy
+    end
+
+    private
+    def set_exchange_rate
+      @exchange_rate = ExchangeRate.find(params[:id])
+    end
+
+    def exchange_rate_params
+      params.fetch(:exchange_rate, {}).permit(
+        :from,
+        :to,
+        :rate
+      )
+    end
+
+  end
+end

data/app/controllers/trade/payments_controller.rb

@@ -1,71 +1,73 @@
-class Trade::PaymentsController < ApplicationController
-  skip_before_action :verify_authenticity_token
-  before_action :set_order, only: [:wxpay_result, :result]
+module Trade
+  class PaymentsController < BaseController
+    skip_before_action :verify_authenticity_token
+    before_action :set_order, only: [:result]
 
-  def alipay_notify
-    notify_params = params.permit!.except(*request.path_parameters.keys).to_h
+    def alipay_notify
+      notify_params = params.permit!.except(*request.path_parameters.keys).to_h
 
-    @order = Order.find_by(uuid: params[:out_trade_no])
-    result = nil
+      @order = Order.find_by(uuid: params[:out_trade_no])
+      result = nil
 
-    if Alipay::Notify.verify?(notify_params)
-      result = @order.change_to_paid! params: notify_params, payment_uuid: notify_params['trade_no'], type: 'AlipayPayment'
-    end
+      if Alipay2::Notify.verify?(notify_params)
+        result = @order.change_to_paid! params: notify_params, payment_uuid: notify_params['trade_no'], type: 'AlipayPayment'
+      end
 
-    if result
-      render plain: 'success'
-    else
-      render plain: 'failure', status: :bad_request
+      if result
+        render plain: 'success'
+      else
+        render plain: 'failure', status: :bad_request
+      end
     end
-  end
 
-  def apple_notify
-    @order = Order.find_by(uuid: params[:order_uuid])
-    notify_params = params.permit!
-    notify_params.merge! amount: @order.amount
+    def apple_notify
+      @order = Order.find_by(uuid: params[:order_uuid])
+      notify_params = params.permit!
+      notify_params.merge! amount: @order.amount
 
-    result = nil
-    if ApplePay.verify?
-      result = @order.changed_to_paid! params: notify_params, type: 'ApplePayment'
-    end
+      result = nil
+      if ApplePay.verify?
+        result = @order.changed_to_paid! params: notify_params, type: 'ApplePayment'
+      end
 
-    if result
-      render json: { code: 200 }
-    else
-      render json: { }, status: :bad_request
+      if result
+        render json: { code: 200 }
+      else
+        render json: { }, status: :bad_request
+      end
     end
-  end
 
-  def wxpay_notify
-    notify_params = Hash.from_xml(request.body.read)['xml']
+    def wxpay_notify
+      encrypted_params = JSON.parse(request.body.read)
+      notify_params = WxPay::Cipher.decrypt_notice encrypted_params['resource'], key: current_wechat_app.key_v3
+
+      @order = Order.find_by(uuid: notify_params['out_trade_no'])
+      result = nil
 
-    @order = Order.find_by(uuid: notify_params['out_trade_no'])
-    wechat_app = WechatApp.find_by(appid: notify_params['appid'])
-    result = nil
+      if @order #&& WxPay::Sign.verify?(notify_params, key: wechat_app.key)
+        result = @order.change_to_paid! params: notify_params, payment_uuid: notify_params['transaction_id'], type: 'Trade::WxpayPayment'
+      end
 
-    if @order && WxPay::Sign.verify?(notify_params, key: wechat_app.key)
-      result = @order.change_to_paid! params: notify_params, payment_uuid: notify_params['transaction_id'], type: 'WxpayPayment'
+      if result
+        render json: { code: 'SUCCESS', message: '处理成功' }
+      else
+        render json: { code: 'FAIL', message: '签名失败' }, status: :bad_request
+      end
     end
 
-    if result
-      render xml: { return_code: 'SUCCESS' }.to_xml(root: 'xml', dasherize: false)
-    else
-      render xml: { return_code: 'FAIL', return_msg: '签名失败' }.to_xml(root: 'xml', dasherize: false), status: :bad_request
+    def notify
+      @notify_params = params.permit!.except(*request.path_parameters.keys).to_h
     end
-  end
 
-  def notify
-    @notify_params = params.permit!.except(*request.path_parameters.keys).to_h
-  end
+    def result
+      @order.change_to_paid! type: 'HandPayment'
+      render json: @order.as_json(only: [:id, :amount, :received_amount, :currency, :payment_status])
+    end
 
-  def result
-    @order.change_to_paid! type: 'HandPayment'
-    render json: @order.as_json(only: [:id, :amount, :received_amount, :currency, :payment_status])
-  end
+    private
+    def set_order
+      @order = Order.find(params[:order_id])
+    end
 
-  private
-  def set_order
-    @order = Order.find(params[:order_id])
   end
-
 end