rails_trade 0.0.1 → 0.0.2

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

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

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

@@ -0,0 +1,75 @@
+<% content_for :breadcrumb do %>
+<div class="ui basic segment breadcrumb">
+  <%= link_to t('trade.admin.orders.index.title'), admin_orders_path(buyer_type: @order.buyer_type, buyer_id: @order.buyer_id), class: 'section' %>
+  <i class="right chevron icon divider"></i>
+  <span class="active section"><%= @order.uuid %></span>
+</div>
+<% end %>
+
+<table class="ui table">
+  <thead>
+    <tr>
+      <th><%= TradeItem.human_attribute_name(:good_id) %></th>
+      <th><%= TradeItem.human_attribute_name(:number) %></th>
+      <th><%= TradeItem.human_attribute_name(:original_amount) %></th>
+      <th><%= TradeItem.human_attribute_name(:additional_amount) %></th>
+      <th><%= TradeItem.human_attribute_name(:reduced_amount) %></th>
+      <th><%= TradeItem.human_attribute_name(:amount) %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <% @order.trade_items.each do |trade_item| %>
+    <tr>
+      <td>
+        <%= trade_item.good.name %>
+        <span><%= trade_item.good&.price %></span>
+        <%# link_to trade_item.good&.name, controller: '/' + trade_item.good_type.underscore.pluralize, action: 'show', id: trade_item.good_id %>
+      </td>
+      <td><%= trade_item.number %></td>
+      <td><%= trade_item.original_amount %></td>
+      <td><%= trade_item.additional_amount %></td>
+      <td><%= trade_item.reduced_amount %></td>
+      <td><%= trade_item.amount %></td>
+      <td><%= link_to '订单流程', admin_trade_item_path(trade_item) %></td>
+    </tr>
+    <% trade_item.trade_promotes.each do |trade_promote| %>
+      <tr class="warning">
+        <td><%= trade_promote.promote.name %></td>
+        <td colspan="4"></td>
+        <td><%= trade_promote.amount %></td>
+        <td>
+          <% if trade_promote.promote.editable %>
+            <%= link_to edit_admin_trade_promote_path(trade_promote), remote: true, class: 'ui mini circular icon button' do %>
+              <i class="fas fa-pencil-alt"></i>
+            <% end %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  <% end %>
+  <% @order.trade_promotes.each do |trade_promote| %>
+    <tr>
+      <td><%= trade_promote.promote.name %></td>
+      <td colspan="4"></td>
+      <td><%= trade_promote.amount %></td>
+      <td>
+        <% if trade_promote.promote.editable %>
+          <%= link_to edit_admin_trade_promote_path(trade_promote), remote: true, class: 'ui mini circular icon button' do %>
+            <i class="fas fa-pencil-alt"></i>
+          <% end %>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+  <tr class="active">
+    <td>总价</td>
+    <td colspan="4"></td>
+    <td>
+      <%= @order.amount %>
+      <%= link_to new_admin_order_order_payment_path(@order.id), remote: true, class: 'ui icon green button' do %>
+        <i class="fas fa-credit-card"></i>
+      <% end %>
+    </td>
+    <td></td>
+  </tr>
+</table>

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

@@ -1,22 +1,18 @@
-<%= search_form_with css: { submit: 'ui green button'} do |f| %>
+<%= form_with theme: 'search', model: PaymentMethod.new do |f| %>
   <div class="fields">
     <%= f.text_field :account_name, placeholder: PaymentMethod.human_attribute_name(:account_name) %>
     <%= f.text_field :account_num, placeholder: PaymentMethod.human_attribute_name(:account_num) %>
     <%= f.text_field :bank, placeholder: PaymentMethod.human_attribute_name(:bank) %>
     <%= f.text_field :'buyers.name-like', placeholder: 'name' %>
-    <%= f.submit 'Search' %>
-  </div>
-  <div class="fields">
-    <div class="field">
-      <%= link_to 'Clear All Filters', filter_params(only: []), class: 'ui white button' %>
-    </div>
+    <%= f.submit %>
+    <%= link_to t('.clear'), filter_params(only: []), class: 'ui white button' %>
   </div>
 <% end %>
 
 <dl>
-  <dt>Admin:</dt>
+  <dt>Admin</dt>
   <dd>
     <%= link_to 'Admin', filter_params(myself: 0), class: active_params(myself: 0, active_class: 'ui basic blue button', item_class: 'ui basic white button') %>
     <%= link_to 'User', filter_params(myself: 1), class: active_params(myself: 1, active_class: 'ui basic blue button', item_class: 'ui basic white button') %>
   </dd>
-</dl>
+</dl>

data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_index_layout.html.erb

@@ -1,13 +1,10 @@
-<div class="ui top attached borderless menu">
+<div class="ui top attached tabular menu">
   <%= link_to 'Verified', admin_payment_methods_path, class: active_helper(action: 'index') %>
   <%= link_to 'Unverified', unverified_admin_payment_methods_path, class: active_helper(action: 'unverified') %>
-  <div class="right menu">
-    <div class="item"><%= link_to t('.new'), new_admin_payment_method_path, class: 'ui teal button' %></div>
-  </div>
 </div>
 
 <div class="ui attached segment">
-  <%= render 'search_form' %>
+  <%= render 'filter' %>
 </div>
 
 <%= yield %>

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

@@ -1,6 +1,6 @@
 <div class="ui modal" id="modal">
   <i class="close icon"></i>
-  <div class="ui header blue">
+  <div class="ui header">
     Add Payment Method
   </div>
 
@@ -10,4 +10,4 @@
     <% end %>
   </div>
 
-</div>
+</div>

data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_payment_method.html.erb

@@ -1,5 +1,4 @@
 <tr>
-  <td><%= payment_method.id %></td>
   <td><%= payment_method.type_i18n %></td>
   <td><%= payment_method.account_name %></td>
   <td><%= payment_method.account_num %></td>
@@ -14,12 +13,12 @@
   </td>
   <td>
     <%= form_with model: payment_method, scope: 'payment_method', url: admin_payment_method_path(payment_method), method: :patch do |f| %>
-      <%= f.check_box :verified, onChange: 'this.form.submit()', label: false, on: { wrapper_all: false, offset: false } %>
+      <%= f.check_box :verified, onChange: 'this.form.submit()', label: false, on: { wrap_all: false, offset: false } %>
     <% end %>
   </td>
   <td>
     <%= link_to t('.relate'), new_admin_payment_method_reference_path(payment_method), class: 'ui mini green button', remote: true %>
-    <%= link_to t('.destroy'), admin_payment_method_path(payment_method), remote: true, method: :delete, data: { confirm: 'Are you sure?' }, class: 'ui mini red button' %>
+    <%= link_to t('.destroy'), admin_payment_method_path(payment_method), remote: true, method: :delete, data: { confirm: t('.confirm') }, class: 'ui mini red button' %>
     <%= link_to t('.edit'), edit_admin_payment_method_path(payment_method), class: 'ui mini blue button' %>
   </td>
 </tr>

data/app/views/trade/admin/payment_methods/create.js.erb

@@ -0,0 +1,2 @@
+$('#modal').modal('hide');
+Turbolinks.visit(location);

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

@@ -2,7 +2,7 @@
 
   <div class="ui segment breadcrumb">
     <%= link_to 'Back', admin_payment_methods_path, class: 'section' %>
-    <div class="divider"> / </div>
+    <i class="fas fa-angle-right divider"></i>
     <div class="active section">Edit</div>
   </div>
 

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

@@ -1,16 +1,19 @@
 <%= render layout: 'index_layout' do %>
 
-  <table class="ui bottom attached table">
+  <table class="ui bottom attached selectable table">
     <thead>
     <tr>
-      <th>ID</th>
       <th><%= PaymentMethod.human_attribute_name(:type) %></th>
       <th><%= PaymentMethod.human_attribute_name(:account_name) %></th>
       <th><%= PaymentMethod.human_attribute_name(:account_num) %></th>
       <th><%= PaymentMethod.human_attribute_name(:bank) %></th>
       <th><%= PaymentMethod.human_attribute_name(:payment_references) %></th>
       <th><%= PaymentMethod.human_attribute_name(:verified) %></th>
-      <th>Operation</th>
+      <th>
+        <%= link_to new_admin_payment_method_path, class: 'ui teal button' do %>
+          <i class="fas fa-plus"></i><%= t('.new') %>
+        <% end %>
+      </th>
     </tr>
     </thead>
 
@@ -20,4 +23,4 @@
 
   </table>
 
-<% end %>
+<% end %>

data/app/views/{rails_trade_admin → trade/admin}/payment_methods/mine.html.erb

@@ -1,6 +1,6 @@
 <%= render layout: 'index_layout' do %>
 
-  <table class="ui bottom attached table">
+  <table class="ui bottom attached selectable table">
     <thead>
     <tr>
       <th>ID</th>
@@ -20,4 +20,4 @@
 
   </table>
 
-<% end %>
+<% end %>

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

@@ -2,7 +2,7 @@
 
   <div class="ui segment breadcrumb">
     <%= link_to 'Back', admin_payment_methods_path, class: 'section' %>
-    <div class="divider"> / </div>
+    <i class="fas fa-angle-right divider"></i>
     <div class="active section">Add New</div>
   </div>
 

data/app/views/{rails_trade_admin → trade/admin}/payment_methods/unverified.html.erb

@@ -1,8 +1,7 @@
 <%= render layout: 'index_layout' do %>
-  <table class="ui bottom attached table">
+  <table class="ui bottom attached selectable table">
     <thead>
     <tr>
-      <th>ID</th>
       <th><%= PaymentMethod.human_attribute_name(:account_name) %></th>
       <th><%= PaymentMethod.human_attribute_name(:account_num) %></th>
       <th><%= PaymentMethod.human_attribute_name(:bank) %></th>
@@ -14,7 +13,6 @@
   <tbody>
     <% @payment_methods.each do |payment_method| %>
       <tr>
-        <td><%= payment_method.id %></td>
         <td><%= payment_method.account_name %></td>
         <td><%= payment_method.account_num %></td>
         <td><%= payment_method.bank %></td>
@@ -27,13 +25,13 @@
           <%= form_with model: payment_method, scope: 'payment_method', url: admin_payment_method_path(payment_method), method: :patch do |f| %>
             <div class="ui toggle checkbox">
               <label></label>
-              <%= f.check_box :verified, onChange: 'this.form.submit()', label: false, on: { wrapper_all: false, wrapper_checkbox: false, offset: false } %>
+              <%= f.check_box :verified, onChange: 'this.form.submit()', label: false, on: { wrap_all: false, wrap_checkbox: false, offset: false } %>
             </div>
           <% end %>
         </td>
         <td>
           <%= link_to t('.edit'), edit_admin_payment_method_path(payment_method), class: 'ui mini blue button' %>
-          <%= link_to t('.destroy'), admin_payment_method_path(payment_method), class: 'ui mini red button', method: :delete, data: { confirm: 'Are you sure?' } %>
+          <%= link_to t('.destroy'), admin_payment_method_path(payment_method), class: 'ui mini red button', method: :delete, data: { confirm: t('.confirm') } %>
         </td>
       </tr>
       <% payment_method.repeat_results.each do |result| %>
@@ -57,4 +55,4 @@
   </tbody>
   </table>
 
-<% end %>
+<% end %>

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

@@ -1,14 +1,10 @@
 <tr id="checked_<%= payment_order.order_id %>">
   <td>
-    <%= payment_order.order.id %>
     <%= form_with url: admin_payment_payment_order_path(@payment, payment_order), id: "edit_payment_order_#{payment_order.id}", method: :patch, remote: true do |f| %>
     <% end %>
   </td>
   <td>
     <%= link_to payment_order.order.uuid, admin_order_path(payment_order.order_id) %>
-    <span style="color: #999;">（<%# payment_order.order.charger&.name %>）</span>
-  </td>
-  <td>
   </td>
   <td><%= payment_order.order.amount %></td>
   <td>
@@ -16,13 +12,13 @@
       <%= payment_order.check_amount %>
     <% else %>
       <div class="ui input">
-        <%= text_field_tag 'payment_order[check_amount]', payment_order.check_amount, placeholder: 'Result:', class: 'three wide field', form: "edit_payment_order_#{payment_order.id}" %>
+        <%= text_field_tag 'payment_order[check_amount]', payment_order.check_amount, class: 'three wide field', form: "edit_payment_order_#{payment_order.id}" %>
       </div>
     <% end %>
   </td>
   <td><%= PaymentOrder.enum_i18n(:state, payment_order.state) %></td>
   <td>
-    <% if payment_order.confirmed? && the_role_user.has_role?('admin/payment_orders', 'destroy') %>
+    <% if payment_order.confirmed? && rails_role_user.has_role?('admin/payment_orders', 'destroy') %>
       <%= link_to '撤销', cancel_admin_payment_payment_order_path(@payment, payment_order), method: :patch, remote: true %>
     <% else %>
       <%= submit_tag '核销', form: "edit_payment_order_#{payment_order.id}", class: 'ui mini button' %>

data/app/views/trade/admin/payment_orders/_new.html.erb

@@ -0,0 +1,23 @@
+<tr id="add_payment_order">
+  <td colspan="11">
+    <table class="ui very basic table">
+      <thead>
+        <tr>
+          <th></th>
+          <th><%= Order.human_attribute_name(:uuid) %></th>
+          <th><%= Order.human_attribute_name(:amount) %></th>
+          <th><%= PaymentOrder.human_attribute_name(:check_amount) %></th>
+          <th><%= PaymentOrder.human_attribute_name(:state) %></th>
+          <th></th>
+        </tr>
+      </thead>
+
+      <% unless @payment.all_checked? %>
+        <%= render partial: 'orders', collection: @orders, as: :order %>
+      <% end %>
+
+      <%= render partial: 'index', collection: @payment.payment_orders, as: :payment_order %>
+    </table>
+  </td>
+</tr>
+

data/app/views/{rails_trade_admin → trade/admin}/payment_orders/_orders.html.erb

@@ -1,27 +1,20 @@
 <tr id="unchecked_<%= order.id %>">
   <td>
-    <%= order.id %>
     <%= form_with url: admin_payment_payment_orders_path(@payment), id: "new_payment_#{order.id}" do |f| %>
     <% end %>
   </td>
   <td>
     <%= link_to order.uuid, admin_order_path(order.id) %>
-    <span style="color: #999;">（<%# order.charger&.name %>）</span>
-  </td>
-  <td>
-    <% if order.payment_memo_id %>
-      <%= link_to 'Download', attachment_url(order, :payment_memo), download: "payment_memo_#{order.id}", target: '_self' %>
-    <% end %>
   </td>
   <td><%= order.amount %></td>
   <td>
     <%= hidden_field_tag 'payment_order[order_id]', order.id, form: "new_payment_#{order.id}" %>
     <div class="ui input">
-      <%= number_field_tag 'payment_order[check_amount]', order.unreceived_amount, placeholder: 'Result:', class: 'three wide field', step: '0.01', form: "new_payment_#{order.id}" %>
+      <%= number_field_tag 'payment_order[check_amount]', order.unreceived_amount, class: 'three wide field', step: '0.01', form: "new_payment_#{order.id}" %>
     </div>
   </td>
   <td></td>
   <td>
     <%= submit_tag '核销', class: 'ui mini grey button', form: "new_payment_#{order.id}" %>
   </td>
-</tr>
+</tr>

data/app/views/{rails_trade_admin → trade/admin}/payment_orders/update.js.erb

@@ -1,2 +1,2 @@
 $('#checked_<%= @payment_order.order_id %>').replaceWith('<%= j(render partial: 'index', locals: { payment_order: @payment_order }) %>')
-$('#checked_amount_<%= @payment_order.payment_id %>').html('<%= @payment_order.payment.checked_amount %>')
+$('#checked_amount_<%= @payment_order.payment_id %>').html('<%= j(render partial: 'trade/admin/payments/checked_amount', locals: { payment: @payment_order.payment }) %>')

data/app/views/{rails_trade_admin → trade/admin}/payment_references/_form.html.erb

@@ -1,4 +1,4 @@
-<%= default_form_with model: @payment_reference, as: :payment_reference, url: admin_payment_method_references_path(@payment_method) do |f| %>
+<%= form_with model: @payment_reference, as: :payment_reference, url: admin_payment_method_references_path(@payment_method) do |f| %>
   <%= f.select :buyer_id, options_for_select([]), { label: 'Buyer', include_blank: true }, { class: 'ui search fluid dropdown' } %>
   <%= f.submit %>
 <% end %>

data/app/views/{rails_trade_admin → trade/admin}/payment_references/_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">
     Edit References
   </div>
 

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

@@ -14,7 +14,7 @@
       <tr>
         <td><%= link_to 'Show', payment_reference %></td>
         <td><%= link_to 'Edit', edit_payment_reference_path(payment_reference) %></td>
-        <td><%= link_to 'Destroy', payment_reference, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to 'Destroy', payment_reference, method: :delete, data: { confirm: t('.confirm') } %></td>
       </tr>
     <% end %>
   </tbody>

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

@@ -2,7 +2,7 @@
 
   <div class="ui segment breadcrumb">
     <%= link_to 'Back', admin_payment_strategies_path, class: 'section' %>
-    <div class="divider"> / </div>
+    <i class="fas fa-angle-right divider"></i>
     <div class="active section">Edit</div>
   </div>
 
@@ -10,4 +10,4 @@
     <%= render 'form' %>
   </div>
 
-</div>
+</div>

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

@@ -7,7 +7,7 @@
     <%= link_to t('.new'), new_admin_payment_strategy_path, class: 'ui teal button' %>
   </div>
 
-  <table class="ui bottom attached table">
+  <table class="ui bottom attached selectable table">
     <thead>
     <tr>
       <th>ID</th>
@@ -24,7 +24,7 @@
         <td><%= payment_strategy.name %></td>
         <td><%= payment_strategy.period %></td>
         <td>
-          <%= link_to t('.destroy'), admin_payment_strategy_path(payment_strategy), remote: true, method: :delete, data: { confirm: 'Are you sure?' }, class: 'ui mini red button' %>
+          <%= link_to t('.destroy'), admin_payment_strategy_path(payment_strategy), remote: true, method: :delete, data: { confirm: t('.confirm') }, class: 'ui mini red button' %>
           <%= link_to t('.edit'), edit_admin_payment_strategy_path(payment_strategy), class: 'ui mini blue button' %>
         </td>
       </tr>