rails_trade 0.0.2 → 0.0.3

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

@@ -1,8 +1,7 @@
-<%= form_with model: [:admin, @promote_good] do |f| %>
-  <%= render '/shared/error_messages', target: @promote_good  %>
-  <%= f.hidden_field :promote_id %>
-  <%= f.select :good_type, options_for_select(PromoteGood.options_i18n(:good_type), @promote_good.good_type), include_blank: true %>
-  <%= f.select :good_id, options_for_select([]) %>
-  <%= f.select :status, options_for_select(PromoteGood.options_i18n(:status), @promote_good.status) %>
-  <%= f.submit %>
-<% end %>
+<%= render 'error_messages', target: @promote_good  %>
+<%= f.hidden_field :promote_id %>
+<%= f.select :good_type, options_for_select(Trade::PromoteGood.options_i18n(:good_type), @promote_good.good_type), include_blank: true %>
+<%= f.select :good_id, options_for_select([]) %>
+<%= f.select :status, options_for_select(Trade::PromoteGood.options_i18n(:status), @promote_good.status) %>
+<%= f.datetime_field :effect_at, value: Time.current %>
+<%= f.datetime_field :expire_at %>

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

@@ -0,0 +1,10 @@
+<td><%= model.good_type_i18n %></td>
+<td>
+  <% if model.good_id %>
+    <%= model.good.name %>
+  <% else %>
+    不限商品
+  <% end %>
+</td>
+<td><%= model.promote.name %></td>
+<td><%= model.status_i18n %></td>

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

@@ -0,0 +1,5 @@
+<th><%= Trade::PromoteGood.human_attribute_name(:good_type) %></th>
+<th><%= Trade::PromoteGood.human_attribute_name(:good_id) %></th>
+<th><%= Trade::PromoteGood.human_attribute_name(:promote_id) %></th>
+<th><%= Trade::PromoteGood.human_attribute_name(:status) %></th>
+<th></th>

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

@@ -0,0 +1,16 @@
+<tr id="tr_<%= model.id %>" data-controller="show" data-action="mouseenter->show#show mouseleave->show#hide">
+  <%= yield %>
+  <td>
+    <span data-show-target="item" style="visibility: hidden">
+      <%= link_to({ controller: 'promote_carts', promote_good_id: model.id }, aria: { label: '派发' }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fas fa-gift"></i>
+      <% end %>
+      <%= link_to({ action: 'edit', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('.edit') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fas fa-pencil-alt"></i>
+      <% end %>
+      <%= button_to({ action: 'destroy', id: model.id }, method: :delete, data: { confirm: t('.confirm') }, aria: { label: t('.destroy') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fas fa-trash-alt"></i>
+      <% end %>
+    </span>
+  </td>
+</tr>

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

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

data/app/views/trade/admin/promote_goods/goods.js.erb

@@ -1,2 +1,2 @@
 <% f_object = form_object(@promote_good) %>
-$('#promote_good_good_id').html('<%= j(render partial: 'goods_options', locals: { f: f_object }) %>');
+$('#promote_good_good_id').html('<%= j(render partial: 'goods_options', locals: { f: f_object }) %>')

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

@@ -1,61 +1,5 @@
-<% content_for :breadcrumb do %>
-<div class="ui basic segment breadcrumb">
-  <%= link_to t('trade.admin.promotes.index.title'), admin_promotes_path, class: 'section' %>
-  <% if params[:promote_id] %>
-    <i class="fas fa-angle-right divider"></i>
-    <div class="section"><%= @promote.name %></div>
-  <% end %>
-  <i class="fas fa-angle-right divider"></i>
-  <div class="active section">设置商品</div>
-</div>
+<%= render layout: 'index_table', locals: { cache_key: Trade::PromoteGood.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @promote_goods, as: :model %>
 <% end %>
 
-<div class="ui attached segment">
-  <%= render 'filter' %>
-</div>
-
-<table class="ui bottom attached selectable table">
-  <thead>
-    <tr>
-      <th><%= PromoteGood.human_attribute_name(:good_type) %></th>
-      <th><%= PromoteGood.human_attribute_name(:good_id) %></th>
-      <th><%= PromoteGood.human_attribute_name(:promote_id) %></th>
-      <th><%= PromoteGood.human_attribute_name(:status) %></th>
-      <th>
-        <%= link_to new_admin_promote_good_path(promote_id: params[:promote_id]), remote: true, class: 'ui teal button' do %>
-          <i class="fas fa-plus"></i><%= t('.new') %>
-        <% end %>
-      </th>
-    </tr>
-  </thead>
-
-  <tbody>
-  <% @promote_goods.each do |promote_good| %>
-    <tr>
-      <td><%= promote_good.good_type_i18n %></td>
-      <td>
-        <% if promote_good.good_id %>
-          <%= promote_good.good.name %>
-        <% else %>
-          不限商品
-        <% end %>
-      </td>
-      <td><%= promote_good.promote.name %></td>
-      <td><%= promote_good.status_i18n %></td>
-      <td>
-        <%= link_to admin_promote_buyers_path(promote_good_id: promote_good.id), data: { tooltip: '派发' }, class: 'ui mini circular icon button' do %>
-          <i class="fas fa-gift"></i>
-        <% end %>
-        <%= link_to edit_admin_promote_good_path(promote_good), data: { tooltip: t('.edit') }, remote: true, class: 'ui mini circular icon button' do %>
-          <i class="fas fa-pencil-alt"></i>
-        <% end %>
-        <%= link_to admin_promote_good_path(promote_good), method: :delete, data: { tooltip: t('.destroy'), confirm: t('.confirm') }, remote: true, class: 'ui mini circular icon button' do %>
-          <i class="fas fa-trash-alt"></i>
-        <% end %>
-      </td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
-
 <%= paginate @promote_goods %>

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

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

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

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

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

@@ -1,12 +1,7 @@
 <%= f.text_field :name, required: true %>
 <%= f.text_field :short_name %>
 <%= f.text_field :code %>
-<%= f.text_field :description %>
-<%= f.select :scope, options_for_select(Promote.options_i18n(:scope), @promote.scope) %>
-<%= f.datetime_field :effect_at, value: Time.now %>
-<%= f.datetime_field :expire_at %>
+<%= f.text_area :description %>
+<%= f.select :scope, options_for_select(Trade::Promote.options_i18n(:scope), @promote.scope) %>
 <%= f.number_field :sequence %>
-<%= f.select :metering, options_for_select(Promote.options_i18n(:metering), @promote.metering) %>
-<%= f.submit %>
-
-
+<%= f.select :metering, options_for_select(Trade::Promote.options_i18n(:metering), @promote.metering) %>

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

@@ -0,0 +1,18 @@
+<td>
+  <p><%= model.name %></p>
+  <p>
+    <span><%= model.short_name %></span>
+    <% if model.code.present? %>
+      <span>(<%= model.code %>)</span>
+    <% end %>
+  </p>
+</td>
+<td><%= model.scope_i18n %></td>
+<td><%= model.metering_i18n %></td>
+<td>
+  <%= form_with theme: nil, model: model, url: { action: 'update', id: model.id }, data: { controller: 'input' } do |f| %>
+    <%= f.check_box :editable, data: { input_target: 'checkbox' }, id: nil, class: 'switch is-rounded' %>
+    <label data-action="click->input#check"></label>
+  <% end %>
+</td>
+<td><%= model.sequence %></td>

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

@@ -0,0 +1,12 @@
+<th>
+  <p><%= Trade::Promote.human_attribute_name(:name) %></p>
+  <p><%= Trade::Promote.human_attribute_name(:short_name) %>(<%= Trade::Promote.human_attribute_name(:code) %>)</p>
+</th>
+<th>
+  <%= Trade::Promote.human_attribute_name(:scope) %>
+  <span aria-label="<%= Trade::Promote.help_i18n(:scope) %>"><i class="fas fa-question-circle"></i></span>
+</th>
+<th><%= Trade::Promote.human_attribute_name(:metering) %></th>
+<th><%= Trade::Promote.human_attribute_name(:editable) %></th>
+<th><%= Trade::Promote.human_attribute_name(:sequence) %></th>
+<th></th>

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

@@ -0,0 +1,22 @@
+<tr id="tr_<%= model.id %>" data-controller="show" data-action="mouseenter->show#show mouseleave->show#hide">
+  <%= yield %>
+  <td>
+    <span data-show-target="item" style="visibility: hidden">
+      <%= link_to({ controller: 'promote_goods', promote_id: model.id }, data: { turbo_frame: '_top' }, aria: { label: '适用商品' }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fas fa-cogs"></i>
+      <% end %>
+      <%= link_to({ controller: 'promote_carts', promote_id: model.id }, data: { turbo_frame: '_top' }, aria: { label: '派发' }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fas fa-gift"></i>
+      <% end %>
+      <%= link_to({ controller: 'promote_charges', promote_id: model.id }, data: { turbo_frame: '_top' }, aria: { label: t('trade.admin.promote_charges.index.title') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fas fa-server"></i>
+      <% end %>
+      <%= link_to({ action: 'edit', id: model.id }, data: { turbo_frame: 'modal' }, aria: { label: t('.edit') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fas fa-pencil-alt"></i>
+      <% end %>
+      <%= button_to({ action: 'destroy', id: model.id }, method: :delete, aria: { label: t('.destroy') }, data: { confirm: t('.confirm') }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fas fa-trash-alt"></i>
+      <% end %>
+    </span>
+  </td>
+</tr>

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

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

data/app/views/trade/admin/promotes/_new_promote_charge.html.erb

@@ -3,7 +3,7 @@
     <%= render partial: 'trade/admin/promote_charges/form', locals: { f: f } %>
   <% end %>
   
-  <%= link_to new_admin_promote_good_path(promote_id: @promote.id), remote: true, class: 'ui teal button' do %>
+  <%= link_to new_admin_promote_good_path(promote_id: @promote.id), class: 'ui teal button' do %>
     <i class="fas fa-plus"></i><%= t('.new') %>
   <% end %>
 </div>

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

@@ -0,0 +1,4 @@
+<tr>
+  <td class="has-text-right"><%= Trade::Promote.human_attribute_name(:name) %></td>
+  <td><%= @promote.name %></td>
+</tr>

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

@@ -1,79 +1,5 @@
-<div class="ui top attached tabular menu">
-  <%= link_to '促销列表', admin_promotes_path, class: active_helper(controllers: ['promotes', 'promote_charges']) %>
-</div>
+<%= render layout: 'index_table', locals: { cache_key: Trade::Promote.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @promotes, as: :model %>
+<% end %>
 
-<div class="ui attached segment">
-  <%= render 'filter' %>
-</div>
-
-<table class="ui bottom attached selectable table">
-  <thead>
-    <tr>
-      <th>
-        <p><%= Promote.human_attribute_name(:name) %></p>
-        <p><%= Promote.human_attribute_name(:short_name) %>(<%= Promote.human_attribute_name(:code) %>)</p>
-      </th>
-      <th>
-        <%= Promote.human_attribute_name(:scope) %>
-        <span data-tooltip="<%= Promote.help_i18n(:scope) %>"><i class="grey question circle icon"></i></span>
-      </th>
-      <th><%= Promote.human_attribute_name(:metering) %></th>
-      <th>
-        <p><%= Promote.human_attribute_name(:effect_at) %></p>
-        <p><%= Promote.human_attribute_name(:expire_at) %></p>
-      </th>
-      <th><%= Promote.human_attribute_name(:editable) %></th>
-      <th><%= Promote.human_attribute_name(:sequence) %></th>
-      <th>
-        <%= link_to new_admin_promote_path, remote: true, class: 'ui mini primary button' do %>
-          <i class="fas fa-plus"></i><%= t('.new') %>
-        <% end %>
-      </th>
-    </tr>
-  </thead>
-
-  <tbody>
-  <% @promotes.each do |promote| %>
-    <tr>
-      <td>
-        <p><%= promote.name %></p>
-        <p>
-          <span><%= promote.short_name %></span>
-          <% if promote.code.present? %>
-            <span>(<%= promote.code %>)</span>
-          <% end %>
-        </p>
-      </td>
-      <td><%= promote.scope_i18n %></td>
-      <td><%= promote.metering_i18n %></td>
-      <td>
-        <p><time><%= promote.effect_at.to_s(:rfc822) if promote.effect_at %></time></p>
-        <p><time><%= promote.expire_at.to_s(:rfc822) if promote.expire_at %></time></p>
-      </td>
-      <td>
-        <div class="ui toggle checkbox">
-          <%= check_box_tag 'promote[editable]', nil, promote.editable, data: { method: :patch, remote: true, url: admin_promote_path(promote.id), submit: true }, id: nil %>
-        </div>
-      </td>
-      <td><%= promote.sequence %></td>
-      <td>
-        <%= link_to admin_promote_goods_path(promote_id: promote.id), data: { tooltip: '适用商品' }, class: 'ui mini circular icon button' do %>
-          <i class="fas fa-cogs"></i>
-        <% end %>
-        <%= link_to admin_promote_buyers_path(promote_id: promote.id), data: { tooltip: '派发' }, class: 'ui mini circular icon button' do %>
-          <i class="fas fa-gift"></i>
-        <% end %>
-        <%= link_to admin_promote_charges_path(promote), data: { tooltip: t('trade.admin.promote_charges.index.title') }, class: 'ui mini circular icon button' do %>
-          <i class="fas fa-server"></i>
-        <% end %>
-        <%= link_to edit_admin_promote_path(promote), data: { tooltip: t('.edit') }, remote: true, class: 'ui mini circular icon button' do %>
-          <i class="fas fa-pencil-alt"></i>
-        <% end %>
-        <%= link_to admin_promote_path(promote), method: :delete, data: { tooltip: t('.destroy'), confirm: t('.confirm') }, remote: true, class: 'ui mini circular icon button' do %>
-          <i class="fas fa-trash-alt"></i>
-        <% end %>
-      </td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
+<%= paginate @promotes %>

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

@@ -0,0 +1,6 @@
+<div class="breadcrumb has-succeeds-separator">
+  <ul>
+    <li><%= link_to t('trade.admin.orders.index.title'), { controller: 'orders', action: 'index', id: params[:order_id] } %></li>
+    <li class="is-active"><%= t('.title') %></li>
+  </ul>
+</div>

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

@@ -0,0 +1,13 @@
+<%= form_with theme: 'search', model: Trade::Refund.new do |f| %>
+  <div class="field-body">
+    <%= hidden_field_tag :payment_status, params[:payment_status] %>
+    <%= f.text_field 'company.name' %>
+    <%= f.text_field :uuid %>
+    <%= f.select :payment_method, options_for_select(Trade::Order.options_i18n(:payment_method)), { include_blank: true, prompt: 'Select one' }, { } %>
+    <%= f.date_field 'created_at-gte' %>
+    <%= f.date_field 'created_at-lte' %>
+    <div class="field is-narrow">
+      <%= f.submit %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,25 @@
+<td><%= model.refund_uuid %></td>
+<td>
+  <p><%= link_to model.order.uuid, { controller: 'orders', action: 'show', id: model.order_id } %></p>
+  <p><%= link_to model.payment.payment_uuid, { controller: 'payments', action: 'show', id: model.payment_id } %></p>
+</td>
+<td><%= model.total_amount.to_money(model.currency).format %></td>
+<td><%= model.type_i18n %></td>
+<td><time data-controller="time"><%= model.created_at.to_s(:rfc822) %></time></td>
+<td><%= model.state_i18n %></td>
+<td><%= model.comment %></td>
+<td>
+  <% if model.refunded_at %>
+    <time data-controller="time"><%= model.refunded_at.to_s(:rfc822) %></time>
+  <% else %>
+    <div class="buttons are-small">
+      <%= button_to 'Approve', { action: 'confirm', id: model.id }, method: :patch, data: { confirm: t('.confirm') }, class: 'button is-primary' %>
+      <div class="or"></div>
+      <%= button_to 'Deny', { action: 'deny', id: model.id }, method: :patch, data: { confirm: 'Deny model!' }, class: 'button is-danger' %>
+    </div>
+  <% end %>
+  <% if model.reason %>
+    <p><%= model.reason.truncate(27) %></p>
+  <% end %>
+</td>
+<td><%= model.operator&.name %></td>

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

@@ -0,0 +1,12 @@
+<th><%= Trade::Refund.human_attribute_name(:refund_uuid) %></th>
+<th>
+  <p><%= Trade::Refund.human_attribute_name(:order_id) %></p>
+  <p><%= Trade::Refund.human_attribute_name(:payment_id) %></p>
+</th>
+<th><%= Trade::Refund.human_attribute_name(:total_amount) %></th>
+<th><%= Trade::Refund.human_attribute_name(:type) %></th>
+<th><%= Trade::Refund.human_attribute_name(:created_at) %></th>
+<th><%= Trade::Refund.human_attribute_name(:state) %></th>
+<th><%= Trade::Refund.human_attribute_name(:comment) %></th>
+<th><%= Trade::Refund.human_attribute_name(:refunded_at) %></th>
+<th></th>

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

@@ -0,0 +1,3 @@
+<tr id="tr_<%= model.id %>" data-controller="show" data-action="mouseenter->show#show mouseleave->show#hide">
+  <%= yield %>
+</tr>

data/app/views/trade/admin/refunds/_logs_form.html.erb

@@ -0,0 +1,33 @@
+<table class="table is-fullwidth">
+  <thead>
+    <tr>
+      <th>Total Amount</th>
+      <th>Order Amount</th>
+      <th>Type</th>
+      <th>Created At</th>
+      <th>State</th>
+      <th>Comment</th>
+      <th>Refunded At</th>
+    </tr>
+  </thead>
+  <tbody>
+  <% @refunds.each do |refund| %>
+      <tr>
+        <td><%= refund.total_amount.to_money(refund.currency).format %></td>
+        <td><%= refund.order_amount.to_money.format %></td>
+        <td><%= refund.type_i18n %></td>
+        <td><time data-controller="time"><%= refund.created_at.to_s(:rfc822) %></time></td>
+        <td><%= refund.state %></td>
+        <td><%= refund.comment %></td>
+        <td>
+          <% if refund.refunded_at %>
+            <time data-controller="time"><%= refund.refunded_at.to_s(:rfc822) %></time>
+          <% else %>
+            <%= refund.reason.to_s.truncate(27) %>
+          <% end %>
+        </td>
+      </tr>
+  <% end %>
+  </tbody>
+</table>
+

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

@@ -1,18 +1,8 @@
-<div class="ui modal" id="new_refund_modal">
-  <i class="close icon"></i>
-  <div class="ui blue header">Refund</div>
-  <div class="content">
-    <%= render 'logs_table' %>
-  </div>
-  <div class="ui divider"></div>
-  <div class="content">
-    <%= form_with model: @refund, url: work_refunds_path, method: 'post' do |f| %>
-      <%= hidden_field_tag :order_id, @order.id %>
-      <%= f.text_field :order_amount, label: 'Refund Amount:', placeholder: '$' %>
-      <%= f.text_area :comment, label: 'Comment:' %>
-      <%= f.select :type, options_for_select(Refund.options_i18n(:type), @refund.type), label: 'Type: ' %>
-      <%= f.submit %>
-    <% end %>
-  </div>
-
-</div>
+<%= render 'logs_table' %>
+<%= form_with model: @refund, url: work_refunds_path, method: 'post' do |f| %>
+  <%= hidden_field_tag :order_id, @order.id %>
+  <%= f.text_field :order_amount, label: 'Refund Amount:', placeholder: '$' %>
+  <%= f.text_area :comment, label: 'Comment:' %>
+  <%= f.select :type, options_for_select(Refund.options_i18n(:type), @refund.type), label: 'Type: ' %>
+  <%= f.submit %>
+<% end %>