rails_trade 0.0.1 → 0.0.2

data/app/views/trade/admin/trade_promotes/new.html.erb

@@ -0,0 +1,9 @@
+<div class="ui segment breadcrumb">
+  <%= link_to 'Back', admin_trade_promotes_path, class: 'section' %>
+  <i class="fas fa-angle-right divider"></i>
+  <div class="active section">Add</div>
+</div>
+
+<div class="ui segment">
+  <%= render 'form' %>
+</div>

data/app/views/trade/admin/trade_promotes/new.js.erb

@@ -0,0 +1,3 @@
+$('#modal').replaceWith('<%= j(render 'new') %>');
+$('#modal').modal('show');
+remote_js_load('<%= raw remote_js_load %>')

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

@@ -0,0 +1,7 @@
+<div class="ui segment breadcrumb">
+  <%= link_to 'Back', admin_trade_promotes_path, class: 'section' %>
+  <i class="fas fa-angle-right divider"></i>
+  <div class="active section">Show</div>
+</div>
+
+<%= render 'show_table' %>

data/app/views/trade/admin/trade_promotes/show.js.erb

@@ -0,0 +1,3 @@
+$('#modal').replaceWith('<%= j(render 'show') %>');
+$('#modal').modal('show');
+remote_js_load('<%= raw remote_js_load %>')

data/app/views/trade/admin/trade_promotes/update.js.erb

@@ -0,0 +1 @@
+Turbolinks.visit(location);

data/app/views/trade/goods/show.html.erb

@@ -0,0 +1,2 @@
+
+

data/app/views/trade/my/carts/_filter.html.erb

@@ -0,0 +1,7 @@
+<%= form_with theme: 'search', model: Cart.new do |f| %>
+  <div class="fields">
+    <%= f.text_field :name %>
+    <%= f.submit %>
+    <%= link_to t('.clear'), filter_params(except: [:name]), class: 'ui button' %>
+  </div>
+<% end %>

data/app/views/trade/my/carts/_form.html.erb

@@ -0,0 +1,8 @@
+<%= form_with model: @cart do |f| %>
+  <%= render 'shared/error_messages', target: @cart %>
+  <%= f.text_field :payment_strategy_id %>
+  <%= f.text_field :deposit_ratio %>
+  <%= f.text_field :buyer_type %>
+  <%= f.text_field :buyer_id %>
+  <%= f.submit %>
+<% end %>

data/app/views/trade/my/carts/_show_table.html.erb

@@ -0,0 +1,28 @@
+<table class="ui very basic large table">
+  <thead>
+    <tr>
+      <th class="six wide">
+        <%= link_to t('.edit'), edit_my_cart_path(@cart), class: 'ui mini blue right floated button', remote: true %>
+      </th>
+      <th class="ten wide"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td class="right aligned"><%= Cart.human_attribute_name(:payment_strategy_id) %></td>
+      <td><%= @cart.payment_strategy_id %></td>
+    </tr>
+    <tr>
+      <td class="right aligned"><%= Cart.human_attribute_name(:deposit_ratio) %></td>
+      <td><%= @cart.deposit_ratio %></td>
+    </tr>
+    <tr>
+      <td class="right aligned"><%= Cart.human_attribute_name(:buyer_type) %></td>
+      <td><%= @cart.buyer_type %></td>
+    </tr>
+    <tr>
+      <td class="right aligned"><%= Cart.human_attribute_name(:buyer_id) %></td>
+      <td><%= @cart.buyer_id %></td>
+    </tr>
+  </tbody>
+</table>

data/app/views/trade/my/carts/edit.html.erb

@@ -0,0 +1,9 @@
+<div class="ui segment breadcrumb">
+  <%= link_to 'Back', my_carts_path, class: 'section' %>
+  <i class="fas fa-angle-right divider"></i>
+  <div class="active section">Edit</div>
+</div>
+
+<div class="ui segment">
+  <%= render 'form' %>
+</div>

data/app/views/trade/my/carts/edit.js.erb

@@ -0,0 +1,3 @@
+$('#modal').replaceWith('<%= j(render 'edit') %>');
+$('#modal').modal('show');
+remote_js_load('<%= raw remote_js_load %>')

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

@@ -0,0 +1,47 @@
+<div class="ui top attached segment">
+  <%= render 'filter' %>
+</div>
+
+<table class="ui bottom attached selectable table">
+  <thead>
+    <tr>
+      <th><%= Cart.human_attribute_name(:payment_strategy_id) %></th>
+      <th><%= Cart.human_attribute_name(:deposit_ratio) %></th>
+      <th><%= Cart.human_attribute_name(:buyer_type) %></th>
+      <th><%= Cart.human_attribute_name(:buyer_id) %></th>
+      <th><%= Cart.human_attribute_name(:default) %></th>
+      <th>
+        <%= link_to new_my_cart_path, remote: true, class: 'ui mini green button' do %>
+          <i class="fas fa-plus"></i><%= t('.new') %>
+        <% end %>
+      </th>
+    </tr>
+  </thead>
+  <tbody>
+  <% @carts.each do |cart| %>
+    <tr>
+      <td><%= cart.payment_strategy_id %></td>
+      <td><%= cart.deposit_ratio %></td>
+      <td><%= cart.buyer_type %></td>
+      <td><%= cart.buyer_id %></td>
+      <td>
+        <div class="ui toggle checkbox inverted <%= active_assert(cart.default, expected: 'disabled green label', unexpected: 'label') %>">
+          <%= check_box_tag '[cart]default', nil, cart.default, data: { method: :patch, remote: true, url: my_cart_path(cart), submit: true }, id: nil %>
+          <label><%= t('.default') %></label>
+        </div>
+      </td>
+      <td>
+        <%= link_to my_cart_cart_items_path(cart), data: { tooltip: t('.show') }, class: 'ui mini circular icon button' do %>
+          <i class="fas fa-eye"></i>
+        <% end %>
+        <%= link_to edit_my_cart_path(cart), data: { tooltip: t('.edit') }, remote: true, class: 'ui mini circular icon button' do %>
+          <i class="fas fa-pencil-alt"></i>
+        <% end %>
+        <%= link_to my_cart_path(cart), method: :delete, data: { tooltip: t('.destroy'), confirm: t('.confirm') }, class: 'ui mini circular icon button' do %>
+          <i class="fas fa-trash-alt"></i>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>

data/app/views/trade/my/carts/new.html.erb

@@ -0,0 +1,9 @@
+<div class="ui segment breadcrumb">
+  <%= link_to 'Back', my_carts_path, class: 'section' %>
+  <i class="fas fa-angle-right divider"></i>
+  <div class="active section">Add</div>
+</div>
+
+<div class="ui segment">
+  <%= render 'form' %>
+</div>

data/app/views/trade/my/carts/new.js.erb

@@ -0,0 +1,3 @@
+$('#modal').replaceWith('<%= j(render 'new') %>');
+$('#modal').modal('show');
+remote_js_load('<%= raw remote_js_load %>')

data/app/views/trade/my/carts/show.html+phone.erb

@@ -0,0 +1,46 @@
+<%= form_with url: my_orders_path, id: 'add_cart' do %><% end %>
+
+<div class="weui-panel weui-panel_access">
+  <div class="weui-panel__hd"><%= t('.title') %></div>
+  <div class="weui-panel__bd">
+    <% @trade_items.each do |trade_item| %>
+      <div class="weui-media-box weui-media-box_appmsg" data-controller="swipe" data-action="touchmove->swipe#left touchstart->swipe#start">
+        <div class="weui-media-box__hd">
+          <%= image_tag trade_item.good.product.logo, class: 'weui-media-box__thumb' %>
+        </div>
+        <div class="weui-media-box__bd">
+          <h4 class="weui-media-box__title"><%= trade_item.good.name %></h4>
+          <p class="weui-media-box__desc">
+            <% trade_item.good.parts.each do |part| %>
+              <span><%= part.name %></span>
+            <% end %>
+          </p>
+          <ul class="weui-media-box__info">
+            <li class="weui-media-box__info__meta">
+              <span><%= trade_item.good.price %></span>
+            </li>
+          </ul>
+        </div>
+        <div class="weui-media-box__ft" data-target="swipe.open" data-controller="cart">
+          <%= link_to my_trade_item_path(trade_item), method: :patch, data: { params: "[trade_item]number=#{trade_item.number + 1}" }, remote: true, class: 'weui-btn weui-btn_mini weui-btn_default' do %>
+            <i class="fas fa-plus"></i>
+          <% end %>
+          <div class="weui-btn weui-btn_mini weui-btn_warn" data-target="cart.number"><%= trade_item.number %></div>
+          <% if trade_item.number <= 1 %>
+            <%= link_to my_trade_item_path(trade_item), method: :delete, data: { confirm: t('.confirm') }, remote: true, class: 'weui-btn weui-btn_mini weui-btn_default' do %>
+              <i class="fas fa-trash"></i>
+            <% end %>
+          <% else %>
+            <%= link_to my_trade_item_path(trade_item), method: :patch, data: { params: "[trade_item]number=#{trade_item.number - 1}" }, remote: true, class: 'weui-btn weui-btn_mini weui-btn_default' do %>
+              <i class="fas fa-minus"></i>
+            <% end %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<div class="weui-btn-area">
+  <%= submit_tag t('helpers.submit.next'), form: 'add_cart', class: 'weui-btn weui-btn_primary' %>
+</div>

data/app/views/{rails_trade_my → trade/my}/order_items/index.html.erb

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

data/app/views/{rails_trade_my → trade/my}/orders/_edit.html.erb

@@ -1,10 +1,10 @@
 <div class="ui modal" id="modal">
   <i class="close icon"></i>
-  <div class="ui header blue">
+  <div class="ui header">
     Add Note
   </div>
 
   <div class="content">
     <%= render 'form' %>
   </div>
-</div>
+</div>

data/app/views/trade/my/orders/_edit_payment_type.html.erb

@@ -0,0 +1,12 @@
+<div class="ui modal" id="modal">
+  <i class="close icon"></i>
+  <div class="ui header">
+    <%= t('.title') %>
+  </div>
+
+  <div class="content">
+    <% ['alipay', 'wxpay'].each do |payment_type| %>
+      <%= link_to payment_type, "/my/orders/#{@order.id}/#{payment_type}_pay", remote: payment_type == 'wxpay' %>
+    <% end %>
+  </div>
+</div>

data/app/views/trade/my/orders/edit_payment_type.js.erb

@@ -0,0 +1,4 @@
+$('#modal').replaceWith('<%= j(render 'edit_payment_type') %>')
+
+$('#modal').modal({autofocus: false}).modal('show');
+$('#order_payment_type').dropdown();

data/app/views/trade/my/orders/index.html+phone.erb

@@ -0,0 +1,37 @@
+<%= content_for(:wechat_js) do %>
+  <%= wechat_config_js debug: false, apis: ['chooseWXPay'] -%>
+<% end %>
+
+<div class="weui-panel weui-panel_access">
+  <% @orders.each do |order| %>
+  <div class="weui-panel__hd"><%= order.payment_status_i18n %></div>
+  <div class="weui-panel__bd">
+    <% order.trade_items.each do |trade_item| %>
+    <a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">
+      <div class="weui-media-box__hd">
+        <%= image_tag trade_item.good.logo, class: 'weui-media-box__thumb' if trade_item.good.logo.attached? %>
+      </div>
+      <div class="weui-media-box__bd">
+        <h4 class="weui-media-box__title"><%= trade_item.good.name %></h4>
+        <p class="weui-media-box__desc"><%= trade_item.amount %></p>
+      </div>
+    </a>
+    <% end %>
+    <div class="weui-media-box weui-media-box_text">
+      <ul class="weui-media-box__info">
+        <li class="weui-media-box__info__meta"><%= order.amount %></li>
+        <li class="weui-media-box__info__meta"></li>
+        <li class="weui-media-box__info__meta weui-media-box__info__meta_extra">
+          <%= link_to '微信支付', wxpay_pay_my_order_path(order.id), remote: true %>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="weui-panel__ft">
+    <%= link_to my_order_path(order), class: 'weui-cell weui-cell_access weui-cell_link' do %>
+      <div class="weui-cell__bd">更多</div>
+      <span class="weui-cell__ft"></span>
+    <% end %>
+  </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,36 @@
+<table class="ui selectable table">
+  <thead>
+    <tr>
+      <th><%= Order.human_attribute_name(:uuid) %></th>
+      <th><%= Order.human_attribute_name(:amount) %></th>
+      <th><%= Order.human_attribute_name(:payment_status) %></th>
+      <th>Pay</th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <% @orders.each do |order| %>
+    <tr>
+      <td><%= order.uuid %></td>
+      <td>
+        <%= order.amount %>
+      </td>
+      <td><%= order.payment_status_i18n %></td>
+      <td>
+        <% if order.can_pay? %>
+          <%= link_to '支付', payment_type_my_order_path(order), remote: true, class: 'ui mini button' %>
+        <% end %>
+      </td>
+      <td>
+        <%= link_to my_order_path(order), data: { tooltip: t('.show') }, class: 'ui mini circular icon button' do %>
+          <i class="fas fa-eye"></i>
+        <% end %>
+        <%= link_to edit_my_order_path(order), remote: true, data: { tooltip: t('.edit') }, class: 'ui mini circular icon button' do %>
+          <i class="fas fa-pencil-alt"></i>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+<%= paginate @orders %>

data/app/views/trade/my/orders/refund.json.jbuilder

@@ -0,0 +1,12 @@
+json.array!(@orders) do |order|
+  json.extract! order, :id, :uuid, :amount, :subtotal
+  json.order_items order.order_items do |oi|
+    json.extract! oi, :id
+    json.sku oi.good&.sku
+    json.name oi.good&.name
+    json.quantity oi.quantity
+  end
+  json.refunds order.refunds do |refund|
+    refund.extract! refund, :id, :total_amount
+  end
+end

data/app/views/trade/my/orders/show.html+phone.erb

@@ -0,0 +1,3 @@
+<div class="ui container content">
+    <%= @order.uuid %>
+</div>

data/app/views/{rails_trade_my → trade/my}/orders/show.html.erb

@@ -26,9 +26,9 @@
           <%# link_to order_item.good&.name, controller: '/' + order_item.good_type.underscore.pluralize, action: 'show', id: order_item.good_id %>
         </td>
         <td><%= link_to '订单流程', my_order_item_path(order_item) %></td>
-        <td><%= order_item.pure_price %></td>
-        <td><%= order_item.serve_sum %></td>
-        <td><%= order_item.promote_sum %></td>
+        <td><%= order_item.original_amount %></td>
+        <td><%= order_item.additional_amount %></td>
+        <td><%= order_item.reduced_amount %></td>
         <td><%= order_item.amount %></td>
         <td><%= order_item.number %></td>
       </tr>

data/app/views/{rails_trade_my → trade/my}/orders/success.html.erb

@@ -1,5 +1,3 @@
-<% content_for :banner, 'banner_cart' %>
-
 <div class="ui container content">
     <!-- 成功 -->
     <div class="settlement">

data/app/views/{rails_trade_my → trade/my}/orders/update.js.erb

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