rails_trade 0.0.2 → 0.0.3

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

@@ -1,26 +1,5 @@
-<%= render layout: 'index_layout' do %>
-
-  <table class="ui bottom attached selectable table">
-    <thead>
-    <tr>
-      <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>
-        <%= link_to new_admin_payment_method_path, class: 'ui teal button' do %>
-          <i class="fas fa-plus"></i><%= t('.new') %>
-        <% end %>
-      </th>
-    </tr>
-    </thead>
-
-    <tbody>
-      <%= render partial: 'payment_method', collection: @payment_methods, as: 'payment_method' %>
-    </tbody>
-
-  </table>
-
+<%= render layout: 'index_table', locals: { cache_key: Trade::PaymentMethod.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @payment_methods, as: :model %>
 <% end %>
+
+<%= paginate @payment_methods %>

data/app/views/trade/admin/payment_methods/mine.html.erb

@@ -1,11 +1,11 @@
 <%= render layout: 'index_layout' do %>
 
-  <table class="ui bottom attached selectable table">
+  <table class="table is-hoverable is-fullwidth">
     <thead>
     <tr>
       <th>ID</th>
-      <th><%= PaymentMethod.human_attribute_name(:type) %></th>
-      <th><%= PaymentMethod.human_attribute_name(:account_name) %></th>
+      <th><%= Trade::PaymentMethod.human_attribute_name(:type) %></th>
+      <th><%= Trade::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>

data/app/views/trade/admin/payment_methods/unverified.html.erb

@@ -1,58 +1,5 @@
-<%= render layout: 'index_layout' do %>
-  <table class="ui bottom attached selectable table">
-    <thead>
-    <tr>
-      <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>Actions</th>
-    </tr>
-    </thead>
-  <tbody>
-    <% @payment_methods.each do |payment_method| %>
-      <tr>
-        <td><%= payment_method.account_name %></td>
-        <td><%= payment_method.account_num %></td>
-        <td><%= payment_method.bank %></td>
-        <td>
-          <% payment_method.payment_references.each do |reference| %>
-            <p><%= reference.buyer.name %></p>
-          <% end %>
-        </td>
-        <td>
-          <%= 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: { 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: t('.confirm') } %>
-        </td>
-      </tr>
-      <% payment_method.repeat_results.each do |result| %>
-        <tr class="warning">
-          <td><%= result.id %></td>
-          <td><%= result.account_name %></td>
-          <td><%= result.account_num %></td>
-          <td><%= result.bank %></td>
-          <td>
-            <% result.payment_references.each do |reference| %>
-              <p><%= reference.buyer.name %></p>
-            <% end %>
-          </td>
-          <td></td>
-          <td>
-            <%= link_to '并入此账户', merge_from_admin_payment_method_path(result, other_id: payment_method.id), method: :patch %>
-          </td>
-        </tr>
-      <% end %>
-    <% end %>
-  </tbody>
-  </table>
-
+<%= render layout: 'index_table', locals: { cache_key: Trade::PaymentMethod.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @payment_methods, as: :model %>
 <% end %>
+
+<%= paginate @payment_methods %>

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

@@ -1,6 +1,6 @@
 <tr id="checked_<%= payment_order.order_id %>">
   <td>
-    <%= form_with url: admin_payment_payment_order_path(@payment, payment_order), id: "edit_payment_order_#{payment_order.id}", method: :patch, remote: true do |f| %>
+    <%= form_with url: admin_payment_payment_order_path(@payment, payment_order), id: "edit_payment_order_#{payment_order.id}", method: :patch do |f| %>
     <% end %>
   </td>
   <td>
@@ -11,17 +11,15 @@
     <% if payment_order.confirmed? %>
       <%= payment_order.check_amount %>
     <% else %>
-      <div class="ui input">
-        <%= text_field_tag 'payment_order[check_amount]', payment_order.check_amount, class: 'three wide field', form: "edit_payment_order_#{payment_order.id}" %>
-      </div>
+      <%= number_field_tag 'payment_order[check_amount]', payment_order.check_amount, class: 'input', step: 0.01, form: "edit_payment_order_#{payment_order.id}" %>
     <% end %>
   </td>
   <td><%= PaymentOrder.enum_i18n(:state, payment_order.state) %></td>
   <td>
-    <% 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 %>
+    <% if payment_order.confirmed? %>
+      <%= link_to '撤销', { action: 'cancel', payment_id: @payment, id: payment_order.id }, method: :patch %>
     <% else %>
-      <%= submit_tag '核销', form: "edit_payment_order_#{payment_order.id}", class: 'ui mini button' %>
+      <%= submit_tag '核销', form: "edit_payment_order_#{payment_order.id}", class: 'button is-small' %>
     <% end %>
   </td>
 </tr>

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

@@ -1,23 +1,20 @@
 <tr id="add_payment_order">
   <td colspan="11">
-    <table class="ui very basic table">
+    <table class="table is-fullwidth is-borderless">
       <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><%= Trade::Order.human_attribute_name(:uuid) %></th>
+          <th><%= Trade::Order.human_attribute_name(:amount) %></th>
+          <th><%= Trade::PaymentOrder.human_attribute_name(:check_amount) %></th>
+          <th><%= Trade::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/trade/admin/payment_orders/_orders.html.erb

@@ -9,9 +9,7 @@
   <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, class: 'three wide field', step: '0.01', form: "new_payment_#{order.id}" %>
-    </div>
+    <%= number_field_tag 'payment_order[check_amount]', order.unreceived_amount, class: 'input', step: 0.01, form: "new_payment_#{order.id}" %>
   </td>
   <td></td>
   <td>

data/app/views/trade/admin/payment_orders/cancel.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 %>')
+document.getElementById('checked_<%= @payment_order.order_id %>').outerHTML = '<%= j(render partial: 'index', locals: { payment_order: @payment_order }) %>'
+document.getElementById('checked_amount_<%= @payment_order.payment_id %>').innerHTML = '<%= @payment_order.payment.checked_amount %>'

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

@@ -1,2 +1,2 @@
-$('#unchecked_<%= @payment_order.order_id %>').replaceWith('<%= j(render partial: 'index', locals: { payment_order: @payment_order }) %>')
-$('#checked_amount_<%= @payment.id %>').html(<%= @payment.checked_amount %>)
+document.getElementById('unchecked_<%= @payment_order.order_id %>').outerHTML = '<%= j(render partial: 'index', locals: { payment_order: @payment_order }) %>'
+document.getElementById('checked_amount_<%= @payment.id %>').innerHTML = '<%= @payment.checked_amount %>'

data/app/views/trade/admin/payment_orders/new.turbo_stream.erb

@@ -0,0 +1,2 @@
+<%= turbo_stream.remove 'add_payment_order' %>
+<%= turbo_stream.after "payment_#{@payment.id}", partial: 'new' %>

data/app/views/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('<%= j(render partial: 'trade/admin/payments/checked_amount', locals: { payment: @payment_order.payment }) %>')
+document.getElementById('checked_<%= @payment_order.order_id %>').outerHTML = '<%= j(render partial: 'index', locals: { payment_order: @payment_order }) %>'
+document.getElementById('checked_amount_<%= @payment_order.payment_id %>').innerHTML = '<%= j(render partial: 'trade/admin/payments/checked_amount', locals: { payment: @payment_order.payment }) %>'

data/app/views/trade/admin/payment_orders/update_fail.js.erb

@@ -1,2 +1,2 @@
-$('#unchecked_<%= @payment_order.order_id %>').replaceWith('<%= j(render partial: 'index', locals: { payment_order: @payment_order }) %>')
-$('#checked_amount_<%= @payment.id %>').html(<%= @payment.checked_amount %>)
+document.getElementById('unchecked_<%= @payment_order.order_id %>').outerHTML = '<%= j(render partial: 'index', locals: { payment_order: @payment_order }) %>'
+document.getElementById('checked_amount_<%= @payment.id %>').innerHTML = '<%= @payment.checked_amount %>'

data/app/views/trade/admin/payment_strategies/_edit_form.html.erb

@@ -0,0 +1,4 @@
+<%= form_with model: @payment_strategy, url: { action: 'update' } do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+  <%= f.submit %>
+<% end %>

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

@@ -1,5 +1,2 @@
-<%= form_with model: [:admin, @payment_strategy], local: true do |f| %>
-  <%= f.text_field :name %>
-  <%= f.number_field :period %>
-  <%= f.submit %>
-<% end %>
+<%= f.text_field :name %>
+<%= f.number_field :period %>

data/app/views/trade/admin/payment_strategies/_index_tbody.html.erb

@@ -0,0 +1,12 @@
+<tr>
+  <td><%= payment_strategy.name %></td>
+  <td><%= payment_strategy.period %></td>
+  <td>
+    <%= link_to({ action: 'edit', id: payment_strategy.id }, aria: { label: t('.edit') }, class: 'button is-link is-small') do %>
+      <i class="fas fa-pencil-alt"></i>
+    <% end %>
+    <%= link_to({ action: 'destroy', id: payment_strategy.id }, method: :delete, aria: { label: t('.destroy') }, data: { confirm: t('.confirm') }, class: 'button is-small') do %>
+      <i class="fas fa-trash"></i>
+    <% end %>
+  </td>
+</tr>

data/app/views/trade/admin/payment_strategies/_index_thead.html.erb

@@ -0,0 +1,3 @@
+<th><%= Trade::PaymentStrategy.human_attribute_name(:name) %></th>
+<th><%= Trade::PaymentStrategy.human_attribute_name(:period) %></th>
+<th></th>

data/app/views/trade/admin/payment_strategies/_new_form.html.erb

@@ -0,0 +1,4 @@
+<%= form_with model: @payment_strategy, url: { action: 'create' } do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+  <%= f.submit %>
+<% end %>

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

@@ -1,37 +1,5 @@
-<div>
-
-  <div class="ui top attached menu borderless">
-  </div>
-
-  <div class="ui segment top attached">
-    <%= link_to t('.new'), new_admin_payment_strategy_path, class: 'ui teal button' %>
-  </div>
-
-  <table class="ui bottom attached selectable table">
-    <thead>
-    <tr>
-      <th>ID</th>
-      <th><%= PaymentStrategy.human_attribute_name(:name) %></th>
-      <th><%= PaymentStrategy.human_attribute_name(:period) %></th>
-      <th>操作</th>
-    </tr>
-    </thead>
-
-    <tbody>
-    <% @payment_strategies.each do |payment_strategy| %>
-      <tr>
-        <td><%= payment_strategy.id %></td>
-        <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: 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>
-    <% end %>
-    </tbody>
-
-  </table>
-</div>
-
+<%= render layout: 'index_table', locals: { cache_key: Trade::PaymentStrategy.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @payment_strategies, as: :payment_strategy %>
+<% end %>
 
+<%= paginate @payment_strategies %>

data/app/views/trade/admin/payments/_breadcrumb.html.erb

@@ -0,0 +1,5 @@
+<div class="breadcrumb has-succeeds-separator">
+  <ul>
+    <li class="is-active"><%= t('.title') %></li>
+  </ul>
+</div>

data/app/views/trade/admin/payments/_button.html.erb

@@ -0,0 +1,2 @@
+<%= link_to t('.new'), { action: 'new' }, data: { turbo_frame: 'modal' }, class: 'button is-link' %>
+<%= link_to t('.import'), import_data_list_table_lists_path('PaymentImport'), class: 'button is-link' %>

data/app/views/trade/admin/payments/_edit_form.html.erb

@@ -0,0 +1,4 @@
+<%= form_with model: @payment, scope: :payment, url: { action: 'update' } do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+  <%= f.submit %>
+<% end %>

data/app/views/trade/admin/payments/_filter_form.html.erb

@@ -0,0 +1,13 @@
+<%= form_with theme: 'search', model: Trade::Payment.new(params.permit(:payment_uuid)) do |f| %>
+  <div class="field-body">
+    <%= f.text_field :payment_uuid %>
+    <%= f.text_field 'buyer_name-like' %>
+    <%= f.text_field :buyer_identifier %>
+    <%= f.text_field :buyer_bank %>
+    <%= f.text_field 'orders.uuid' %>
+    <div class="field is-narrow">
+      <%= f.submit %>
+      <%= link_to t('.clear'), filter_params(except: [:payment_uuid, 'orders.uuid']), class: 'button is-light' %>
+    </div>
+  </div>
+<% end %>

data/app/views/trade/admin/payments/_filter_table.html.erb

@@ -0,0 +1,29 @@
+<table class="as-search">
+  <tr>
+    <th><%= Trade::Payment.human_attribute_name(:type) %></th>
+    <td>
+      <%= link_to t('.all'), filter_params(except: [:type]), class: active_params(type: '', active: 'button is-info', item: 'button is-light') %>
+      <% Trade::Payment.options_i18n(:type).each do |text, type| %>
+        <%= link_to text, filter_params(type: type), class: active_params(type: type, active: 'button is-info', item: 'button is-light') %>
+      <% end %>
+    </td>
+  </tr>
+  <tr>
+    <th><%= Trade::Payment.human_attribute_name(:state) %></th>
+    <td>
+      <%= link_to t('.all'), filter_params(except: [:state]), class: active_params(state: '', active: 'button is-info', item: 'button is-light') %>
+      <% Trade::Payment.options_i18n(:state).each do |text, state| %>
+        <%= link_to text, filter_params(state: state), class: active_params(state: state, active: 'button is-info', item: 'button is-light') %>
+      <% end %>
+    </td>
+  </tr>
+  <tr>
+    <th><%= Trade::PaymentOrder.human_attribute_name(:state) %></th>
+    <td>
+      <%= link_to t('.all'), filter_params(except: [:'payment_orders.state']), class: active_params('payment_orders.state': '', active: 'button is-info', item: 'button is-light') %>
+      <% Trade::PaymentOrder.options_i18n(:state).each do |text, state| %>
+        <%= link_to text, filter_params('payment_orders.state': state), class: active_params('payment_orders.state': state, active: 'button is-info', item: 'button is-light') %>
+      <% end %>
+    </td>
+  </tr>
+</table>

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

@@ -2,10 +2,10 @@
 <% if params[:order_id] %>
   <%= f.hidden_field :type, value: 'HandPayment' %>
 <% else %>
-  <%= f.select :type, options_for_select(Payment.options_i18n(:type), @payment.type) %>
+  <%= f.select :type, options_for_select(Trade::Payment.options_i18n(:type), @payment.type) %>
 <% end %>
 <%= f.text_field :payment_uuid %>
-<%= f.number_field :total_amount, step: Payment.total_amount_step, required: true %>
+<%= f.number_field :total_amount, step: Trade::Payment.total_amount_step, required: true %>
 <%= f.number_field :fee_amount, step: '0.01' %>
 <%= f.number_field :income_amount, step: '0.01' %>
 <%= f.datetime_field :notified_at %>
@@ -13,4 +13,3 @@
 <%= f.text_field :buyer_identifier %>
 <%= f.text_field :buyer_bank %>
 <%= f.text_field :comment %>
-<%= f.submit %>

data/app/views/trade/admin/payments/_index_tbody.html.erb

@@ -0,0 +1,24 @@
+<td>
+  <p><%= model.payment_uuid %></p>
+  <div class="tag"><%= model.type_i18n %></div>
+</td>
+<td id="checked_amount_<%= model.id %>">
+  <%= render partial: 'checked_amount', locals: { payment: model } %>
+</td>
+<td>
+  <%= model.total_amount %>
+</td>
+<td>
+  <p><%= model.income_amount.to_d %></p>
+  <p><%= model.fee_amount.to_d %></p>
+</td>
+<td><%= model.adjust_amount %></td>
+<td>
+  <p><%= model.buyer_name %></p>
+  <p><%= model.buyer_identifier %></p>
+  <p><%= model.buyer_bank %></p>
+  <% if model.payment_method %>
+    <%= link_to 'Payment Method', admin_payment_methods_path(id: model.payment_method_id), class: 'tag', targe: '_blank' %>
+  <% end %>
+</td>
+<td><time data-controller="time"><%= model.notified_at.to_s(:rfc822) if model.notified_at %></time></td>

data/app/views/trade/admin/payments/_index_thead.html.erb

@@ -0,0 +1,15 @@
+<th><%= Trade::Payment.human_attribute_name(:payment_uuid) %></th>
+<th><%= Trade::Payment.human_attribute_name(:checked_amount) %></th>
+<th><%= Trade::Payment.human_attribute_name(:total_amount) %></th>
+<th>
+  <p><%= Trade::Payment.human_attribute_name(:income_amount) %></p>
+  <p><%= Trade::Payment.human_attribute_name(:fee_amount) %></p>
+</th>
+<th><%= Trade::Payment.human_attribute_name(:adjust_amount) %></th>
+<th>
+  <p><%= Trade::Payment.human_attribute_name(:buyer_name) %></p>
+  <p><%= Trade::Payment.human_attribute_name(:buyer_identifier) %></p>
+  <p><%= Trade::Payment.human_attribute_name(:buyer_bank) %></p>
+</th>
+<th><%= Trade::Payment.human_attribute_name(:notified_at) %></th>
+<th></th>

data/app/views/trade/admin/payments/_index_tr.html.erb

@@ -0,0 +1,17 @@
+<tr id="tr_<%= model.id %>" data-controller="show" data-action="mouseenter->show#show mouseleave->show#hide">
+  <%= yield %>
+  <td>
+    <turbo-frame data-show-target="item" style="visibility: hidden">
+      <% if model.payment_method.present? %>
+        <%= link_to t('.show'), admin_payment_methods_path(id: model.payment_method_id), class: 'button is-small is-rounded is-light', target: '_blank' %>
+      <% end %>
+      <%= link_to t('.checking'), new_admin_payment_payment_order_path(model), class: 'button is-small is-rounded is-light' %>
+      <%= link_to audits_path('Payment', model.id), aria: { label: t('.log') }, class: 'button is-small is-rounded is-light' do %>
+        <i class="fas fa-comments"></i>
+      <% end %>
+      <%= link_to({ action: 'edit', id: model.id }, aria: { label: t('.edit') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fas fa-pencil-alt"></i>
+      <% end %>
+    </turbo-frame>
+  </td>
+</tr>

data/app/views/trade/admin/payments/_new_form.html.erb

@@ -0,0 +1,4 @@
+<%= form_with model: @payment, scope: :payment, url: { action: 'create' } do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+  <%= f.submit %>
+<% end %>