rails_trade 0.0.1 → 0.0.2

data/app/models/rails_trade/user.rb

@@ -0,0 +1,9 @@
+module RailsTrade::User
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :carts, dependent: :destroy
+  end
+
+end
+

data/app/models/refund.rb

@@ -0,0 +1,3 @@
+class Refund < ApplicationRecord
+  include RailsTrade::Refund
+end unless defined? Refund

data/app/models/refund/alipay_refund.rb

@@ -0,0 +1,3 @@
+class AlipayRefund < Refund
+  include RailsTrade::Refund::AlipayRefund
+end unless defined? AlipayRefund

data/app/models/refund/bank_refund.rb

@@ -0,0 +1,3 @@
+class BankRefund < Refund
+  include RailsTrade::Refund::BankRefund
+end unless defined? BankRefund

data/app/models/refund/hand_refund.rb

@@ -0,0 +1,3 @@
+class HandRefund < Refund
+  include RailsTrade::Refund::HandRefund
+end unless defined? HandRefund

data/app/models/refund/paypal_refund.rb

@@ -0,0 +1,3 @@
+class PaypalRefund < Refund
+  include RailsTrade::Refund::PaypalRefund
+end unless defined? PaypalRefund

data/app/models/refund/stripe_refund.rb

@@ -0,0 +1,3 @@
+class StripeRefund < Refund
+  include RailsTrade::Refund::StripeRefund
+end unless defined? StripeRefund

data/app/models/refund/wxpay_refund.rb

@@ -0,0 +1,3 @@
+class WxpayRefund < Refund
+  include RailsTrade::Refund::WxpayRefund
+end unless defined? WxpayRefund

data/app/models/trade_item.rb

@@ -0,0 +1,3 @@
+class TradeItem < ApplicationRecord
+  include RailsTrade::TradeItem
+end unless defined? TradeItem

data/app/models/trade_promote.rb

@@ -0,0 +1,3 @@
+class TradePromote < ApplicationRecord
+  include RailsTrade::TradePromote
+end unless defined? TradePromote

data/app/views/application/_trade_nav.html.erb

@@ -0,0 +1,16 @@
+<% if rails_role_user.any_role?('trade/admin') %>
+<div class="item">
+  <a class="<%= active_helper(modules: 'trade/admin', active_class: 'title active', item_class: 'title') %>">
+    <i class="fas fa-shopping-cart fa-fw"></i>
+    <span>订单管理</span>
+    <i class="dropdown icon"></i>
+  </a>
+  <div class="<%= active_helper(modules: 'trade/admin', active_class: 'active content menu', item_class: 'content menu') %>">
+    <%= link_to t('trade.admin.orders.index.title'), admin_orders_path, class: active_helper(controllers: 'orders') %>
+    <%= link_to t('trade.admin.payments.index.title'), admin_payments_path, class: active_helper(controllers: 'payments') %>
+    <%= link_to t('trade.admin.payment_methods.index.title'), admin_payment_methods_path, class: active_helper(controllers: 'payment_methods') %>
+    <%= link_to t('trade.admin.promotes.index.title'), admin_promotes_path, class: active_helper(controllers: 'promotes') %>
+    <%= link_to t('trade.admin.promote_buyers.index.title'), admin_promote_buyers_path, class: active_helper(controllers: 'promote_buyers') %>
+  </div>
+</div>
+<% end %>

data/app/views/my/_trade_nav.html.erb

@@ -0,0 +1,10 @@
+<div class="item">
+  <span class="header">订单</span>
+  <div class="menu">
+    <%= link_to t('trade.my.cart.show.title'), my_cart_path, class: active_helper(controllers: ['carts']) %>
+    <%= link_to t('trade.my.orders.index.title'), my_orders_path, class: active_helper(controllers: ['orders']) %>
+  </div>
+</div>
+
+
+

data/app/views/{rails_trade_admin → trade/admin}/buyers/_search_form.html.erb

@@ -1,11 +1,11 @@
-<%= search_form_with scope: :q do |f| %>
+<%= form_with theme: 'search' do |f| %>
   <div class="fields">
     <%= f.text_field :'name-like' %>
     <%= f.collection_select :payment_strategy_id, PaymentStrategy.all, :id, :name, { prompt: 'Credit Terms' }, { class: 'ui dropdown' } %>
     <%= f.collection_select :'crm_permits.manager_id', @managers, :id, :name, { prompt: 'AR' }, { class: 'ui dropdown' } %>
     <%= f.date_field :'overdue_date-lte' %>
-    <%= f.submit 'Search' %>
-    <%= link_to 'Clear All Filters', filter_params(only: [:buyer_id]), class: 'ui white button' %>
+    <%= f.submit %>
+    <%= link_to t('.clear'), filter_params(only: [:buyer_id]), class: 'ui white button' %>
   </div>
 <% end %>
 

data/app/views/{rails_trade_admin → trade/admin}/buyers/index.html.erb

@@ -13,7 +13,7 @@
     </p>
   </div>
 
-  <table class="ui bottom attached table">
+  <table class="ui bottom attached selectable table">
     <thead>
     <tr>
       <th>ID</th>

data/app/views/{rails_trade_admin → trade/admin}/buyers/orders.html.erb

@@ -5,7 +5,7 @@
     <div class="item"><%= @buyer.name %></div>
   </div>
 
-  <table class="ui bottom attached table">
+  <table class="ui bottom attached selectable table">
     <thead>
     <tr>
       <th>UUID</th>
@@ -37,7 +37,7 @@
     </p>
   </div>
 
-  <table class="ui bottom attached table">
+  <table class="ui bottom attached selectable table">
     <thead>
     <tr>
       <th></th>

data/app/views/{rails_trade_admin → trade/admin}/buyers/overdue.html.erb

@@ -13,7 +13,7 @@
     </p>
   </div>
 
-  <table class="ui bottom attached table">
+  <table class="ui bottom attached selectable table">
     <thead>
     <tr>
       <th>ID</th>

data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_index.html.erb

@@ -1,6 +1,6 @@
 <div class="ui modal" id="good_serves_index">
   <i class="close icon"></i>
-  <div class="ui header blue">
+  <div class="ui header">
     Cart Item Servers
   </div>
   <div class="content">

data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_single.html.erb

@@ -1,6 +1,6 @@
 <div class="ui modal" id="good_serves_index">
   <i class="close icon"></i>
-  <div class="ui header blue">
+  <div class="ui header">
     Cart Item Servers
   </div>
   <div class="content">

data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_total.html.erb

@@ -1,6 +1,6 @@
 <div class="ui modal" id="good_serves_index">
   <i class="close icon"></i>
-  <div class="ui header blue">
+  <div class="ui header">
     Cart Item Servers
   </div>
   <div class="content">

data/app/views/trade/admin/goods/_form.html.erb

@@ -0,0 +1,7 @@
+<%= form_with model: [:admin, @good], class: 'ui form' do |f| %>
+  <%= render 'shared/error_messages', target: @good %>
+  <%= f.text_field :sku, css: { wrap_input: 'disabled field' } %>
+  <%= f.text_field :unit %>
+  <%= f.number_field :price, step: '0.01' %>
+  <%= f.submit %>
+<% end %>

data/app/views/{rails_trade_admin → trade/admin}/goods/_new.html.erb

@@ -1,6 +1,6 @@
 <div class="ui modal">
   <i class="close icon"></i>
-  <div class="ui header blue">
+  <div class="ui header">
     Add Good Info
   </div>
 
@@ -8,4 +8,4 @@
     <%= render partial: 'form' %>
   </div>
 
-</div>
+</div>

data/app/views/{rails_trade_admin → trade/admin}/goods/edit.html.erb

@@ -1,8 +1,8 @@
 <div class="ui breadcrumb">
   <%= link_to '全部商品', admin_goods_path, class: 'section' %>
-  <div class="divider"> / </div>
+  <i class="fas fa-angle-right divider"></i>
   <%= link_to @good.name, admin_good_path(@good), class: 'section' %>
-  <div class="divider"> / </div>
+  <i class="fas fa-angle-right divider"></i>
   <span class="section">编辑</span>
 </div>
 

data/app/views/{rails_trade_admin → trade/admin}/goods/edit_items.html.erb

@@ -1,8 +1,8 @@
 <div class="ui breadcrumb">
   <%= link_to '全部商品', admin_goods_path, class: 'section' %>
-  <div class="divider"> / </div>
+  <i class="fas fa-angle-right divider"></i>
   <%= link_to @good.name, admin_good_path(@good), class: 'section' %>
-  <div class="divider"> / </div>
+  <i class="fas fa-angle-right divider"></i>
   <span class="section">编辑</span>
 </div>
 

data/app/views/{rails_trade_admin → trade/admin}/goods/edit_pic.html.erb

@@ -1,8 +1,8 @@
 <div class="ui breadcrumb">
   <%= link_to '全部商品', admin_goods_path, class: 'section' %>
-  <div class="divider"> / </div>
+  <i class="fas fa-angle-right divider"></i>
   <%= link_to @good.name, admin_good_path(@good), class: 'section' %>
-  <div class="divider"> / </div>
+  <i class="fas fa-angle-right divider"></i>
   <span class="section">编辑</span>
 </div>
 

data/app/views/{rails_trade_admin → trade/admin}/goods/edit_promote.html.erb

@@ -2,9 +2,9 @@
 
 <div class="ui breadcrumb">
   <%= link_to '全部商品', admin_goods_path, class: 'section' %>
-  <div class="divider"> / </div>
+  <i class="fas fa-angle-right divider"></i>
   <%= link_to @good.name, admin_good_path(@good), class: 'section' %>
-  <div class="divider"> / </div>
+  <i class="fas fa-angle-right divider"></i>
   <span class="section">编辑</span>
 </div>
 

data/app/views/{rails_trade_admin → trade/admin}/goods/index.html.erb

@@ -25,7 +25,7 @@
         <td><%= good.sku %></td>
         <td><%= good.price %></td>
         <td><%= link_to '编辑', edit_admin_good_path(good) %></td>
-        <td><%= link_to '删除', admin_good_path(good), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to '删除', admin_good_path(good), method: :delete, data: { confirm: t('.confirm') } %></td>
       </tr>
     <% end %>
   </table>

data/app/views/{rails_trade_admin → trade/admin}/goods/new.html.erb

@@ -5,7 +5,7 @@
 <div class="thirteen wide column">
   <div class="ui breadcrumb">
     <%= link_to '商品列表', admin_goods_path, class: 'section' %>
-    <div class="divider"> / </div>
+    <i class="fas fa-angle-right divider"></i>
     <div class="active section">新增商品</div>
   </div>
 

data/app/views/{rails_trade_admin → trade/admin}/order_payments/_payment_orders.html.erb

@@ -8,7 +8,7 @@
     <%= payment_order.check_amount.to_money(payment_order.payment.currency).format %>
     <span style="color: #999;"><%= payment_order.state_i18n %></span>
   </td>
-  <td class="center aligned"><%= payment_order.created_at.to_s %></td>
+  <td class="center aligned"><time><%= payment_order.created_at.to_s(:rfc822) %></time></td>
   <td>
     <% if payment_order.init? %>
       <%= link_to '撤销', admin_order_order_payment_path(@order, payment_order), method: :delete, remote: true %>

data/app/views/{rails_trade_admin → trade/admin}/orders/_addresses.html.erb

@@ -26,7 +26,7 @@
       <td>
         <%= link_to 'Show', address_path(address) %>
         <%= link_to 'Edit', edit_admin_address_path(address), remote: true %>
-        <%= link_to 'Destroy', admin_address_path(address), method: :delete, remote: true, data: { confirm: 'Are you sure?' } %>
+        <%= link_to 'Destroy', admin_address_path(address), method: :delete, remote: true, data: { confirm: t('.confirm') } %>
       </td>
     </tr>
   <% end %>

data/app/views/trade/admin/orders/_filter.html.erb

@@ -0,0 +1,26 @@
+<%= form_with theme: 'search', model: Order.new(params.permit(:uuid)) do |f| %>
+  <div class="fields">
+    <%= f.text_field :uuid, css: { wrap_input: 'three wide field' } %>
+    <%= f.submit %>
+    <%= link_to t('.clear'), filter_params(only: []), class: 'ui button' %>
+  </div>
+<% end %>
+<div class="ui divider"></div>
+<dl>
+  <dt><%= Order.human_attribute_name(:payment_status) %></dt>
+  <dd>
+    <%= link_to t('.all'), filter_params(except: [:payment_status]), class: active_params(payment_status: '', active_class: 'ui basic blue button', item_class: 'ui basic white button') %>
+  <% Order.options_i18n(:payment_status).each do |text, value| %>
+    <%= link_to text, filter_params(payment_status: value, except: [:id]), class: active_params(payment_status: value, active_class: 'ui basic blue button', item_class: 'ui basic white button') %>
+  <% end %>
+  </dd>
+</dl>
+<dl>
+  <dt><%= Order.human_attribute_name(:payment_type) %></dt>
+  <dd>
+    <%= link_to t('.all'), filter_params(except: [:payment_type]), class: active_params(payment_type: '', active_class: 'ui basic blue button', item_class: 'ui basic white button') %>
+  <% Order.options_i18n(:payment_type).each do |text, value| %>
+    <%= link_to text, filter_params(payment_type: value), class: active_params(payment_type: value, active_class: 'ui basic blue button', item_class: 'ui basic white button') %>
+  <% end %>
+  </dd>
+</dl>

data/app/views/trade/admin/orders/_form.html.erb

@@ -0,0 +1,4 @@
+<%= form_with model: order do |f| %>
+
+  <%= f.submit %>
+<% end %>

data/app/views/{rails_trade_admin → trade/admin}/orders/_invoice_addresses.html.erb

@@ -26,7 +26,7 @@
       <td>
         <%= link_to 'Show', address_path(address) %>
         <%= link_to 'Edit', edit_admin_address_path(address), remote: true %>
-        <%= link_to 'Destroy', admin_address_path(address), method: :delete, remote: true, data: { confirm: 'Are you sure?' } %>
+        <%= link_to 'Destroy', admin_address_path(address), method: :delete, remote: true, data: { confirm: t('.confirm') } %>
       </td>
     </tr>
   <% end %>

data/app/views/{rails_trade_admin → trade/admin}/orders/_new_items.html.erb

@@ -23,7 +23,7 @@
           <%= oi.hidden_field :cart_item_id, form: 'new_order' %>
         </td>
         <td><%= oi.date_field :deliver_on, form: 'new_order' %></td>
-        <td><%= oi.number_field :advance_payment, form: 'new_order' %></td>
+        <td><%= oi.number_field :advance_price, form: 'new_order' %></td>
         <td><%= oi.text_field :comment, form: 'new_order' %></td>
         <td><%= order_item.amount %></td>
         <td></td>

data/app/views/trade/admin/orders/index.html.erb

@@ -0,0 +1,52 @@
+<% content_for :breadcrumb do %>
+<div class="ui basic segment breadcrumb">
+  <div class="active section"><%= t('.title') %></div>
+</div>
+<% end %>
+
+<div class="ui top attached segment">
+  <%= render 'filter' %>
+</div>
+
+<table class="ui bottom attached selectable table">
+  <thead>
+    <tr>
+      <th><%= Order.human_attribute_name(:uuid) %></th>
+      <th><%= Order.human_attribute_name(:amount) %></th>
+      <th><%= Order.human_attribute_name(:received_amount) %></th>
+      <th><%= Order.human_attribute_name(:payment_status) %></th>
+      <th><%= Order.human_attribute_name(:created_at) %></th>
+      <th><%= Order.human_attribute_name(:user_id) %></th>
+      <th><%= Order.human_attribute_name(:extra) %></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <% @orders.each do |order| %>
+    <tr id="order_<%= order.id %>">
+      <td><%= link_to order.uuid, admin_order_path(order), text: true %></td>
+      <td><%= order.amount %></td>
+      <td><%= order.received_amount %></td>
+      <td>
+        <%= order.payment_status_i18n %>
+        <% if ['part_paid', 'all_paid'].include?(order.payment_status) %>
+          <%= link_to t('.refund'), refund_admin_order_path(order.id), method: :patch, class: 'ui mini gray button' %>
+        <% elsif ['refunding', 'refunded', 'denied'].include?(order.payment_status) %>
+          <%= link_to t('.refund_list'), admin_refunds_path(order_id: order.id), class: 'ui mini green button' %>
+        <% elsif ['unpaid'].include?(order.payment_status) %>
+          <%= link_to t('.add_payment'), new_admin_payment_path(order_id: order.id), remote: true, class: 'ui mini green button' %>
+        <% end %>
+      </td>
+      <td><time><%= order.created_at.to_s(:rfc822) %></time></td>
+      <td><%= link_to order.user_name, admin_orders_path(user_id: order.user_id) %></td>
+      <td><%= simple_format(order.extra_i18n) %></td>
+      <td>
+        <%= link_to edit_admin_order_path(order), data: { tooltip: t('.edit') }, remote: true, class: 'ui mini circular icon button' do %>
+          <i class="fas fa-pencil-alt"></i>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+<%= paginate @orders %>