rails_trade 0.0.2 → 0.0.3

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

@@ -1 +1,5 @@
-<%= render 'index' %>
+<%= render layout: 'index_table', locals: { cache_key: Trade::PaymentMethod.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @payment_methods, as: :payment_method %>
+<% end %>
+
+<%= paginate @payment_methods %>

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

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

data/app/views/trade/my/payments/_filter_form.html.erb

@@ -0,0 +1,9 @@
+<%= form_with theme: 'search', model: Trade::Payment.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/payments/_form.html.erb

@@ -0,0 +1,2 @@
+<%= render 'error_messages', target: f.object %>
+<%= f.text_field :total_amount %>

data/app/views/trade/my/payments/_index_tbody.html.erb

@@ -0,0 +1 @@
+<td><%= model.total_amount %></td>

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

@@ -0,0 +1,2 @@
+<th><%= Trade::Payment.human_attribute_name(:total_amount) %></th>
+<th></th>

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

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

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

@@ -0,0 +1,4 @@
+<tr>
+  <td class="has-text-right"><%= Trade::Payment.human_attribute_name(:total_amount) %></td>
+  <td><%= @payment.total_amount %></td>
+</tr>

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

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

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

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

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

@@ -0,0 +1,5 @@
+<%= render layout: 'index_table', locals: { cache_key: Trade::Payment.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @payments, as: :model %>
+<% end %>
+
+<%= paginate @payments %>

data/app/views/trade/my/payouts/_payout.json.jbuilder

@@ -0,0 +1,11 @@
+json.extract!(
+  payout,
+  :id,
+  :type,
+  :requested_amount,
+  :actual_amount,
+  :state,
+  :state_i18n,
+  :paid_at,
+  :created_at
+)

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

@@ -0,0 +1,3 @@
+json.payouts @payouts, partial: 'payout', as: :payout
+json.cash @cash, :id, :amount, :expense_amount
+json.partial! 'api/shared/pagination', items: @payouts

data/app/views/trade/my/payouts/list.json.jbuilder

@@ -0,0 +1,2 @@
+json.payout_lists @payout_lists
+json.cash current_user.cash, :id, :amount, :expense_amount

data/app/views/trade/my/payouts/show.json.jbuilder

@@ -0,0 +1 @@
+json.payout @payout, partial: 'payout', as: :payout

data/app/views/trade/my/shared/_cash.json.jbuilder

@@ -0,0 +1,6 @@
+json.extract!(
+  cash,
+  :id,
+  :amount,
+  :income_amount
+)

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

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

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

@@ -0,0 +1,12 @@
+<div class="is-relative" data-hover-target="card">
+  <div class="as-tooltip">
+    <div class="card">
+      <div class="card-content">
+        <% @trade_item.trade_promotes.each do |trade_promote| %>
+          <p><%= trade_promote.promote.name %>: <%= trade_promote.amount %></p>
+        <% end %>
+      </div>
+    </div>
+    <div class="as-tooltip-arrow"></div>
+  </div>
+</div>

data/app/views/trade/my/trade_items/toggle.turbo_stream.erb

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

data/app/views/trade/panel/exchange_rates/_edit_form.html.erb

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

data/app/views/trade/panel/exchange_rates/_filter_form.html.erb

@@ -0,0 +1,9 @@
+<%= form_with theme: 'search', model: Trade::ExchangeRate.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/panel/exchange_rates/_form.html.erb

@@ -0,0 +1,4 @@
+<%= render 'error_messages', target: f.object %>
+<%= f.select :from, options_for_select(Trade::ExchangeRate.currency_options, f.object.from) %>
+<%= f.select :to, options_for_select(Trade::ExchangeRate.currency_options, f.object.to) %>
+<%= f.number_field :rate, step: 0.01 %>

data/app/views/trade/panel/exchange_rates/_index_tbody.html.erb

@@ -0,0 +1,3 @@
+<td><%= model.from %></td>
+<td><%= model.to %></td>
+<td><%= model.rate %></td>

data/app/views/trade/panel/exchange_rates/_index_thead.html.erb

@@ -0,0 +1,4 @@
+<th><%= Trade::ExchangeRate.human_attribute_name(:from) %></th>
+<th><%= Trade::ExchangeRate.human_attribute_name(:to) %></th>
+<th><%= Trade::ExchangeRate.human_attribute_name(:rate) %></th>
+<th></th>

data/app/views/trade/panel/exchange_rates/_new_form.html.erb

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

data/app/views/trade/panel/exchange_rates/_show_table.html.erb

@@ -0,0 +1,12 @@
+<tr>
+  <td class="has-text-right"><%= Trade::ExchangeRate.human_attribute_name(:from) %></td>
+  <td><%= @exchange_rate.from %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Trade::ExchangeRate.human_attribute_name(:to) %></td>
+  <td><%= @exchange_rate.to %></td>
+</tr>
+<tr>
+  <td class="has-text-right"><%= Trade::ExchangeRate.human_attribute_name(:rate) %></td>
+  <td><%= @exchange_rate.rate %></td>
+</tr>

data/app/views/trade/panel/exchange_rates/index.html.erb

@@ -0,0 +1,5 @@
+<%= render layout: 'index_table', locals: { cache_key: Trade::ExchangeRate.column_names.hash } do %>
+  <%= render partial: 'index_tbody', layout: 'index_tr', collection: @exchange_rates, as: :model %>
+<% end %>
+
+<%= paginate @exchange_rates %>

data/config/locales/en.attributes.yml

@@ -0,0 +1,35 @@
+en:
+  activerecord:
+    attributes:
+      cash:
+        user: 所属用户
+        amount: 数额
+        income_amount: 收入
+        expense_amount: 提现数额
+      cash_log:
+        title: 摘要
+        amount: 数额
+        tag_str: 交易类别
+      coin_exchange/state:
+        pending: Pending
+        handling: Handling
+        rejected: Rejected
+        done: Done
+      payment:
+        total_amount: 总金额
+        income_amount: 净收入
+        fee_amount: 手续费
+        adjust_amount: 四舍五入
+        buyer_name: 账号名称
+        buyer_identifier: 账号
+        buyer_bank: 银行
+        notified_at: 通知时间
+        uuid: 流水号
+        type: 类别
+        comment: 备注
+      payment_method:
+        account_name: Account Name
+        account_num: Account
+        bank: Bank
+        verified: Verified
+        payment_references: Associated Account

data/config/locales/en.controller.yml

@@ -0,0 +1,73 @@
+en:
+  trade:
+    admin:
+      title: Order And Payment
+      advances:
+        index:
+          title: Advances
+      cards:
+        index:
+          title: Cards
+      card_templates:
+        index:
+          title: Card Settings
+      card_prepayments:
+        index:
+          title: Card Prepayments
+      card_promotes:
+        index:
+          title: Card Promotes
+      carts:
+        index:
+          title: Carts
+      cashes:
+        index:
+          title: Cashes
+      orders:
+        index:
+          title: Orders
+      payments:
+        index:
+          title: Payments
+          add_new: add
+          import: Import
+          init: 预核销
+          confirmed: 未预核销
+        item:
+          edit: Edit
+          destroy: Destroy
+          show: 支付方式
+          checking: 核销
+          analyze: 分析支付方式
+          adjust: 平账
+      payment_methods:
+        index:
+          title: Payment Methods
+        index_layout:
+          remove: Remove
+          edit: Edit
+          destroy: Delete
+          new: Add
+          relate: Refer Buyer
+      promotes:
+        index:
+          title: Promotes
+      payouts:
+        index:
+          title: Payouts
+    my:
+      title: Orders
+      carts:
+        show:
+          title: Cart
+      orders:
+        index:
+          title: Order list
+        new:
+          title: Confirm Order
+          confirm: Confirm
+        payment_types:
+          title: Check
+        success:
+          title: Your payment is successful!
+          tip: We will ship out your order and update you with dispatch detail!

data/config/locales/en.yml

@@ -1,47 +1,31 @@
 en:
-  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:
-      buyer:
-        name: 公司名称
-      payment:
-        total_amount: 总金额
-        income_amount: 净收入
-        fee_amount: 手续费
-        adjust_amount: 四舍五入
-        buyer_name: 账号名称
-        buyer_identifier: 账号
-        buyer_bank: 银行
-        notified_at: 通知时间
-        uuid: 流水号
-        type: 类别
-        comment: 备注
-      payment_method:
-        account_name: Account Name
-        account_num: Account
-        bank: Bank
-        verified: Verified
-        payment_references: Associated Account
+      wallet/type:
+        IosWallet: Ios Wallet
+        NormalWallet: Normal Wallet
+  wallet_log:
+    income:
+      user_advance:
+        title: 用户充值
+        tag_str: 充值
+      coin_wallet:
+        title: 金币兑换氧育币
+        tag_str: 兑换收入
+    expense:
+      wallet_payment:
+        tag_str: 氧育币支出
+  cash_log:
+    income:
+      cash_given:
+        title: 系统赠予
+        tag_str: 收入
+  coin_log:
+    income:
+      wallet_coin:
+        title: 虚拟币兑换金币
+        tag_str: 兑换收入
+    expense:
+      coin_wallet:
+        title: 金币兑换氧育币
+        tag_str: 兑换支出

data/config/locales/zh.attributes.yml

@@ -1,9 +1,41 @@
 zh:
   activerecord:
-    models:
-      role: ''
     attributes:
-      order:
+      trade/advance:
+        amount: 额度
+        price: 价格
+        apple_product_id: iOS内购配置
+      trade/card:
+        card_template_id: 会员卡类型
+        user_id: 购买人
+        card_uuid: 卡号
+        effect_at: 生效时间
+        expire_at: 失效时间
+        amount: 剩余额度
+        income_amount: 初始额度
+        expense_amount: 已用额度
+        client_id: 持卡人
+      trade/card/card_template:
+        name: 卡类型
+      trade/card_advance:
+        amount: 金额
+      trade/card_log:
+        tag_str: 标签
+        source_type: 来源类型
+        source_id: 来源
+        amount: 额度
+      trade/card_promote:
+        income_min: 充值大于
+        income_max: 充值少于
+        promote_id: 优惠内容
+      trade/cart:
+        retail_price: 原价
+        discount_price: 优惠价格
+        bulk_price: 批发价
+        overall_additional_amount: 附加费用
+        overall_reduced_amount: 优惠费用
+        amount: 总金额
+      trade/order:
         uuid: 订单号
         payment_status: 付款状态
         payment_type: 支付方式
@@ -12,21 +44,24 @@ zh:
         currency: 币种
         user_id: 购买者
         extra: 附加信息
-      trade_item:
+      trade/trade_item:
         good_id: 商品
+        good_name: 商品名称
+        single_price: 单价
         number: 数量
         original_amount: 原价
         additional_amount: 附加费
         reduced_amount: 优惠金额
         amount: 总价
-      trade_promote:
+      trade/trade_promote:
         amount: 金额
-      payment:
+      trade/payment:
         total_amount: 总金额
         income_amount: 净收入
         checked_amount: 已核销金额
         fee_amount: 手续费
         adjust_amount: 冲抵
+        refunded_amount: 退款金额
         buyer_name: 账号名称
         buyer_name-like: 账号名称包含
         buyer_identifier: 账号
@@ -36,35 +71,40 @@ zh:
         comment: 备注
         state: 状态
         payment_uuid: 流水号
-      payment/orders:
+      trade/payment/orders:
         uuid: 订单号
-      payment_method:
+      trade/payment_method:
         account_name: 账号名称
         account_num: 账号
         bank: 银行
         verified: 已审核
         payment_references: 关联账号
-      payment_order:
+      trade/payment_order:
         state: 核销状态
         check_amount: 核销金额
-      promote:
+      trade/promote:
         short_name: 简称
         code: 编码
         scope: 应用范围
         editable: 是否可改价
-        effect_at: 生效时间
-        expire_at: 过期时间
         metering: 单位
         sequence: 序列
-      promote_good:
+        valid_years: 有效年
+        valid_months: 有效月
+        valid_days: 有效日
+      trade/promote_good:
         good_type: 商品类型
         good_id: 商品
         promote_id: 优惠券
         status: 状态
-      promote_buyer:
-        buyer_type: 用户类型
+        effect_at: 生效时间
+        expire_at: 过期时间
+      trade/promote_cart:
+        cart_id: 用户类型
         status: 状态
-      promote_charge:
+        effect_at: 生效时间
+        expire_at: 过期时间
+      trade/promote_charge:
         value: 值
         min: 起始值
         max: 结束值
@@ -73,3 +113,25 @@ zh:
         extra: 额外参数
         parameter: 参数
         base_price: 基础价格
+      trade/refund:
+        refunded_at: 退款时间
+        total_amount: 金额
+        order_id: 订单
+        payment_id: 支付
+      trade/cash:
+        user: 所属用户
+        amount: 数额
+        income_amount: 收入
+        expense_amount: 提现数额
+        account_bank: 开户银行
+        account_name: 户名
+        account_num: 账号
+      trade/cash_log:
+        title: 摘要
+        amount: 数额
+        tag_str: 交易类别
+      trade/card_template:
+        valid_years: 有效年
+        valid_months: 有效月
+        valid_days: 有效天数
+        default: 默认显示