rails_trade 0.0.2 → 0.0.3

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

@@ -0,0 +1,6 @@
+<th><%= check_box_tag :all %></th>
+<th><%= Trade::TradeItem.human_attribute_name(:good_name) %></th>
+<th><%= Trade::TradeItem.human_attribute_name(:single_price) %></th>
+<th><%= Trade::TradeItem.human_attribute_name(:number) %></th>
+<th><%= Trade::TradeItem.human_attribute_name(:amount) %></th>
+<th></th>

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

@@ -0,0 +1,44 @@
+<tbody>
+  <tr>
+    <td></td>
+    <td><%= Trade::Cart.human_attribute_name(:retail_price) %></td>
+    <td colspan="2"></td>
+    <td><%= current_cart.retail_price %></td>
+    <td></td>
+  </tr>
+  <tr class="has-text-danger">
+    <td></td>
+    <td><%= Trade::Cart.human_attribute_name(:discount_price) %></td>
+    <td colspan="2"></td>
+    <td><%= current_cart.discount_price %></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td></td>
+    <td><%= Trade::Cart.human_attribute_name(:bulk_price) %></td>
+    <td colspan="2"></td>
+    <td><%= current_cart.bulk_price %></td>
+    <td></td>
+  </tr>
+  <tr class="has-text-danger">
+    <td></td>
+    <td><%= Trade::Cart.human_attribute_name(:overall_reduced_amount) %></td>
+    <td colspan="2"></td>
+    <td><%= current_cart.overall_reduced_amount %></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td></td>
+    <td><%= Trade::Cart.human_attribute_name(:overall_additional_amount) %></td>
+    <td colspan="2"></td>
+    <td><%= current_cart.overall_additional_amount %></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td></td>
+    <td><%= Trade::Cart.human_attribute_name(:amount) %></td>
+    <td colspan="2"></td>
+    <td><%= current_cart.amount %></td>
+    <td></td>
+  </tr>
+</tbody>

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

@@ -0,0 +1,52 @@
+<tr class="<%= 'active' if trade_item.checked? %>" id="trade_item_<%= trade_item.id %>">
+  <td>
+    <%= form_with theme: nil, model: trade_item, url: { controller: 'trade_items', action: 'toggle', id: trade_item.id }, data: { controller: 'input' } do |f| %>
+      <%= f.check_box :status, value: trade_item.checked? ? 'checked' : 'init', checked: trade_item.checked?, data: { action: 'click->input#form' }, id: nil %>
+    <% end %>
+  </td>
+  <td>
+    <%= trade_item.good&.name %>
+    <p style="color: grey;"><%= trade_item.good_type_i18n %></p>
+  </td>
+  <td>
+    <p><%= trade_item.retail_price %></p>
+    <p><%= trade_item.weight_str %></p>
+  </td>
+  <td>
+    <div class="field has-addons">
+      <div class="control">
+        <%= button_to({ controller: 'trade_items', action: 'update', id: trade_item.id }, method: :patch, params: { '[trade_item]number': trade_item.number - 1 }, class: 'button') do %>
+          <i class="fas fa-minus"></i>
+        <% end %>
+      </div>
+      <div class="control">
+        <%= form_with theme: nil, model: trade_item, url: { controller: 'trade_items', action: 'update', id: trade_item.id }, data: { controller: 'input' } do |f| %>
+          <%= f.number_field :number, step: 1, data: { action: 'input#form' }, class: 'input', id: nil %>
+        <% end %>
+      </div>
+      <div class="control">
+        <%= button_to({ controller: 'trade_items', action: 'update', id: trade_item.id }, method: :patch, params: { '[trade_item]number': trade_item.number + 1 }, class: 'button is-link') do %>
+          <i class="fas fa-plus"></i>
+        <% end %>
+      </div>
+    </div>
+  </td>
+  <td>
+    <% if trade_item.amount != trade_item.wholesale_price %>
+    <div>
+      <del class="has-text-grey"><%= trade_item.wholesale_price %></del>
+      <% if trade_item.reduced_amount < 0 %>
+        <span class="is-inline-block" data-controller="hover" data-hover-url-value="<%= promote_my_trade_item_url(trade_item) %>">
+          <span class="has-text-danger" data-action="mouseenter->hover#show mouseleave->hover#hide"><%= trade_item.reduced_amount %></span>
+        </span>
+      <% end %>
+    </div>
+    <% end %>
+    <p>
+      <strong><%= trade_item.amount %></strong>
+    </p>
+  </td>
+  <td>
+    <%= button_to t('.destroy'), { controller: 'trade_items', action: 'destroy', id: trade_item.id }, method: :delete %>
+  </td>
+</tr>

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

@@ -0,0 +1,23 @@
+<table class="table is-fullwidth">
+  <thead>
+    <tr>
+      <%= render 'show_thead' %>
+    </tr>
+  </thead>
+  <tbody>
+    <%= render partial: 'trade_item', collection: @trade_items, as: :trade_item %>
+  </tbody>
+  <%= render 'total_price' %>
+  <tfoot>
+    <tr>
+      <th colspan="5"></th>
+      <th>
+      <% if @checked_ids.present? %>
+        <%= link_to '去结算', { controller: 'orders', action: 'new' }, class: 'button is-primary', id: 'new_order' %>
+      <% else %>
+        <button class="button is-primary" disabled>去结算</button>
+      <% end %>
+      </th>
+    </tr>
+  </tfoot>
+</table>

data/app/views/trade/my/carts/add.turbo_stream.erb

@@ -0,0 +1,3 @@
+<%= turbo_stream.append 'body' do %>
+  <div data-controller="visit"></div>
+<% end %>

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

@@ -0,0 +1,5 @@
+<%= turbo_frame_tagged 'modal' do %>
+  <%= render layout: 'index_table', locals: { cache_key: Profiled::Address.column_names.hash } do %>
+    <%= render partial: 'index_tbody', layout: 'index_tr', collection: @addresses, as: :model %>
+  <% end %>
+<% end %>

data/app/views/trade/my/carts/destroy.turbo_stream.erb

@@ -0,0 +1,3 @@
+<%= turbo_stream.append 'body' do %>
+  <div data-controller="visit"></div>
+<% end %>

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

@@ -1,46 +1,66 @@
-<%= form_with url: my_orders_path, id: 'add_cart' do %><% end %>
+<%= content_for(:wechat_js) do %>
+  <%# wechat_config_js debug: false, apis: ['openAddress'] if defined?(:wechat_config_js) -%>
+<% end %>
 
 <div class="weui-panel weui-panel_access">
   <div class="weui-panel__hd"><%= t('.title') %></div>
   <div class="weui-panel__bd">
+    <%= link_to({ controller: 'profiled/my/addresses', return_to: url_for(controller: 'trade/my/carts', action: 'show') }, class: 'weui-cell weui-cell_access') do %>
+      <div class="weui-cell__bd">
+        <% if current_cart.address %>
+          <p><%= current_cart.address.contact %></p>
+          <p><%= current_cart.address.detail %></p>
+        <% else %>
+          <p>选择地址</p>
+        <% end %>
+      </div>
+      <div class="weui-cell__ft"></div>
+    <% end %>
     <% @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 weui-media-box_appmsg" data-controller="swipe" data-action="touchmove->swipe#move:passive touchstart->swipe#start:passive touchend->swipe#end:passive">
+        <%= form_with theme: nil, model: trade_item, url: { controller: 'trade_items', action: 'toggle', id: trade_item.id }, data: { controller: 'input' } do |f| %>
+          <label class="weui-cells_checkbox">
+            <%= f.check_box :status, value: trade_item.checked? ? 'checked' : 'init', checked: trade_item.checked?, data: { action: 'change->input#form' }, class: 'weui-check', id: nil %>
+            <i class="weui-icon-checked"></i>
+          </label>
+        <% end %>
         <div class="weui-media-box__hd">
-          <%= image_tag trade_item.good.product.logo, class: 'weui-media-box__thumb' %>
+          <%= 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">
+            <% if trade_item.good.respond_to?(:parts) %>
             <% trade_item.good.parts.each do |part| %>
               <span><%= part.name %></span>
             <% end %>
+            <% end %>
           </p>
-          <ul class="weui-media-box__info">
-            <li class="weui-media-box__info__meta">
-              <span><%= trade_item.good.price %></span>
-            </li>
-          </ul>
+          <div class="weui-media-box__info is-flex is-justify-content-space-between">
+            <div class="is-flex is-align-items-center">
+              <div class="weui-media-box__info__meta">
+                <span><%= trade_item.good.price %></span>
+              </div>
+            </div>
+            <div class="is-flex is-align-items-center">
+              <%= button_to({ controller: 'trade_items', action: 'update', id: trade_item.id }, method: :patch, params: { '[trade_item]number': trade_item.number - 1 }, class: 'mr-1') do %>
+                <i class="fas fa-minus fa-lg"></i>
+              <% end if trade_item.number > 1 %>
+              <%= form_with(theme: nil, scope: 'trade_item', url: { controller: 'trade_items', action: 'update', id: trade_item.id }, method: :patch, data: { controller: 'input' }) do |f| %>
+                <%= f.number_field :number, value: trade_item.number, data: { action: 'change->input#form' }, class: 'has-background-light has-text-centered', style: 'width: 30px' %>
+              <% end %>
+              <%= button_to({ controller: 'trade_items', action: 'update', id: trade_item.id }, method: :patch, params: { '[trade_item]number': trade_item.number + 1 }, class: 'ml-1') do %>
+                <i class="fas fa-plus fa-lg"></i>
+              <% end %>
+            </div>
+          </div>
         </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 %>
+        <div class="weui-media-box__ft" data-swipe-target="open" style="width: 0">
+          <%= button_to({ controller: 'trade_items', action: 'destroy', id: trade_item.id }, method: :delete, data: { confirm: t('.confirm') }, form: { class: 'weui-btn weui-btn_mini weui-btn_default' }) do %>
+            <i class="fas fa-trash"></i>
           <% 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/trade/my/carts/show.html.erb

@@ -0,0 +1,25 @@
+<%= render 'address' %>
+<table class="table is-fullwidth">
+  <thead>
+    <tr>
+      <%= render 'show_thead' %>
+    </tr>
+  </thead>
+  <tbody>
+    <%= render partial: 'trade_item', collection: @trade_items, as: :trade_item %>
+  </tbody>
+  <%= render 'total_price' %>
+  <tfoot>
+    <tr>
+      <th colspan="5"></th>
+      <th>
+      <% if @checked_ids.present? %>
+        <%= link_to '结算', { controller: 'orders', action: 'new' }, class: 'button is-primary', id: 'new_order' %>
+      <% else %>
+        <button class="button is-primary" disabled>结算</button>
+      <% end %>
+      </th>
+    </tr>
+  </tfoot>
+</table>
+

data/app/views/trade/my/carts/update.turbo_stream.erb

@@ -0,0 +1,9 @@
+<%= turbo_stream.append 'body' do %>
+<% if request.headers['Turbo-Frame'] == 'modal' && request.headers['Redirect'].present? %>
+  <div data-controller="visit" data-visit-frame-value="modal" data-visit-url-value="<%= request.headers['Redirect'] %>"></div>
+<% elsif params.dig('cart', 'address_id') %>
+  <div data-controller="visit" data-visit-frame-value="modal" data-visit-reload-value="true" data-visit-url-value="<%= url_for(action: 'addresses') %>"></div>
+<% else %>
+  <div data-controller="visit"></div>
+<% end %>
+<% end %>

data/app/views/trade/my/cash_logs/_cash_log.json.jbuilder

@@ -0,0 +1 @@
+json.extract! cash_log, :id, :title, :tag_str, :amount, :created_at

data/app/views/trade/my/cash_logs/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.cash @cash, :id, :amount
+json.coin current_user.coin, partial: 'wallet/api/shared/coin', as: :coin
+json.cash_logs @cash_logs, partial: 'cash_log', as: :cash_log
+json.partial! 'api/shared/pagination', items: @cash_logs

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

@@ -1,5 +1,5 @@
 <%= form_for [:my, @order], :url => date_my_order_path(@order), :html => { :class => 'form-horizontal' } do |f| %>
-  <%= render "shared/error_messages", :target => @order %>
+  <%= render 'error_messages', target: @order %>
 
   <div class="form-group">
     <%= f.label :order_on, '预约日期：', :class => 'col-sm-2 control-label' %>
@@ -20,4 +20,4 @@
       <%= f.submit :class => "btn btn-primary" %>
     </div>
   </div>
-<% end %>
+<% end %>

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

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

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

@@ -1,12 +1,3 @@
-<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>
+<% ['alipay', 'wxpay_pc'].each do |payment_type| %>
+  <%= link_to payment_type, "/my/orders/#{@order.id}/#{payment_type}_pay", data: { turbo_frame: '_top' } %>
+<% end %>

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

@@ -1,4 +1 @@
-<%= form_with model: [:my, @order] do |f| %>
-  <%= f.text_area :note %>
-  <%= f.submit %>
-<% end %>
+<%= f.text_area :note %>

data/app/views/trade/my/orders/_payment_types/_show_table.html.erb

@@ -0,0 +1,35 @@
+<% current_user.cards.each do |card| %>
+<tr>
+  <td class="has-text-right"><%= card.card_template.name %></td>
+  <td>(可用： <%= card.amount %>)</td>
+  <td data-controller="input">
+    <%= form_with theme: nil, model: Trade::Payment.new, scope: 'payment', url: { controller: 'payments', action: 'create' }, id: "card_#{card.id}" do |f| %>
+      <%= f.hidden_field :type, value: 'Trade::CardPayment' %>
+      <%= f.hidden_field :card_id, value: card.id %>
+      <%= f.fields :payment_orders, model: f.object.payment_orders.build do |ef| %>
+        <%= ef.hidden_field :order_id, value: @order.id %>
+        <%= ef.hidden_field :state, value: 'confirmed' %>
+        <%= ef.hidden_field :check_amount, value: @order.amount < card.amount ? @order.amount : card.amount %>
+      <% end %>
+    <% end %>
+    <% if @order.payments.pluck(:card_id).include?(card.id) %>
+      <%= form_with theme: nil, url: { controller: 'payments', action: 'destroy', id: @order.payments.find_by(card_id: card.id).id }, method: :delete, data: { controller: 'input' } do |f| %>
+        <%= f.check_box 'xx', checked: true, class: 'weui-check', data: { action: 'input#form' } %>
+      <% end %>
+    <% else %>
+      <%= check_box_tag 'xx', 'x', false, class: 'weui-check', form: "card_#{card.id}", data: { action: 'input#form' } %>
+    <% end %>
+  </td>
+</tr>
+<% end %>
+<tr>
+  <td class="has-text-right">待支付</td>
+  <td><%= @order.remaining_amount.to_money %></td>
+  <td></td>
+</tr>
+<tr>
+  <td></td>
+  <td colspan="2">
+    <button class="button is-danger is-large">立即支付</button>
+  </td>
+</tr>

data/app/views/trade/my/orders/_show/_breadcrumb.html.erb

@@ -0,0 +1,6 @@
+<div class="breadcrumb has-succeeds-separator">
+  <ul>
+    <li><%= link_to t('trade.my.orders.index.title'), { action: 'index' } %></li>
+    <li class="is-active"><%= @order.uuid %></li>
+  </ul>
+</div>

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

@@ -0,0 +1,9 @@
+<div class="hero-body container">
+  <div class="tile is-parent">
+    <div>
+      <p class="title"><%= t('.title') %></p>
+      <p><%= t('.tip') %></p>
+      <%= link_to t('trade.my.orders.index.title'), { controller: 'trade/my/orders', action: 'index' } %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1 @@
+json.result @order.alipay_prepay

data/app/views/trade/my/orders/create.turbo_stream.erb

@@ -0,0 +1,3 @@
+<%= turbo_stream.append 'body' do %>
+  <div data-controller="visit" data-visit-url-value="<%= url_for(action: controller.available_action?(:index) ? 'index' : 'show') %>"></div>
+<% end %>

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

@@ -0,0 +1,3 @@
+<turbo-frame id="modal">
+  <%= render 'edit_payment_type' %>
+</turbo-frame>

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

@@ -2,33 +2,36 @@
   <%= wechat_config_js debug: false, apis: ['chooseWXPay'] -%>
 <% end %>
 
+<% if @orders.blank? %>
+  <p class="has-text-centered">暂无订单</p>
+<% 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>
+      <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 %>
+          <%= link_to '支付', { action: 'payment_types', id: order.id } %>
         </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 %>
+    <%= link_to({ action: 'show', id: order }, class: 'weui-cell weui-cell_access weui-cell_link') do %>
       <div class="weui-cell__bd">更多</div>
       <span class="weui-cell__ft"></span>
     <% end %>