rails_trade 0.0.2 → 0.0.3

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

@@ -0,0 +1,67 @@
+module Trade
+  class Admin::PayoutsController < Admin::BaseController
+    before_action :set_payout, only: [:show, :edit, :update, :do_pay, :destroy]
+
+    def index
+      q_params = {}
+      q_params.merge! params.permit(:id, :cash_id, :payout_uuid)
+
+      @payouts = Payout.default_where(q_params).page(params[:page])
+    end
+
+    def new
+      @payout = Payout.new
+    end
+
+    def create
+      @payout = Payout.new(payout_params)
+
+      if @payout.save
+        render 'create'
+      else
+        render :new, locals: { model: @payout }, status: :unprocessable_entity
+      end
+    end
+
+    def show
+    end
+
+    def edit
+    end
+
+    def update
+      @payout.assign_attributes(payout_params)
+
+      unless @payout.save
+        render :edit, locals: { model: @payout }, status: :unprocessable_entity
+      end
+    end
+
+    def do_pay
+      @payout.do_pay
+    end
+
+    def destroy
+      @payout.destroy
+    end
+
+    private
+    def set_payout
+      @payout = Payout.find(params[:id])
+    end
+
+    def payout_params
+      p = params.fetch(:payout, {}).permit(
+        :actual_amount,
+        :payout_uuid,
+        :to_bank,
+        :to_name,
+        :to_identifier,
+        :proof
+      )
+      p.merge! operator_id: current_member.id
+      p
+    end
+
+  end
+end

data/app/controllers/trade/admin/promote_carts_controller.rb

@@ -0,0 +1,54 @@
+module Trade
+  class Admin::PromoteCartsController < Admin::BaseController
+    before_action :set_promote_cart, only: [:show, :destroy]
+
+    def index
+      q_params = {}
+      q_params.merge! params.permit(:promote_id, :user_id, :member_id)
+
+      @promote_carts = PromoteCart.includes(:buyer, :promote).default_where(q_params).page(params[:page])
+      if params[:promote_good_id]
+        @promote_good = PromoteGood.find params[:promote_good_id]
+      end
+    end
+
+    def show
+    end
+
+    def new
+      @promote_cart = PromoteCart.new(
+        promote_id: params[:promote_id],
+      )
+    end
+
+    def create
+      @promote_cart = PromoteCart.new(promote_cart_params)
+
+      if @promote_cart.save
+        render 'create'
+      else
+        render :new, locals: { model: @promote_cart }, status: :unprocessable_entity
+      end
+    end
+
+    def destroy
+      @promote_cart.destroy
+    end
+
+    private
+    def set_promote_cart
+      @promote_cart = PromoteCart.find(params[:id])
+    end
+
+    def promote_cart_params
+      params.fetch(:promote_cart, {}).permit(
+        :cart_id,
+        :promote_good_id,
+        :status,
+        :effect_at,
+        :expire_at
+      )
+    end
+
+  end
+end

data/app/controllers/trade/admin/promote_charges_controller.rb

@@ -1,67 +1,69 @@
-class Trade::Admin::PromoteChargesController < Trade::Admin::BaseController
-  before_action :set_promote, except: [:options]
-  before_action :set_charge, only: [:edit, :update, :destroy]
-
-  def index
-    q_params = {}
-    q_params.merge! params.permit(PromoteCharge.extra_columns)
-    q_params.merge! 'filter_min-lte': params[:value], 'filter_max-gte': params[:value]
-    
-    @promote_charges = @promote.promote_charges.default_where(q_params).order(min: :asc).page(params[:page]).per(params[:per])
-  end
-  
-  def options
-  
-  end
+module Trade
+  class Admin::PromoteChargesController < Admin::BaseController
+    before_action :set_promote, except: [:options]
+    before_action :set_charge, only: [:edit, :update, :destroy]
 
-  def new
-    @promote_charge = @promote.promote_charges.build
-  end
+    def index
+      q_params = {}
+      q_params.merge! params.permit(PromoteCharge.extra_columns)
+      q_params.merge! 'filter_min-lte': params[:value], 'filter_max-gte': params[:value]
 
-  def create
-    @promote_charge = @promote.promote_charges.build(promote_charge_params)
-    
-    if @promote_charge.save
-      render :new, locals: { model: @promote_charge }, status: :unprocessable_entity
+      @promote_charges = @promote.promote_charges.default_where(q_params).order(min: :asc).page(params[:page]).per(params[:per])
     end
-  end
 
-  def edit
+    def options
 
-  end
+    end
 
-  def update
-    @promote_charge.assign_attributes(promote_charge_params)
+    def new
+      @promote_charge = @promote.promote_charges.build
+    end
+
+    def create
+      @promote_charge = @promote.promote_charges.build(promote_charge_params)
 
-    if @promote_charge.save
-      render :edit, locals: { model: @promote_charge }, status: :unprocessable_entity
+      unless @promote_charge.save
+        render :new, locals: { model: @promote_charge }, status: :unprocessable_entity
+      end
     end
-  end
 
-  def destroy
-    @promote_charge.destroy
-  end
+    def edit
 
-  private
-  def promote_charge_params
-    params.fetch(:promote_charge, {}).permit(
-      :min,
-      :max,
-      :type,
-      :unit,
-      :parameter,
-      :contain_min,
-      :contain_max,
-      *PromoteCharge.extra_columns
-    )
-  end
+    end
 
-  def set_promote
-    @promote = Promote.find params[:promote_id]
-  end
+    def update
+      @promote_charge.assign_attributes(promote_charge_params)
 
-  def set_charge
-    @promote_charge = PromoteCharge.find params[:id]
-  end
+      unless @promote_charge.save
+        render :edit, locals: { model: @promote_charge }, status: :unprocessable_entity
+      end
+    end
+
+    def destroy
+      @promote_charge.destroy
+    end
+
+    private
+    def promote_charge_params
+      params.fetch(:promote_charge, {}).permit(
+        :min,
+        :max,
+        :type,
+        :unit,
+        :parameter,
+        :contain_min,
+        :contain_max,
+        *PromoteCharge.extra_columns
+      )
+    end
+
+    def set_promote
+      @promote = Promote.find params[:promote_id]
+    end
 
+    def set_charge
+      @promote_charge = @promote.promote_charges.find params[:id]
+    end
+
+  end
 end

data/app/controllers/trade/admin/promote_goods_controller.rb

@@ -1,63 +1,68 @@
-class Trade::Admin::PromoteGoodsController < Trade::Admin::BaseController
-  before_action :set_promote_good, only: [:show, :edit, :update, :destroy]
+module Trade
+  class Admin::PromoteGoodsController < Admin::BaseController
+    before_action :set_promote_good, only: [:show, :edit, :update, :destroy]
 
-  def index
-    q_params = {}.with_indifferent_access
-    q_params.merge! params.permit(:promote_id, :good_type, :good_id)
-    @promote_goods = PromoteGood.default_where(q_params).page(params[:page])
-    if params[:promote_id]
-      @promote = Promote.find params[:promote_id]
+    def index
+      q_params = {}
+      q_params.merge! params.permit(:promote_id, :good_type, :good_id)
+
+      @promote_goods = PromoteGood.default_where(q_params).page(params[:page])
+      if params[:promote_id]
+        @promote = Promote.find params[:promote_id]
+      end
     end
-  end
 
-  def goods
-    # todo support search
-    @goods = params[:good_type].constantize.default_where(default_params).order(id: :desc)
-    @promote_good = PromoteGood.new
-  end
+    def goods
+      # todo support search
+      @goods = params[:good_type].constantize.default_where(default_params).order(id: :desc)
+      @promote_good = PromoteGood.new
+    end
 
-  def show
-  end
+    def show
+    end
 
-  def new
-    @promote_good = PromoteGood.new(params.permit(:promote_id, :good_type, :good_id))
-  end
+    def new
+      @promote_good = PromoteGood.new(params.permit(:promote_id, :good_type, :good_id))
+    end
 
-  def edit
-  end
+    def edit
+    end
 
-  def create
-    @promote_good = PromoteGood.new(promote_good_params)
+    def create
+      @promote_good = PromoteGood.new(promote_good_params)
 
-    unless @promote_good.save
-      render :new, locals: { model: @promote_good }, status: :unprocessable_entity
+      unless @promote_good.save
+        render :new, locals: { model: @promote_good }, status: :unprocessable_entity
+      end
     end
-  end
 
-  def update
-    @promote_good.assign_attributes(promote_good_params)
+    def update
+      @promote_good.assign_attributes(promote_good_params)
 
-    unless @promote_good.save
-      render :edit, locals: { model: @promote_good }, status: :unprocessable_entity
+      unless @promote_good.save
+        render :edit, locals: { model: @promote_good }, status: :unprocessable_entity
+      end
     end
-  end
 
-  def destroy
-    @promote_good.destroy
-  end
+    def destroy
+      @promote_good.destroy
+    end
 
-  private
-  def set_promote_good
-    @promote_good = PromoteGood.find(params[:id])
-  end
+    private
+    def set_promote_good
+      @promote_good = PromoteGood.find(params[:id])
+    end
 
-  def promote_good_params
-    params.fetch(:promote_good, {}).permit(
-      :promote_id,
-      :good_type,
-      :good_id,
-      :status
-    )
-  end
+    def promote_good_params
+      params.fetch(:promote_good, {}).permit(
+        :promote_id,
+        :good_type,
+        :good_id,
+        :effect_at,
+        :expire_at,
+        :status
+      )
+    end
 
+  end
 end

data/app/controllers/trade/admin/promotes_controller.rb

@@ -1,69 +1,5 @@
-class Trade::Admin::PromotesController < Trade::Admin::BaseController
-  before_action :set_promote, only: [:show, :edit, :update, :destroy]
-
-  def index
-    q_params = {}
-    q_params.merge! default_params
-    q_params.merge! params.permit(:scope)
-    
-    @promotes = Promote.default_where(q_params).order(id: :desc).page(params[:page])
-  end
-
-  def search
-    @promotes = Promote.default_where('name-like': params[:q])
-    render json: { results: @promotes.as_json(only: [:id, :name]) }
-  end
-
-  def new
-    @promote = Promote.new
-  end
-
-  def create
-    @promote = Promote.new(promote_params)
-    
-    if @promote.save
-      @promote_charge = @promote.promote_charges.build
-    else
-      render :new, locals: { model: @promote }, status: :unprocessable_entity
-    end
-  end
-
-  def show
-  end
-
-  def edit
-  end
-
-  def update
-    @promote.assign_attributes promote_params
-
-    unless @promote.save
-      render :edit, locals: { model: @promote }, status: :unprocessable_entity
-    end
-  end
-
-  def destroy
-    @promote.destroy
-  end
-
-  private
-  def set_promote
-    @promote = Promote.find(params[:id])
-  end
-
-  def promote_params
-    p = params.fetch(:promote, {}).permit(
-      :name,
-      :code,
-      :short_name,
-      :description,
-      :scope,
-      :metering,
-      :effect_at,
-      :expire_at,
-      :editable,
-      extra: []
-    )
-    p.merge! default_form_params
+module Trade
+  class Admin::PromotesController < Admin::BaseController
+    include Controller::Promote
   end
 end

data/app/controllers/trade/admin/refunds_controller.rb

@@ -1,57 +1,68 @@
-class Trade::Admin::RefundsController < Trade::Admin::BaseController
-  before_action :set_refund, only: [:show, :edit, :update, :confirm, :deny, :destroy]
+module Trade
+  class Admin::RefundsController < Admin::BaseController
+    before_action :set_refund, only: [:show, :edit, :update, :confirm, :deny, :destroy]
 
-  def index
-    @refunds = Refund.includes(:order, :payment).default_where(params.permit(:order_id, :payment_id)).page(params[:page])
-  end
+    def index
+      q_params = {}
+      q_params.merge! default_params
+      q_params.merge! params.permit(:order_id, :payment_id)
 
-  def show
-  end
+      @refunds = Refund.includes(:order, :payment).default_where(q_params).page(params[:page])
+    end
 
-  def new
-    @refund = @payment.refunds.build
-  end
+    def new
+      @refund = @payment.refunds.build
+    end
 
-  def edit
-  end
+    def create
+      @refund = Refund.new(refund_params)
 
-  def create
-    @refund = Refund.new(refund_params)
+      unless @refund.save
+        render :new, locals: { model: @refund }, status: :unprocessable_entity
+      end
+    end
 
-    unless @refund.save
-      render :new, locals: { model: @refund }, status: :unprocessable_entity
+    def show
+    end
+
+    def edit
     end
-  end
 
-  def update
-    @refund.assign_attributes(refund_params)
+    def update
+      @refund.assign_attributes(refund_params)
 
-    unless @refund.save
-      render :new, locals: { model: @refund }, status: :unprocessable_entity
+      unless @refund.save
+        render :new, locals: { model: @refund }, status: :unprocessable_entity
+      end
     end
-  end
 
-  def confirm
-    @refund.do_refund(operator_id: current_user.id, operator_type: current_user.class.name)
-    redirect_to admin_refunds_url(order_id: @refund.order_id)
-  end
+    def confirm
+      @refund.do_refund
+      @refund.operator = current_member
+      @refund.refunded_at = Time.current
 
-  def deny
-    @refund.deny_refund(operator_id: current_user.id, operator_type: current_user.class.name)
-    redirect_to admin_refunds_url(order_id: @refund.order_id)
-  end
+      @refund.save
+    end
 
-  def destroy
-    @refund.destroy
-  end
+    def deny
+      @refund.state = 'denied'
+      @refund.operator = current_member
 
-  private
-  def set_refund
-    @refund = Refund.find(params[:id])
-  end
+      @refund.save
+    end
 
-  def refund_params
-    params.fetch(:refund, {})
-  end
+    def destroy
+      @refund.destroy
+    end
+
+    private
+    def set_refund
+      @refund = Refund.find(params[:id])
+    end
 
+    def refund_params
+      params.fetch(:refund, {})
+    end
+
+  end
 end