rails_trade 0.0.2 → 0.0.3

data/app/views/trade/admin/cards/_show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! 'card', card: @card

data/app/views/trade/admin/cards/_show_table.html.erb

@@ -0,0 +1,20 @@
+<tr>
+  <td class="has-text-right"><%= Card.human_attribute_name(:card_uuid) %></td>
+  <td><%= @card.card_uuid %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Card.human_attribute_name(:effect_at) %></td>
+  <td><time data-controller="time"><%= @card.effect_at.to_s(:rfc822) %></time></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Card.human_attribute_name(:expire_at) %></td>
+  <td><time data-controller="time"><%= @card.expire_at.to_s(:rfc822) %></time></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Card.human_attribute_name(:amount) %></td>
+  <td><%= @card.amount %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Card.human_attribute_name(:created_at) %></td>
+  <td><time data-controller="time"><%= @card.created_at.to_s(:rfc822) %></time></td>
+</tr>

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

@@ -0,0 +1,5 @@
+<%= render layout: 'index_table', locals: { cache_key: Trade::Card.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @cards, as: :model %>
+<% end %>
+
+<%= paginate @cards %>

data/app/views/trade/admin/cards/index.json.jbuilder

@@ -0,0 +1 @@
+json.cards @cards, partial: 'card', as: :card

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

@@ -7,9 +7,7 @@
     <table class="ui table">
       <thead>
       <tr>
-        <th></th>
-        <th>Price</th>
-        <th></th>
+      
       </tr>
       </thead>
 

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

@@ -0,0 +1,6 @@
+<td><%= model.user_id %></td>
+<td><%= model.member_id %></td>
+<td><%= model.item_amount %></td>
+<td><%= model.overall_additional_amount %></td>
+<td><%= model.overall_reduced_amount %></td>
+<td><%= model.amount %></td>

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

@@ -0,0 +1,7 @@
+<th><%= Trade::Cart.human_attribute_name(:user_id) %></th>
+<th><%= Trade::Cart.human_attribute_name(:member_id) %></th>
+<th><%= Trade::Cart.human_attribute_name(:item_amount) %></th>
+<th><%= Trade::Cart.human_attribute_name(:overall_additional_amount) %></th>
+<th><%= Trade::Cart.human_attribute_name(:overall_reduced_amount) %></th>
+<th><%= Trade::Cart.human_attribute_name(:amount) %></th>
+<th></th>

data/app/views/trade/admin/{cart_item_serves → carts}/_new.html.erb

@@ -8,7 +8,7 @@
     <%= hidden_field_tag 'cart_item_serve[serve_id]', @cart_item_serve.serve_id, form: "cart_item_serve_new_#{@cart_item_serve.serve_id}" %>
   </td>
   <td>
-    <%= submit_tag 'Save', class: 'ui mini green button', form: "cart_item_serve_new_#{@cart_item_serve.serve_id}" %>
+    <%= submit_tag 'Save', class: 'button is-link is-small', form: "cart_item_serve_new_#{@cart_item_serve.serve_id}" %>
     <a class="ui mini grey button" onclick="removeForm()">取消</a>
   </td>
 </tr>

data/app/views/trade/admin/{cart_item_serves → carts}/_serve.html.erb

@@ -1,7 +1,7 @@
 <tr id="serve_<%= serve_charge.serve_id %>">
   <td><%= serve_charge.item.name %></td>
   <td>
-    <%= link_to new_admin_cart_item_cart_item_serve_path(@cart_item, serve_id: serve_charge.serve_id), remote: true do %>
+    <%= link_to new_admin_cart_item_cart_item_serve_path(@cart_item, serve_id: serve_charge.serve_id) do %>
       <div class="ui label" style="cursor: text"><%= serve_charge.subtotal %></div>
     <% end %>
   </td>
@@ -13,4 +13,4 @@
       </div>
     <% end %>
   </td>
-</tr>
+</tr>

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

@@ -0,0 +1,5 @@
+<%= render layout: 'index_table', locals: { cache_key: Trade::Cart.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @carts, as: :model %>
+<% end %>
+
+<%= paginate @carts %>

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

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

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

@@ -0,0 +1,5 @@
+<%= form_with theme: 'search' do |f| %>
+  <div class="fields">
+    <%= f.submit %>
+  </div>
+<% end %>

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

@@ -0,0 +1,4 @@
+<%= render 'error_messages', target: f.object %>
+<%= f.text_field :user %>
+<%= f.text_field :amount %>
+<%= f.text_field :note %>

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

@@ -0,0 +1,17 @@
+<tr>
+  <td><%= cash_given.id %></td>
+  <td><%= link_to cash_given.user.name, admin_user_path(cash_given.user_id) if cash_given.user %></td>
+  <td><%= cash_given.amount %></td>
+  <td><%= cash_given.note %></td>
+  <td>
+    <%= link_to admin_cash_given_path(cash_given), aria: { label: t('.show') }, class: 'ui blue mini icon button' do %>
+      <i class="location arrow icon"></i>
+    <% end %>
+    <%= link_to edit_admin_cash_given_path(cash_given), aria: { label: t('.edit') }, class: 'ui pink mini icon button' do %>
+      <i class="pencil alternate icon"></i>
+    <% end %>
+    <%= link_to admin_cash_given_path(cash_given), method: :delete, aria: { label: t('.destroy') }, data: { confrim: t('.confirm') }, class: 'ui red mini icon button' do %>
+      <i class="fas fa-trash"></i>
+    <% end %>
+  </td>
+</tr>

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

@@ -0,0 +1,4 @@
+<th><%= Trade::CashGiven.human_attribute_name(:user) %></th>
+<th><%= Trade::CashGiven.human_attribute_name(:amount) %></th>
+<th><%= CashGiven.human_attribute_name(:note) %></th>
+<th></th>

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

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

data/app/views/trade/admin/cash_givens/_show_table.html.erb

@@ -0,0 +1,12 @@
+<tr>
+  <td class="has-text-right"><%= CashGiven.human_attribute_name(:user) %></td>
+  <td><%= @cash_given.user %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= CashGiven.human_attribute_name(:amount) %></td>
+  <td><%= @cash_given.amount %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= CashGiven.human_attribute_name(:note) %></td>
+  <td><%= @cash_given.note %></td>
+</tr>

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

@@ -0,0 +1,5 @@
+<%= render layout: 'index_table', locals: { cache_key: Trade::CashGiven.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @cash_givens, as: :cash_given %>
+<% end %>
+
+<%= paginate @cash_givens %>

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

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

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

@@ -0,0 +1,8 @@
+<%= form_with theme: 'search', model: Trade::CashLog.new do |f| %>
+  <div class="field-body">
+    <%= f.text_field :user_id %>
+    <div class="field is-narrow">
+      <%= f.submit %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,2 @@
+<%= render 'error_messages', target: @cash_log %>
+<%= f.text_field :title %>

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

@@ -0,0 +1,25 @@
+<tr>
+  <td><%= cash_log.id %></td>
+  <td><%= cash_log.title %></td>
+  <td><%= cash_log.tag_str %></td>
+  <td><%= cash_log.amount %></td>
+  <td>
+    <%= link_to cash_log.user.name, admin_user_path(cash_log.user_id) %>
+  </td>
+  <td>
+    <p><%= cash_log.source_type %></p>
+    <p><%= cash_log.source_id %></p>
+  </td>
+  <td><time data-controller="time"><%= cash_log.created_at.to_s(:rfc822) %></time></td>
+  <td>
+    <%= link_to({ action: 'show', id: cash_log.id }, aria: { label: t('.show') }, class: 'button') do %>
+      <i class="location arrow icon"></i>
+    <% end %>
+    <%= link_to({ action: 'edit', id: cash_log.id }, aria: { label: t('.edit') }, class: 'button') do %>
+      <i class="pencil alternate icon"></i>
+    <% end %>
+    <%= link_to({ action: 'destroy', id: cash_log.id }, method: :delete, aria: { label: t('.destroy') }, data: { confrim: t('.confirm') }, class: 'button') do %>
+      <i class="times icon"></i>
+    <% end %>
+  </td>
+</tr>

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

@@ -0,0 +1,11 @@
+<th><%= Trade::CashLog.human_attribute_name(:id) %></th>
+<th><%= CashLog.human_attribute_name(:title) %></th>
+<th><%= CashLog.human_attribute_name(:tag_str) %></th>
+<th><%= CashLog.human_attribute_name(:amount) %></th>
+<th><%= CashLog.human_attribute_name(:user) %></th>
+<th>
+  <p><%= CashLog.human_attribute_name(:source_type) %></p>
+  <p><%= CashLog.human_attribute_name(:source_id) %></p>
+</th>
+<th><%= CashLog.human_attribute_name(:created_at) %></th>
+<th></th>

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

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

data/app/views/trade/admin/cash_logs/_show_table.html.erb

@@ -0,0 +1,20 @@
+<tr>
+  <td class="has-text-right"><%= CashLog.human_attribute_name(:title) %></td>
+  <td><%= @cash_log.title %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= CashLog.human_attribute_name(:amount) %></td>
+  <td><%= @cash_log.amount %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= CashLog.human_attribute_name(:user) %></td>
+  <td><%= @cash_log.user %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= CashLog.human_attribute_name(:source_type) %></td>
+  <td><%= @cash_log.source_type %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= CashLog.human_attribute_name(:source_id) %></td>
+  <td><%= @cash_log.source_id %></td>
+</tr>

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

@@ -0,0 +1,5 @@
+<%= render layout: 'index_table', locals: { cache_key: Trade::CashLog.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @cash_logs, as: :cash_log %>
+<% end %>
+
+<%= paginate @cash_logs %>

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

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

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

@@ -0,0 +1,5 @@
+<%= form_with theme: 'search', model: Trade::Cash.new do |f| %>
+  <div class="field-body">
+    <%= f.submit %>
+  </div>
+<% end %>

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

@@ -0,0 +1,3 @@
+<%= f.text_field :account_bank %>
+<%= f.text_field :account_name %>
+<%= f.text_field :account_num %>

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

@@ -0,0 +1,18 @@
+<td>
+  <p><%= model.account_bank %></p>
+  <p><%= model.account_name %></p>
+  <p><%= model.account_num %></p>
+</td>
+<td><%= model.amount %></td>
+<td>
+  <%= link_to model.income_amount, admin_cash_givens_path(cash_id: model.id) %>
+</td>
+<td>
+  <%= link_to model.expense_amount, admin_payouts_path(cash_id: model.id) %>
+</td>
+<td>
+  <%= link_to model.user.name, admin_user_path(model.user_id) if model.user_id %>
+</td>
+<td>
+  <p><%= link_to 'incomes', admin_user_advances_path(cash_id: model.id) %></p>
+</td>

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

@@ -0,0 +1,12 @@
+<th>
+  <p><%= Trade::Cash.human_attribute_name(:account_bank) %></p>
+  <p><%= Trade::Cash.human_attribute_name(:account_name) %></p>
+  <p><%= Trade::Cash.human_attribute_name(:account_num) %></p>
+</th>
+<th><%= Trade::Cash.human_attribute_name(:amount) %></th>
+<th><%= Trade::Cash.human_attribute_name(:income_amount) %></th>
+<th><%= Trade::Cash.human_attribute_name(:expense_amount) %></th>
+<th><%= Trade::Cash.human_attribute_name(:user) %></th>
+<th><%= Trade::Cash.human_attribute_name(:cash_logs) %></th>
+<th></th>
+

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

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

data/app/views/trade/admin/cashes/_show_tbody.html.erb

@@ -0,0 +1,20 @@
+<tr>
+  <td class="has-text-right"><%= Cash.human_attribute_name(:type) %></td>
+  <td><%= @cash.type %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Cash.human_attribute_name(:amount) %></td>
+  <td><%= @cash.amount %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Cash.human_attribute_name(:income_amount) %></td>
+  <td><%= @cash.income_amount %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Cash.human_attribute_name(:expense_amount) %></td>
+  <td><%= @cash.expense_amount %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Cash.human_attribute_name(:user_id) %></td>
+  <td><%= @cash.user %></td>
+</tr>

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

@@ -0,0 +1,5 @@
+<%= render layout: 'index_table', locals: { cache_key: Trade::Cash.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @cashes, as: :model %>
+<% end %>
+
+<%= paginate @cashes %>

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

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

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

@@ -1,4 +1,4 @@
-<%= link_to admin_good_path(good.id), remote: true do %>
+<%= link_to admin_good_path(good.id) do %>
   <i class="shopping bag icon" id="good_<%= good.id %>"></i>
 <% end %>
 

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

@@ -1,5 +1,5 @@
 <div class="ui modal">
-  <i class="close icon"></i>
+  <i class="fas fa-times close"></i>
   <div class="ui header">
     Add Good Info
   </div>

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

@@ -0,0 +1,6 @@
+<td style="color: #999"><%= model.payment_id %></td>
+<td><%= model.payment.type %></td>
+<td><%= model.order_amount %></td>
+<td><%= model.check_amount.to_money(model.payment.currency).format %></td>
+<td><time data-controller="time"><%= model.created_at.to_s(:rfc822) %></time></td>
+<td></td>

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

@@ -0,0 +1,6 @@
+<th>Payment ID</th>
+<th><%= Trade::Payment.human_attribute_name(:type) %></th>
+<th><%= Trade::PaymentOrder.human_attribute_name(:order_amount) %></th>
+<th><%= Trade::PaymentOrder.human_attribute_name(:check_amount) %></th>
+<th><%= Trade::PaymentOrder.human_attribute_name(:created_at) %></th>
+<th>操作</th>

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

@@ -0,0 +1,4 @@
+<tr id="checked_<%= payment_order.id %>">
+  <%= yield %>
+  <%= link_to '退款', new_admin_payment_refund_path(payment_order.payment_id, order_id: payment_order.order_id) %>
+</tr>

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

@@ -0,0 +1,30 @@
+<table class="table">
+  <thead>
+    <tr>
+      <th>Payment ID</th>
+      <th><%= Trade::Payment.human_attribute_name(:type) %></th>
+      <th><%= Trade::Payment.human_attribute_name(:total_amount) %></th>
+      <th>可核销</th>
+      <th><%= Trade::Payment.human_attribute_name(:created_at) %></th>
+      <th>预核销</th>
+      <th>核销时间</th>
+      <th>操作</th>
+    </tr>
+  </thead>
+  <tbody>
+  <% unless @order.all_paid? %>
+    <%= render partial: 'payments', collection: @payments, as: :payment %>
+  <% end %>
+
+  <%= render partial: 'payment_orders', collection: @order.payment_orders, as: :payment_order %>
+  </tbody>
+  <tfoot>
+    <tr>
+      <th colspan="5"></th>
+      <th class="center aligned">
+        预核销合计：<span id="checked_amount"><%= @order.payment_orders.sum(:check_amount) %></span>
+      </th>
+      <th colspan="2"></th>
+    </tr>
+  </tfoot>
+</table>