rails_trade 0.0.1 → 0.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/LICENSE +1 -1
- data/README.md +37 -15
- data/Rakefile +9 -27
- data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/cart_items/create.js +0 -0
- data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/cart_items/index.js +0 -0
- data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/cart_items/only.js +0 -0
- data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/orders/new.js +0 -0
- data/app/assets/javascripts/controllers/trade/admin/payment_methods/edit.js +1 -0
- data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/payment_methods/new.js +0 -0
- data/app/assets/javascripts/controllers/trade/admin/payments/edit.js +1 -0
- data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/payments/new.js +0 -0
- data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/promote_buyers/edit.js +0 -0
- data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/promote_buyers/new.js +3 -1
- data/app/assets/javascripts/controllers/trade/admin/promote_charges/edit.js +1 -0
- data/app/assets/javascripts/controllers/trade/admin/promote_charges/new.js +7 -0
- data/app/assets/javascripts/controllers/trade/admin/promote_goods/edit.js +1 -0
- data/app/assets/javascripts/controllers/trade/admin/promote_goods/new.js +17 -0
- data/app/assets/javascripts/controllers/trade/admin/promotes/edit.js +2 -0
- data/app/assets/javascripts/controllers/trade/admin/promotes/new.js +5 -0
- data/app/assets/javascripts/controllers/trade/admin/refunds/index.js +1 -0
- data/app/assets/javascripts/controllers/trade/admin/refunds/new.js +1 -0
- data/app/assets/javascripts/controllers/trade/my/carts/show-phone-ready.js +1 -0
- data/app/assets/javascripts/controllers/trade/my/carts/show-ready.js +28 -0
- data/app/assets/javascripts/controllers/trade/my/orders/wait-phone.js +8 -0
- data/app/{views/goods/show.html.erb → assets/javascripts/controllers/trade/my/trade_items/create.js} +0 -0
- data/app/assets/stylesheets/controllers/trade/admin/promote_charges/index.css +4 -0
- data/app/assets/stylesheets/controllers/trade/admin/promotes/index.css +4 -0
- data/app/{views/rails_trade_admin/orders/edit.html.erb → assets/stylesheets/controllers/trade/my/carts/show-phone.css} +0 -0
- data/app/assets/stylesheets/controllers/trade/payments/wxpay_result.css +57 -0
- data/app/channels/paid_channel.rb +7 -0
- data/app/controllers/concerns/controller_order_types.rb +3 -6
- data/app/controllers/rails_trade/my_cart.rb +16 -0
- data/app/controllers/trade/admin/base_controller.rb +5 -0
- data/app/controllers/{the_trade_admin → trade/admin}/buyers_controller.rb +3 -3
- data/app/controllers/{the_trade_admin/cart_item_serves_controller.rb → trade/admin/cart_serves_controller.rb} +8 -5
- data/app/controllers/{goods_controller.rb → trade/admin/goods_controller.rb} +7 -1
- data/app/controllers/{the_trade_admin → trade/admin}/order_payments_controller.rb +6 -3
- data/app/controllers/{the_trade_admin → trade/admin}/orders_controller.rb +23 -16
- data/app/controllers/{the_trade_admin → trade/admin}/payment_methods_controller.rb +8 -5
- data/app/controllers/{the_trade_admin → trade/admin}/payment_orders_controller.rb +10 -12
- data/app/controllers/{the_trade_admin → trade/admin}/payment_references_controller.rb +3 -3
- data/app/controllers/{the_trade_admin → trade/admin}/payment_strategies_controller.rb +9 -5
- data/app/controllers/trade/admin/payments_controller.rb +97 -0
- data/app/controllers/{the_trade_admin → trade/admin}/produces_controller.rb +4 -4
- data/app/controllers/trade/admin/promote_buyers_controller.rb +57 -0
- data/app/controllers/trade/admin/promote_charges_controller.rb +67 -0
- data/app/controllers/trade/admin/promote_goods_controller.rb +63 -0
- data/app/controllers/trade/admin/promotes_controller.rb +69 -0
- data/app/controllers/{the_trade_admin → trade/admin}/refunds_controller.rb +9 -12
- data/app/controllers/{the_trade_admin/cart_items_controller.rb → trade/admin/trade_items_controller.rb} +26 -28
- data/app/controllers/trade/admin/trade_promotes_controller.rb +71 -0
- data/app/controllers/trade/buyers_controller.rb +8 -0
- data/app/controllers/trade/my/base_controller.rb +4 -0
- data/app/controllers/trade/my/carts_controller.rb +32 -0
- data/app/controllers/{the_trade_my → trade/my}/order_items_controller.rb +4 -4
- data/app/controllers/trade/my/orders_controller.rb +106 -0
- data/app/controllers/{the_trade_my → trade/my}/payment_methods_controller.rb +1 -1
- data/app/controllers/trade/my/trade_items_controller.rb +47 -0
- data/app/controllers/trade/payments_controller.rb +71 -0
- data/app/models/cart.rb +4 -0
- data/app/models/order.rb +4 -0
- data/app/models/payment.rb +4 -0
- data/app/models/payment/alipay_payment.rb +3 -0
- data/app/models/payment/apple_payment.rb +3 -0
- data/app/models/payment/bank_payment.rb +3 -0
- data/app/models/payment/hand_payment.rb +3 -0
- data/app/models/payment/paypal_payment.rb +3 -0
- data/app/models/payment/stripe_payment.rb +3 -0
- data/app/models/payment/wxpay_payment.rb +3 -0
- data/app/models/payment_method.rb +3 -0
- data/app/models/{rails_trade/payment_methods → payment_method}/alipay_method.rb +1 -1
- data/app/models/{rails_trade/payment_methods → payment_method}/bank_method.rb +1 -1
- data/app/models/payment_method/stripe_method.rb +3 -0
- data/app/models/payment_order.rb +3 -0
- data/app/models/payment_reference.rb +3 -0
- data/app/models/payment_strategy.rb +3 -0
- data/app/models/payment_type.rb +3 -0
- data/app/models/promote.rb +3 -0
- data/app/models/promote_buyer.rb +3 -0
- data/app/models/promote_charge.rb +3 -0
- data/app/models/promote_charge/cash_promote_charge.rb +3 -0
- data/app/models/promote_charge/discount_promote_charge.rb +3 -0
- data/app/models/promote_charge/final_promote_charge.rb +3 -0
- data/app/models/promote_charge/minus_promote_charge.rb +3 -0
- data/app/models/promote_charge/plus_promote_charge.rb +3 -0
- data/app/models/promote_extra.rb +3 -0
- data/app/models/promote_good.rb +3 -0
- data/app/models/rails_trade/amount.rb +44 -0
- data/app/models/rails_trade/buyer.rb +35 -0
- data/app/models/rails_trade/cart.rb +64 -0
- data/app/models/rails_trade/good.rb +71 -0
- data/app/models/rails_trade/order.rb +78 -91
- data/app/models/rails_trade/ordering/payment.rb +113 -0
- data/app/models/rails_trade/{concerns/the_refund.rb → ordering/refund.rb} +3 -5
- data/app/models/rails_trade/payment.rb +72 -73
- data/app/models/rails_trade/payment/alipay_payment.rb +15 -0
- data/app/models/rails_trade/payment/apple_payment.rb +7 -0
- data/app/models/rails_trade/{payments → payment}/bank_payment.rb +2 -4
- data/app/models/rails_trade/payment/hand_payment.rb +8 -0
- data/app/models/rails_trade/payment/paypal_payment.rb +8 -0
- data/app/models/rails_trade/payment/stripe_payment.rb +9 -0
- data/app/models/rails_trade/{payments → payment}/wxpay_payment.rb +1 -2
- data/app/models/rails_trade/payment_method.rb +22 -12
- data/app/models/rails_trade/{payment_methods → payment_method}/stripe_method.rb +7 -4
- data/app/models/rails_trade/payment_order.rb +84 -51
- data/app/models/rails_trade/payment_reference.rb +12 -9
- data/app/models/rails_trade/payment_strategy.rb +15 -12
- data/app/models/rails_trade/payment_type/alipay.rb +28 -0
- data/app/models/rails_trade/payment_type/apple_pay.rb +18 -0
- data/app/models/rails_trade/{payment_interface/the_paypal.rb → payment_type/paypal.rb} +8 -29
- data/app/models/rails_trade/{payment_interface/the_stripe.rb → payment_type/stripe.rb} +8 -26
- data/app/models/rails_trade/payment_type/wxpay.rb +55 -0
- data/app/models/rails_trade/promote.rb +65 -27
- data/app/models/rails_trade/promote_buyer.rb +25 -7
- data/app/models/rails_trade/promote_charge.rb +78 -11
- data/app/models/rails_trade/promote_charge/cash_promote_charge.rb +12 -0
- data/app/models/rails_trade/promote_charge/discount_promote_charge.rb +17 -0
- data/app/models/rails_trade/promote_charge/final_promote_charge.rb +12 -0
- data/app/models/rails_trade/promote_charge/minus_promote_charge.rb +11 -0
- data/app/models/rails_trade/promote_charge/plus_promote_charge.rb +7 -0
- data/app/models/rails_trade/promote_extra.rb +13 -0
- data/app/models/rails_trade/promote_good.rb +20 -7
- data/app/models/rails_trade/refund.rb +30 -19
- data/app/models/rails_trade/{refunds → refund}/alipay_refund.rb +1 -1
- data/app/models/rails_trade/refund/bank_refund.rb +5 -0
- data/app/models/rails_trade/refund/hand_refund.rb +5 -0
- data/app/models/rails_trade/{refunds → refund}/paypal_refund.rb +1 -1
- data/app/models/rails_trade/{refunds → refund}/stripe_refund.rb +1 -1
- data/app/models/rails_trade/{refunds → refund}/wxpay_refund.rb +17 -9
- data/app/models/rails_trade/sell.rb +24 -0
- data/app/models/rails_trade/trade_item.rb +153 -0
- data/app/models/rails_trade/trade_promote.rb +92 -0
- data/app/models/rails_trade/user.rb +9 -0
- data/app/models/refund.rb +3 -0
- data/app/models/refund/alipay_refund.rb +3 -0
- data/app/models/refund/bank_refund.rb +3 -0
- data/app/models/refund/hand_refund.rb +3 -0
- data/app/models/refund/paypal_refund.rb +3 -0
- data/app/models/refund/stripe_refund.rb +3 -0
- data/app/models/refund/wxpay_refund.rb +3 -0
- data/app/models/trade_item.rb +3 -0
- data/app/models/trade_promote.rb +3 -0
- data/app/views/application/_trade_nav.html.erb +16 -0
- data/app/views/my/_trade_nav.html.erb +10 -0
- data/app/views/{rails_trade_admin → trade/admin}/buyers/_form.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/buyers/_menu.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/buyers/_search_form.html.erb +3 -3
- data/app/views/{rails_trade_admin → trade/admin}/buyers/edit.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/buyers/index.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/buyers/new.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/buyers/orders.html.erb +2 -2
- data/app/views/{rails_trade_admin → trade/admin}/buyers/overdue.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/buyers/show.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_check.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_index.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_new.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_serve.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_single.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_single_table.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_total.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_total_table.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/add.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/create.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/destroy.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/index.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/new.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/single.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/total.js.erb +0 -0
- data/app/views/trade/admin/goods/_form.html.erb +7 -0
- data/app/views/{rails_trade_admin → trade/admin}/goods/_item.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/goods/_new.html.erb +2 -2
- data/app/views/{rails_trade_admin → trade/admin}/goods/_show.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/goods/_show_tr.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/goods/create.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/goods/destroy.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/goods/edit.html.erb +2 -2
- data/app/views/{rails_trade_admin → trade/admin}/goods/edit.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/goods/edit_items.html.erb +2 -2
- data/app/views/{rails_trade_admin → trade/admin}/goods/edit_pic.html.erb +2 -2
- data/app/views/{rails_trade_admin → trade/admin}/goods/edit_promote.html.erb +2 -2
- data/app/views/{rails_trade_admin → trade/admin}/goods/index.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/goods/new.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/goods/new.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/goods/show.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/goods/update.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/order_payments/_index.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/order_payments/_new.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/order_payments/_payment_orders.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/order_payments/_payments.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/order_payments/create.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/order_payments/create_fail.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/order_payments/destroy.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/order_payments/index.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/order_payments/new.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/orders/_addresses.html.erb +1 -1
- data/app/views/trade/admin/orders/_filter.html.erb +26 -0
- data/app/views/trade/admin/orders/_form.html.erb +4 -0
- data/app/views/{rails_trade_admin → trade/admin}/orders/_invoice_addresses.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/orders/_item.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/orders/_new_items.html.erb +1 -1
- data/app/{assets/javascripts/controllers/rails_trade_admin/payments/index.js → views/trade/admin/orders/_search_form.html.erb} +0 -0
- data/app/views/trade/admin/orders/index.html.erb +52 -0
- data/app/views/{rails_trade_admin → trade/admin}/orders/new.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/orders/payments.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/orders/refresh.js.erb +0 -0
- data/app/views/trade/admin/orders/show.html.erb +75 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_edit.html.erb +0 -0
- data/app/views/{rails_trade_admin/payment_methods/_search_form.html.erb → trade/admin/payment_methods/_filter.html.erb} +5 -9
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_form.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_index_layout.html.erb +2 -5
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_new.html.erb +2 -2
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_payment_method.html.erb +2 -3
- data/app/views/trade/admin/payment_methods/create.js.erb +2 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/destroy.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/edit.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/edit.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/index.html.erb +7 -4
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/mine.html.erb +2 -2
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/new.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/new.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/unverified.html.erb +4 -6
- data/app/views/{rails_trade_admin → trade/admin}/payment_methods/update.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_orders/_index.html.erb +2 -6
- data/app/views/trade/admin/payment_orders/_new.html.erb +23 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_orders/_orders.html.erb +2 -9
- data/app/views/{rails_trade_admin → trade/admin}/payment_orders/cancel.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_orders/create.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_orders/create_fail.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_orders/new.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_orders/raise_fail.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_orders/update.js.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/payment_orders/update_fail.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_references/_form.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/payment_references/_new.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/payment_references/destroy.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_references/edit.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_references/index.html.erb +1 -1
- data/app/views/{rails_trade_admin → trade/admin}/payment_references/new.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_references/show.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_strategies/_form.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payment_strategies/edit.html.erb +2 -2
- data/app/views/{rails_trade_admin → trade/admin}/payment_strategies/index.html.erb +2 -2
- data/app/views/{rails_trade_admin → trade/admin}/payment_strategies/new.html.erb +1 -1
- data/app/views/trade/admin/payments/_checked_amount.html.erb +6 -0
- data/app/views/trade/admin/payments/_edit.html.erb +12 -0
- data/app/views/trade/admin/payments/_filter.html.erb +40 -0
- data/app/views/{rails_trade_admin → trade/admin}/payments/_form.html.erb +6 -2
- data/app/views/trade/admin/payments/_item.html.erb +41 -0
- data/app/views/trade/admin/payments/_new.html.erb +12 -0
- data/app/views/{rails_trade_admin → trade/admin}/payments/analyze.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/payments/dashboard.html.erb +0 -0
- data/app/views/trade/admin/payments/edit.html.erb +13 -0
- data/app/views/trade/admin/payments/edit.js.erb +3 -0
- data/app/views/trade/admin/payments/index.html.erb +40 -0
- data/app/views/trade/admin/payments/new.html.erb +13 -0
- data/app/views/trade/admin/payments/new.js.erb +3 -0
- data/app/views/{rails_trade_admin → trade/admin}/payments/show.html.erb +0 -0
- data/app/views/trade/admin/promote_buyers/_filter.html.erb +7 -0
- data/app/views/trade/admin/promote_buyers/_form.html.erb +17 -0
- data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/_promote_buyer.json.jbuilder +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/edit.html.erb +1 -1
- data/app/views/trade/admin/promote_buyers/edit.js.erb +3 -0
- data/app/views/trade/admin/promote_buyers/index.html.erb +52 -0
- data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/index.json.jbuilder +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/new.html.erb +1 -1
- data/app/views/trade/admin/promote_buyers/new.js.erb +3 -0
- data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/show.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/show.json.jbuilder +0 -0
- data/app/views/trade/admin/promote_charges/_base_price_form.html.erb +1 -0
- data/app/views/trade/admin/promote_charges/_edit.html.erb +13 -0
- data/app/views/trade/admin/promote_charges/_filter.html.erb +11 -0
- data/app/views/trade/admin/promote_charges/_form.html.erb +11 -0
- data/app/views/trade/admin/promote_charges/_new.html.erb +13 -0
- data/app/views/trade/admin/promote_charges/index.html.erb +65 -0
- data/app/views/trade/admin/promote_charges/options.js.erb +4 -0
- data/app/views/trade/admin/promote_goods/_filter.html.erb +8 -0
- data/app/views/trade/admin/promote_goods/_form.html.erb +8 -0
- data/app/views/trade/admin/promote_goods/_goods_options.html.erb +1 -0
- data/app/views/trade/admin/promote_goods/goods.js.erb +2 -0
- data/app/views/trade/admin/promote_goods/index.html.erb +61 -0
- data/app/views/trade/admin/promotes/_edit.html.erb +12 -0
- data/app/views/trade/admin/promotes/_filter.html.erb +9 -0
- data/app/views/trade/admin/promotes/_form.html.erb +12 -0
- data/app/views/trade/admin/promotes/_new.html.erb +12 -0
- data/app/views/trade/admin/promotes/_new_promote_charge.html.erb +10 -0
- data/app/views/trade/admin/promotes/create.js.erb +2 -0
- data/app/views/trade/admin/promotes/index.html.erb +79 -0
- data/app/views/trade/admin/refunds/_filter.html.erb +11 -0
- data/app/views/{rails_trade_admin → trade/admin}/refunds/_form.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/refunds/_logs_table.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/refunds/_new.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/refunds/edit.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/refunds/index.html.erb +13 -17
- data/app/views/{rails_trade_admin → trade/admin}/refunds/logs.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/refunds/new.html.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/refunds/new.js.erb +0 -0
- data/app/views/{rails_trade_admin → trade/admin}/refunds/show.html.erb +0 -0
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_additions.html.erb +0 -0
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_filter.html.erb +0 -0
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_good_price.html.erb +0 -0
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_order_price.html.erb +0 -0
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_retail_price.html.erb +0 -0
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_single_price.html.erb +0 -0
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_total_price.html.erb +0 -0
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/destroy.js.erb +0 -0
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/error.html.erb +0 -0
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/index.html.erb +3 -3
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/only.html.erb +2 -2
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/total.js.erb +0 -0
- data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/update.js.erb +0 -0
- data/app/views/trade/admin/trade_promotes/_filter.html.erb +7 -0
- data/app/views/trade/admin/trade_promotes/_form.html.erb +6 -0
- data/app/views/trade/admin/trade_promotes/_show_table.html.erb +20 -0
- data/app/views/trade/admin/trade_promotes/edit.html.erb +9 -0
- data/app/views/trade/admin/trade_promotes/edit.js.erb +3 -0
- data/app/views/trade/admin/trade_promotes/index.html.erb +38 -0
- data/app/views/trade/admin/trade_promotes/new.html.erb +9 -0
- data/app/views/trade/admin/trade_promotes/new.js.erb +3 -0
- data/app/views/trade/admin/trade_promotes/show.html.erb +7 -0
- data/app/views/trade/admin/trade_promotes/show.js.erb +3 -0
- data/app/views/trade/admin/trade_promotes/update.js.erb +1 -0
- data/app/views/{buyers → trade/buyers}/_show.html.erb +0 -0
- data/app/views/{buyers → trade/buyers}/show.js.erb +0 -0
- data/app/views/{goods → trade/goods}/_choose.html.erb +0 -0
- data/app/views/{goods → trade/goods}/_good.html.erb +0 -0
- data/app/views/{goods → trade/goods}/_good_item.html.erb +0 -0
- data/app/views/{goods → trade/goods}/_nav.html.erb +0 -0
- data/app/views/{goods → trade/goods}/_search.html.erb +0 -0
- data/app/views/{goods → trade/goods}/index.html.erb +0 -0
- data/app/views/{goods → trade/goods}/index/_product.html.erb +0 -0
- data/app/views/{goods → trade/goods}/item.html.erb +0 -0
- data/app/views/{goods → trade/goods}/produce.html.erb +0 -0
- data/app/views/trade/goods/show.html.erb +2 -0
- data/app/views/{goods → trade/goods}/show/_basic.html.erb +0 -0
- data/app/views/{goods → trade/goods}/show/_carousel.html.erb +0 -0
- data/app/views/{goods → trade/goods}/show/_items.html.erb +0 -0
- data/app/views/{goods → trade/goods}/show/_sales.html.erb +0 -0
- data/app/views/{goods → trade/goods}/show/_side.html.erb +0 -0
- data/app/views/{goods → trade/goods}/taxon/_breadcrumb.html.erb +0 -0
- data/app/views/{goods → trade/goods}/taxon/_nav.html.erb +0 -0
- data/app/views/{goods → trade/goods}/taxon/_nav_.html.erb +0 -0
- data/app/views/{goods → trade/goods}/taxon/_nav_last.html.erb +0 -0
- data/app/views/trade/my/carts/_filter.html.erb +7 -0
- data/app/views/trade/my/carts/_form.html.erb +8 -0
- data/app/views/trade/my/carts/_show_table.html.erb +28 -0
- data/app/views/trade/my/carts/edit.html.erb +9 -0
- data/app/views/trade/my/carts/edit.js.erb +3 -0
- data/app/views/trade/my/carts/index.html.erb +47 -0
- data/app/views/trade/my/carts/new.html.erb +9 -0
- data/app/views/trade/my/carts/new.js.erb +3 -0
- data/app/views/trade/my/carts/show.html+phone.erb +46 -0
- data/app/views/{rails_trade_admin/promote_goods → trade/my/carts}/show.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/order_items/_form.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/order_items/edit.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/order_items/index.html.erb +1 -1
- data/app/views/{rails_trade_my → trade/my}/order_items/new.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/order_items/show.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/orders/_date_form.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/orders/_edit.html.erb +2 -2
- data/app/views/trade/my/orders/_edit_payment_type.html.erb +12 -0
- data/app/views/{rails_trade_my → trade/my}/orders/_form.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/orders/destroy.js.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/orders/edit.js.erb +0 -0
- data/app/views/trade/my/orders/edit_payment_type.js.erb +4 -0
- data/app/views/{rails_trade_my → trade/my}/orders/fail.html.erb +0 -0
- data/app/views/trade/my/orders/index.html+phone.erb +37 -0
- data/app/views/trade/my/orders/index.html.erb +36 -0
- data/app/views/{rails_trade_my → trade/my}/orders/index.json.jbuilder +0 -0
- data/app/views/{rails_trade_my → trade/my}/orders/new.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/orders/refresh.js.erb +0 -0
- data/app/views/trade/my/orders/refund.json.jbuilder +12 -0
- data/app/views/trade/my/orders/show.html+phone.erb +3 -0
- data/app/views/{rails_trade_my → trade/my}/orders/show.html.erb +3 -3
- data/app/views/{rails_trade_my → trade/my}/orders/success.html.erb +0 -2
- data/app/views/{rails_trade_my → trade/my}/orders/update.js.erb +1 -1
- data/app/views/trade/my/orders/wait.html+wechat.erb +4 -0
- data/app/views/trade/my/orders/wxpay_pay.js.erb +16 -0
- data/app/views/trade/my/orders/wxpay_pay_err.js.erb +5 -0
- data/app/views/{rails_trade_my → trade/my}/payment_methods/_edit.html.erb +1 -1
- data/app/views/{rails_trade_my → trade/my}/payment_methods/_form.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/payment_methods/_index.html.erb +1 -1
- data/app/views/{rails_trade_my → trade/my}/payment_methods/_item.html.erb +1 -1
- data/app/views/{rails_trade_my → trade/my}/payment_methods/_new.html.erb +3 -3
- data/app/views/{rails_trade_my → trade/my}/payment_methods/create.js.erb +0 -0
- data/app/views/{rails_trade_my/addresses → trade/my/payment_methods}/destroy.js.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/payment_methods/edit.js.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/payment_methods/index.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/payment_methods/index.js.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/payment_methods/new.js.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/payment_methods/show.html.erb +0 -0
- data/app/views/{rails_trade_my/addresses → trade/my/payment_methods}/update.js.erb +0 -0
- data/app/views/trade/my/trade_items/_additions.html.erb +12 -0
- data/app/views/trade/my/trade_items/_cart_item.js.erb +2 -0
- data/app/views/trade/my/trade_items/_single_price.html.erb +6 -0
- data/app/views/trade/my/trade_items/_total_price.html.erb +8 -0
- data/app/views/trade/my/trade_items/_trade_items.html.erb +68 -0
- data/app/views/trade/my/trade_items/create.html.erb +1 -0
- data/app/views/{rails_trade_my/cart_items → trade/my/trade_items}/destroy.js.erb +0 -0
- data/app/views/trade/my/trade_items/index.json.jbuilder +0 -0
- data/app/views/trade/my/trade_items/update.js.erb +1 -0
- data/app/views/{rails_trade_my → trade/my}/users/_form.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/users/edit.html.erb +0 -0
- data/app/views/{rails_trade_my → trade/my}/users/show.html.erb +0 -0
- data/app/views/trade/payments/_wxpay_result.html.erb +3 -0
- data/app/views/trade/payments/wxpay_result.js.erb +1 -0
- data/config/locales/en.enum.yml +47 -0
- data/config/locales/en.yml +22 -60
- data/config/locales/zh.attributes.yml +75 -0
- data/config/locales/zh.controller.yml +51 -0
- data/config/locales/zh.enum.yml +58 -0
- data/config/locales/zh.help.yml +7 -0
- data/config/routes.rb +45 -59
- data/lib/rails_trade.rb +9 -19
- data/lib/rails_trade/apple_pay.rb +32 -0
- data/lib/rails_trade/config.rb +6 -3
- data/lib/rails_trade/engine.rb +15 -19
- data/lib/rails_trade/version.rb +1 -1
- metadata +475 -422
- data/app/assets/config/rails_trade_manifest.js +0 -1
- data/app/assets/javascripts/controllers/rails_trade_admin/buyers/index.js +0 -15
- data/app/assets/javascripts/controllers/rails_trade_admin/buyers/overdue.js +0 -15
- data/app/assets/javascripts/controllers/rails_trade_admin/payment_methods/edit.js +0 -1
- data/app/assets/javascripts/controllers/rails_trade_admin/payment_methods/index.js +0 -1
- data/app/assets/javascripts/controllers/rails_trade_admin/payment_methods/unverified.js +0 -1
- data/app/assets/javascripts/controllers/rails_trade_admin/promote_goods/index.js +0 -1
- data/app/assets/javascripts/controllers/rails_trade_admin/promotes/edit.js +0 -2
- data/app/assets/javascripts/controllers/rails_trade_admin/promotes/index.js +0 -1
- data/app/assets/javascripts/controllers/rails_trade_admin/promotes/new.js +0 -2
- data/app/assets/javascripts/controllers/rails_trade_admin/serves/edit.js +0 -2
- data/app/assets/javascripts/controllers/rails_trade_admin/serves/index.js +0 -1
- data/app/assets/javascripts/controllers/rails_trade_admin/serves/new.js +0 -4
- data/app/assets/javascripts/controllers/rails_trade_my/cart_items/create.js +0 -3
- data/app/assets/javascripts/controllers/rails_trade_my/cart_items/index.js +0 -65
- data/app/controllers/areas_controller.rb +0 -18
- data/app/controllers/buyers_controller.rb +0 -8
- data/app/controllers/payments_controller.rb +0 -50
- data/app/controllers/providers_controller.rb +0 -8
- data/app/controllers/the_trade_admin/addresses_controller.rb +0 -75
- data/app/controllers/the_trade_admin/areas_controller.rb +0 -50
- data/app/controllers/the_trade_admin/base_controller.rb +0 -5
- data/app/controllers/the_trade_admin/payments_controller.rb +0 -89
- data/app/controllers/the_trade_admin/promote_buyers_controller.rb +0 -39
- data/app/controllers/the_trade_admin/promote_charges_controller.rb +0 -62
- data/app/controllers/the_trade_admin/promote_goods_controller.rb +0 -50
- data/app/controllers/the_trade_admin/promotes_controller.rb +0 -105
- data/app/controllers/the_trade_admin/providers_controller.rb +0 -121
- data/app/controllers/the_trade_admin/serve_charges_controller.rb +0 -67
- data/app/controllers/the_trade_admin/serves_controller.rb +0 -107
- data/app/controllers/the_trade_my/addresses_controller.rb +0 -50
- data/app/controllers/the_trade_my/base_controller.rb +0 -13
- data/app/controllers/the_trade_my/buyers_controller.rb +0 -35
- data/app/controllers/the_trade_my/cart_items_controller.rb +0 -71
- data/app/controllers/the_trade_my/orders_controller.rb +0 -161
- data/app/controllers/the_trade_my/providers_controller.rb +0 -44
- data/app/models/rails_trade/address.rb +0 -14
- data/app/models/rails_trade/area.rb +0 -65
- data/app/models/rails_trade/cart_item.rb +0 -185
- data/app/models/rails_trade/cart_item_serve.rb +0 -16
- data/app/models/rails_trade/concerns/good_able.rb +0 -63
- data/app/models/rails_trade/concerns/order_able.rb +0 -48
- data/app/models/rails_trade/concerns/promote_fee.rb +0 -54
- data/app/models/rails_trade/concerns/serve_fee.rb +0 -41
- data/app/models/rails_trade/concerns/summary_service.rb +0 -67
- data/app/models/rails_trade/concerns/the_payment.rb +0 -88
- data/app/models/rails_trade/concerns/the_trade_buyer.rb +0 -50
- data/app/models/rails_trade/concerns/the_trade_user.rb +0 -23
- data/app/models/rails_trade/good_partner.rb +0 -8
- data/app/models/rails_trade/good_produce.rb +0 -14
- data/app/models/rails_trade/order_item.rb +0 -88
- data/app/models/rails_trade/order_promote.rb +0 -23
- data/app/models/rails_trade/order_serve.rb +0 -23
- data/app/models/rails_trade/order_shipment.rb +0 -10
- data/app/models/rails_trade/payment_interface/payment_interface_base.rb +0 -8
- data/app/models/rails_trade/payment_interface/the_alipay.rb +0 -49
- data/app/models/rails_trade/payment_interface/the_wxpay.rb +0 -56
- data/app/models/rails_trade/payments/alipay_payment.rb +0 -12
- data/app/models/rails_trade/payments/hand_payment.rb +0 -13
- data/app/models/rails_trade/payments/paypal_payment.rb +0 -8
- data/app/models/rails_trade/payments/stripe_payment.rb +0 -7
- data/app/models/rails_trade/produce.rb +0 -18
- data/app/models/rails_trade/promote_charges/single_promote_charge.rb +0 -7
- data/app/models/rails_trade/promote_charges/total_promote_charge.rb +0 -7
- data/app/models/rails_trade/promotes/amount_promote.rb +0 -4
- data/app/models/rails_trade/promotes/number_promote.rb +0 -4
- data/app/models/rails_trade/provider.rb +0 -25
- data/app/models/rails_trade/refunds/bank_refund.rb +0 -5
- data/app/models/rails_trade/refunds/hand_refund.rb +0 -5
- data/app/models/rails_trade/serve.rb +0 -44
- data/app/models/rails_trade/serve_charge.rb +0 -37
- data/app/models/rails_trade/serve_charges/single_serve_charge.rb +0 -7
- data/app/models/rails_trade/serve_charges/total_serve_charge.rb +0 -7
- data/app/models/rails_trade/serve_good.rb +0 -9
- data/app/models/rails_trade/serves/number_serve.rb +0 -4
- data/app/models/rails_trade/serves/quantity_serve.rb +0 -4
- data/app/models/rails_trade/shipment.rb +0 -8
- data/app/views/layouts/rails_trade_admin/base.html.erb +0 -25
- data/app/views/layouts/rails_trade_my/base.html.erb +0 -28
- data/app/views/rails_trade_admin/addresses/_address.html.erb +0 -24
- data/app/views/rails_trade_admin/addresses/_edit.html.erb +0 -13
- data/app/views/rails_trade_admin/addresses/_form.html.erb +0 -23
- data/app/views/rails_trade_admin/addresses/_new.html.erb +0 -13
- data/app/views/rails_trade_admin/addresses/create.js.erb +0 -2
- data/app/views/rails_trade_admin/addresses/destroy.js.erb +0 -1
- data/app/views/rails_trade_admin/addresses/edit.js.erb +0 -39
- data/app/views/rails_trade_admin/addresses/index.html.erb +0 -41
- data/app/views/rails_trade_admin/addresses/new.js.erb +0 -52
- data/app/views/rails_trade_admin/addresses/show.html.erb +0 -4
- data/app/views/rails_trade_admin/addresses/update.js.erb +0 -2
- data/app/views/rails_trade_admin/areas/_form.html.erb +0 -9
- data/app/views/rails_trade_admin/areas/edit.html.erb +0 -16
- data/app/views/rails_trade_admin/areas/index.html.erb +0 -43
- data/app/views/rails_trade_admin/areas/new.html.erb +0 -11
- data/app/views/rails_trade_admin/areas/show.html.erb +0 -1
- data/app/views/rails_trade_admin/base/_nav.html.erb +0 -24
- data/app/views/rails_trade_admin/base/_nav_bar.html.erb +0 -23
- data/app/views/rails_trade_admin/base/_nav_payment.html.erb +0 -25
- data/app/views/rails_trade_admin/goods/_form.html.erb +0 -7
- data/app/views/rails_trade_admin/orders/_filter.html.erb +0 -20
- data/app/views/rails_trade_admin/orders/_form.html.erb +0 -17
- data/app/views/rails_trade_admin/orders/_search_form.html.erb +0 -7
- data/app/views/rails_trade_admin/orders/index.html.erb +0 -61
- data/app/views/rails_trade_admin/orders/show.html.erb +0 -89
- data/app/views/rails_trade_admin/payment_methods/create.js.erb +0 -2
- data/app/views/rails_trade_admin/payment_orders/_new.html.erb +0 -24
- data/app/views/rails_trade_admin/payments/_item.html.erb +0 -49
- data/app/views/rails_trade_admin/payments/_search_form.html.erb +0 -15
- data/app/views/rails_trade_admin/payments/edit.html.erb +0 -15
- data/app/views/rails_trade_admin/payments/index.html.erb +0 -60
- data/app/views/rails_trade_admin/payments/new.html.erb +0 -17
- data/app/views/rails_trade_admin/promote_buyers/_form.html.erb +0 -6
- data/app/views/rails_trade_admin/promote_buyers/index.html.erb +0 -42
- data/app/views/rails_trade_admin/promote_charges/_edit.html.erb +0 -13
- data/app/views/rails_trade_admin/promote_charges/_form.html.erb +0 -6
- data/app/views/rails_trade_admin/promote_charges/_new.html.erb +0 -13
- data/app/views/rails_trade_admin/promote_charges/_search_form.html.erb +0 -9
- data/app/views/rails_trade_admin/promote_charges/edit.js.erb +0 -8
- data/app/views/rails_trade_admin/promote_charges/index.html.erb +0 -49
- data/app/views/rails_trade_admin/promote_charges/new.js.erb +0 -8
- data/app/views/rails_trade_admin/promote_goods/_form.html.erb +0 -4
- data/app/views/rails_trade_admin/promote_goods/_promote_good.json.jbuilder +0 -2
- data/app/views/rails_trade_admin/promote_goods/edit.html.erb +0 -14
- data/app/views/rails_trade_admin/promote_goods/index.html.erb +0 -37
- data/app/views/rails_trade_admin/promote_goods/index.json.jbuilder +0 -1
- data/app/views/rails_trade_admin/promote_goods/new.html.erb +0 -13
- data/app/views/rails_trade_admin/promote_goods/show.json.jbuilder +0 -1
- data/app/views/rails_trade_admin/promotes/_form.html.erb +0 -9
- data/app/views/rails_trade_admin/promotes/edit.html.erb +0 -9
- data/app/views/rails_trade_admin/promotes/index.html.erb +0 -65
- data/app/views/rails_trade_admin/promotes/new.html.erb +0 -9
- data/app/views/rails_trade_admin/promotes/show.html.erb +0 -4
- data/app/views/rails_trade_admin/providers/_form.html.erb +0 -6
- data/app/views/rails_trade_admin/providers/_product.html.erb +0 -12
- data/app/views/rails_trade_admin/providers/_side.html.erb +0 -8
- data/app/views/rails_trade_admin/providers/area.html.erb +0 -1
- data/app/views/rails_trade_admin/providers/channel.html.erb +0 -46
- data/app/views/rails_trade_admin/providers/edit.html.erb +0 -16
- data/app/views/rails_trade_admin/providers/index.html.erb +0 -27
- data/app/views/rails_trade_admin/providers/new.html.erb +0 -21
- data/app/views/rails_trade_admin/providers/posts.html.erb +0 -41
- data/app/views/rails_trade_admin/providers/products.html.erb +0 -23
- data/app/views/rails_trade_admin/providers/show.html.erb +0 -60
- data/app/views/rails_trade_admin/refunds/_search_form.html.erb +0 -13
- data/app/views/rails_trade_admin/serve_charges/_edit.html.erb +0 -13
- data/app/views/rails_trade_admin/serve_charges/_form.html.erb +0 -10
- data/app/views/rails_trade_admin/serve_charges/_new.html.erb +0 -13
- data/app/views/rails_trade_admin/serve_charges/_search_form.html.erb +0 -10
- data/app/views/rails_trade_admin/serve_charges/edit.js.erb +0 -7
- data/app/views/rails_trade_admin/serve_charges/index.html.erb +0 -56
- data/app/views/rails_trade_admin/serve_charges/new.js.erb +0 -8
- data/app/views/rails_trade_admin/serves/_form.html.erb +0 -9
- data/app/views/rails_trade_admin/serves/edit.html.erb +0 -9
- data/app/views/rails_trade_admin/serves/index.html.erb +0 -80
- data/app/views/rails_trade_admin/serves/new.html.erb +0 -9
- data/app/views/rails_trade_my/addresses/_edit.html.erb +0 -31
- data/app/views/rails_trade_my/addresses/_form.html.erb +0 -23
- data/app/views/rails_trade_my/addresses/_new.html.erb +0 -11
- data/app/views/rails_trade_my/addresses/create.js.erb +0 -2
- data/app/views/rails_trade_my/addresses/edit.js.erb +0 -39
- data/app/views/rails_trade_my/addresses/index.html.erb +0 -44
- data/app/views/rails_trade_my/addresses/new.js.erb +0 -39
- data/app/views/rails_trade_my/addresses/show.html.erb +0 -4
- data/app/views/rails_trade_my/base/_nav.html.erb +0 -22
- data/app/views/rails_trade_my/buyers/_form.html.erb +0 -5
- data/app/views/rails_trade_my/buyers/edit.html.erb +0 -2
- data/app/views/rails_trade_my/buyers/show.html.erb +0 -21
- data/app/views/rails_trade_my/cart_items/_additions.html.erb +0 -22
- data/app/views/rails_trade_my/cart_items/_single_price.html.erb +0 -6
- data/app/views/rails_trade_my/cart_items/_total_price.html.erb +0 -8
- data/app/views/rails_trade_my/cart_items/index.html.erb +0 -69
- data/app/views/rails_trade_my/cart_items/total.js.erb +0 -11
- data/app/views/rails_trade_my/cart_items/update.js.erb +0 -8
- data/app/views/rails_trade_my/my/index.html.erb +0 -17
- data/app/views/rails_trade_my/orders/_edit_payment_type.html.erb +0 -13
- data/app/views/rails_trade_my/orders/edit_payment_type.js.erb +0 -6
- data/app/views/rails_trade_my/orders/index.html.erb +0 -55
- data/app/views/rails_trade_my/orders/update_payment_type.js.erb +0 -3
- data/app/views/rails_trade_my/orders/wxpay_pay.js.erb +0 -16
- data/app/views/rails_trade_my/orders/wxpay_pay_err.js.erb +0 -5
- data/app/views/rails_trade_my/payment_methods/destroy.js.erb +0 -1
- data/app/views/rails_trade_my/payment_methods/update.js.erb +0 -2
- data/app/views/rails_trade_my/providers/_form.html.erb +0 -5
- data/app/views/rails_trade_my/providers/_provider.html.erb +0 -20
- data/app/views/rails_trade_my/providers/edit.html.erb +0 -2
- data/app/views/rails_trade_my/providers/index.html.erb +0 -12
- data/app/views/rails_trade_my/providers/new.html.erb +0 -10
- data/app/views/rails_trade_my/providers/show.html.erb +0 -13
- data/config/locales/zh.yml +0 -75
- data/db/migrate/20150514135720_create_providers.rb +0 -59
- data/db/migrate/20170601014520_create_payments.rb +0 -52
- data/db/migrate/20170602061859_create_payment_references.rb +0 -12
- data/db/migrate/20170702234123_create_orders.rb +0 -56
- data/db/migrate/20170714080032_create_payment_strategies.rb +0 -77
- data/db/migrate/20171115063702_create_promote_buyers.rb +0 -31
- data/db/schema.rb +0 -94
- data/lib/tasks/the_trade_tasks.rake +0 -4
@@ -0,0 +1,35 @@
|
|
1
|
+
module RailsTrade::Buyer
|
2
|
+
extend ActiveSupport::Concern
|
3
|
+
|
4
|
+
included do
|
5
|
+
attribute :name, :string
|
6
|
+
|
7
|
+
has_many :carts, as: :buyer, dependent: :destroy
|
8
|
+
has_many :orders, as: :buyer, inverse_of: :buyer, dependent: :nullify
|
9
|
+
|
10
|
+
has_many :promote_buyers, -> { valid }, as: :buyer, dependent: :destroy
|
11
|
+
has_many :promotes, through: :promote_buyers
|
12
|
+
|
13
|
+
has_many :payment_references, as: :buyer, dependent: :destroy, autosave: true
|
14
|
+
has_many :payment_methods, through: :payment_references, autosave: true
|
15
|
+
|
16
|
+
scope :credited, -> { where(payment_strategy_id: self.credit_ids) }
|
17
|
+
end
|
18
|
+
|
19
|
+
def name_detail
|
20
|
+
"#{name} (#{id})"
|
21
|
+
end
|
22
|
+
|
23
|
+
def last_overdue_date
|
24
|
+
orders.order(overdue_date: :asc).first&.overdue_date
|
25
|
+
end
|
26
|
+
|
27
|
+
class_methods do
|
28
|
+
|
29
|
+
def credit_ids
|
30
|
+
PaymentStrategy.where.not(period: 0).pluck(:id)
|
31
|
+
end
|
32
|
+
|
33
|
+
end
|
34
|
+
|
35
|
+
end
|
@@ -0,0 +1,64 @@
|
|
1
|
+
# 数据定期清理
|
2
|
+
# 改变数据动作:
|
3
|
+
# * 新增(check)
|
4
|
+
# * 更新数量
|
5
|
+
# * 选择或更换优惠券
|
6
|
+
# * 选择服务
|
7
|
+
module RailsTrade::Cart
|
8
|
+
extend ActiveSupport::Concern
|
9
|
+
|
10
|
+
included do
|
11
|
+
attribute :session_id, :string, limit: 128
|
12
|
+
attribute :amount, :decimal, precision: 10, scale: 2
|
13
|
+
attribute :trade_items_count, :integer, default: 0
|
14
|
+
attribute :retail_price, :decimal, default: 0, comment: '商品汇总的原价'
|
15
|
+
attribute :discount_price, :decimal, default: 0
|
16
|
+
attribute :bulk_price, :decimal, default: 0
|
17
|
+
attribute :reduced_amount, :decimal, default: 0, comment: '汇总的减少价格'
|
18
|
+
attribute :additional_amount, :decimal, default: 0
|
19
|
+
attribute :total_quantity, :decimal, default: 0
|
20
|
+
attribute :deposit_ratio, :integer, default: 100, comment: '最小预付比例'
|
21
|
+
attribute :payment_strategy_id, :integer
|
22
|
+
attribute :default, :boolean, default: false
|
23
|
+
|
24
|
+
belongs_to :organ, optional: true
|
25
|
+
belongs_to :user, optional: true
|
26
|
+
belongs_to :buyer, polymorphic: true, optional: true
|
27
|
+
belongs_to :payment_strategy, optional: true
|
28
|
+
has_many :orders, dependent: :nullify
|
29
|
+
|
30
|
+
validates :deposit_ratio, numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 100 }, allow_nil: true
|
31
|
+
|
32
|
+
validates :user_id, presence: true, if: -> { session_id.blank? }
|
33
|
+
validates :session_id, presence: true, if: -> { user_id.blank? }
|
34
|
+
|
35
|
+
after_update :set_default, if: -> { self.default? && saved_change_to_default? }
|
36
|
+
end
|
37
|
+
|
38
|
+
def compute_price
|
39
|
+
self.retail_price = trade_items.checked.sum(&:retail_price)
|
40
|
+
self.discount_price = trade_items.checked.sum(&:discount_price)
|
41
|
+
self.bulk_price = self.retail_price - self.discount_price
|
42
|
+
|
43
|
+
self.reduced_amount = trade_items.checked.sum(&:reduced_amount)
|
44
|
+
self.additional_amount = trade_items.checked.sum(&:additional_amount)
|
45
|
+
|
46
|
+
self.amount = trade_items.checked.sum(&:amount)
|
47
|
+
|
48
|
+
self.total_quantity = trade_items.checked.sum(&:original_quantity)
|
49
|
+
self
|
50
|
+
end
|
51
|
+
|
52
|
+
def set_default
|
53
|
+
self.class.where.not(id: self.id).where(user_id: self.user_id).update_all(default: false)
|
54
|
+
end
|
55
|
+
|
56
|
+
class_methods do
|
57
|
+
|
58
|
+
def default
|
59
|
+
find_by(default: true)
|
60
|
+
end
|
61
|
+
|
62
|
+
end
|
63
|
+
|
64
|
+
end
|
@@ -0,0 +1,71 @@
|
|
1
|
+
module RailsTrade::Good
|
2
|
+
extend ActiveSupport::Concern
|
3
|
+
|
4
|
+
included do
|
5
|
+
attribute :name, :string
|
6
|
+
attribute :sku, :string, default: -> { SecureRandom.hex }
|
7
|
+
attribute :price, :decimal, default: 0
|
8
|
+
attribute :advance_price, :decimal, default: 0
|
9
|
+
attribute :extra, :json, default: {}
|
10
|
+
attribute :unit, :string
|
11
|
+
attribute :quantity, :decimal, default: 0
|
12
|
+
attribute :unified_quantity, :decimal, default: 0
|
13
|
+
|
14
|
+
has_many :trade_items, as: :trade, autosave: true, dependent: :destroy
|
15
|
+
has_many :orders, through: :trade_items, source: :trade
|
16
|
+
|
17
|
+
has_many :promote_goods, as: :good
|
18
|
+
end
|
19
|
+
|
20
|
+
def final_price
|
21
|
+
compute_order_amount
|
22
|
+
#self.retail_price + self.promote_price
|
23
|
+
end
|
24
|
+
|
25
|
+
def valid_promote_goods
|
26
|
+
PromoteGood.valid.where(good_type: self.class.base_class.name, good_id: [nil, self.id]).where.not(promote_id: self.promote_goods.select(:promote_id).unavailable)
|
27
|
+
end
|
28
|
+
|
29
|
+
def default_promote_goods
|
30
|
+
PromoteGood.default.where(good_type: self.class.base_class.name, good_id: [nil, self.id])
|
31
|
+
end
|
32
|
+
|
33
|
+
def generate_order!(buyer: nil, cart: nil, maintain_id: nil, **params)
|
34
|
+
o = generate_order(buyer: buyer, cart: cart, maintain_id: maintain_id, **params)
|
35
|
+
o.check_state
|
36
|
+
o.save!
|
37
|
+
o
|
38
|
+
end
|
39
|
+
|
40
|
+
def generate_order(buyer: nil, cart: nil, maintain_id: nil, **params)
|
41
|
+
if buyer
|
42
|
+
o = buyer.orders.build
|
43
|
+
elsif cart
|
44
|
+
o = cart.orders.build
|
45
|
+
else
|
46
|
+
raise 'please assign buyer or cart'
|
47
|
+
end
|
48
|
+
|
49
|
+
o.organ_id = self.organ_id if self.respond_to?(:organ_id)
|
50
|
+
if o.respond_to?(:maintain_id)
|
51
|
+
o.maintain_id = maintain_id
|
52
|
+
o.organ_id ||= o.maintain&.organ_id
|
53
|
+
end
|
54
|
+
|
55
|
+
ti = o.trade_items.build(good: self)
|
56
|
+
ti.assign_attributes params.slice(:number)
|
57
|
+
ti.init_amount
|
58
|
+
ti.compute_promote
|
59
|
+
ti.sum_amount
|
60
|
+
|
61
|
+
o.assign_attributes params.slice(:extra, :currency)
|
62
|
+
o.compute_promote
|
63
|
+
o.compute_amount
|
64
|
+
o
|
65
|
+
end
|
66
|
+
|
67
|
+
def order_done
|
68
|
+
puts 'Should realize in good entity'
|
69
|
+
end
|
70
|
+
|
71
|
+
end
|
@@ -1,111 +1,98 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
include
|
4
|
-
include
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
1
|
+
module RailsTrade::Order
|
2
|
+
extend ActiveSupport::Concern
|
3
|
+
include RailsTrade::Ordering::Payment
|
4
|
+
include RailsTrade::Ordering::Refund
|
5
|
+
|
6
|
+
included do
|
7
|
+
attribute :uuid, :string
|
8
|
+
attribute :state, :string
|
9
|
+
attribute :item_amount, :decimal, precision: 10, scale: 2
|
10
|
+
attribute :overall_additional_amount, :decimal, precision: 10, scale: 2
|
11
|
+
attribute :overall_reduced_amount, :decimal, precision: 10, scale: 2
|
12
|
+
attribute :amount, :decimal, precision: 10, scale: 2
|
13
|
+
attribute :received_amount, :decimal, precision: 10, scale: 2
|
14
|
+
attribute :payment_id, :integer, comment: 'for paypal'
|
15
|
+
attribute :myself, :boolean, default: true
|
16
|
+
attribute :note, :string, limit: 4096
|
17
|
+
attribute :expire_at, :datetime
|
18
|
+
attribute :payment_status, :string, default: 'unpaid', index: true
|
19
|
+
attribute :received_amount, :decimal, default: 0
|
20
|
+
attribute :expire_at, :datetime, default: -> { Time.current + RailsTrade.config.expire_after }
|
21
|
+
attribute :extra, :json, default: {}
|
22
|
+
attribute :currency, :string, default: RailsTrade.config.default_currency
|
23
|
+
attribute :trade_items_count, :integer, default: 0
|
24
|
+
attribute :lock_version, :integer
|
25
|
+
|
26
|
+
belongs_to :organ, optional: true
|
27
|
+
belongs_to :cart, optional: true
|
28
|
+
belongs_to :user, optional: true
|
29
|
+
belongs_to :payment_strategy, optional: true
|
30
|
+
has_many :payment_orders, dependent: :destroy
|
31
|
+
has_many :payments, through: :payment_orders, inverse_of: :orders
|
32
|
+
has_many :refunds, dependent: :nullify, inverse_of: :order
|
33
|
+
|
34
|
+
scope :credited, -> { where(payment_strategy_id: PaymentStrategy.where.not(period: 0).pluck(:id)) }
|
35
|
+
scope :to_pay, -> { where(payment_status: ['unpaid', 'part_paid']) }
|
36
|
+
|
37
|
+
enum payment_status: {
|
38
|
+
unpaid: 'unpaid',
|
39
|
+
part_paid: 'part_paid',
|
40
|
+
all_paid: 'all_paid',
|
41
|
+
refunding: 'refunding',
|
42
|
+
refunded: 'refunded',
|
43
|
+
denied: 'denied'
|
44
|
+
}
|
45
|
+
|
46
|
+
after_initialize if: :new_record? do
|
47
|
+
if cart
|
48
|
+
self.user_id = cart.user_id
|
49
|
+
self.payment_strategy_id = cart.payment_strategy_id
|
50
|
+
end
|
51
|
+
end
|
52
|
+
before_validation do
|
53
|
+
self.uuid ||= UidHelper.nsec_uuid('OD')
|
54
|
+
end
|
55
|
+
after_save :sync_from_cart, if: -> { saved_change_to_cart_id? && cart }
|
56
|
+
after_create_commit :confirm_ordered!
|
43
57
|
|
44
|
-
|
45
|
-
{}
|
58
|
+
delegate :url_helpers, to: 'Rails.application.routes'
|
46
59
|
end
|
47
60
|
|
48
61
|
def subject
|
49
|
-
|
62
|
+
trade_items.map { |oi| oi.good&.name || 'Goods' }.join(', ')
|
50
63
|
end
|
51
64
|
|
52
|
-
def
|
53
|
-
|
54
|
-
self.user = cart_item.user
|
55
|
-
self.buyer = user.buyer
|
56
|
-
self.order_items.build(cart_item_id: cart_item_id, good_type: cart_item.good_type, good_id: cart_item.good_id, quantity: cart_item.quantity)
|
57
|
-
|
58
|
-
cart_item.total_serve_charges.each do |serve_charge|
|
59
|
-
self.order_serves.build(serve_charge_id: serve_charge.id, serve_id: serve_charge.serve_id, amount: serve_charge.subtotal)
|
60
|
-
end
|
61
|
-
cart_item.total_promote_charges.each do |promote_charge|
|
62
|
-
self.order_promotes.build(promote_charge_id: promote_charge.id, promote_id: promote_charge.promote_id, amount: promote_charge.subtotal)
|
63
|
-
end
|
64
|
-
compute_sum
|
65
|
+
def user_name
|
66
|
+
user&.name.presence || "#{user&.id}"
|
65
67
|
end
|
66
68
|
|
67
|
-
def
|
68
|
-
|
69
|
-
cart_items.each do |cart_item|
|
70
|
-
self.order_items.build cart_item_id: cart_item.id, good_type: cart_item.good_type, good_id: cart_item.good_id, quantity: cart_item.quantity
|
71
|
-
end
|
72
|
-
init_with_default_serves
|
69
|
+
def amount_money
|
70
|
+
amounto_money(self.currency)
|
73
71
|
end
|
74
72
|
|
75
|
-
def
|
76
|
-
summary = CartItem.checked_items(user_id: self.user_id, myself: self.myself, extra: self.extra)
|
77
|
-
|
78
|
-
summary.promote_charges.each do |promote_charge|
|
79
|
-
self.order_promotes.build(promote_charge_id: promote_charge.id, promote_id: promote_charge.promote_id, amount: promote_charge.subtotal)
|
80
|
-
end
|
81
|
-
summary.serve_charges.each do |serve_charge|
|
82
|
-
self.order_serves.build(serve_charge_id: serve_charge.id, serve_id: serve_charge.serve_id, amount: serve_charge.subtotal)
|
83
|
-
end
|
84
|
-
compute_sum
|
73
|
+
def compute_promote
|
85
74
|
end
|
86
75
|
|
87
|
-
def
|
88
|
-
|
89
|
-
_pure_order_promotes = self.order_promotes.select { |op| op.order_item_id.nil? }
|
90
|
-
|
91
|
-
self.pure_serve_sum = _pure_order_serves.sum { |o| o.amount }
|
92
|
-
self.pure_promote_sum = _pure_order_promotes.sum { |o| o.amount }
|
93
|
-
self.subtotal = self.order_items.sum { |o| o.amount }
|
94
|
-
self.amount = self.subtotal.to_d + self.pure_serve_sum.to_d + self.pure_promote_sum.to_d
|
76
|
+
def metering_attributes
|
77
|
+
attributes.slice 'quantity', 'amount'
|
95
78
|
end
|
96
79
|
|
97
|
-
def
|
98
|
-
|
99
|
-
|
80
|
+
def sync_from_cart
|
81
|
+
cart.trade_items.checked.default_where(myself: myself).update_all(trade_type: self.class.name, trade_id: self.id)
|
82
|
+
cart.trade_promotes.update_all(trade_type: self.class.name, trade_id: self.id)
|
100
83
|
|
101
|
-
|
102
|
-
|
84
|
+
self.compute_amount
|
85
|
+
self.save
|
103
86
|
end
|
104
87
|
|
105
88
|
def confirm_ordered!
|
106
|
-
self.
|
107
|
-
|
108
|
-
|
89
|
+
self.trade_items.each(&:confirm_ordered!)
|
90
|
+
end
|
91
|
+
|
92
|
+
def compute_received_amount
|
93
|
+
_received_amount = self.payment_orders.where(state: 'confirmed').sum(:check_amount)
|
94
|
+
_refund_amount = self.refunds.where.not(state: 'failed').sum(:total_amount)
|
95
|
+
_received_amount - _refund_amount
|
109
96
|
end
|
110
97
|
|
111
|
-
end
|
98
|
+
end
|
@@ -0,0 +1,113 @@
|
|
1
|
+
# payment_id
|
2
|
+
# payment_type
|
3
|
+
# amount
|
4
|
+
# received_amount
|
5
|
+
module RailsTrade::Ordering::Payment
|
6
|
+
|
7
|
+
def can_pay?
|
8
|
+
self.payment_status != 'all_paid'
|
9
|
+
end
|
10
|
+
|
11
|
+
def unreceived_amount
|
12
|
+
self.amount.to_d - self.received_amount.to_d
|
13
|
+
end
|
14
|
+
|
15
|
+
def init_received_amount
|
16
|
+
self.payment_orders.confirmed.sum(:check_amount)
|
17
|
+
end
|
18
|
+
|
19
|
+
def pending_payments
|
20
|
+
Payment.where.not(id: self.payment_orders.pluck(:payment_id)).where(payment_method_id: self.buyer.payment_method_ids, state: ['init', 'part_checked'])
|
21
|
+
end
|
22
|
+
|
23
|
+
def exists_payments
|
24
|
+
Payment.where.not(id: self.payment_orders.pluck(:payment_id)).exists?(payment_method_id: self.buyer.payment_method_ids, state: ['init', 'part_checked'])
|
25
|
+
end
|
26
|
+
|
27
|
+
def confirm_paid!
|
28
|
+
self.expire_at = nil
|
29
|
+
self.trade_items.each(&:confirm_paid!)
|
30
|
+
sent_notice
|
31
|
+
end
|
32
|
+
|
33
|
+
def confirm_part_paid!
|
34
|
+
self.expire_at = nil
|
35
|
+
self.trade_items.each(&:confirm_part_paid!)
|
36
|
+
end
|
37
|
+
|
38
|
+
def change_to_paid!(type:, payment_uuid:, params: {})
|
39
|
+
payment = self.payments.find_by(type: type, payment_uuid: payment_uuid)
|
40
|
+
|
41
|
+
if payment
|
42
|
+
self.check_state!
|
43
|
+
payment
|
44
|
+
else
|
45
|
+
payment = self.payments.build(type: type, payment_uuid: payment_uuid)
|
46
|
+
payment.assign_detail params
|
47
|
+
|
48
|
+
payment_order = self.payment_orders.find { |i| i.id.nil? }
|
49
|
+
payment_order.check_amount = payment.total_amount
|
50
|
+
|
51
|
+
begin
|
52
|
+
self.class.transaction do
|
53
|
+
payment_order.confirm!
|
54
|
+
payment.save!
|
55
|
+
self.save!
|
56
|
+
end
|
57
|
+
rescue ActiveRecord::RecordInvalid => e
|
58
|
+
payment.errors.add :base, 'can not save'
|
59
|
+
logger.error "#{payment.errors.full_messages.join(', ')}"
|
60
|
+
raise e
|
61
|
+
end
|
62
|
+
payment
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
def sent_notice
|
67
|
+
return unless self.user
|
68
|
+
PaidChannel.broadcast_to(
|
69
|
+
self.user_id,
|
70
|
+
link: url_helpers.my_order_url(id),
|
71
|
+
)
|
72
|
+
end
|
73
|
+
|
74
|
+
def payment_result(payment_kind: payment_type)
|
75
|
+
if self.payment_status == 'all_paid'
|
76
|
+
return self
|
77
|
+
end
|
78
|
+
|
79
|
+
if self.amount == 0
|
80
|
+
self.received_amount = self.amount
|
81
|
+
self.check_state!
|
82
|
+
end
|
83
|
+
|
84
|
+
if payment_kind.present?
|
85
|
+
begin
|
86
|
+
self.send payment_kind.to_s + '_result'
|
87
|
+
rescue NoMethodError
|
88
|
+
self
|
89
|
+
end
|
90
|
+
end
|
91
|
+
|
92
|
+
self
|
93
|
+
end
|
94
|
+
|
95
|
+
def check_state
|
96
|
+
if self.received_amount.to_d >= self.amount
|
97
|
+
self.payment_status = 'all_paid'
|
98
|
+
self.confirm_paid!
|
99
|
+
elsif self.received_amount.to_d > 0 && self.received_amount.to_d < self.amount
|
100
|
+
self.payment_status = 'part_paid'
|
101
|
+
self.confirm_part_paid!
|
102
|
+
elsif self.received_amount.to_d <= 0
|
103
|
+
self.payment_status = 'unpaid'
|
104
|
+
end
|
105
|
+
end
|
106
|
+
|
107
|
+
def check_state!
|
108
|
+
self.received_amount = init_received_amount
|
109
|
+
self.check_state
|
110
|
+
self.save!
|
111
|
+
end
|
112
|
+
|
113
|
+
end
|