rails_trade 0.0.2 → 0.0.3

data/app/views/trade/admin/{buyers → users}/index.html.erb

@@ -9,11 +9,11 @@
   <div class="ui segment top attached">
     <p>
       <span>State:</span>
-      <%= link_to 'All', filter_params(except: [:payment_status]), class: active_params(payment_status: '', active_class: 'ui basic blue button', item_class: 'ui basic white button') %>
+      <%= link_to t('.all'), filter_params(except: [:payment_status]), class: active_params(payment_status: '', active: 'button is-info', item: 'button is-light') %>
     </p>
   </div>
 
-  <table class="ui bottom attached selectable table">
+  <table class="table is-hoverable is-fullwidth">
     <thead>
     <tr>
       <th>ID</th>
@@ -34,8 +34,8 @@
         <td><%# buyer.charger&.name %></td>
         <td><%# buyer.sum_amount %></td>
         <td>
-          <%= link_to 'Orders', orders_admin_buyer_path(buyer.id), class: 'ui mini blue button' %>
-          <%= link_to 'Promotes', admin_promote_buyers_path(buyer_id: buyer.id), class: 'ui mini green button' %>
+          <%= link_to 'Orders', orders_admin_buyer_path(buyer.id), class: 'button is-link is-small' %>
+          <%= link_to 'Promotes', admin_promote_buyers_path(buyer_id: buyer.id), class: 'button is-link is-small' %>
         </td>
       </tr>
     <% end %>

data/app/views/trade/admin/{buyers → users}/orders.html.erb

@@ -5,7 +5,7 @@
     <div class="item"><%= @buyer.name %></div>
   </div>
 
-  <table class="ui bottom attached selectable table">
+  <table class="table is-hoverable is-fullwidth">
     <thead>
     <tr>
       <th>UUID</th>
@@ -37,7 +37,7 @@
     </p>
   </div>
 
-  <table class="ui bottom attached selectable table">
+  <table class="table is-hoverable is-fullwidth">
     <thead>
     <tr>
       <th></th>
@@ -74,18 +74,18 @@
             <p><%= order_item.chemical.cas %></p>
           <% end %>
         </td>
-        <td class="<%= active_assert(order.overdue_date && order.overdue_date < Date.today, expected: 'error', unexpected: '') %>">
+        <td class="<%= order.overdue_date && order.overdue_date < Date.today ? 'error' : '' %>">
           <%= order.overdue_date %>
         </td>
         <td><%= order.amount %> / <%= order.unreceived_amount %></td>
         <td><%= order.remind_counter %></td>
         <td>
           <% if order.exists_payments && !order.cancel? %>
-            <%= link_to new_admin_order_order_payment_path(order.id), remote: true, class: 'ui icon green button' do %>
+            <%= link_to new_admin_order_order_payment_path(order.id), class: 'ui icon green button' do %>
               <i class="payment icon"></i>
             <% end %>
           <% elsif !order.cancel? %>
-            <%= link_to new_admin_order_order_payment_path(order.id), remote: true, class: 'ui icon grey button' do %>
+            <%= link_to new_admin_order_order_payment_path(order.id), class: 'ui icon grey button' do %>
               <i class="payment icon"></i>
             <% end %>
           <% end %>
@@ -99,7 +99,7 @@
 </div>
 
 <div class="ui modal" id="alert_modal">
-  <i class="close icon"></i>
+  <i class="fas fa-times close"></i>
   <div class="header">
     Alert
   </div>

data/app/views/trade/admin/{buyers → users}/overdue.html.erb

@@ -9,11 +9,11 @@
   <div class="ui segment top attached">
     <p>
       <span>State:</span>
-      <%= link_to 'All', filter_params(except: [:payment_status]), class: active_params(payment_status: '', active_class: 'ui basic blue button', item_class: 'ui basic white button') %>
+      <%= link_to t('.all'), filter_params(except: [:payment_status]), class: active_params(payment_status: '', active: 'button is-info', item: 'button is-light') %>
     </p>
   </div>
 
-  <table class="ui bottom attached selectable table">
+  <table class="table is-hoverable is-fullwidth">
     <thead>
     <tr>
       <th>ID</th>

data/app/views/trade/advances/index.html.erb

@@ -0,0 +1,15 @@
+<div class="cards">
+  <% @advances.each do |advance| %>
+    <div class="card">
+      <div class="card-content">
+        <div class="header"><%= advance.amount %></div>
+        <div class="description">价格：￥<%= advance.price %></div>
+      </div>
+      <div class="card-footer">
+        <%= button_to({ controller: 'trade/my/carts', action: 'add', good_id: advance.id, good_type: advance.class_name }, method: 'post', class: 'button', form: { class: 'card-footer-item' }) do %>
+          <i class="fas fa-shopping-cart"></i><span><%= advance.price %></span>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+</div>

data/app/views/trade/card_templates/_card_template.json.jbuilder

@@ -0,0 +1,9 @@
+json.extract!(
+  card_template,
+  :id,
+  :name,
+  :valid_days,
+  :amount,
+  :price,
+  :created_at
+)

data/app/views/trade/card_templates/_filter_form.html.erb

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

data/app/views/trade/card_templates/_show_table.html.erb

@@ -0,0 +1,16 @@
+<tr>
+  <td class="has-text-right"><%= CardTemplate.human_attribute_name(:name) %></td>
+  <td><%= @card_template.name %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= CardTemplate.human_attribute_name(:valid_days) %></td>
+  <td><%= @card_template.valid_days %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= CardTemplate.human_attribute_name(:amount) %></td>
+  <td><%= @card_template.amount %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= CardTemplate.human_attribute_name(:price) %></td>
+  <td><%= @card_template.price %></td>
+</tr>

data/app/views/trade/card_templates/index.html.erb

@@ -0,0 +1,16 @@
+<div class="box">
+  <% @card_templates.each do |card_template| %>
+    <div class="card">
+      <div class="card-image">
+        <%= image_tag card_template.cover if card_template.cover.present? %>
+      </div>
+      <div class="card-content">
+        <div class="header"><%= card_template.name %></div>
+        <div class="description">有效期：<%= card_template.valid_days %>天</div>
+      </div>
+      <div class="card-footer">
+        <%= link_to '充值', { controller: '/trade/advances', card_template_id: card_template.id }, class: 'card-footer-item' %>
+      </div>
+    </div>
+  <% end %>
+</div>

data/app/views/trade/card_templates/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @card_templates, partial: 'card_template', as: :card_template

data/app/views/trade/card_templates/show.json.jbuilder

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

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

@@ -1,6 +1,6 @@
 <ul class="nav nav-pills nav-level">
-  <li class="active"><%= link_to '默认促销', url_for(:action => :taxon) %></li>
-  <li <%= active_params(:price_order, "DESC") %>><%= link_to '价格↓', url_for(:action => :taxon, :price_order => "DESC") %></li>
-  <li <%= active_params(:price_order, "ASC") %>><%= link_to '价格↑', url_for(:action => :taxon, :price_order => "ASC") %></li>
+  <li class="active"><%= link_to '默认促销', { action: 'taxon' } %></li>
+  <li <%= active_params(price_order: "DESC") %>><%= link_to '价格↓', { action: 'taxon', price_order: 'DESC' } %></li>
+  <li <%= active_params(price_order: "ASC") %>><%= link_to '价格↑', { action: 'taxon', price_order: 'ASC' } %></li>
   <li class="pull-right"><span>共有商品数：<%= Product.count %></span></li>
 </ul>

data/app/views/trade/goods/taxon/_breadcrumb.html.erb

@@ -1,8 +1,8 @@
-<ul class="breadcrumb">
+<ul class="breadcrumb has-succeeds-separator">
   <% @taxon.ancestors.each do |taxon| %>
     <li><%= link_to taxon.name, taxon_products_path(:taxon_id => taxon) %></li>
   <% end %>
-  <li class="active"><%= @taxon.name %></li>
+  <li class="is-active"><%= @taxon.name %></li>
 </ul>
 
 

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

@@ -0,0 +1,11 @@
+json.advances @advances do |advance|
+  json.extract! advance,
+                :id,
+                :name,
+                :description,
+                :price,
+                :final_price,
+                :apple_product_id,
+                :amount
+  json.promote_names advance.overall_promotes.pluck(:name)
+end

data/app/views/trade/my/advances/order.json.jbuilder

@@ -0,0 +1,14 @@
+json.order do
+  json.extract! @order, :id, :uuid, :amount, :payment_status, :buyer_id, :buyer_type
+  json.buyer do
+    json.extract! @order.buyer, :id, :name
+  end
+  json.order_items @order.order_items do |order_item|
+    json.extract! order_item, :id, :number, :amount
+    json.advance order_item.good, :id, :name, :price, :final_price, :apple_product_id, :amount
+  end
+end
+
+if @wxpay_order
+  json.wxpay_order @wxpay_order
+end

data/app/views/trade/my/card_logs/_wallet_log.json.jbuilder

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

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

@@ -0,0 +1,15 @@
+<div class="box">
+<% @card_logs.each do |card_log| %>
+  <div class="level is-flex">
+    <div class="level-left">
+      <div class="level-item">
+        <span class="<%= card_log.amount >= 0 ? 'has-text-success' : 'has-text-danger' %>"><%= card_log.amount %></span>
+        <span class="tag"><%= card_log.tag_str %></span>
+      </div>
+    </div>
+    <div class="level-right mt-0">
+      <div class="level-item"><time data-controller="time"><%= card_log.created_at.to_s(:rfc822) %></time></div>
+    </div>
+  </div>
+<% end %>
+</div>

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

@@ -0,0 +1,5 @@
+json.wallet @wallet, :total_balance, :ios_balance, :other_balance
+json.coin current_user.coin, :amount
+json.cash current_user.cash, :amount
+json.wallet_logs @wallet_logs, partial: 'wallet_log', as: :wallet_log
+json.partial! 'api/shared/pagination', items: @wallet_logs

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

@@ -0,0 +1,45 @@
+<div class="box">
+<% @cards.each do |card| %>
+  <div class="card is-radiusless" style="background-image: url(<%= rails_blob_url(card.card_template.cover) %>); background-size: cover; background-repeat: no-repeat">
+    <div class="card-header">
+      <p class="card-header-title"><%= card.card_template.name %></p>
+    </div>
+    <div class="card-content">
+      <p><%= card.card_uuid %></p>
+    </div>
+    <div class="card-content">
+      <div class="header"></div>
+      <div class="description">
+        <div class="level is-flex">
+          <div class="level-left">
+            <div class="level-item"><time data-controller="time"><%= card.effect_at.to_s(:rfc822) %></time></div>
+          </div>
+          <div class="level-right mt-0">
+            <div class="level-item"><time data-controller="time"><%= card.expire_at.to_s(:rfc822) %></time></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="card-footer">
+    </div>
+  </div>
+  <div class="panel is-radiusless">
+    <div class="panel-block">
+      <p><%= Trade::Card.human_attribute_name(:amount) %>：<%= card.amount %></p>
+    </div>
+    <div class="panel-block">
+      <%= link_to '记录', { controller: 'card_logs', card_id: card.id }, class: 'card-footer-item' %>
+    </div>
+    <div class="panel-block">
+      <%= link_to '充值', { controller: '/trade/advances', card_template_id: card.card_template_id }, class: 'card-footer-item' %>
+    </div>
+  </div>
+<% end %>
+<% @card_templates.each do |card_template| %>
+  <div class="card is-radiusless" style="background-image: url(<%= rails_blob_url(card_template.cover) %>); background-size: cover; background-repeat: no-repeat">
+    <div class="card-header">
+      <p class="card-header-title"><%= card_template.name %></p>
+    </div>
+  </div>
+<% end %>
+</div>

data/app/views/trade/my/cards/token.html.erb

@@ -0,0 +1,11 @@
+<div>
+  <%= @card.card_template.name %>
+</div>
+
+<%= form_with theme: 'weui', model: @card, url: { action: 'create' } do |f| %>
+  <%= f.hidden_field :token, value: params[:token] %>
+  <%= f.fields :card_advances do |ef| %>
+    <%= ef.text_field :amount, readonly: true, label: '获得积分' %>
+  <% end %>
+  <%= f.submit %>
+<% end %>

data/app/views/trade/my/{trade_items → carts}/_additions.html.erb

@@ -8,5 +8,3 @@
     <td></td>
   </tr>
 <% end %>
-
-

data/app/views/trade/my/carts/_addresses/_index_table.html.erb

@@ -0,0 +1,14 @@
+<div class="buttons are-small mb-0 pt-2">
+  <%= link_to({ controller: 'profiled/my/addresses', action: 'new' }, data: { turbo_frame: 'modal' }, class: 'button is-link') do %>
+    <i class="fas fa-plus"></i><span><%= t('.new') %></span>
+  <% end %>
+</div>
+
+<%= form_with theme: nil, model: current_cart, url: { action: 'update' }, id: 'cart_address' do %>
+<% end %>
+
+<table class="table is-hoverable is-fullwidth">
+  <tbody id="tbody">
+    <%= yield %>
+  </tbody>
+</table>

data/app/views/trade/my/carts/_addresses/_index_tbody.html.erb

@@ -0,0 +1,5 @@
+<td data-action="click->input#check"><%= radio_button_tag 'cart[address_id]', model.id, current_cart.address_id == model.id, form: 'cart_address', data: { action: 'input#form', input_target: 'checkbox' } %></td>
+<td data-action="click->input#check"><%= model.contact %></td>
+<td data-action="click->input#check"><%= model.tel %></td>
+<td data-action="click->input#check"><%= model.area.full_name %></td>
+<td data-action="click->input#check"><%= model.detail %></td>

data/app/views/trade/my/carts/_addresses/_index_tr.html.erb

@@ -0,0 +1,13 @@
+<tr id="tr_<%= model.id %>" data-controller="show input" data-action="mouseenter->show#show mouseleave->show#hide">
+  <%= yield %>
+  <td>
+    <span data-show-target="item" style="visibility: hidden">
+      <%= link_to({ controller: 'profiled/my/addresses', 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({ controller: 'profiled/my/addresses', 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/my/carts/_filter_form.html.erb

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

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

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

data/app/views/trade/my/carts/_show/_address.html.erb

@@ -0,0 +1,18 @@
+<div class="level">
+  <div class="level-left">
+    <div class="level-item">
+      <% if current_cart.address %>
+        <p><%= current_cart.address.contact %></p>
+        <p><%= current_cart.address.tel %></p>
+        <p><%= current_cart.address.detail %></p>
+      <% else %>
+        <p>选择地址</p>
+      <% end %>
+    </div>
+  </div>
+  <div class="level-right">
+    <%= link_to({ action: 'addresses' }, data: { turbo_frame: 'modal' }, class: 'level-item') do %>
+      <i class="fas fa-angle-right"></i>
+    <% end %>
+  </div>
+</div>

data/app/views/trade/my/carts/_show/_tab_bar.html.erb

@@ -0,0 +1,22 @@
+<div class="weui-tabbar_fixed">
+  <div class="weui-tabbar">
+    <div class="weui-tabbar__item">
+    
+    </div>
+    <div class="weui-tabbar__item">
+      <div class="weui-tabbar__content">
+        <%= Trade::Cart.human_attribute_name(:amount) %>:<%= current_cart.amount if current_cart %>
+      </div>
+    </div>
+    <div class="weui-tabbar__item">
+    <% if @checked_ids.present? %>
+      <%= link_to '结算', { controller: 'orders', action: 'new' }, class: 'weui-btn weui-btn_primary' %>
+    <% else %>
+      <button class="weui-btn weui-btn_primary weui-btn_disabled">结算</button>
+    <% end %>
+    </div>
+  </div>
+  <div class="weui-tabbar">
+    <%= render 'tab_bar_item' %>
+  </div>
+</div>

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

@@ -1,28 +1,16 @@
-<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>
+<tr>
+  <td class="has-text-right"><%= Trade::Cart.human_attribute_name(:payment_strategy_id) %></td>
+  <td><%= @cart.payment_strategy_id %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Trade::Cart.human_attribute_name(:deposit_ratio) %></td>
+  <td><%= @cart.deposit_ratio %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Trade::Cart.human_attribute_name(:buyer_type) %></td>
+  <td><%= @cart.buyer_type %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Trade::Cart.human_attribute_name(:buyer_id) %></td>
+  <td><%= @cart.buyer_id %></td>
+</tr>