rails_trade 0.0.2 → 0.0.3

data/config/locales/zh.controller.yml

@@ -1,6 +1,20 @@
 zh:
   trade:
+    title: 电商
     admin:
+      title: 交易管理
+      card_advances:
+        index:
+          title: 充值明细
+      card_payments:
+        index:
+          title: 支付
+      card_prepayments:
+        index:
+          title: 充值码
+      carts:
+        index:
+          title: 购物用户
       orders:
         index:
           title: 订单
@@ -36,16 +50,54 @@ zh:
       promote_charges:
         index:
           title: 服务计算细则
-      promote_buyers:
+      promote_carts:
         index:
           title: 优惠券发放
       refunds:
         index:
           title: 退款列表
+      card_templates:
+        index:
+          title: 会员卡
+      card_promotes:
+        index:
+          title: 促销设置
+      cards:
+        index:
+          title: 会员卡记录
+      card_logs:
+        index:
+          title: 用卡日志
+      advances:
+        index:
+          title: 充值设置
+      cashes:
+        index:
+          title: 现金
+      payouts:
+        index:
+          title: 提现
     my:
+      title: 订单
       carts:
         show:
           title: 我的购物车
       orders:
         index:
           title: 我的订单
+        new:
+          title: 确认订单
+          confirm: 确认订单
+        edit_payment_type:
+          title: 支付方式
+        wxpay_pc_pay:
+          title: 微信支付
+          tip: 订单提交成功，请尽快完成付款。
+        success:
+          title: 你的订单已支付成功！
+          tip: 我们会尽快处理您的订单。
+    panel:
+      title: 电商设置
+      exchange_rates:
+        index:
+          title: 汇率设置

data/config/locales/zh.enum.yml

@@ -1,7 +1,16 @@
 zh:
   activerecord:
     enum:
-      order:
+      trade/card:
+        type:
+          Trade::CounterCard: 次卡
+          Trade::VipCard: 会员
+          Trade::SvfCard: 储值卡
+      trade/card_log:
+        source_type:
+          Trade::CardAdvance: 充值
+          Trade::CardPayment: 支付
+      trade/order:
         payment_status:
           unpaid: 未支付
           part_paid: 部分支付
@@ -9,50 +18,67 @@ zh:
           refunding: 退款中
           refunded: 已退款
           denied: 退款失败
-      payment:
+      trade/payment:
         type:
-          HandPayment: 后台支付
-          BankPayment: 银行支付
-          PaypalPayment: Paypal
+          Trade::HandPayment: 后台支付
+          Trade::BankPayment: 银行支付
+          Trade::PaypalPayment: Paypal
+          Trade::WxpayPayment: 微信支付
+          Trade::AlipayPayment: 支付宝
         state:
           init: 未核销
           part_checked: 部分核销
           all_checked: 全部核销
           adjust_checked: 调整核销
           abusive_checked: 问题核销
-      payment_order:
+      trade/payment_order:
         state:
           init: 待确认
           confirmed: 已确认
-      promote:
+      trade/promote:
         scope:
           overall: 全体商品
           single: 单个商品
         metering:
           number: 购买件数
-          amount: 总金额
+          original_amount: 总金额
           weight: 总重量
           volume: 体积
-      trade_promote:
+      trade/trade_item:
+        good_type:
+          Facilitate: 标准化服务
+      trade/trade_promote:
         scope:
           overall: 全体商品
           single: 单个商品
-      promote_charge:
+      trade/promote_charge:
         type:
-          DiscountPromoteCharge: 折扣
-          FinalPromoteCharge: 一口价
-          MinusPromoteCharge: 满减
-          CashPromoteCharge: 抵扣券
-          PlusPromoteCharge: 附加费用
-      promote_good:
+          Trade::DiscountPromoteCharge: 折扣
+          Trade::FinalPromoteCharge: 一口价
+          Trade::MinusPromoteCharge: 满减/抵扣券
+          Trade::PlusPromoteCharge: 附加费用
+      trade/promote_good:
         status:
           default: 默认生效
           available: 适用
           unavailable: 不适用
           specific: 特定的
-      promote_buyer:
+      trade/promote_cart:
         state:
           unused: 未使用
           used: 已使用
           expired: 已过期
-
+      trade/payout:
+        state:
+          pending: 待处理
+          done: 提现成功
+          failed: 提现失败，核查中
+      trade/refund:
+        state:
+          init: 待退款
+          completed: 已完成
+          failed: 退款失败
+          denied: 拒绝退款
+        type:
+          Trade::CardRefund: 会员卡
+          Trade::WxpayRefund: 微信支付

data/config/locales/zh.help.yml

@@ -1,7 +1,7 @@
-zh:
-  activerecord:
-    help:
-      promote:
-        scope: 是否可以对多个商品进行统一计算
-      trade_promote:
-        amount: 负数表示减少金额，正数表示增加金额
+zh:
+  activerecord:
+    help:
+      promote:
+        scope: 是否可以对多个商品进行统一计算
+      trade_promote:
+        amount: 负数表示减少金额，正数表示增加金额

data/config/locales/zh.yml

@@ -0,0 +1,24 @@
+zh:
+  activerecord:
+    attributes:
+      wallet/type:
+        IosWallet: ios钱包
+        NormalWallet: 普通钱包
+  card_log:
+    income:
+      card_advance:
+        title: 用户充值
+        tag_str: 充值
+      card_given:
+        title: 系统赠送
+        tag_str: 赠送
+    expense:
+      svf_card_payment:
+        title: 储值卡支付
+        tag_str: 支付
+  cash_log:
+    income:
+      cash_given:
+        title: 系统赠予
+        tag_str: 收入
+

data/config/routes.rb

@@ -1,104 +1,179 @@
 Rails.application.routes.draw do
 
-  scope module: 'trade' do
+  namespace :trade, defaults: { business: 'trade' } do
     resources :payments, only: [:index] do
-      get :result, on: :collection
-      match :notify, on: :collection, via: [:get, :post]
-      match :alipay_notify, on: :collection, via: [:get, :post]
-      match :wxpay_notify, on: :collection, via: [:get, :post]
+      collection do
+        get :result
+        match :notify, via: [:get, :post]
+        match :alipay_notify, via: [:get, :post]
+        match :wxpay_notify, via: [:get, :post]
+      end
     end
-    resources :buyers, only: [] do
-      get :search, on: :collection
+    resources :card_templates do
+      resources :advances
     end
-  end
-
-  scope :admin, module: 'trade/admin', as: 'admin' do
-    get 'trade' => 'trade#index'
 
-    resources :buyers do
-      get :overdue, on: :collection
-      get :orders, on: :member
-      put :remind, on: :collection
+    namespace :panel, defaults: { namespace: 'panel' } do
+      resources :exchange_rates
     end
-    resources :carts, except: [:new] do
-      get :total, on: :collection
-      get :doc, on: :collection
-      get :only, on: :collection
-      resources :cart_serves do
-        get :single, on: :collection
-        get :total, on: :collection
-        post :add, on: :collection
+
+    namespace :admin, defaults: { namespace: 'admin' } do
+      get 'trade' => 'trade#index'
+      resources :users do
+        collection do
+          get :overdue
+          put :remind
+        end
+        member do
+          get :orders
+        end
       end
+      resources :carts, except: [:new] do
+        collection do
+          get :total
+          get :doc
+          get :only
+        end
+      end
+      resources :orders do
+        collection do
+          get :payments
+          get :refresh
+        end
+        member do
+          patch :refund
+        end
+        resources :order_payments
+      end
+      resources :trade_items
+      resources :trade_promotes
+      resources :payments do
+        collection do
+          get :dashboard
+        end
+        member do
+          patch :analyze
+          patch :adjust
+        end
+        resources :payment_orders do
+          member do
+            patch :cancel
+          end
+        end
+      end
+      resources :payment_strategies
+      resources :payment_methods do
+        collection do
+          get :unverified
+          get :mine
+        end
+        member do
+          patch :verify
+          patch :merge_from
+        end
+        resources :payment_references, as: :references
+      end
+      resources :produces
+      resources :promotes do
+        collection do
+          get :search
+        end
+        resources :promote_charges, as: 'charges'
+      end
+      resources :promote_charges, only: [] do
+        collection do
+          get :options
+        end
+      end
+      resources :promote_carts
+      resources :promote_goods do
+        collection do
+          get :goods
+        end
+      end
+      resources :refunds do
+        member do
+          patch :confirm
+          patch :deny
+        end
+      end
+      resources :card_templates do
+        collection do
+          get :advance_options
+        end
+        resources :advances
+        resources :card_promotes
+        resources :card_prepayments
+      end
+      resources :cards do
+        resources :card_logs
+        resources :card_advances
+        resources :card_payments
+      end
+      resources :cashes
+      resources :cash_givens
+      resources :payouts do
+        member do
+          put :do_pay
+        end
+      end
+      resources :cash_logs
     end
-    resources :orders do
-      get :payments, on: :collection
-      get :refresh, on: :collection
-      patch :refund, on: :member
-      resources :order_payments
-    end
-    resources :trade_items
-    resources :trade_promotes
-    resources :payments do
-      resources :payment_orders do
-        patch :cancel, on: :member
-      end
-      get :dashboard, on: :collection
-      patch :analyze, on: :member
-      patch :adjust, on: :member
-    end
-    resources :payment_strategies
-    resources :payment_methods do
-      resources :payment_references, as: :references
-      get :unverified, on: :collection
-      get :mine, on: :collection
-      patch :verify, on: :member
-      patch :merge_from, on: :member
-    end
-    resources :produces
-    resources :promotes do
-      get :search, on: :collection
-      resources :promote_charges, as: 'charges'
-    end
-    resources :promote_charges, only: [] do
-      get :options, on: :collection
-    end
-    resources :promote_buyers
-    resources :promote_goods do
-      get :goods, on: :collection
-    end
-    resources :refunds do
-      patch :confirm, on: :member
-      patch :deny, on: :member
-    end
-  end
 
-  scope :my, module: 'trade/my', as: 'my' do
-    resource :cart, only: [:show, :edit, :update] do
-      get :total, on: :member
-    end
-    resources :trade_items
-    resources :good_providers
-    resources :orders do
-      collection do
-        post :direct
-        get :refresh
-      end
-      member do
-        get :paypal_pay
-        get :alipay_pay
-        get :wxpay_pay
-        patch :stripe_pay
-        get :paypal_execute
-        get :pay
-        get 'payment_type' => :edit_payment_type
-        get 'cancel' => :edit_cancel
-        put 'cancel' => :update_cancel
-        put :refund
-        get :wait
+    namespace :my, defaults: { namespace: 'my' } do
+      resource :cart do
+        match :add, via: [:get, :post]
+        member do
+          get :addresses
+        end
+      end
+      resources :trade_items do
+        member do
+          patch :toggle
+          get :promote
+        end
+      end
+      resources :orders do
+        collection do
+          post :direct
+          get :refresh
+        end
+        member do
+          get :paypal_pay
+          get :alipay_pay
+          get :wxpay_pay
+          get :wxpay_pc_pay
+          patch :stripe_pay
+          get :paypal_execute
+          get :pay
+          get :payment_types
+          get 'payment_type' => :edit_payment_type
+          get 'cancel' => :edit_cancel
+          put 'cancel' => :update_cancel
+          put :refund
+          get :success
+        end
+      end
+      resources :payments
+      resources :payment_methods
+      resources :advances do
+        member do
+          get :order
+        end
+      end
+      resources :cards do
+        collection do
+          get :token
+        end
+      end
+      resources :card_logs, only: [:index]
+      resources :cash_logs, only: [:index]
+      resources :payouts, only: [:index, :create] do
+        collection do
+          get :list
+        end
       end
     end
-    resources :order_items
-    resources :payment_methods
   end
 
 end