rails_trade 0.0.2 → 0.0.3

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

@@ -1,36 +1,36 @@
-<table class="ui selectable table">
+<table class="table is-hoverable is-fullwidth">
   <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><%= Trade::Order.human_attribute_name(:uuid) %></th>
+      <th><%= Trade::Order.human_attribute_name(:amount) %></th>
+      <th><%= Trade::Order.human_attribute_name(:payment_status) %></th>
       <th></th>
     </tr>
   </thead>
-
+  <tbody>
   <% @orders.each do |order| %>
     <tr>
-      <td><%= order.uuid %></td>
+      <td>
+        <%= link_to order.uuid, { action: 'show', id: order.id } %>
+      </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 %>
+        <span><%= order.payment_status_i18n %></span>
+        <%= link_to({ action: 'payment_types', id: order.id }, class: 'button is-small') do %>
+          <span>支付</span>
+        <% end if order.can_pay? %>
       </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 %>
+        <span><%= order.note %></span>
+        <%= link_to({ action: 'edit', id: order.id }, data: { turbo_frame: 'modal' }, aria: { label: t('.edit') }) do %>
           <i class="fas fa-pencil-alt"></i>
         <% end %>
       </td>
     </tr>
   <% end %>
+  </tbody>
 </table>
 
 <%= paginate @orders %>

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

@@ -1,41 +1,30 @@
-<div class="ui segment top attached">
-</div>
-
-
-<table class="ui table">
+<table class="table is-fullwidth">
   <thead>
-  <tr>
-    <th>
-      <%= form_with model: @order, url: my_orders_path, id: 'new_order' do |f| %>
-        <% @order_form = f %>
-      <% end %>
-    </th>
-    <th>Name</th>
-    <th></th>
-    <th></th>
-  </tr>
+    <tr>
+      <th>
+        <%= form_with model: @order, url: { action: 'create' }, id: 'new_order' do %><% end %>
+      </th>
+      <th><%= Trade::TradeItem.human_attribute_name(:good_name) %></th>
+      <th><%= Trade::TradeItem.human_attribute_name(:number) %></th>
+      <th><%= Trade::TradeItem.human_attribute_name(:amount) %></th>
+    </tr>
   </thead>
-  <% @order.order_items.each do |order_item| %>
-    <%= @order_form.fields_for :order_items, order_item do |oi| %>
-      <tr>
-        <td>
-          <%= order_item.good&.name %>
-          <%= oi.hidden_field :cart_item_id, form: 'new_order' %>
-        </td>
-        <td></td>
-        <td><%= order_item.quantity %></td>
-        <td></td>
-      </tr>
-    <% end %>
+  <tbody>
+  <% current_cart.trade_items.checked.each do |trade_item| %>
+    <tr>
+      <td></td>
+      <td><%= trade_item.good_name %></td>
+      <td><%= trade_item.number %></td>
+      <td><%= trade_item.amount %></td>
+    </tr>
   <% end %>
-
+  </tbody>
   <tfoot>
-  <tr>
-    <th colspan="5">
-      <div class="">
-        <%= submit_tag '确认订单', class: 'ui red right floated button', form: 'new_order' %>
-      </div>
-    </th>
-  </tr>
+    <tr>
+      <th colspan="3"></th>
+      <th>
+        <%= submit_tag t('.confirm'), class: 'button is-primary', form: 'new_order' %>
+      </th>
+    </tr>
   </tfoot>
-</table>
+</table>

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

@@ -0,0 +1,51 @@
+<div class="weui-panel">
+  <div class="weui-panel__hd">
+    待支付：<%= @order.remaining_amount.to_money %>
+  </div>
+  <div class="weui-panel__bd">
+    <div class="weui-media-box weui-media-box_small-appmsg">
+      <div class="weui-cells weui-cells_checkbox">
+        <% current_user.cards.each do |card| %>
+        <label class="weui-cell weui-cell_active">
+          <span class="weui-cell__bd">
+            <%= card.card_template.name %>
+            (可用： <%= card.amount %>)
+          </span>
+          <span class="weui-cell__ft" 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' } %>
+                <span class="weui-icon-checked"></span>
+              <% end %>
+            <% else %>
+              <%= check_box_tag 'xx', 'x', false, class: 'weui-check', form: "card_#{card.id}", data: { action: 'input#form' } %>
+              <span class="weui-icon-checked"></span>
+            <% end %>
+          </span>
+        </label>
+        <% end %>
+      </div>
+      <div class="weui-cells">
+        <%= link_to({ action: 'wxpay_pay' }, class: 'weui-cell weui-cell_active weui-cell_access') do %>
+          <div class="weui-cell__hd"></div>
+          <div class="weui-cell__bd weui-cell_primary">微信支付</div>
+          <div class="weui-cell__ft"></div>
+        <% end unless @order.all_paid? %>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="hero">
+  <div class="hero-body">
+    <%= link_to '订单列表', { action: 'index' } %>
+  </div>
+</div>

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

@@ -0,0 +1,5 @@
+<table class="table is-fullwidth is-borderless as-show">
+  <tbody>
+    <%= render 'show_table' %>
+  </tbody>
+</table>

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

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

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

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

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

@@ -1,103 +1,60 @@
-<div class="ui grid">
-  <div class="sixteen wide column">
-    <div class="ui breadcrumb">
-      <%= link_to '全部订单', my_orders_path, class: 'section' %>
-      <i class="right chevron icon divider"></i>
-      <%= link_to '编辑', edit_my_order_path(@order), class: 'section' %>
-    </div>
-
-    <table class="ui table">
-      <thead>
-      <tr>
-        <th>商品</th>
-        <th></th>
-        <th>Pure Price</th>
-        <th>Serve Sum</th>
-        <th>Promote Sum</th>
-        <th></th>
-        <th>数量</th>
-      </tr>
-      </thead>
-      <% @order.order_items.each do |order_item| %>
-      <tr>
-        <td>
-          <%= order_item.good.name %>
-          <span><%= order_item.good&.price %></span>
-          <%# 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.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>
-        <% order_item.order_serves.each do |order_serve| %>
-          <tr class="warning">
-            <td><%= order_serve.serve.name %></td>
-            <td></td>
-            <td></td>
-            <td><%= order_serve.amount %></td>
-            <td></td>
-            <td></td>
-            <td></td>
-          </tr>
-        <% end %>
-        <% order_item.order_promotes.each do |order_promote| %>
-          <tr class="warning">
-            <td><%= order_promote.promote.name %></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td><span style="color: red;"><%= order_promote.amount %></span></td>
-            <td></td>
-            <td></td>
-            <td></td>
-          </tr>
-        <% end %>
-      <% end %>
-      <% @order.pure_order_serves.each do |order_serve| %>
-        <tr>
-          <td><%= order_serve.serve.name %></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td><%= order_serve.amount %></td>
-          <td></td>
-          <td></td>
-        </tr>
-      <% end %>
-      <% @order.pure_order_promotes.each do |order_promote| %>
-        <tr>
-          <td><%= order_promote.promote.name %></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td><%= order_promote.amount %></td>
-          <td></td>
-          <td></td>
-        </tr>
-      <% end %>
-      <tr>
-        <td>总价</td>
-        <td></td>
+<table class="table is-fullwidth">
+  <thead>
+    <tr>
+      <th>商品</th>
+      <th></th>
+      <th>Pure Price</th>
+      <th>Serve Sum</th>
+      <th>Promote Sum</th>
+      <th></th>
+      <th>数量</th>
+    </tr>
+  </thead>
+  <% @order.trade_items.each do |trade_item| %>
+  <tr>
+    <td>
+      <%= trade_item.good_name %>
+      <span><%= trade_item.single_price %></span>
+      <%# link_to trade_item.good&.name, controller: '/' + trade_item.good_type.underscore.pluralize, action: 'show', id: trade_item.good_id %>
+    </td>
+    <td><%= link_to '订单流程', { controller: 'trade_items', action: 'show', id: trade_item.id } %></td>
+    <td><%= trade_item.original_amount %></td>
+    <td><%= trade_item.additional_amount %></td>
+    <td><%= trade_item.reduced_amount %></td>
+    <td><%= trade_item.amount %></td>
+    <td><%= trade_item.number %></td>
+  </tr>
+    <% trade_item.trade_promotes.each do |trade_promote| %>
+      <tr class="warning">
+        <td><%= trade_promote.promote.name %></td>
         <td></td>
         <td></td>
+        <td><%= trade_promote.amount %></td>
         <td></td>
-        <td><%= @order.subtotal %>(<%= @order.amount %>)</td>
         <td></td>
         <td></td>
       </tr>
-    </table>
-  </div>
-
-</div>
-
-
-
-
-
-
-
+    <% end %>
+  <% end %>
+  <% @order.trade_promotes.each do |trade_promote| %>
+    <tr>
+      <td><%= trade_promote.promote.name %></td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td><%= trade_promote.amount %></td>
+      <td></td>
+      <td></td>
+    </tr>
+  <% end %>
+  <tr>
+    <td>总价</td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td><%= @order.item_amount %>(<%= @order.amount %>)</td>
+    <td></td>
+  </tr>
+</table>

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

@@ -1,10 +1,3 @@
-<div class="ui container content">
-    <!-- 成功 -->
-    <div class="settlement">
-        <%= image_tag "face2.jpg"%>
-        <p class="title">Your payment is successful!</p>
-        <p>We will ship out your order and update you with dispatch detail</p>
-        <%= link_to 'My Order list', show_orders_my_personal_center_path, class: 'ui green button mr_w_15 settlement_btn2' %>
-        <%= link_to 'Back Home', root_path, class: 'ui yellow button mr_w_15' %>
-    </div>
+<div class="hero is-medium">
+  <%= render 'success' %>
 </div>

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

@@ -0,0 +1,13 @@
+<%= content_for(:wechat_js) do %>
+  <%= wechat_config_js debug: false, apis: ['chooseWXPay'] -%>
+  <meta name="turbo-visit-control" content="reload">
+<% end %>
+
+<%= turbo_stream_from @order %>
+<div data-controller="wxpay" data-wxpay-params-value="<%= { timestamp: @wxpay_order[:timeStamp], nonceStr: @wxpay_order[:nonceStr], package: @wxpay_order[:package], signType: @wxpay_order[:signType], paySign: @wxpay_order[:paySign] }.to_json %>">
+  <div class="hero is-medium" id="order_result">
+    <div data-wxpay-target="load" class="weui-loadmore" style="display: none">
+      <i class="weui-loading"></i><span class="weui-loadmore__tips">等待支付结果确认</span>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,5 @@
+<div class="hero is-medium">
+  <div class="hero-body">
+    <%= @wxpay_order['code'].present? ? @wxpay_order['message'] : '出现错误' %>
+  </div>
+</div>

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

@@ -0,0 +1,24 @@
+<%= turbo_stream_from @order %>
+<div class="hero is-medium is-light" id="order_result">
+  <div class="hero-body container">
+    <div class="level">
+      <div class="level-left">
+        <p class="level-item"><%= t('.tip') %></p>
+        <p class="level-item">订单编号：<%= @order.uuid %></p>
+      </div>
+      <div class="level-right">
+        <p class="level-item">付款金额：<span class="has-text-danger"><%= @order.amount %></span></p>
+      </div>
+    </div>
+    <div class="tile is-parent">
+      <div class="tile is-child is-flex is-align-items-center">
+        <figure class="image">
+          <%= image_tag @image_url %>
+        </figure>
+      </div>
+      <div class="tile is-child">
+        <%= image_pack_tag 'wx.png', class: 'image' %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/trade/my/payment_methods/_button.html.erb

@@ -0,0 +1,3 @@
+<%= link_to 'My Expenses', my_expense_members_path, class: active_helper(controllers: 'finance_my/expense_members') %>
+<%= link_to 'My Payment Methods', my_payment_methods_path, class: active_helper(controllers: 'payment_methods') %>
+<%= link_to 'Add New', new_my_payment_method_path, class: 'ui teal button' %>

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

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

data/app/views/trade/my/payment_methods/{_item.html.erb → _index_tbody.html.erb}

@@ -1,10 +1,9 @@
-<tr id="payment_method_<%= payment_method.id %>">
-  <td><%= payment_method.id %></td>
+<tr>
   <td><%= payment_method.account_name %></td>
   <td><%= payment_method.account_num %></td>
   <td><%= payment_method.bank %></td>
   <td>
-    <%= link_to 'Edit', edit_my_payment_method_path(payment_method), class: 'ui mini blue button', remote: true %>
-    <%= link_to 'Delete', my_payment_method_path(payment_method), class: 'ui mini button', remote: true, method: :delete, data: { confirm: t('.confirm') } %>
+    <%= link_to 'Edit', edit_my_payment_method_path(payment_method), class: 'button is-link is-small' %>
+    <%= link_to 'Delete', my_payment_method_path(payment_method), class: 'button', method: :delete, data: { confirm: t('.confirm') } %>
   </td>
 </tr>

data/app/views/trade/my/payment_methods/_index_thead.html.erb

@@ -0,0 +1,4 @@
+<th>Account Name</th>
+<th>Account Num</th>
+<th>Bank</th>
+<th></th>

data/app/views/trade/my/payment_methods/_new_form.html.erb

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