rails_trade 0.0.2 → 0.0.3

data/app/assets/javascripts/controllers/trade/admin/payment_methods/edit.js

@@ -1 +0,0 @@
-import './new'

data/app/assets/javascripts/controllers/trade/admin/payment_methods/new.js

@@ -1 +0,0 @@
-$('#payment_method_type').dropdown();

data/app/assets/javascripts/controllers/trade/admin/payments/edit.js

@@ -1 +0,0 @@
-import './new'

data/app/assets/javascripts/controllers/trade/admin/payments/new.js

@@ -1 +0,0 @@
-$('#payment_type').dropdown();

data/app/assets/javascripts/controllers/trade/admin/promote_charges/edit.js

@@ -1 +0,0 @@
-import './new'

data/app/assets/javascripts/controllers/trade/admin/promote_charges/new.js

@@ -1,7 +0,0 @@
-$('#promote_charge_type').dropdown({
-  onChange: function(value, text, $selectedItem){
-    var search_url = new URL('admin/promote_charges/options', location.origin);
-    search_url.searchParams.set('type', value);
-    Rails.ajax({url: search_url, type: 'GET', dataType: 'script'});
-  }
-});

data/app/assets/javascripts/controllers/trade/admin/promote_goods/edit.js

@@ -1 +0,0 @@
-import './new'

data/app/assets/javascripts/controllers/trade/admin/promote_goods/new.js

@@ -1,17 +0,0 @@
-$('#promote_good_good_type').dropdown({
-  onChange: function (value, text, $selectedItem) {
-    var search_url = new URL(window.location.origin);
-    search_url.pathname = 'admin/promote_goods/goods';
-    search_url.search = $.param({good_type: value});
-
-    Rails.ajax({
-      url: search_url,
-      type: 'GET',
-      dataType: 'script'
-    })
-  }
-});
-$('#promote_good_good_id').dropdown({
-  placeholder: false
-});
-$('#promote_good_status').dropdown();

data/app/assets/javascripts/controllers/trade/admin/promotes/edit.js

@@ -1,2 +0,0 @@
-import './new'
-

data/app/assets/javascripts/controllers/trade/admin/promotes/new.js

@@ -1,5 +0,0 @@
-$('#promote_type').dropdown();
-$('#promote_scope').dropdown();
-$('#promote_extra').dropdown();
-$('#promote_deal_type').dropdown({placeholder: false});
-$('#promote_metering').dropdown();

data/app/assets/javascripts/controllers/trade/admin/refunds/index.js

@@ -1 +0,0 @@
-$('#q_payment_method').dropdown();

data/app/assets/javascripts/controllers/trade/admin/refunds/new.js

@@ -1 +0,0 @@
-$('#payment_type').dropdown();

data/app/assets/javascripts/controllers/trade/my/carts/show-phone-ready.js

@@ -1 +0,0 @@
-import './show-ready'

data/app/assets/javascripts/controllers/trade/my/carts/show-ready.js

@@ -1,28 +0,0 @@
-import { Controller } from 'stimulus'
-
-class CartController extends Controller {
-  static targets = [ 'number' ];
-
-  connect() {
-    console.log(this.numberTarget.value)
-    console.log('CartController connected!')
-  }
-
-  update() {
-    var data = new FormData();
-    data.set(this.numberTarget.name, this.numberTarget.value);
-    Rails.ajax({ url: this.numberTarget.dataset.url, type: 'PATCH', dataType: 'script', data: data })
-  }
-
-  increase() {
-    this.numberTarget.value = this.numberTarget.valueAsNumber + 1;
-    this.update()
-  }
-
-  decrease() {
-    this.numberTarget.value = this.numberTarget.valueAsNumber - 1;
-    this.update()
-  }
-}
-
-application.register('cart', CartController);

data/app/assets/javascripts/controllers/trade/my/orders/wait-phone.js

@@ -1,8 +0,0 @@
-ApplicationCable.subscriptions.create('PaidChannel', {
-  received: function(data) {
-    location.href = data.link;
-  },
-  connected: function() {
-    console.log('PaidChannel connected success');
-  }
-});

data/app/assets/javascripts/controllers/trade/my/trade_items/create.js

@@ -1,2 +0,0 @@
-
-

data/app/assets/stylesheets/controllers/trade/admin/promote_charges/index.css

@@ -1,4 +0,0 @@
-div.ui.toggle.checkbox {
-  display: block;
-  margin-top: .5em;
-}

data/app/assets/stylesheets/controllers/trade/admin/promotes/index.css

@@ -1,4 +0,0 @@
-div.ui.toggle.checkbox {
-  display: block;
-  margin-top: .5em;
-}

data/app/assets/stylesheets/controllers/trade/my/carts/show-phone.css

@@ -1 +0,0 @@
-

data/app/assets/stylesheets/controllers/trade/payments/wxpay_result.css

@@ -1,57 +0,0 @@
-.loader,
-.loader:before,
-.loader:after {
-  border-radius: 50%;
-  width: 2.5em;
-  height: 2.5em;
-  -webkit-animation-fill-mode: both;
-  animation-fill-mode: both;
-  -webkit-animation: load7 1.8s infinite ease-in-out;
-  animation: load7 1.8s infinite ease-in-out;
-}
-.loader {
-  color: #ffffff;
-  font-size: 10px;
-  margin: 80px auto;
-  position: relative;
-  text-indent: -9999em;
-  -webkit-transform: translateZ(0);
-  -ms-transform: translateZ(0);
-  transform: translateZ(0);
-  -webkit-animation-delay: -0.16s;
-  animation-delay: -0.16s;
-}
-.loader:before,
-.loader:after {
-  content: '';
-  position: absolute;
-  top: 0;
-}
-.loader:before {
-  left: -3.5em;
-  -webkit-animation-delay: -0.32s;
-  animation-delay: -0.32s;
-}
-.loader:after {
-  left: 3.5em;
-}
-@-webkit-keyframes load7 {
-  0%,
-  80%,
-  100% {
-    box-shadow: 0 2.5em 0 -1.3em;
-  }
-  40% {
-    box-shadow: 0 2.5em 0 0;
-  }
-}
-@keyframes load7 {
-  0%,
-  80%,
-  100% {
-    box-shadow: 0 2.5em 0 -1.3em;
-  }
-  40% {
-    box-shadow: 0 2.5em 0 0;
-  }
-}

data/app/channels/paid_channel.rb

@@ -1,7 +0,0 @@
-class PaidChannel < ApplicationCable::Channel
-  
-  def subscribed
-    stream_from "paid:#{current_receiver.id}" if current_receiver
-  end
-  
-end

data/app/controllers/concerns/controller_order_types.rb

@@ -1,89 +0,0 @@
-module ControllerOrderTypes
-  extend ActiveSupport::Concern
-
-  included do
-    before_action :set_payment_order, only: [
-      :paypal_pay,
-      :stripe_pay,
-      :alipay_pay,
-      :paypal_execute,
-      :wxpay_pay
-    ]
-  end
-
-  def stripe_pay
-    if @order.payment_status != 'all_paid'
-      @order.stripe_charge(params)
-    end
-
-    respond_to do |format|
-      if @order.errors.blank?
-        format.json { render json: { result: @order } }
-        format.html { redirect_to @order.approve_url }
-      else
-        format.json {
-          process_errors(@order)
-        }
-        format.html { redirect_to my_orders_url }
-      end
-    end
-  end
-
-  def alipay_pay
-    respond_to do |format|
-      if @order.payment_status != 'all_paid'
-        format.json {
-          result = @order.alipay_prepay
-          render json: { result: result }
-        }
-        format.html {
-          redirect_to @order.alipay_prepay_url
-        }
-      else
-        format.json
-        format.html { redirect_to my_orders_url }
-      end
-    end
-  end
-
-  def paypal_pay
-    respond_to do |format|
-      if @order.payment_status != 'all_paid'
-        result = @order.paypal_prepay
-        format.json
-        format.html { redirect_to result }
-      else
-        format.json
-        format.html { redirect_to my_orders_url }
-      end
-    end
-  end
-
-  def paypal_execute
-    respond_to do |format|
-      if @order.paypal_execute(params)
-        format.json {  }
-        format.html { redirect_to my_order_url(@order.id), notice: "Order[#{@order.uuid}] placed successfully" }
-      else
-        format.html { redirect_to my_orders_url, alert: @order.error.inspect }
-        format.json {  }
-      end
-    end
-  end
-
-  def wxpay_pay
-    @wxpay_order = @order.wxpay_order(spbill_create_ip: request.remote_ip)
-
-    if @wxpay_order['result_code'] == 'FAIL' || @wxpay_order.blank?
-      render 'wxpay_pay_err'
-    else
-      render 'wxpay_pay'
-    end
-  end
-
-  private
-  def set_payment_order
-    set_order
-  end
-
-end

data/app/controllers/rails_trade/my_cart.rb

@@ -1,16 +0,0 @@
-module RailsTrade::MyCart
-  extend ActiveSupport::Concern
-  included do
-    helper_method :current_cart
-  end
-  
-  def current_cart
-    return @current_cart if defined? @current_cart
-    if current_user
-      @current_cart = current_user.carts.default_where(default_params).find_or_create_by(default: true)
-    else
-      @current_cart = Cart.find_or_create_by(default_form_params.merge(session_id: session.id))
-    end
-  end
-  
-end

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

@@ -1,37 +0,0 @@
-class Trade::Admin::BuyersController < Trade::Admin::BaseController
-  before_action :set_buyer, only: [:orders]
-
-  def index
-    @managers = Manager.where(id: current_manager.allow_ids)
-    q_params = params.fetch(:q, {}).permit(:payment_strategy_id, :'crm_permits.manager_id', :'name-like').reverse_merge('orders.payment_status': ['unpaid', 'part_paid'], 'orders.state': 'active')
-    @overdue_date = params.fetch(:q, {})['overdue_date-lte'] || Date.today
-
-    @buyers = Buyer.unscoped.includes(:orders, :payment_strategy, :crm_permits).default_where(q_params).permit_with(rails_role_user).page(params[:page])
-  end
-
-  def overdue
-    @managers = Manager.where(id: current_manager.allow_ids)
-    q_params = params.fetch(:q, {}).permit(:payment_strategy_id, :'crm_permits.manager_id', :'name-like').reverse_merge('orders.payment_status': ['unpaid', 'part_paid'], 'orders.state': 'active')
-    @overdue_date = params.fetch(:q, {})['overdue_date-lte'] || Date.today
-
-    @buyers = Buyer.unscoped.includes(:orders, :payment_strategy, :crm_permits).default_where(q_params).permit_with(rails_role_user).page(params[:page])
-  end
-
-  def orders
-    @orders = @buyer.orders.includes(crm_performs: :manager).to_pay.order(overdue_date: :asc).page(params[:page])
-    payment_method_ids = @buyer.payment_references.pluck(:payment_method_id)
-    @payments = Payment.where(payment_method_id: payment_method_ids, state: ['init', 'part_checked'])
-  end
-
-  def remind
-    Order.remind params[:order_ids].split(',')
-
-    redirect_back fallback_location: admin_buyers_url
-  end
-
-  private
-  def set_buyer
-    @buyer = Buyer.find params[:id]
-  end
-
-end

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

@@ -1,66 +0,0 @@
-class Trade::Admin::CartServesController < Trade::Admin::BaseController
-  before_action :set_cart_item
-
-  def index
-  end
-
-  def single
-  end
-
-  def total
-  end
-
-  def show
-  end
-
-  def new
-    @cart_serve = @cart_item.cart_serves.find_or_initialize_by(serve_id: params[:serve_id])
-    @serve_charge = @cart_item.get_charge(@cart_serve.serve)
-  end
-
-  def create
-    @cart_item_serve = @cart_item.cart_item_serves.find_or_initialize_by(serve_id: cart_item_serve_params[:serve_id])
-    @cart_item_serve.assign_attributes cart_item_serve_params
-
-    @serve_charge = @cart_item.get_charge(@cart_item_serve.serve)
-    @serve_charge.subtotal = @cart_item_serve.price
-
-    respond_to do |format|
-      if @cart_item_serve.save
-        @cart_item.cart_item_serves.reload
-        format.js
-        format.html { redirect_to @cart_item_serve }
-      else
-        format.js
-        format.html { render :new }
-      end
-    end
-  end
-
-  def add
-    @cart_item_serve = @cart_item.cart_item_serves.find_or_initialize_by(serve_id: params[:serve_id])
-
-    @serve_charge = @cart_item.get_charge(@cart_item_serve.serve)
-    @cart_item_serve.price = @serve_charge.default_subtotal
-    @cart_item_serve.save
-  end
-
-  def destroy
-    @cart_item_serve = CartItemServe.find(params[:id])
-    @serve_charge = @cart_item.get_charge(@cart_item_serve.serve)
-    @cart_item_serve.destroy
-  end
-
-  private
-  def set_cart_item
-    @cart_item = CartItem.find params[:cart_item_id]
-  end
-
-  def cart_item_serve_params
-    params.fetch(:cart_item_serve, {}).permit(
-      :serve_id,
-      :price
-    )
-  end
-
-end

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

@@ -1,96 +0,0 @@
-class Trade::Admin::GoodsController < Trade::Admin::BaseController
-  before_action :set_good, only: [:show, :produce]
-
-  def index
-    @goods = Good.page(params[:page]).per(params[:per])
-    @menus = List.kind_menus.joins(:items).where(items: {node_type: Item.node_types[:node_top]})
-
-    respond_to do |format|
-      format.html
-      format.html.phone
-      format.json { render json: @goods }
-    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]})
-
-    respond_to do |format|
-      format.html
-      format.json { render json: @item }
-    end
-  end
-
-  def taxon
-    @taxon = Item.find params[:id]
-    @items = @taxon.children
-    @goods = Good.joins(:good_items).where('good_items.item_id' => @items)
-
-    if params[:area_id].to_i > 0
-      @area = Area.find params[:area_id]
-      @goods = @goods.where(:provider_id => @area.providers)
-    end
-
-    if params[:provider_id].to_i > 0
-      @provider = Provider.find params[:provider_id]
-      @goods = @goods.where(:provider_id => params[:provider_id])
-    end
-
-    @goods = @goods.page(params[:page])
-    @goods = @goods.order("price #{params[:price_order]}") unless params[:price_order].nil?
-
-    respond_to do |format|
-      format.html
-      format.json { render json: @goods }
-    end
-  end
-
-  def market
-    @market = Market.find(params[:id])
-
-    # 相关产品
-    needs = @market.needs.map { |i| i.id }
-    items = ItemNeed.select(:item_id).where(:need_id => needs).map { |i| i.item_id }
-    items.uniq!
-
-    groups = GoodItem.where(:item_id => items).map { |i| i.good_id }
-    a1 = groups.group_by { |i| i }
-    a2 = a1.sort_by { |k, v| v.count }
-    a3 = a2.reverse.map { |i|  i[0] }
-
-    @groups = Good.find a3.slice(0..9)
-    @items = Item.find items
-
-  end
-
-  def show
-
-  end
-
-  def produce
-    @produces = @good.good_produces
-  end
-
-  def wiki
-    @post = @good.producer.posts.where(:channel_id => Setting.wiki_channel).first
-  end
-
-  def buy
-    redirect_to @good.buy_link
-  end
-
-  private
-  def set_good
-    @good = Good.find params[:id]
-  end
-
-end
-
-