rails_trade 0.0.1 → 0.0.2

data/app/controllers/{goods_controller.rb → trade/admin/goods_controller.rb}

@@ -1,4 +1,4 @@
-class GoodsController < ApplicationController
+class Trade::Admin::GoodsController < Trade::Admin::BaseController
   before_action :set_good, only: [:show, :produce]
 
   def index
@@ -12,6 +12,12 @@ class GoodsController < ApplicationController
     end
   end
 
+  def search
+    @goods = params[:good_type].constantize.default_where('')
+    @buyers = RailsTrade.buyer_class.default_where('name-like': params[:q])
+    render json: { results: @buyers.as_json(only: [:id], methods: [:name_detail]) }
+  end
+
   def item
     @item = Item.includes(:goods).find params[:id]
     @menus = List.joins(:items).where(items: {node_type: Item.node_types[:node_top]})

data/app/controllers/{the_trade_admin → trade/admin}/order_payments_controller.rb

@@ -1,8 +1,8 @@
-class RailsTradeAdmin::OrderPaymentsController < RailsTradeAdmin::BaseController
+class Trade::Admin::OrderPaymentsController < Trade::Admin::BaseController
   before_action :set_order
   before_action :set_payment_order, only: [:destroy]
   after_action only: [:create] do
-    mark_audits(Order: [:payment_orders])
+    mark_audits(instance: :@order, include: [:payment_orders])
   end
 
   def index
@@ -46,7 +46,10 @@ class RailsTradeAdmin::OrderPaymentsController < RailsTradeAdmin::BaseController
   end
 
   def payment_order_params
-    params.fetch(:payment_order, {}).permit(:payment_id, :check_amount)
+    params.fetch(:payment_order, {}).permit(
+      :payment_id,
+      :check_amount
+    )
   end
 
 end

data/app/controllers/{the_trade_admin → trade/admin}/orders_controller.rb

@@ -1,13 +1,13 @@
-class RailsTradeAdmin::OrdersController < RailsTradeAdmin::BaseController
+class Trade::Admin::OrdersController < Trade::Admin::BaseController
   before_action :set_order, only: [:show, :edit, :update, :refund, :destroy]
   skip_before_action :verify_authenticity_token, only: [:refresh]
 
   def index
-    query_params = params.permit(:id, :user_id, :payment_status, :payment_type)
-    q_params = params.fetch(:q, {}).permit(:uuid)
-    query_params.merge! q_params
+    q_params = {}
+    q_params.merge! default_params
+    q_params.merge! params.permit(:id, :uuid, :user_id, :buyer_type, :buyer_id, :payment_status, :payment_type)
 
-    @orders = Order.default_where(query_params).order(id: :desc).page(params[:page])
+    @orders = Order.includes(:user).default_where(q_params).order(id: :desc).page(params[:page])
   end
 
   def payments
@@ -15,7 +15,7 @@ class RailsTradeAdmin::OrdersController < RailsTradeAdmin::BaseController
   end
 
   def new
-    @order = Order.new(user_id: params[:user_id])
+    @order = Order.new(buyer_id: params[:buyer_id])
     if params[:cart_item_id]
       @order.migrate_from_cart_item(params[:cart_item_id])
     else
@@ -29,7 +29,7 @@ class RailsTradeAdmin::OrdersController < RailsTradeAdmin::BaseController
   end
 
   def refresh
-    @order = Order.new(user_id: params[:user_id])
+    @order = Order.new(buyer_id: params[:buyer_id])
     @order.assign_attributes order_params
 
     if params[:cart_item_id]
@@ -52,7 +52,7 @@ class RailsTradeAdmin::OrdersController < RailsTradeAdmin::BaseController
 
     respond_to do |format|
       if @order.save
-        format.html { redirect_to admin_order_url(@order), notice: 'Order was successfully created.' }
+        format.html { redirect_to admin_order_url(@order) }
         format.json { render json: @order, status: :created, location: @order }
       else
         format.html { render action: 'new' }
@@ -66,7 +66,7 @@ class RailsTradeAdmin::OrdersController < RailsTradeAdmin::BaseController
 
   def update
     if @order.update(order_params)
-      redirect_to @order, notice: 'Order was successfully updated.'
+      redirect_to @order
     else
       render :edit
     end
@@ -83,7 +83,7 @@ class RailsTradeAdmin::OrdersController < RailsTradeAdmin::BaseController
 
   def destroy
     @order.destroy
-    redirect_to admin_orders_url(user_id: @order.user_id), notice: 'Order was successfully destroyed.'
+    redirect_to admin_orders_url(buyer_id: @order.buyer_id)
   end
 
   private
@@ -92,12 +92,19 @@ class RailsTradeAdmin::OrdersController < RailsTradeAdmin::BaseController
   end
 
   def order_params
-    params.fetch(:order, {}).permit(:user_id, :quantity, :payment_id, :payment_type,
-                                    :address_id, :invoice_address_id,
-                                    :amount,
-                                    order_items_attributes: [:cart_item_id, :deliver_on, :advance_payment, :comment],
-                                    order_serves_attributes: [:serve_id, :serve_charge_id, :amount],
-                                    order_promotes_attributes: [:promote_id, :promote_charge_id, :amount])
+    p = params.fetch(:order, {}).permit(
+      :buyer_type,
+      :buyer_id,
+      :quantity,
+      :payment_id,
+      :payment_type,
+      :address_id,
+      :invoice_address_id,
+      :amount,
+      trade_items_attributes: [:deliver_on, :advance_price, :comment],
+      trade_promotes_attributes: [:promote_id]
+    )
+    p.merge! default_form_params
   end
 
 end

data/app/controllers/{the_trade_admin → trade/admin}/payment_methods_controller.rb

@@ -1,4 +1,4 @@
-class RailsTradeAdmin::PaymentMethodsController < RailsTradeAdmin::BaseController
+class Trade::Admin::PaymentMethodsController < Trade::Admin::BaseController
   before_action :set_payment_method, only: [:show, :edit, :update, :verify, :merge_from, :destroy]
 
   def index
@@ -30,7 +30,7 @@ class RailsTradeAdmin::PaymentMethodsController < RailsTradeAdmin::BaseControlle
 
     respond_to do |format|
       if @payment_method.save
-        format.html { redirect_to admin_payment_methods_url, notice: 'Payment method was successfully created.' }
+        format.html { redirect_to admin_payment_methods_url }
         format.js
       else
         format.html { render :new }
@@ -51,7 +51,7 @@ class RailsTradeAdmin::PaymentMethodsController < RailsTradeAdmin::BaseControlle
 
   def update
     if @payment_method.update(payment_method_params)
-      redirect_to admin_payment_methods_url, notice: 'Payment method was successfully updated.'
+      redirect_to admin_payment_methods_url
     else
       render :edit
     end
@@ -79,7 +79,7 @@ class RailsTradeAdmin::PaymentMethodsController < RailsTradeAdmin::BaseControlle
 
   def destroy
     @payment_method.destroy
-    redirect_to admin_payment_methods_url, notice: 'Payment method was successfully destroyed.'
+    redirect_to admin_payment_methods_url
   end
 
   private
@@ -105,7 +105,10 @@ class RailsTradeAdmin::PaymentMethodsController < RailsTradeAdmin::BaseControlle
   end
 
   def payment_reference_params
-    params.fetch(:payment_reference, {}).permit(:account_type, :account_id)
+    params.fetch(:payment_reference, {}).permit(
+      :account_type,
+      :account_id
+    )
   end
 
 end

data/app/controllers/{the_trade_admin → trade/admin}/payment_orders_controller.rb

@@ -1,8 +1,8 @@
-class RailsTradeAdmin::PaymentOrdersController < RailsTradeAdmin::BaseController
+class Trade::Admin::PaymentOrdersController < Trade::Admin::BaseController
   before_action :set_payment
   before_action :set_payment_order, only: [:update, :cancel]
   after_action only: [:create] do
-    mark_audits(Payment: [:payment_orders])
+    mark_audits(instance: :@payment, include: [:payment_orders])
   end
 
   def new
@@ -14,9 +14,7 @@ class RailsTradeAdmin::PaymentOrdersController < RailsTradeAdmin::BaseController
     @payment_order = @payment.payment_orders.build(payment_order_params)
 
     if @payment_order.confirm!
-      respond_to do |format|
-        format.js
-      end
+      render 'create'
     else
       render 'create_fail'
     end
@@ -25,9 +23,7 @@ class RailsTradeAdmin::PaymentOrdersController < RailsTradeAdmin::BaseController
   def update
     @payment_order.assign_attributes payment_order_params
     if @payment_order.confirm!
-      respond_to do |format|
-        format.js
-      end
+      render 'update'
     else
       render 'create_fail'
     end
@@ -35,9 +31,6 @@ class RailsTradeAdmin::PaymentOrdersController < RailsTradeAdmin::BaseController
 
   def cancel
     @payment_order.revert_confirm!
-    respond_to do |format|
-      format.js
-    end
   end
 
   private
@@ -50,7 +43,12 @@ class RailsTradeAdmin::PaymentOrdersController < RailsTradeAdmin::BaseController
   end
 
   def payment_order_params
-    params.fetch(:payment_order, {}).permit(:order_id, :check_amount).merge(state: 'confirmed')
+    params.fetch(:payment_order, {}).permit(
+      :order_id,
+      :check_amount
+    ).merge(
+      state: 'confirmed'
+    )
   end
 
 end

data/app/controllers/{the_trade_admin → trade/admin}/payment_references_controller.rb

@@ -1,4 +1,4 @@
-class RailsTradeAdmin::PaymentReferencesController < RailsTradeAdmin::BaseController
+class Trade::Admin::PaymentReferencesController < Trade::Admin::BaseController
   before_action :set_payment_method
   before_action :set_payment_reference, only: [:show, :edit, :update, :destroy]
 
@@ -20,7 +20,7 @@ class RailsTradeAdmin::PaymentReferencesController < RailsTradeAdmin::BaseContro
     @payment_reference = @payment_method.payment_references.build(payment_reference_params)
 
     if @payment_reference.save
-      redirect_to admin_payment_methods_url, notice: 'Payment reference was successfully created.'
+      redirect_to admin_payment_methods_url
     else
       render :new
     end
@@ -28,7 +28,7 @@ class RailsTradeAdmin::PaymentReferencesController < RailsTradeAdmin::BaseContro
 
   def update
     if @payment_reference.update(payment_reference_params)
-      redirect_to @payment_reference, notice: 'Payment reference was successfully updated.'
+      redirect_to @payment_reference
     else
       render :edit
     end

data/app/controllers/{the_trade_admin → trade/admin}/payment_strategies_controller.rb

@@ -1,4 +1,4 @@
-class RailsTradeAdmin::PaymentStrategiesController < RailsTradeAdmin::BaseController
+class Trade::Admin::PaymentStrategiesController < Trade::Admin::BaseController
   before_action :set_payment_strategy, only: [:show, :edit, :update, :destroy]
 
   def index
@@ -19,7 +19,7 @@ class RailsTradeAdmin::PaymentStrategiesController < RailsTradeAdmin::BaseContro
     @payment_strategy = PaymentStrategy.new(payment_strategy_params)
 
     if @payment_strategy.save
-      redirect_to admin_payment_strategies_url, notice: 'Payment strategy was successfully created.'
+      redirect_to admin_payment_strategies_url
     else
       render :new
     end
@@ -27,7 +27,7 @@ class RailsTradeAdmin::PaymentStrategiesController < RailsTradeAdmin::BaseContro
 
   def update
     if @payment_strategy.update(payment_strategy_params)
-      redirect_to admin_payment_strategies_url, notice: 'Payment strategy was successfully updated.'
+      redirect_to admin_payment_strategies_url
     else
       render :edit
     end
@@ -35,7 +35,7 @@ class RailsTradeAdmin::PaymentStrategiesController < RailsTradeAdmin::BaseContro
 
   def destroy
     @payment_strategy.destroy
-    redirect_to admin_payment_strategies_url, notice: 'Payment strategy was successfully destroyed.'
+    redirect_to admin_payment_strategies_url
   end
 
   private
@@ -44,7 +44,11 @@ class RailsTradeAdmin::PaymentStrategiesController < RailsTradeAdmin::BaseContro
   end
 
   def payment_strategy_params
-    params.fetch(:payment_strategy, {}).permit(:name, :strategy, :period)
+    params.fetch(:payment_strategy, {}).permit(
+      :name,
+      :strategy,
+      :period
+    )
   end
 
 end

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

@@ -0,0 +1,97 @@
+class Trade::Admin::PaymentsController < Trade::Admin::BaseController
+  before_action :set_payment, only: [:show, :edit, :update, :analyze, :adjust, :destroy]
+
+  def dashboard
+
+  end
+
+  def index
+    q_params = {}
+    q_params.merge! default_params
+    q_params.merge! params.permit(:type, :state, :id, :buyer_identifier, :buyer_bank, :payment_uuid, :'buyer_name-like', :'payment_orders.state', :'orders.uuid')
+    @payments = Payment.default_where(q_params).permit_with(rails_role_user).order(id: :desc).page(params[:page])
+  end
+
+  def show
+  end
+
+  def new
+    @payment = Payment.new
+    if params[:order_id]
+      @order = Order.find params[:order_id]
+      @payment.total_amount = @order.amount
+    end
+    @payment.payment_uuid = UidHelper.nsec_uuid('PAY')
+  end
+
+  def create
+    if params[:order_id].present?
+      @order = Order.find params[:order_id]
+      @payment = @order.payments.build(payment_params.merge(creator_id: rails_role_user.id))
+    else
+      @payment = Payment.new(payment_params.merge(creator_id: rails_role_user.id))
+    end
+
+    if @payment.save
+      redirect_to admin_payments_url
+    else
+      render :new
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @payment.update(payment_params)
+      redirect_to admin_payments_url
+    else
+      render :edit
+    end
+  end
+
+  def analyze
+    @payment.analyze_payment_method
+
+    respond_to do |format|
+      format.js
+      format.json
+    end
+  end
+
+  def adjust
+    @payment.analyze_adjust_amount
+    respond_to do |format|
+      format.js
+      format.html { redirect_to admin_payments_url }
+    end
+  end
+
+  def destroy
+    @payment.destroy
+    redirect_to admin_payments_url
+  end
+
+  private
+  def set_payment
+    @payment = Payment.find(params[:id])
+  end
+
+  def payment_params
+    p = params.fetch(:payment, {}).permit(
+      :type,
+      :payment_uuid,
+      :total_amount,
+      :fee_amount,
+      :income_amount,
+      :notified_at,
+      :comment,
+      :buyer_name,
+      :buyer_identifier,
+      :buyer_bank
+    )
+    p.merge! default_form_params
+    p
+  end
+
+end

data/app/controllers/{the_trade_admin → trade/admin}/produces_controller.rb

@@ -1,4 +1,4 @@
-class Admin::ProducesController < Admin::BaseController
+class Trade::Admin::ProducesController < Trade::Admin::BaseController
   before_action :set_produce, only: [:show, :edit, :update, :destroy]
 
   def index
@@ -20,7 +20,7 @@ class Admin::ProducesController < Admin::BaseController
 
     respond_to do |format|
       if @produce.save
-        format.html { redirect_to @produce, notice: 'Produce was successfully created.' }
+        format.html { redirect_to @produce }
         format.json { render :show, status: :created, location: @produce }
       else
         format.html { render :new }
@@ -34,7 +34,7 @@ class Admin::ProducesController < Admin::BaseController
   def update
     respond_to do |format|
       if @produce.update(produce_params)
-        format.html { redirect_to @produce, notice: 'Produce was successfully updated.' }
+        format.html { redirect_to @produce }
         format.json { render :show, status: :ok, location: @produce }
       else
         format.html { render :edit }
@@ -48,7 +48,7 @@ class Admin::ProducesController < Admin::BaseController
   def destroy
     @produce.destroy
     respond_to do |format|
-      format.html { redirect_to produces_url, notice: 'Produce was successfully destroyed.' }
+      format.html { redirect_to produces_url }
       format.json { head :no_content }
     end
   end

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

@@ -0,0 +1,57 @@
+class Trade::Admin::PromoteBuyersController < Trade::Admin::BaseController
+  before_action :set_promote_buyer, only: [:show, :destroy]
+
+  def index
+    q_params = {}
+    q_params.merge! params.permit(:promote_id, :buyer_type, :buyer_id)
+    @promote_buyers = PromoteBuyer.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_buyer = PromoteBuyer.new(
+      buyer_type: params[:buyer_type],
+      buyer_id: params[:buyer_id],
+      promote_id: params[:promote_id],
+    )
+  end
+
+  def create
+    @promote_buyer = PromoteBuyer.new(promote_buyer_params)
+
+    if @promote_buyer.save
+      redirect_to admin_promote_buyers_url(buyer_id: @promote_buyer.buyer_id)
+    else
+      render :new
+    end
+  end
+
+  def destroy
+    @promote_buyer.destroy
+    redirect_to admin_promote_buyers_url(buyer_id: @promote_buyer.buyer_id)
+  end
+
+  private
+  def set_promote_buyer
+    @promote_buyer = PromoteBuyer.find(params[:id])
+  end
+
+  def promote_buyer_params
+    q = params.fetch(:promote_buyer, {}).permit(
+      :buyer_type,
+      :buyer_id,
+      :promote_good_id,
+      :status,
+      :effect_at,
+      :expire_at
+    )
+    q[:buyer_type] = 'User' if q[:buyer_type].blank?
+    q
+  end
+
+end