rails_trade 0.0.1 → 0.0.2

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

@@ -0,0 +1,67 @@
+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
+
+  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 :new, locals: { model: @promote_charge }, status: :unprocessable_entity
+    end
+  end
+
+  def edit
+
+  end
+
+  def update
+    @promote_charge.assign_attributes(promote_charge_params)
+
+    if @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 = PromoteCharge.find params[:id]
+  end
+
+end

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

@@ -0,0 +1,63 @@
+class Trade::Admin::PromoteGoodsController < Trade::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]
+    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 show
+  end
+
+  def new
+    @promote_good = PromoteGood.new(params.permit(:promote_id, :good_type, :good_id))
+  end
+
+  def edit
+  end
+
+  def create
+    @promote_good = PromoteGood.new(promote_good_params)
+
+    unless @promote_good.save
+      render :new, locals: { model: @promote_good }, status: :unprocessable_entity
+    end
+  end
+
+  def update
+    @promote_good.assign_attributes(promote_good_params)
+
+    unless @promote_good.save
+      render :edit, locals: { model: @promote_good }, status: :unprocessable_entity
+    end
+  end
+
+  def destroy
+    @promote_good.destroy
+  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
+
+end

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

@@ -0,0 +1,69 @@
+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
+  end
+end

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

@@ -1,4 +1,4 @@
-class RailsTradeAdmin::RefundsController < RailsTradeAdmin::BaseController
+class Trade::Admin::RefundsController < Trade::Admin::BaseController
   before_action :set_refund, only: [:show, :edit, :update, :confirm, :deny, :destroy]
 
   def index
@@ -18,34 +18,31 @@ class RailsTradeAdmin::RefundsController < RailsTradeAdmin::BaseController
   def create
     @refund = Refund.new(refund_params)
 
-    if @refund.save
-      redirect_to @refund, notice: 'Refund was successfully created.'
-    else
-      render :new
+    unless @refund.save
+      render :new, locals: { model: @refund }, status: :unprocessable_entity
     end
   end
 
   def update
-    if @refund.update(refund_params)
-      redirect_to @refund, notice: 'Refund was successfully updated.'
-    else
-      render :edit
+    @refund.assign_attributes(refund_params)
+
+    unless @refund.save
+      render :new, locals: { model: @refund }, status: :unprocessable_entity
     end
   end
 
   def confirm
-    @refund.do_refund(operator_id: the_audit_user.id, operator_type: the_audit_user.class.name)
+    @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 deny
-    @refund.deny_refund(operator_id: the_audit_user.id, operator_type: the_audit_user.class.name)
+    @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
 
   def destroy
     @refund.destroy
-    redirect_to admin_refunds_url, notice: 'Refund was successfully destroyed.'
   end
 
   private

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

@@ -1,17 +1,17 @@
-class TheTradeAdmin::CartItemsController < TheTradeAdmin::BaseController
-  before_action :current_cart, only: [:index, :create, :only, :total]
+class Trade::Admin::TradeItemsController < Trade::Admin::BaseController
+  before_action :set_cart_items, only: [:index, :create, :only, :total]
   before_action :set_cart_item, only: [:update, :destroy]
+  before_action :set_additions
   skip_before_action :verify_authenticity_token, only: [:total]
 
   def index
     @cart_items = @cart_items.page(params[:page])
     @checked_ids = @cart_items.checked.pluck(:id)
-    @additions = CartItem.checked_items(user_id: @user&.id, buyer_id: params[:buyer_id])
   end
 
   def only
     unless params[:good_type] && params[:good_id]
-      redirect_back(fallback_location: admin_cart_items_url, notice: 'Need Good type and Good ID') and return
+      redirect_back(fallback_location: admin_cart_items_url) and return
     end
 
     good = params[:good_type].safe_constantize&.find_by(id: params[:good_id])
@@ -53,7 +53,6 @@ class TheTradeAdmin::CartItemsController < TheTradeAdmin::BaseController
     end
 
     @checked_ids = @cart_items.checked.pluck(:id)
-    @additions = CartItem.checked_items(user_id: @user_id, buyer_id: params[:buyer_id])
 
     render 'index'
   end
@@ -67,8 +66,6 @@ class TheTradeAdmin::CartItemsController < TheTradeAdmin::BaseController
       @remove.update(checked: false)
     end
 
-    @additions = CartItem.checked_items(user_id: @user&.id, buyer_id: params[:buyer_id])
-
     response.headers['X-Request-URL'] = request.url
   end
 
@@ -78,40 +75,32 @@ class TheTradeAdmin::CartItemsController < TheTradeAdmin::BaseController
 
   def update
     @cart_item.update(quantity: params[:quantity])
-    @additions = CartItem.checked_items(user_id: @cart_item.user_id, buyer_id: @cart_item.buyer_id)
   end
 
   def destroy
-    @cart_item = CartItem.find params[:id]
     @cart_item.destroy
-    @additions = CartItem.checked_items(user_id: @cart_item.user_id, buyer_id: @cart_item.buyer_id)
   end
 
   private
   def set_cart_item
     @cart_item = CartItem.find(params[:id])
-    if @cart_item.user_id
-      @cart_items = CartItem.where(user_id: @cart_item.user_id)
-    else
-      @cart_items = CartItem.where(buyer_id: @cart_item.buyer_id)
-    end
+    @cart_items = CartItem.where(buyer_type: @cart_item.buyer_type, buyer_id: @cart_item.buyer_id)
   end
 
-  def cart_item_params
-    params.require(:cart_item).permit(id: [],
-                                      single_price: [],
-                                      amount: [],
-                                      total_price: [])
+  def set_additions
+    if params[:buyer_type].present? && params[:buyer_id].present?
+      @additions = CartItem.checked_items(buyer_type: params[:buyer_type], buyer_id: params[:buyer_id])
+    elsif params[:id]
+      @additions = CartItem.checked_items(buyer_type: @cart_item.buyer_type, buyer_id: @cart_item.buyer_id)
+    else
+      @additions = CartItem.checked_items(buyer_type: nil, buyer_id: nil)
+    end
   end
 
-  def current_cart
-    if params[:user_id].present?
-      @cart_items = CartItem.where(user_id: params[:user_id])
-      @user = User.find params[:user_id]
-      @buyer = @user.buyer
-    elsif params[:buyer_id].present?
-      @buyer = Buyer.find params[:buyer_id]
-      @cart_items = CartItem.where(buyer_id: params[:buyer_id])
+  def set_cart_items
+    if params[:buyer_type].present? && params[:buyer_id].present?
+      @buyer = params[:buyer_type].constantize.find params[:buyer_id]
+      @cart_items = CartItem.where(buyer_type: params[:buyer_type], buyer_id: params[:buyer_id])
     elsif params[:id].present?
       @cart_items = CartItem.where(id: params[:id])
     else
@@ -120,4 +109,13 @@ class TheTradeAdmin::CartItemsController < TheTradeAdmin::BaseController
     @cart_items = @cart_items.pending.default_where(params.permit(:good_type, :myself, :id))
   end
 
+  def cart_item_params
+    params.require(:cart_item).permit(
+      id: [],
+      single_price: [],
+      amount: [],
+      total_price: []
+    )
+  end
+
 end

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

@@ -0,0 +1,71 @@
+class Trade::Admin::TradePromotesController < Trade::Admin::BaseController
+  before_action :set_trade_promote, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @trade_promotes = TradePromote.page(params[:page])
+  end
+
+  def new
+    @trade_promote = TradePromote.new
+  end
+
+  def create
+    @trade_promote = TradePromote.new(trade_promote_params)
+
+    respond_to do |format|
+      if @trade_promote.save
+        format.html.phone
+        format.html { redirect_to admin_trade_promotes_url }
+        format.js { redirect_back fallback_location: admin_trade_promotes_url }
+        format.json { render :show }
+      else
+        format.html.phone { render :new }
+        format.html { render :new }
+        format.js { redirect_back fallback_location: admin_trade_promotes_url }
+        format.json { render :show }
+      end
+    end
+  end
+
+  def show
+  end
+
+  def edit
+  end
+
+  def update
+    @trade_promote.assign_attributes(trade_promote_params)
+
+    respond_to do |format|
+      if @trade_promote.save
+        format.html.phone
+        format.html { redirect_to admin_trade_promotes_url }
+        format.js { redirect_back fallback_location: admin_trade_promotes_url }
+        format.json { render :show }
+      else
+        format.html.phone { render :edit }
+        format.html { render :edit }
+        format.js { redirect_back fallback_location: admin_trade_promotes_url }
+        format.json { render :show }
+      end
+    end
+  end
+
+  def destroy
+    @trade_promote.destroy
+    redirect_to admin_trade_promotes_url
+  end
+
+  private
+  def set_trade_promote
+    @trade_promote = TradePromote.find(params[:id])
+  end
+
+  def trade_promote_params
+    params.fetch(:trade_promote, {}).permit(
+      :amount,
+      :note
+    )
+  end
+
+end

data/app/controllers/trade/buyers_controller.rb

@@ -0,0 +1,8 @@
+class Trade::BuyersController < ApplicationController
+
+  def search
+    @buyers = User.default_where('name-like': params[:q])
+    render json: { results: @buyers.as_json(only: [:id], methods: [:name_detail]) }
+  end
+
+end

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

@@ -0,0 +1,4 @@
+class Trade::My::BaseController < RailsTrade.config.my_controller.constantize
+  include RailsTrade::MyCart
+
+end

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

@@ -0,0 +1,32 @@
+class Trade::My::CartsController < Trade::My::BaseController
+
+  def index
+  end
+
+  def show
+    @trade_items = current_cart.trade_items.page(params[:page])
+    @checked_ids = current_cart.trade_items.checked.pluck(:id)
+
+    current_cart.compute_price
+  end
+
+  def total
+  end
+
+  def edit
+
+  end
+
+  def update
+
+  end
+
+  private
+  def cart_params
+    params.fetch(:cart, {}).permit(
+      :buyer_type,
+      :buyer_id
+    )
+  end
+
+end