rails_trade 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79869fd94d1d309bcb742d29ff7802e24a5dbe575bb592a958fd36c9a9a1ce50
-  data.tar.gz: a3677b595f761113163f73f14caea9b2593f28d5417c3866c7bef7649814d3ce
+  metadata.gz: 2d112e55ad01337c027a723850cf6cbd103a552480cabc2922075aa28d10e069
+  data.tar.gz: aeb19d3f5c728963ea5e5b6760174e4723eb46565d230c43fded491fa0816804
 SHA512:
-  metadata.gz: 5628d0ccd6a19c839f3c6a44b199afff6d4ee0c9dd1b4e45a708c4baba5429afca66b28dccec0fcb209116bc652afe1c5cae47c2210d3d1275726922f00edb04
-  data.tar.gz: 39ebb407b45c5e77254ebe963cb67deb2d8b44a0979deb985b936a838844d5460ab91f2435bc16eedf9b35602035ac5390b1df666266b46d5b7b8287f576f8f1
+  metadata.gz: 54e3f0ce194c840eebb880898bc8593f8c0835319f64fab543be25168198ef0bfb2e55c8252cdbcf5bbd27085c6f4ccef6bbba693cfcfb6fa60a367ed8f8c85c
+  data.tar.gz: d5564ac56c8bff784949b48deac9c7d59707adbbc4bb23732a13d6e8d956aeeb7c9a0d47a0d3cd676ce0e6e8aa80dcda14ca1b4ea9d67bbb38d1707271c3d5a6

data/LICENSE

@@ -1,7 +1,7 @@
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2019 Mingyuan Qin.
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

data/README.md

@@ -1,26 +1,37 @@
 # RailsTrade
 
+处理订单、支付（退款）、促销策略、附加服务策略；
 
-
+## 特性
+* 在购物车环节就可以查看完整的优惠券策略，不必首先生成订单才能知晓全部优惠，能进一步提升转化率，降低系统取消订单数。
+* 经典的优惠券策略叠加计算实现，性能佳，实现简单，易于理解；
+* 接入了常见的支付方式
+  * 微信支付
+  * 支付宝
+  * PayPal
+  * Stripe
+  * ApplePay
+  
 ## 核心模型
  
 * good_type / good_id
  
-可进行售卖，出租的实体，将其关联 good 即可处理。`Good`模型会处理涉及由可交易产生的信息，比如价格、促销方式等。
+可进行售卖，出租的实体，将其关联 good 即可处理。
 
-* User/Buyer
+`Good`模型会处理涉及由可交易产生的信息，比如价格、促销方式等。
 
-#### 流程  
-CartItem -> Order(OrderItem) <=> Payment
+* User/Buyer
 
+## 生成订单的两种方式 
 
-QuotationItem -> Order(OrderItem)
-  
+* 基于购物车生成订单；
 ```
-└ Promote
+Good -> [CartItem] -> Order(OrderItem) <=> Payment
+ └ Promote(Serve)
 ```
+* 直接生成订单；
   
-#### 集成商品编辑信息
+## 集成商品编辑信息
 ```erb
 
 ```
@@ -31,10 +42,16 @@ OrderItem <=> Shipment
  
 * Provider
 
-#### Dev 
--[] support process to order by cart item ids
+## 购物车中价格字段说明
+
+cart/cart_item 中价格字段说明
 
-### Warning
+* single_price: 商品单价
+* original_amount: 商品原价
+* retail_price: 零售价（）
+* final_price: 最终价格
+
+## 注意
 * Order: amount, received_amount
 * Payment: total_amount, checked_amount
 * PaymentOrder: check_amount
@@ -42,6 +59,11 @@ OrderItem <=> Shipment
 ### 依赖
 * [default_form](https://github.com/qinmingyuan/default_form)
 * [default_where](https://github.com/qinmingyuan/default_where)
-* [the_audit](https://github.com/yougexiangfa/the_audit)
-* [the_data](https://github.com/yougexiangfa/the_data)
-  * admin/payments
+* [rails_audit](https://github.com/work-design/rails_audit)
+* [rails_data](https://github.com/work-design/rails_data)
+  * admin/payments
+* [rails_role](https://github.com/work-design/rails_role)
+  * admin/payments_controller
+
+## License
+License 采用 [LGPL-3.0](https://opensource.org/licenses/LGPL-3.0).

data/Rakefile

@@ -1,37 +1,19 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
+require 'bundler/setup'
+require 'sdoc'
 require 'rdoc/task'
 
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'TheTrade'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+RDoc::Task.new(:sdoc) do |rdoc|
+  rdoc.rdoc_dir = 'docs'
+  rdoc.title = 'RailsTrade'
+  rdoc.options << '--format=sdoc'
+  rdoc.template = 'rails'
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
-
-
 load 'rails/tasks/statistics.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task default: :test

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

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

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

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

data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/promote_buyers/new.js

@@ -1,3 +1,4 @@
+$('#promote_buyer_buyer_type').dropdown();
 $('#promote_buyer_buyer_id').dropdown({
   apiSettings: {
     url: '/buyers/search?q={query}',
@@ -28,4 +29,5 @@ $('#promote_buyer_promote_id').dropdown({
   filterRemoteData: false,
   saveRemoteData: true,
   minCharacters: 2
-});
+});
+$('#promote_buyer_status').dropdown();

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

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

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

@@ -0,0 +1,7 @@
+$('#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

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

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

@@ -0,0 +1,17 @@
+$('#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

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

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

@@ -0,0 +1,5 @@
+$('#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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,57 @@
+.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

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

@@ -9,7 +9,6 @@ module ControllerOrderTypes
       :paypal_execute,
       :wxpay_pay
     ]
-    wechat_api
   end
 
   def stripe_pay
@@ -73,11 +72,9 @@ module ControllerOrderTypes
   end
 
   def wxpay_pay
-    #@order.openid = current_wechat_user.open_id
-    @order.spbill_create_ip = request.remote_ip
+    @wxpay_order = @order.wxpay_order(spbill_create_ip: request.remote_ip)
 
-    @wxpay_order = @order.wxpay_order
-    if @wxpay_order[:result_code] == 'FAIL' || @wxpay_order.empty?
+    if @wxpay_order['result_code'] == 'FAIL' || @wxpay_order.blank?
       render 'wxpay_pay_err'
     else
       render 'wxpay_pay'
@@ -89,4 +86,4 @@ module ControllerOrderTypes
     set_order
   end
 
-end
+end

data/app/controllers/rails_trade/my_cart.rb

@@ -0,0 +1,16 @@
+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/base_controller.rb

@@ -0,0 +1,5 @@
+class Trade::Admin::BaseController < RailsTrade.config.admin_controller.constantize
+
+
+
+end

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

@@ -1,4 +1,4 @@
-class RailsTradeAdmin::BuyersController < RailsTradeAdmin::BaseController
+class Trade::Admin::BuyersController < Trade::Admin::BaseController
   before_action :set_buyer, only: [:orders]
 
   def index
@@ -6,7 +6,7 @@ class RailsTradeAdmin::BuyersController < RailsTradeAdmin::BaseController
     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(the_role_user).page(params[:page])
+    @buyers = Buyer.unscoped.includes(:orders, :payment_strategy, :crm_permits).default_where(q_params).permit_with(rails_role_user).page(params[:page])
   end
 
   def overdue
@@ -14,7 +14,7 @@ class RailsTradeAdmin::BuyersController < RailsTradeAdmin::BaseController
     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(the_role_user).page(params[:page])
+    @buyers = Buyer.unscoped.includes(:orders, :payment_strategy, :crm_permits).default_where(q_params).permit_with(rails_role_user).page(params[:page])
   end
 
   def orders

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

@@ -1,4 +1,4 @@
-class RailsTradeAdmin::CartItemServesController < RailsTradeAdmin::BaseController
+class Trade::Admin::CartServesController < Trade::Admin::BaseController
   before_action :set_cart_item
 
   def index
@@ -14,8 +14,8 @@ class RailsTradeAdmin::CartItemServesController < RailsTradeAdmin::BaseControlle
   end
 
   def new
-    @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_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
@@ -29,7 +29,7 @@ class RailsTradeAdmin::CartItemServesController < RailsTradeAdmin::BaseControlle
       if @cart_item_serve.save
         @cart_item.cart_item_serves.reload
         format.js
-        format.html { redirect_to @cart_item_serve, notice: 'Taxon item was successfully created.' }
+        format.html { redirect_to @cart_item_serve }
       else
         format.js
         format.html { render :new }
@@ -57,7 +57,10 @@ class RailsTradeAdmin::CartItemServesController < RailsTradeAdmin::BaseControlle
   end
 
   def cart_item_serve_params
-    params.fetch(:cart_item_serve, {}).permit(:serve_id, :price)
+    params.fetch(:cart_item_serve, {}).permit(
+      :serve_id,
+      :price
+    )
   end
 
 end