rails_trade 0.0.1 → 0.0.2

data/app/views/trade/my/orders/wait.html+wechat.erb

@@ -0,0 +1,4 @@
+<div class="weui-loadmore">
+  <i class="weui-loading"></i>
+  <span class="weui-loadmore__tips">等待支付结果确认</span>
+</div>

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

@@ -0,0 +1,16 @@
+wx.ready(function() {
+  wx.chooseWXPay({
+    timestamp: '<%= @wxpay_order[:timeStamp] %>',
+    nonceStr: '<%= @wxpay_order[:nonceStr] %>',
+    package: '<%= @wxpay_order[:package] %>',
+    signType: '<%= @wxpay_order[:signType] %>',
+    paySign: '<%= @wxpay_order[:paySign] %>',
+    success: function(res) {
+      console.log(res)
+      window.location.href = '<%= wait_my_order_url(@order) %>'
+    },
+    error: function(e) {
+      alert(e)
+    }
+  })
+})

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

@@ -0,0 +1,5 @@
+<% if @wxpay_order['result_code'] == 'FAIL' %>
+  alert('<%= @wxpay_order['err_code_des'] %>')
+<% else %>
+  alert('出现错误')
+<% end %>

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

@@ -1,6 +1,6 @@
 <div class="ui modal">
   <i class="close icon"></i>
-  <div class="ui header blue">
+  <div class="ui header">
     Edit Payment Method
   </div>
 

data/app/views/{rails_trade_my → trade/my}/payment_methods/_index.html.erb

@@ -6,7 +6,7 @@
   <%= link_to 'Add New', new_my_payment_method_path, remote: true, class: 'ui teal button' %>
 </div>
 
-<table class="ui bottom attached table">
+<table class="ui bottom attached selectable table">
   <thead>
   <tr>
     <th>ID</th>

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

@@ -5,6 +5,6 @@
   <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: 'Are you sure?' } %>
+    <%= link_to 'Delete', my_payment_method_path(payment_method), class: 'ui mini button', remote: true, method: :delete, data: { confirm: t('.confirm') } %>
   </td>
 </tr>

data/app/views/{rails_trade_my → trade/my}/payment_methods/_new.html.erb

@@ -1,13 +1,13 @@
 <div class="ui modal">
   <i class="close icon"></i>
-  <div class="ui header blue">
+  <div class="ui header">
     Add Payment Method
   </div>
 
   <div class="content">
-    <%= default_form_with model: [:my, @payment_method] do |f| %>
+    <%= form_with model: [:my, @payment_method] do |f| %>
       <%= render partial: 'form', locals: { f: f } %>
     <% end %>
   </div>
 
-</div>
+</div>

data/app/views/trade/my/trade_items/_additions.html.erb

@@ -0,0 +1,12 @@
+<% current_cart.trade_promotes.each do |trade_promote| %>
+  <tr class="error">
+    <td></td>
+    <td><%= trade_promote.promote.name %></td>
+    <td></td>
+    <td></td>
+    <td><%= trade_promote.amount %></td>
+    <td></td>
+  </tr>
+<% end %>
+
+

data/app/views/trade/my/trade_items/_cart_item.js.erb

@@ -0,0 +1,2 @@
+$('#additions_body').html('<%= j(render partial: 'additions') %>');
+$('#total_price').html('<%= j(render partial: 'total_price') %>');

data/app/views/trade/my/trade_items/_single_price.html.erb

@@ -0,0 +1,6 @@
+<% if trade_item.discount_price < 0 %>
+  <span style="color: red;"><%= trade_item.discount_price %></span>
+  <i class="info circle icon" style="color: grey;"></i>
+<% end %>
+
+

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

@@ -0,0 +1,8 @@
+<p>原价：<%= current_cart.retail_price %></p>
+<p style="color: red;">批发折扣：<%= current_cart.discount_price %></p>
+<p>折后价格： <%= current_cart.bulk_price %></p>
+<p style="color: red;">优惠价格： <%= current_cart.reduced_amount %></p>
+<p>附加服务： <%= current_cart.additional_amount %></p>
+<p>最终价格： <%= current_cart.amount %></p>
+
+

data/app/views/trade/my/trade_items/_trade_items.html.erb

@@ -0,0 +1,68 @@
+<table class="ui table">
+  <thead>
+    <tr>
+      <th><%= check_box_tag :all %></th>
+      <th><%= TradeItem.human_attribute_name(:good_name) %></th>
+      <th><%= TradeItem.human_attribute_name(:price) %></th>
+      <th><%= TradeItem.human_attribute_name(:number) %></th>
+      <th><%= TradeItem.human_attribute_name(:amount) %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+  <% @trade_items.each do |trade_item| %>
+    <tr class="<%= 'active' if trade_item.checked? %>" id="trade_item_<%= trade_item.id %>">
+      <td>
+        <%= check_box_tag '[trade_item]status', trade_item.checked? ? 'init' : 'checked', trade_item.checked?, data: { method: :patch, remote: true, url: my_trade_item_path(trade_item), submit: true }, id: nil %>
+      </td>
+      <td>
+        <%= trade_item.good&.name %>
+        <p style="color: grey;"><%= trade_item.good_type %></p>
+      </td>
+      <td>
+        <p><%= trade_item.retail_price %></p>
+        <p><%= trade_item.quantity %><%= trade_item.unit %></p>
+      </td>
+      <td>
+        <div class="ui left right action input" data-controller="cart">
+          <div class="ui button" data-action="click->cart#decrease"><i class="fas fa-minus"></i></div>
+          <%= number_field_tag '[trade_item]number', trade_item.number, id: "quantity_#{trade_item.id}", step: 1, data: { action: 'change->cart#update', target: 'cart.number', url: my_trade_item_path(trade_item) } %>
+          <div class="ui button" data-action="click->cart#increase"><i class="fas fa-plus"></i></div>
+        </div>
+      </td>
+      <td>
+        <p id="retail_price_<%= trade_item.id %>">
+          <%= trade_item.wholesale_price %>
+        </p>
+        <p id="discount_price_<%= trade_item.id %>">
+          <%= render partial: 'trade/my/trade_items/single_price', locals: { trade_item: trade_item } %>
+        </p>
+      </td>
+      <td>
+        <%= link_to 'delete', my_trade_item_path(trade_item), method: :delete, remote: true %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+  <tbody id="additions_body">
+  <%= render 'trade/my/trade_items/additions' %>
+  </tbody>
+  <tfoot>
+    <tr>
+      <th colspan="4"></th>
+      <th id="total_price">
+        <%= render 'trade/my/trade_items/total_price' %>
+      </th>
+      <th></th>
+    </tr>
+    <tr>
+      <th colspan="5">
+        <div class="">
+          <%= link_to '去结算', new_my_order_path, class: 'ui red right floated button', id: 'new_order' %>
+        </div>
+      </th>
+      <th></th>
+    </tr>
+  </tfoot>
+</table>
+

data/app/views/trade/my/trade_items/create.html.erb

@@ -0,0 +1 @@
+<%= render 'trade/my/trade_items/trade_items' %>

data/app/views/trade/my/trade_items/update.js.erb

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

data/app/views/trade/payments/_wxpay_result.html.erb

@@ -0,0 +1,3 @@
+<div class="ui active dimmer">
+  <div class="ui indeterminate text loader">支付校验中</div>
+</div>

data/app/views/trade/payments/wxpay_result.js.erb

@@ -0,0 +1 @@
+$('body').append('<%= j(render 'wxpay_result') %>')

data/config/locales/en.enum.yml

@@ -0,0 +1,47 @@
+en:
+  activerecord:
+    enum:
+      order:
+        payment_type:
+          paypal: Paypal
+          alipay: Alipay
+          stripe: Stripe
+      payment:
+        type:
+          HandPayment: Hand Record
+          BankPayment: Bank Record
+          PaypalPayment: Paypal
+        state:
+          init: 未核销
+          part_checked: 部分核销
+          all_checked: 全部核销
+          abusive_checked: 问题核销
+      payment_order:
+        state:
+          init: 预核销
+          confirmed: 已核销
+      promote:
+        type:
+          QuantityPromote: 总重量
+          NumberPromote: 购买件数
+          AmountPromote: 总金额
+        scope:
+          total: 全部应用
+          single: 单独应用
+      promote_charge:
+        type:
+          DiscountPromoteCharge: Discount
+          FinalPromoteCharge: Final
+          MinusPromoteCharge: Minus
+          CashPromoteCharge: Cash
+      serve:
+        type:
+          QuantityServe: 总重量
+          NumberServe: 购买件数
+        scope:
+          total: 全部应用
+          single: 单独应用
+      serve_charge:
+        type:
+          SingleServeCharge: Single Charge
+          TotalServeCharge: Total Charge

data/config/locales/en.yml

@@ -1,48 +1,32 @@
 en:
-  rails_trade_admin:
-    payments:
-      index:
-        add_new: add
-        import: Import
-        init: 预核销
-        confirmed: 未预核销
-      item:
-        edit: Edit
-        destroy: Destroy
-        show: 支付方式
-        checking: 核销
-        analyze: 分析支付方式
-        adjust: 平账
-    payment_methods:
-      index_layout:
-        remove: Remove
-        edit: Edit
-        destroy: Delete
-        new: Add
-        relate: Refer Buyer
+  trade:
+    admin:
+      payments:
+        index:
+          add_new: add
+          import: Import
+          init: 预核销
+          confirmed: 未预核销
+        item:
+          edit: Edit
+          destroy: Destroy
+          show: 支付方式
+          checking: 核销
+          analyze: 分析支付方式
+          adjust: 平账
+      payment_methods:
+        index_layout:
+          remove: Remove
+          edit: Edit
+          destroy: Delete
+          new: Add
+          relate: Refer Buyer
   activerecord:
     models:
       role: ''
     attributes:
-      address/kind:
-        transport: Transport
-        forwarder: Forwarder
-        invoice: Invoice
       buyer:
         name: 公司名称
-      order/payment_type:
-        paypal: Paypal
-        alipay: Alipay
-        stripe: Stripe
-      payment/type:
-        HandPayment: Hand Record
-        BankPayment: Bank Record
-        PaypalPayment: Paypal
-      payment/state:
-        init: 未核销
-        part_checked: 部分核销
-        all_checked: 全部核销
-        abusive_checked: 问题核销
       payment:
         total_amount: 总金额
         income_amount: 净收入
@@ -61,25 +45,3 @@ en:
         bank: Bank
         verified: Verified
         payment_references: Associated Account
-      payment_order/state:
-        init: 预核销
-        confirmed: 已核销
-      promote/type:
-        QuantityPromote: 总重量
-        NumberPromote: 购买件数
-        AmountPromote: 总金额
-      promote/scope:
-        total: 全部应用
-        single: 单独应用
-      promote_charge/type:
-        SinglePromoteCharge: Single Charge
-        TotalPromoteCharge: Total Charge
-      serve/type:
-        QuantityServe: 总重量
-        NumberServe: 购买件数
-      serve/scope:
-        total: 全部应用
-        single: 单独应用
-      serve_charge/type:
-        SingleServeCharge: Single Charge
-        TotalServeCharge: Total Charge

data/config/locales/zh.attributes.yml

@@ -0,0 +1,75 @@
+zh:
+  activerecord:
+    models:
+      role: ''
+    attributes:
+      order:
+        uuid: 订单号
+        payment_status: 付款状态
+        payment_type: 支付方式
+        amount: 金额
+        received_amount: 已收金额
+        currency: 币种
+        user_id: 购买者
+        extra: 附加信息
+      trade_item:
+        good_id: 商品
+        number: 数量
+        original_amount: 原价
+        additional_amount: 附加费
+        reduced_amount: 优惠金额
+        amount: 总价
+      trade_promote:
+        amount: 金额
+      payment:
+        total_amount: 总金额
+        income_amount: 净收入
+        checked_amount: 已核销金额
+        fee_amount: 手续费
+        adjust_amount: 冲抵
+        buyer_name: 账号名称
+        buyer_name-like: 账号名称包含
+        buyer_identifier: 账号
+        buyer_bank: 银行
+        notified_at: 通知时间
+        type: 类别
+        comment: 备注
+        state: 状态
+        payment_uuid: 流水号
+      payment/orders:
+        uuid: 订单号
+      payment_method:
+        account_name: 账号名称
+        account_num: 账号
+        bank: 银行
+        verified: 已审核
+        payment_references: 关联账号
+      payment_order:
+        state: 核销状态
+        check_amount: 核销金额
+      promote:
+        short_name: 简称
+        code: 编码
+        scope: 应用范围
+        editable: 是否可改价
+        effect_at: 生效时间
+        expire_at: 过期时间
+        metering: 单位
+        sequence: 序列
+      promote_good:
+        good_type: 商品类型
+        good_id: 商品
+        promote_id: 优惠券
+        status: 状态
+      promote_buyer:
+        buyer_type: 用户类型
+        status: 状态
+      promote_charge:
+        value: 值
+        min: 起始值
+        max: 结束值
+        contain_min: 包含起始值
+        contain_max: 包含结束值
+        extra: 额外参数
+        parameter: 参数
+        base_price: 基础价格

data/config/locales/zh.controller.yml

@@ -0,0 +1,51 @@
+zh:
+  trade:
+    admin:
+      orders:
+        index:
+          title: 订单
+          add_payment: 添加支付流水
+          refund: 申请退款
+          refund_list: 退款详情
+      payments:
+        index:
+          title: 支付流水
+          new: 新增
+          import: 导入
+          init: 预核销
+          confirmed: 未预核销
+        item:
+          edit: 编辑
+          destroy: 删除
+          show: 支付方式
+          checking: 核销
+          analyze: 分析支付方式
+          adjust: 平账
+      payment_methods:
+        index_layout:
+          remove: 移除
+          edit: 编辑
+          destroy: 删除
+          new: 新增
+          relate: 关联买家
+        index:
+          title: 支付方式
+      promotes:
+        index:
+          title: 促销
+      promote_charges:
+        index:
+          title: 服务计算细则
+      promote_buyers:
+        index:
+          title: 优惠券发放
+      refunds:
+        index:
+          title: 退款列表
+    my:
+      carts:
+        show:
+          title: 我的购物车
+      orders:
+        index:
+          title: 我的订单