rails_trade 0.0.1 → 0.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (616) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE +1 -1
  3. data/README.md +37 -15
  4. data/Rakefile +9 -27
  5. data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/cart_items/create.js +0 -0
  6. data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/cart_items/index.js +0 -0
  7. data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/cart_items/only.js +0 -0
  8. data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/orders/new.js +0 -0
  9. data/app/assets/javascripts/controllers/trade/admin/payment_methods/edit.js +1 -0
  10. data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/payment_methods/new.js +0 -0
  11. data/app/assets/javascripts/controllers/trade/admin/payments/edit.js +1 -0
  12. data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/payments/new.js +0 -0
  13. data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/promote_buyers/edit.js +0 -0
  14. data/app/assets/javascripts/controllers/{rails_trade_admin → trade/admin}/promote_buyers/new.js +3 -1
  15. data/app/assets/javascripts/controllers/trade/admin/promote_charges/edit.js +1 -0
  16. data/app/assets/javascripts/controllers/trade/admin/promote_charges/new.js +7 -0
  17. data/app/assets/javascripts/controllers/trade/admin/promote_goods/edit.js +1 -0
  18. data/app/assets/javascripts/controllers/trade/admin/promote_goods/new.js +17 -0
  19. data/app/assets/javascripts/controllers/trade/admin/promotes/edit.js +2 -0
  20. data/app/assets/javascripts/controllers/trade/admin/promotes/new.js +5 -0
  21. data/app/assets/javascripts/controllers/trade/admin/refunds/index.js +1 -0
  22. data/app/assets/javascripts/controllers/trade/admin/refunds/new.js +1 -0
  23. data/app/assets/javascripts/controllers/trade/my/carts/show-phone-ready.js +1 -0
  24. data/app/assets/javascripts/controllers/trade/my/carts/show-ready.js +28 -0
  25. data/app/assets/javascripts/controllers/trade/my/orders/wait-phone.js +8 -0
  26. data/app/{views/goods/show.html.erb → assets/javascripts/controllers/trade/my/trade_items/create.js} +0 -0
  27. data/app/assets/stylesheets/controllers/trade/admin/promote_charges/index.css +4 -0
  28. data/app/assets/stylesheets/controllers/trade/admin/promotes/index.css +4 -0
  29. data/app/{views/rails_trade_admin/orders/edit.html.erb → assets/stylesheets/controllers/trade/my/carts/show-phone.css} +0 -0
  30. data/app/assets/stylesheets/controllers/trade/payments/wxpay_result.css +57 -0
  31. data/app/channels/paid_channel.rb +7 -0
  32. data/app/controllers/concerns/controller_order_types.rb +3 -6
  33. data/app/controllers/rails_trade/my_cart.rb +16 -0
  34. data/app/controllers/trade/admin/base_controller.rb +5 -0
  35. data/app/controllers/{the_trade_admin → trade/admin}/buyers_controller.rb +3 -3
  36. data/app/controllers/{the_trade_admin/cart_item_serves_controller.rb → trade/admin/cart_serves_controller.rb} +8 -5
  37. data/app/controllers/{goods_controller.rb → trade/admin/goods_controller.rb} +7 -1
  38. data/app/controllers/{the_trade_admin → trade/admin}/order_payments_controller.rb +6 -3
  39. data/app/controllers/{the_trade_admin → trade/admin}/orders_controller.rb +23 -16
  40. data/app/controllers/{the_trade_admin → trade/admin}/payment_methods_controller.rb +8 -5
  41. data/app/controllers/{the_trade_admin → trade/admin}/payment_orders_controller.rb +10 -12
  42. data/app/controllers/{the_trade_admin → trade/admin}/payment_references_controller.rb +3 -3
  43. data/app/controllers/{the_trade_admin → trade/admin}/payment_strategies_controller.rb +9 -5
  44. data/app/controllers/trade/admin/payments_controller.rb +97 -0
  45. data/app/controllers/{the_trade_admin → trade/admin}/produces_controller.rb +4 -4
  46. data/app/controllers/trade/admin/promote_buyers_controller.rb +57 -0
  47. data/app/controllers/trade/admin/promote_charges_controller.rb +67 -0
  48. data/app/controllers/trade/admin/promote_goods_controller.rb +63 -0
  49. data/app/controllers/trade/admin/promotes_controller.rb +69 -0
  50. data/app/controllers/{the_trade_admin → trade/admin}/refunds_controller.rb +9 -12
  51. data/app/controllers/{the_trade_admin/cart_items_controller.rb → trade/admin/trade_items_controller.rb} +26 -28
  52. data/app/controllers/trade/admin/trade_promotes_controller.rb +71 -0
  53. data/app/controllers/trade/buyers_controller.rb +8 -0
  54. data/app/controllers/trade/my/base_controller.rb +4 -0
  55. data/app/controllers/trade/my/carts_controller.rb +32 -0
  56. data/app/controllers/{the_trade_my → trade/my}/order_items_controller.rb +4 -4
  57. data/app/controllers/trade/my/orders_controller.rb +106 -0
  58. data/app/controllers/{the_trade_my → trade/my}/payment_methods_controller.rb +1 -1
  59. data/app/controllers/trade/my/trade_items_controller.rb +47 -0
  60. data/app/controllers/trade/payments_controller.rb +71 -0
  61. data/app/models/cart.rb +4 -0
  62. data/app/models/order.rb +4 -0
  63. data/app/models/payment.rb +4 -0
  64. data/app/models/payment/alipay_payment.rb +3 -0
  65. data/app/models/payment/apple_payment.rb +3 -0
  66. data/app/models/payment/bank_payment.rb +3 -0
  67. data/app/models/payment/hand_payment.rb +3 -0
  68. data/app/models/payment/paypal_payment.rb +3 -0
  69. data/app/models/payment/stripe_payment.rb +3 -0
  70. data/app/models/payment/wxpay_payment.rb +3 -0
  71. data/app/models/payment_method.rb +3 -0
  72. data/app/models/{rails_trade/payment_methods → payment_method}/alipay_method.rb +1 -1
  73. data/app/models/{rails_trade/payment_methods → payment_method}/bank_method.rb +1 -1
  74. data/app/models/payment_method/stripe_method.rb +3 -0
  75. data/app/models/payment_order.rb +3 -0
  76. data/app/models/payment_reference.rb +3 -0
  77. data/app/models/payment_strategy.rb +3 -0
  78. data/app/models/payment_type.rb +3 -0
  79. data/app/models/promote.rb +3 -0
  80. data/app/models/promote_buyer.rb +3 -0
  81. data/app/models/promote_charge.rb +3 -0
  82. data/app/models/promote_charge/cash_promote_charge.rb +3 -0
  83. data/app/models/promote_charge/discount_promote_charge.rb +3 -0
  84. data/app/models/promote_charge/final_promote_charge.rb +3 -0
  85. data/app/models/promote_charge/minus_promote_charge.rb +3 -0
  86. data/app/models/promote_charge/plus_promote_charge.rb +3 -0
  87. data/app/models/promote_extra.rb +3 -0
  88. data/app/models/promote_good.rb +3 -0
  89. data/app/models/rails_trade/amount.rb +44 -0
  90. data/app/models/rails_trade/buyer.rb +35 -0
  91. data/app/models/rails_trade/cart.rb +64 -0
  92. data/app/models/rails_trade/good.rb +71 -0
  93. data/app/models/rails_trade/order.rb +78 -91
  94. data/app/models/rails_trade/ordering/payment.rb +113 -0
  95. data/app/models/rails_trade/{concerns/the_refund.rb → ordering/refund.rb} +3 -5
  96. data/app/models/rails_trade/payment.rb +72 -73
  97. data/app/models/rails_trade/payment/alipay_payment.rb +15 -0
  98. data/app/models/rails_trade/payment/apple_payment.rb +7 -0
  99. data/app/models/rails_trade/{payments → payment}/bank_payment.rb +2 -4
  100. data/app/models/rails_trade/payment/hand_payment.rb +8 -0
  101. data/app/models/rails_trade/payment/paypal_payment.rb +8 -0
  102. data/app/models/rails_trade/payment/stripe_payment.rb +9 -0
  103. data/app/models/rails_trade/{payments → payment}/wxpay_payment.rb +1 -2
  104. data/app/models/rails_trade/payment_method.rb +22 -12
  105. data/app/models/rails_trade/{payment_methods → payment_method}/stripe_method.rb +7 -4
  106. data/app/models/rails_trade/payment_order.rb +84 -51
  107. data/app/models/rails_trade/payment_reference.rb +12 -9
  108. data/app/models/rails_trade/payment_strategy.rb +15 -12
  109. data/app/models/rails_trade/payment_type/alipay.rb +28 -0
  110. data/app/models/rails_trade/payment_type/apple_pay.rb +18 -0
  111. data/app/models/rails_trade/{payment_interface/the_paypal.rb → payment_type/paypal.rb} +8 -29
  112. data/app/models/rails_trade/{payment_interface/the_stripe.rb → payment_type/stripe.rb} +8 -26
  113. data/app/models/rails_trade/payment_type/wxpay.rb +55 -0
  114. data/app/models/rails_trade/promote.rb +65 -27
  115. data/app/models/rails_trade/promote_buyer.rb +25 -7
  116. data/app/models/rails_trade/promote_charge.rb +78 -11
  117. data/app/models/rails_trade/promote_charge/cash_promote_charge.rb +12 -0
  118. data/app/models/rails_trade/promote_charge/discount_promote_charge.rb +17 -0
  119. data/app/models/rails_trade/promote_charge/final_promote_charge.rb +12 -0
  120. data/app/models/rails_trade/promote_charge/minus_promote_charge.rb +11 -0
  121. data/app/models/rails_trade/promote_charge/plus_promote_charge.rb +7 -0
  122. data/app/models/rails_trade/promote_extra.rb +13 -0
  123. data/app/models/rails_trade/promote_good.rb +20 -7
  124. data/app/models/rails_trade/refund.rb +30 -19
  125. data/app/models/rails_trade/{refunds → refund}/alipay_refund.rb +1 -1
  126. data/app/models/rails_trade/refund/bank_refund.rb +5 -0
  127. data/app/models/rails_trade/refund/hand_refund.rb +5 -0
  128. data/app/models/rails_trade/{refunds → refund}/paypal_refund.rb +1 -1
  129. data/app/models/rails_trade/{refunds → refund}/stripe_refund.rb +1 -1
  130. data/app/models/rails_trade/{refunds → refund}/wxpay_refund.rb +17 -9
  131. data/app/models/rails_trade/sell.rb +24 -0
  132. data/app/models/rails_trade/trade_item.rb +153 -0
  133. data/app/models/rails_trade/trade_promote.rb +92 -0
  134. data/app/models/rails_trade/user.rb +9 -0
  135. data/app/models/refund.rb +3 -0
  136. data/app/models/refund/alipay_refund.rb +3 -0
  137. data/app/models/refund/bank_refund.rb +3 -0
  138. data/app/models/refund/hand_refund.rb +3 -0
  139. data/app/models/refund/paypal_refund.rb +3 -0
  140. data/app/models/refund/stripe_refund.rb +3 -0
  141. data/app/models/refund/wxpay_refund.rb +3 -0
  142. data/app/models/trade_item.rb +3 -0
  143. data/app/models/trade_promote.rb +3 -0
  144. data/app/views/application/_trade_nav.html.erb +16 -0
  145. data/app/views/my/_trade_nav.html.erb +10 -0
  146. data/app/views/{rails_trade_admin → trade/admin}/buyers/_form.html.erb +0 -0
  147. data/app/views/{rails_trade_admin → trade/admin}/buyers/_menu.html.erb +0 -0
  148. data/app/views/{rails_trade_admin → trade/admin}/buyers/_search_form.html.erb +3 -3
  149. data/app/views/{rails_trade_admin → trade/admin}/buyers/edit.html.erb +0 -0
  150. data/app/views/{rails_trade_admin → trade/admin}/buyers/index.html.erb +1 -1
  151. data/app/views/{rails_trade_admin → trade/admin}/buyers/new.html.erb +0 -0
  152. data/app/views/{rails_trade_admin → trade/admin}/buyers/orders.html.erb +2 -2
  153. data/app/views/{rails_trade_admin → trade/admin}/buyers/overdue.html.erb +1 -1
  154. data/app/views/{rails_trade_admin → trade/admin}/buyers/show.html.erb +0 -0
  155. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_check.html.erb +0 -0
  156. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_index.html.erb +1 -1
  157. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_new.html.erb +0 -0
  158. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_serve.html.erb +0 -0
  159. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_single.html.erb +1 -1
  160. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_single_table.html.erb +0 -0
  161. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_total.html.erb +1 -1
  162. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/_total_table.html.erb +0 -0
  163. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/add.js.erb +0 -0
  164. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/create.js.erb +0 -0
  165. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/destroy.js.erb +0 -0
  166. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/index.js.erb +0 -0
  167. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/new.js.erb +0 -0
  168. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/single.js.erb +0 -0
  169. data/app/views/{rails_trade_admin → trade/admin}/cart_item_serves/total.js.erb +0 -0
  170. data/app/views/trade/admin/goods/_form.html.erb +7 -0
  171. data/app/views/{rails_trade_admin → trade/admin}/goods/_item.html.erb +0 -0
  172. data/app/views/{rails_trade_admin → trade/admin}/goods/_new.html.erb +2 -2
  173. data/app/views/{rails_trade_admin → trade/admin}/goods/_show.html.erb +0 -0
  174. data/app/views/{rails_trade_admin → trade/admin}/goods/_show_tr.html.erb +0 -0
  175. data/app/views/{rails_trade_admin → trade/admin}/goods/create.js.erb +0 -0
  176. data/app/views/{rails_trade_admin → trade/admin}/goods/destroy.js.erb +0 -0
  177. data/app/views/{rails_trade_admin → trade/admin}/goods/edit.html.erb +2 -2
  178. data/app/views/{rails_trade_admin → trade/admin}/goods/edit.js.erb +0 -0
  179. data/app/views/{rails_trade_admin → trade/admin}/goods/edit_items.html.erb +2 -2
  180. data/app/views/{rails_trade_admin → trade/admin}/goods/edit_pic.html.erb +2 -2
  181. data/app/views/{rails_trade_admin → trade/admin}/goods/edit_promote.html.erb +2 -2
  182. data/app/views/{rails_trade_admin → trade/admin}/goods/index.html.erb +1 -1
  183. data/app/views/{rails_trade_admin → trade/admin}/goods/new.html.erb +1 -1
  184. data/app/views/{rails_trade_admin → trade/admin}/goods/new.js.erb +0 -0
  185. data/app/views/{rails_trade_admin → trade/admin}/goods/show.js.erb +0 -0
  186. data/app/views/{rails_trade_admin → trade/admin}/goods/update.js.erb +0 -0
  187. data/app/views/{rails_trade_admin → trade/admin}/order_payments/_index.html.erb +0 -0
  188. data/app/views/{rails_trade_admin → trade/admin}/order_payments/_new.html.erb +0 -0
  189. data/app/views/{rails_trade_admin → trade/admin}/order_payments/_payment_orders.html.erb +1 -1
  190. data/app/views/{rails_trade_admin → trade/admin}/order_payments/_payments.html.erb +0 -0
  191. data/app/views/{rails_trade_admin → trade/admin}/order_payments/create.js.erb +0 -0
  192. data/app/views/{rails_trade_admin → trade/admin}/order_payments/create_fail.js.erb +0 -0
  193. data/app/views/{rails_trade_admin → trade/admin}/order_payments/destroy.js.erb +0 -0
  194. data/app/views/{rails_trade_admin → trade/admin}/order_payments/index.js.erb +0 -0
  195. data/app/views/{rails_trade_admin → trade/admin}/order_payments/new.js.erb +0 -0
  196. data/app/views/{rails_trade_admin → trade/admin}/orders/_addresses.html.erb +1 -1
  197. data/app/views/trade/admin/orders/_filter.html.erb +26 -0
  198. data/app/views/trade/admin/orders/_form.html.erb +4 -0
  199. data/app/views/{rails_trade_admin → trade/admin}/orders/_invoice_addresses.html.erb +1 -1
  200. data/app/views/{rails_trade_admin → trade/admin}/orders/_item.html.erb +0 -0
  201. data/app/views/{rails_trade_admin → trade/admin}/orders/_new_items.html.erb +1 -1
  202. data/app/{assets/javascripts/controllers/rails_trade_admin/payments/index.js → views/trade/admin/orders/_search_form.html.erb} +0 -0
  203. data/app/views/trade/admin/orders/index.html.erb +52 -0
  204. data/app/views/{rails_trade_admin → trade/admin}/orders/new.html.erb +0 -0
  205. data/app/views/{rails_trade_admin → trade/admin}/orders/payments.html.erb +1 -1
  206. data/app/views/{rails_trade_admin → trade/admin}/orders/refresh.js.erb +0 -0
  207. data/app/views/trade/admin/orders/show.html.erb +75 -0
  208. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_edit.html.erb +0 -0
  209. data/app/views/{rails_trade_admin/payment_methods/_search_form.html.erb → trade/admin/payment_methods/_filter.html.erb} +5 -9
  210. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_form.html.erb +0 -0
  211. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_index_layout.html.erb +2 -5
  212. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_new.html.erb +2 -2
  213. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/_payment_method.html.erb +2 -3
  214. data/app/views/trade/admin/payment_methods/create.js.erb +2 -0
  215. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/destroy.js.erb +0 -0
  216. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/edit.html.erb +1 -1
  217. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/edit.js.erb +0 -0
  218. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/index.html.erb +7 -4
  219. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/mine.html.erb +2 -2
  220. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/new.html.erb +1 -1
  221. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/new.js.erb +0 -0
  222. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/unverified.html.erb +4 -6
  223. data/app/views/{rails_trade_admin → trade/admin}/payment_methods/update.js.erb +0 -0
  224. data/app/views/{rails_trade_admin → trade/admin}/payment_orders/_index.html.erb +2 -6
  225. data/app/views/trade/admin/payment_orders/_new.html.erb +23 -0
  226. data/app/views/{rails_trade_admin → trade/admin}/payment_orders/_orders.html.erb +2 -9
  227. data/app/views/{rails_trade_admin → trade/admin}/payment_orders/cancel.js.erb +0 -0
  228. data/app/views/{rails_trade_admin → trade/admin}/payment_orders/create.js.erb +0 -0
  229. data/app/views/{rails_trade_admin → trade/admin}/payment_orders/create_fail.js.erb +0 -0
  230. data/app/views/{rails_trade_admin → trade/admin}/payment_orders/new.js.erb +0 -0
  231. data/app/views/{rails_trade_admin → trade/admin}/payment_orders/raise_fail.js.erb +0 -0
  232. data/app/views/{rails_trade_admin → trade/admin}/payment_orders/update.js.erb +1 -1
  233. data/app/views/{rails_trade_admin → trade/admin}/payment_orders/update_fail.js.erb +0 -0
  234. data/app/views/{rails_trade_admin → trade/admin}/payment_references/_form.html.erb +1 -1
  235. data/app/views/{rails_trade_admin → trade/admin}/payment_references/_new.html.erb +1 -1
  236. data/app/views/{rails_trade_admin → trade/admin}/payment_references/destroy.js.erb +0 -0
  237. data/app/views/{rails_trade_admin → trade/admin}/payment_references/edit.html.erb +0 -0
  238. data/app/views/{rails_trade_admin → trade/admin}/payment_references/index.html.erb +1 -1
  239. data/app/views/{rails_trade_admin → trade/admin}/payment_references/new.js.erb +0 -0
  240. data/app/views/{rails_trade_admin → trade/admin}/payment_references/show.html.erb +0 -0
  241. data/app/views/{rails_trade_admin → trade/admin}/payment_strategies/_form.html.erb +0 -0
  242. data/app/views/{rails_trade_admin → trade/admin}/payment_strategies/edit.html.erb +2 -2
  243. data/app/views/{rails_trade_admin → trade/admin}/payment_strategies/index.html.erb +2 -2
  244. data/app/views/{rails_trade_admin → trade/admin}/payment_strategies/new.html.erb +1 -1
  245. data/app/views/trade/admin/payments/_checked_amount.html.erb +6 -0
  246. data/app/views/trade/admin/payments/_edit.html.erb +12 -0
  247. data/app/views/trade/admin/payments/_filter.html.erb +40 -0
  248. data/app/views/{rails_trade_admin → trade/admin}/payments/_form.html.erb +6 -2
  249. data/app/views/trade/admin/payments/_item.html.erb +41 -0
  250. data/app/views/trade/admin/payments/_new.html.erb +12 -0
  251. data/app/views/{rails_trade_admin → trade/admin}/payments/analyze.js.erb +0 -0
  252. data/app/views/{rails_trade_admin → trade/admin}/payments/dashboard.html.erb +0 -0
  253. data/app/views/trade/admin/payments/edit.html.erb +13 -0
  254. data/app/views/trade/admin/payments/edit.js.erb +3 -0
  255. data/app/views/trade/admin/payments/index.html.erb +40 -0
  256. data/app/views/trade/admin/payments/new.html.erb +13 -0
  257. data/app/views/trade/admin/payments/new.js.erb +3 -0
  258. data/app/views/{rails_trade_admin → trade/admin}/payments/show.html.erb +0 -0
  259. data/app/views/trade/admin/promote_buyers/_filter.html.erb +7 -0
  260. data/app/views/trade/admin/promote_buyers/_form.html.erb +17 -0
  261. data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/_promote_buyer.json.jbuilder +0 -0
  262. data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/edit.html.erb +1 -1
  263. data/app/views/trade/admin/promote_buyers/edit.js.erb +3 -0
  264. data/app/views/trade/admin/promote_buyers/index.html.erb +52 -0
  265. data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/index.json.jbuilder +0 -0
  266. data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/new.html.erb +1 -1
  267. data/app/views/trade/admin/promote_buyers/new.js.erb +3 -0
  268. data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/show.html.erb +0 -0
  269. data/app/views/{rails_trade_admin → trade/admin}/promote_buyers/show.json.jbuilder +0 -0
  270. data/app/views/trade/admin/promote_charges/_base_price_form.html.erb +1 -0
  271. data/app/views/trade/admin/promote_charges/_edit.html.erb +13 -0
  272. data/app/views/trade/admin/promote_charges/_filter.html.erb +11 -0
  273. data/app/views/trade/admin/promote_charges/_form.html.erb +11 -0
  274. data/app/views/trade/admin/promote_charges/_new.html.erb +13 -0
  275. data/app/views/trade/admin/promote_charges/index.html.erb +65 -0
  276. data/app/views/trade/admin/promote_charges/options.js.erb +4 -0
  277. data/app/views/trade/admin/promote_goods/_filter.html.erb +8 -0
  278. data/app/views/trade/admin/promote_goods/_form.html.erb +8 -0
  279. data/app/views/trade/admin/promote_goods/_goods_options.html.erb +1 -0
  280. data/app/views/trade/admin/promote_goods/goods.js.erb +2 -0
  281. data/app/views/trade/admin/promote_goods/index.html.erb +61 -0
  282. data/app/views/trade/admin/promotes/_edit.html.erb +12 -0
  283. data/app/views/trade/admin/promotes/_filter.html.erb +9 -0
  284. data/app/views/trade/admin/promotes/_form.html.erb +12 -0
  285. data/app/views/trade/admin/promotes/_new.html.erb +12 -0
  286. data/app/views/trade/admin/promotes/_new_promote_charge.html.erb +10 -0
  287. data/app/views/trade/admin/promotes/create.js.erb +2 -0
  288. data/app/views/trade/admin/promotes/index.html.erb +79 -0
  289. data/app/views/trade/admin/refunds/_filter.html.erb +11 -0
  290. data/app/views/{rails_trade_admin → trade/admin}/refunds/_form.html.erb +0 -0
  291. data/app/views/{rails_trade_admin → trade/admin}/refunds/_logs_table.html.erb +0 -0
  292. data/app/views/{rails_trade_admin → trade/admin}/refunds/_new.html.erb +0 -0
  293. data/app/views/{rails_trade_admin → trade/admin}/refunds/edit.html.erb +0 -0
  294. data/app/views/{rails_trade_admin → trade/admin}/refunds/index.html.erb +13 -17
  295. data/app/views/{rails_trade_admin → trade/admin}/refunds/logs.js.erb +0 -0
  296. data/app/views/{rails_trade_admin → trade/admin}/refunds/new.html.erb +0 -0
  297. data/app/views/{rails_trade_admin → trade/admin}/refunds/new.js.erb +0 -0
  298. data/app/views/{rails_trade_admin → trade/admin}/refunds/show.html.erb +0 -0
  299. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_additions.html.erb +0 -0
  300. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_filter.html.erb +0 -0
  301. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_good_price.html.erb +0 -0
  302. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_order_price.html.erb +0 -0
  303. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_retail_price.html.erb +0 -0
  304. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_single_price.html.erb +0 -0
  305. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/_total_price.html.erb +0 -0
  306. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/destroy.js.erb +0 -0
  307. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/error.html.erb +0 -0
  308. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/index.html.erb +3 -3
  309. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/only.html.erb +2 -2
  310. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/total.js.erb +0 -0
  311. data/app/views/{rails_trade_admin/cart_items → trade/admin/trade_items}/update.js.erb +0 -0
  312. data/app/views/trade/admin/trade_promotes/_filter.html.erb +7 -0
  313. data/app/views/trade/admin/trade_promotes/_form.html.erb +6 -0
  314. data/app/views/trade/admin/trade_promotes/_show_table.html.erb +20 -0
  315. data/app/views/trade/admin/trade_promotes/edit.html.erb +9 -0
  316. data/app/views/trade/admin/trade_promotes/edit.js.erb +3 -0
  317. data/app/views/trade/admin/trade_promotes/index.html.erb +38 -0
  318. data/app/views/trade/admin/trade_promotes/new.html.erb +9 -0
  319. data/app/views/trade/admin/trade_promotes/new.js.erb +3 -0
  320. data/app/views/trade/admin/trade_promotes/show.html.erb +7 -0
  321. data/app/views/trade/admin/trade_promotes/show.js.erb +3 -0
  322. data/app/views/trade/admin/trade_promotes/update.js.erb +1 -0
  323. data/app/views/{buyers → trade/buyers}/_show.html.erb +0 -0
  324. data/app/views/{buyers → trade/buyers}/show.js.erb +0 -0
  325. data/app/views/{goods → trade/goods}/_choose.html.erb +0 -0
  326. data/app/views/{goods → trade/goods}/_good.html.erb +0 -0
  327. data/app/views/{goods → trade/goods}/_good_item.html.erb +0 -0
  328. data/app/views/{goods → trade/goods}/_nav.html.erb +0 -0
  329. data/app/views/{goods → trade/goods}/_search.html.erb +0 -0
  330. data/app/views/{goods → trade/goods}/index.html.erb +0 -0
  331. data/app/views/{goods → trade/goods}/index/_product.html.erb +0 -0
  332. data/app/views/{goods → trade/goods}/item.html.erb +0 -0
  333. data/app/views/{goods → trade/goods}/produce.html.erb +0 -0
  334. data/app/views/trade/goods/show.html.erb +2 -0
  335. data/app/views/{goods → trade/goods}/show/_basic.html.erb +0 -0
  336. data/app/views/{goods → trade/goods}/show/_carousel.html.erb +0 -0
  337. data/app/views/{goods → trade/goods}/show/_items.html.erb +0 -0
  338. data/app/views/{goods → trade/goods}/show/_sales.html.erb +0 -0
  339. data/app/views/{goods → trade/goods}/show/_side.html.erb +0 -0
  340. data/app/views/{goods → trade/goods}/taxon/_breadcrumb.html.erb +0 -0
  341. data/app/views/{goods → trade/goods}/taxon/_nav.html.erb +0 -0
  342. data/app/views/{goods → trade/goods}/taxon/_nav_.html.erb +0 -0
  343. data/app/views/{goods → trade/goods}/taxon/_nav_last.html.erb +0 -0
  344. data/app/views/trade/my/carts/_filter.html.erb +7 -0
  345. data/app/views/trade/my/carts/_form.html.erb +8 -0
  346. data/app/views/trade/my/carts/_show_table.html.erb +28 -0
  347. data/app/views/trade/my/carts/edit.html.erb +9 -0
  348. data/app/views/trade/my/carts/edit.js.erb +3 -0
  349. data/app/views/trade/my/carts/index.html.erb +47 -0
  350. data/app/views/trade/my/carts/new.html.erb +9 -0
  351. data/app/views/trade/my/carts/new.js.erb +3 -0
  352. data/app/views/trade/my/carts/show.html+phone.erb +46 -0
  353. data/app/views/{rails_trade_admin/promote_goods → trade/my/carts}/show.html.erb +0 -0
  354. data/app/views/{rails_trade_my → trade/my}/order_items/_form.html.erb +0 -0
  355. data/app/views/{rails_trade_my → trade/my}/order_items/edit.html.erb +0 -0
  356. data/app/views/{rails_trade_my → trade/my}/order_items/index.html.erb +1 -1
  357. data/app/views/{rails_trade_my → trade/my}/order_items/new.html.erb +0 -0
  358. data/app/views/{rails_trade_my → trade/my}/order_items/show.html.erb +0 -0
  359. data/app/views/{rails_trade_my → trade/my}/orders/_date_form.html.erb +0 -0
  360. data/app/views/{rails_trade_my → trade/my}/orders/_edit.html.erb +2 -2
  361. data/app/views/trade/my/orders/_edit_payment_type.html.erb +12 -0
  362. data/app/views/{rails_trade_my → trade/my}/orders/_form.html.erb +0 -0
  363. data/app/views/{rails_trade_my → trade/my}/orders/destroy.js.erb +0 -0
  364. data/app/views/{rails_trade_my → trade/my}/orders/edit.js.erb +0 -0
  365. data/app/views/trade/my/orders/edit_payment_type.js.erb +4 -0
  366. data/app/views/{rails_trade_my → trade/my}/orders/fail.html.erb +0 -0
  367. data/app/views/trade/my/orders/index.html+phone.erb +37 -0
  368. data/app/views/trade/my/orders/index.html.erb +36 -0
  369. data/app/views/{rails_trade_my → trade/my}/orders/index.json.jbuilder +0 -0
  370. data/app/views/{rails_trade_my → trade/my}/orders/new.html.erb +0 -0
  371. data/app/views/{rails_trade_my → trade/my}/orders/refresh.js.erb +0 -0
  372. data/app/views/trade/my/orders/refund.json.jbuilder +12 -0
  373. data/app/views/trade/my/orders/show.html+phone.erb +3 -0
  374. data/app/views/{rails_trade_my → trade/my}/orders/show.html.erb +3 -3
  375. data/app/views/{rails_trade_my → trade/my}/orders/success.html.erb +0 -2
  376. data/app/views/{rails_trade_my → trade/my}/orders/update.js.erb +1 -1
  377. data/app/views/trade/my/orders/wait.html+wechat.erb +4 -0
  378. data/app/views/trade/my/orders/wxpay_pay.js.erb +16 -0
  379. data/app/views/trade/my/orders/wxpay_pay_err.js.erb +5 -0
  380. data/app/views/{rails_trade_my → trade/my}/payment_methods/_edit.html.erb +1 -1
  381. data/app/views/{rails_trade_my → trade/my}/payment_methods/_form.html.erb +0 -0
  382. data/app/views/{rails_trade_my → trade/my}/payment_methods/_index.html.erb +1 -1
  383. data/app/views/{rails_trade_my → trade/my}/payment_methods/_item.html.erb +1 -1
  384. data/app/views/{rails_trade_my → trade/my}/payment_methods/_new.html.erb +3 -3
  385. data/app/views/{rails_trade_my → trade/my}/payment_methods/create.js.erb +0 -0
  386. data/app/views/{rails_trade_my/addresses → trade/my/payment_methods}/destroy.js.erb +0 -0
  387. data/app/views/{rails_trade_my → trade/my}/payment_methods/edit.js.erb +0 -0
  388. data/app/views/{rails_trade_my → trade/my}/payment_methods/index.html.erb +0 -0
  389. data/app/views/{rails_trade_my → trade/my}/payment_methods/index.js.erb +0 -0
  390. data/app/views/{rails_trade_my → trade/my}/payment_methods/new.js.erb +0 -0
  391. data/app/views/{rails_trade_my → trade/my}/payment_methods/show.html.erb +0 -0
  392. data/app/views/{rails_trade_my/addresses → trade/my/payment_methods}/update.js.erb +0 -0
  393. data/app/views/trade/my/trade_items/_additions.html.erb +12 -0
  394. data/app/views/trade/my/trade_items/_cart_item.js.erb +2 -0
  395. data/app/views/trade/my/trade_items/_single_price.html.erb +6 -0
  396. data/app/views/trade/my/trade_items/_total_price.html.erb +8 -0
  397. data/app/views/trade/my/trade_items/_trade_items.html.erb +68 -0
  398. data/app/views/trade/my/trade_items/create.html.erb +1 -0
  399. data/app/views/{rails_trade_my/cart_items → trade/my/trade_items}/destroy.js.erb +0 -0
  400. data/app/views/trade/my/trade_items/index.json.jbuilder +0 -0
  401. data/app/views/trade/my/trade_items/update.js.erb +1 -0
  402. data/app/views/{rails_trade_my → trade/my}/users/_form.html.erb +0 -0
  403. data/app/views/{rails_trade_my → trade/my}/users/edit.html.erb +0 -0
  404. data/app/views/{rails_trade_my → trade/my}/users/show.html.erb +0 -0
  405. data/app/views/trade/payments/_wxpay_result.html.erb +3 -0
  406. data/app/views/trade/payments/wxpay_result.js.erb +1 -0
  407. data/config/locales/en.enum.yml +47 -0
  408. data/config/locales/en.yml +22 -60
  409. data/config/locales/zh.attributes.yml +75 -0
  410. data/config/locales/zh.controller.yml +51 -0
  411. data/config/locales/zh.enum.yml +58 -0
  412. data/config/locales/zh.help.yml +7 -0
  413. data/config/routes.rb +45 -59
  414. data/lib/rails_trade.rb +9 -19
  415. data/lib/rails_trade/apple_pay.rb +32 -0
  416. data/lib/rails_trade/config.rb +6 -3
  417. data/lib/rails_trade/engine.rb +15 -19
  418. data/lib/rails_trade/version.rb +1 -1
  419. metadata +475 -422
  420. data/app/assets/config/rails_trade_manifest.js +0 -1
  421. data/app/assets/javascripts/controllers/rails_trade_admin/buyers/index.js +0 -15
  422. data/app/assets/javascripts/controllers/rails_trade_admin/buyers/overdue.js +0 -15
  423. data/app/assets/javascripts/controllers/rails_trade_admin/payment_methods/edit.js +0 -1
  424. data/app/assets/javascripts/controllers/rails_trade_admin/payment_methods/index.js +0 -1
  425. data/app/assets/javascripts/controllers/rails_trade_admin/payment_methods/unverified.js +0 -1
  426. data/app/assets/javascripts/controllers/rails_trade_admin/promote_goods/index.js +0 -1
  427. data/app/assets/javascripts/controllers/rails_trade_admin/promotes/edit.js +0 -2
  428. data/app/assets/javascripts/controllers/rails_trade_admin/promotes/index.js +0 -1
  429. data/app/assets/javascripts/controllers/rails_trade_admin/promotes/new.js +0 -2
  430. data/app/assets/javascripts/controllers/rails_trade_admin/serves/edit.js +0 -2
  431. data/app/assets/javascripts/controllers/rails_trade_admin/serves/index.js +0 -1
  432. data/app/assets/javascripts/controllers/rails_trade_admin/serves/new.js +0 -4
  433. data/app/assets/javascripts/controllers/rails_trade_my/cart_items/create.js +0 -3
  434. data/app/assets/javascripts/controllers/rails_trade_my/cart_items/index.js +0 -65
  435. data/app/controllers/areas_controller.rb +0 -18
  436. data/app/controllers/buyers_controller.rb +0 -8
  437. data/app/controllers/payments_controller.rb +0 -50
  438. data/app/controllers/providers_controller.rb +0 -8
  439. data/app/controllers/the_trade_admin/addresses_controller.rb +0 -75
  440. data/app/controllers/the_trade_admin/areas_controller.rb +0 -50
  441. data/app/controllers/the_trade_admin/base_controller.rb +0 -5
  442. data/app/controllers/the_trade_admin/payments_controller.rb +0 -89
  443. data/app/controllers/the_trade_admin/promote_buyers_controller.rb +0 -39
  444. data/app/controllers/the_trade_admin/promote_charges_controller.rb +0 -62
  445. data/app/controllers/the_trade_admin/promote_goods_controller.rb +0 -50
  446. data/app/controllers/the_trade_admin/promotes_controller.rb +0 -105
  447. data/app/controllers/the_trade_admin/providers_controller.rb +0 -121
  448. data/app/controllers/the_trade_admin/serve_charges_controller.rb +0 -67
  449. data/app/controllers/the_trade_admin/serves_controller.rb +0 -107
  450. data/app/controllers/the_trade_my/addresses_controller.rb +0 -50
  451. data/app/controllers/the_trade_my/base_controller.rb +0 -13
  452. data/app/controllers/the_trade_my/buyers_controller.rb +0 -35
  453. data/app/controllers/the_trade_my/cart_items_controller.rb +0 -71
  454. data/app/controllers/the_trade_my/orders_controller.rb +0 -161
  455. data/app/controllers/the_trade_my/providers_controller.rb +0 -44
  456. data/app/models/rails_trade/address.rb +0 -14
  457. data/app/models/rails_trade/area.rb +0 -65
  458. data/app/models/rails_trade/cart_item.rb +0 -185
  459. data/app/models/rails_trade/cart_item_serve.rb +0 -16
  460. data/app/models/rails_trade/concerns/good_able.rb +0 -63
  461. data/app/models/rails_trade/concerns/order_able.rb +0 -48
  462. data/app/models/rails_trade/concerns/promote_fee.rb +0 -54
  463. data/app/models/rails_trade/concerns/serve_fee.rb +0 -41
  464. data/app/models/rails_trade/concerns/summary_service.rb +0 -67
  465. data/app/models/rails_trade/concerns/the_payment.rb +0 -88
  466. data/app/models/rails_trade/concerns/the_trade_buyer.rb +0 -50
  467. data/app/models/rails_trade/concerns/the_trade_user.rb +0 -23
  468. data/app/models/rails_trade/good_partner.rb +0 -8
  469. data/app/models/rails_trade/good_produce.rb +0 -14
  470. data/app/models/rails_trade/order_item.rb +0 -88
  471. data/app/models/rails_trade/order_promote.rb +0 -23
  472. data/app/models/rails_trade/order_serve.rb +0 -23
  473. data/app/models/rails_trade/order_shipment.rb +0 -10
  474. data/app/models/rails_trade/payment_interface/payment_interface_base.rb +0 -8
  475. data/app/models/rails_trade/payment_interface/the_alipay.rb +0 -49
  476. data/app/models/rails_trade/payment_interface/the_wxpay.rb +0 -56
  477. data/app/models/rails_trade/payments/alipay_payment.rb +0 -12
  478. data/app/models/rails_trade/payments/hand_payment.rb +0 -13
  479. data/app/models/rails_trade/payments/paypal_payment.rb +0 -8
  480. data/app/models/rails_trade/payments/stripe_payment.rb +0 -7
  481. data/app/models/rails_trade/produce.rb +0 -18
  482. data/app/models/rails_trade/promote_charges/single_promote_charge.rb +0 -7
  483. data/app/models/rails_trade/promote_charges/total_promote_charge.rb +0 -7
  484. data/app/models/rails_trade/promotes/amount_promote.rb +0 -4
  485. data/app/models/rails_trade/promotes/number_promote.rb +0 -4
  486. data/app/models/rails_trade/provider.rb +0 -25
  487. data/app/models/rails_trade/refunds/bank_refund.rb +0 -5
  488. data/app/models/rails_trade/refunds/hand_refund.rb +0 -5
  489. data/app/models/rails_trade/serve.rb +0 -44
  490. data/app/models/rails_trade/serve_charge.rb +0 -37
  491. data/app/models/rails_trade/serve_charges/single_serve_charge.rb +0 -7
  492. data/app/models/rails_trade/serve_charges/total_serve_charge.rb +0 -7
  493. data/app/models/rails_trade/serve_good.rb +0 -9
  494. data/app/models/rails_trade/serves/number_serve.rb +0 -4
  495. data/app/models/rails_trade/serves/quantity_serve.rb +0 -4
  496. data/app/models/rails_trade/shipment.rb +0 -8
  497. data/app/views/layouts/rails_trade_admin/base.html.erb +0 -25
  498. data/app/views/layouts/rails_trade_my/base.html.erb +0 -28
  499. data/app/views/rails_trade_admin/addresses/_address.html.erb +0 -24
  500. data/app/views/rails_trade_admin/addresses/_edit.html.erb +0 -13
  501. data/app/views/rails_trade_admin/addresses/_form.html.erb +0 -23
  502. data/app/views/rails_trade_admin/addresses/_new.html.erb +0 -13
  503. data/app/views/rails_trade_admin/addresses/create.js.erb +0 -2
  504. data/app/views/rails_trade_admin/addresses/destroy.js.erb +0 -1
  505. data/app/views/rails_trade_admin/addresses/edit.js.erb +0 -39
  506. data/app/views/rails_trade_admin/addresses/index.html.erb +0 -41
  507. data/app/views/rails_trade_admin/addresses/new.js.erb +0 -52
  508. data/app/views/rails_trade_admin/addresses/show.html.erb +0 -4
  509. data/app/views/rails_trade_admin/addresses/update.js.erb +0 -2
  510. data/app/views/rails_trade_admin/areas/_form.html.erb +0 -9
  511. data/app/views/rails_trade_admin/areas/edit.html.erb +0 -16
  512. data/app/views/rails_trade_admin/areas/index.html.erb +0 -43
  513. data/app/views/rails_trade_admin/areas/new.html.erb +0 -11
  514. data/app/views/rails_trade_admin/areas/show.html.erb +0 -1
  515. data/app/views/rails_trade_admin/base/_nav.html.erb +0 -24
  516. data/app/views/rails_trade_admin/base/_nav_bar.html.erb +0 -23
  517. data/app/views/rails_trade_admin/base/_nav_payment.html.erb +0 -25
  518. data/app/views/rails_trade_admin/goods/_form.html.erb +0 -7
  519. data/app/views/rails_trade_admin/orders/_filter.html.erb +0 -20
  520. data/app/views/rails_trade_admin/orders/_form.html.erb +0 -17
  521. data/app/views/rails_trade_admin/orders/_search_form.html.erb +0 -7
  522. data/app/views/rails_trade_admin/orders/index.html.erb +0 -61
  523. data/app/views/rails_trade_admin/orders/show.html.erb +0 -89
  524. data/app/views/rails_trade_admin/payment_methods/create.js.erb +0 -2
  525. data/app/views/rails_trade_admin/payment_orders/_new.html.erb +0 -24
  526. data/app/views/rails_trade_admin/payments/_item.html.erb +0 -49
  527. data/app/views/rails_trade_admin/payments/_search_form.html.erb +0 -15
  528. data/app/views/rails_trade_admin/payments/edit.html.erb +0 -15
  529. data/app/views/rails_trade_admin/payments/index.html.erb +0 -60
  530. data/app/views/rails_trade_admin/payments/new.html.erb +0 -17
  531. data/app/views/rails_trade_admin/promote_buyers/_form.html.erb +0 -6
  532. data/app/views/rails_trade_admin/promote_buyers/index.html.erb +0 -42
  533. data/app/views/rails_trade_admin/promote_charges/_edit.html.erb +0 -13
  534. data/app/views/rails_trade_admin/promote_charges/_form.html.erb +0 -6
  535. data/app/views/rails_trade_admin/promote_charges/_new.html.erb +0 -13
  536. data/app/views/rails_trade_admin/promote_charges/_search_form.html.erb +0 -9
  537. data/app/views/rails_trade_admin/promote_charges/edit.js.erb +0 -8
  538. data/app/views/rails_trade_admin/promote_charges/index.html.erb +0 -49
  539. data/app/views/rails_trade_admin/promote_charges/new.js.erb +0 -8
  540. data/app/views/rails_trade_admin/promote_goods/_form.html.erb +0 -4
  541. data/app/views/rails_trade_admin/promote_goods/_promote_good.json.jbuilder +0 -2
  542. data/app/views/rails_trade_admin/promote_goods/edit.html.erb +0 -14
  543. data/app/views/rails_trade_admin/promote_goods/index.html.erb +0 -37
  544. data/app/views/rails_trade_admin/promote_goods/index.json.jbuilder +0 -1
  545. data/app/views/rails_trade_admin/promote_goods/new.html.erb +0 -13
  546. data/app/views/rails_trade_admin/promote_goods/show.json.jbuilder +0 -1
  547. data/app/views/rails_trade_admin/promotes/_form.html.erb +0 -9
  548. data/app/views/rails_trade_admin/promotes/edit.html.erb +0 -9
  549. data/app/views/rails_trade_admin/promotes/index.html.erb +0 -65
  550. data/app/views/rails_trade_admin/promotes/new.html.erb +0 -9
  551. data/app/views/rails_trade_admin/promotes/show.html.erb +0 -4
  552. data/app/views/rails_trade_admin/providers/_form.html.erb +0 -6
  553. data/app/views/rails_trade_admin/providers/_product.html.erb +0 -12
  554. data/app/views/rails_trade_admin/providers/_side.html.erb +0 -8
  555. data/app/views/rails_trade_admin/providers/area.html.erb +0 -1
  556. data/app/views/rails_trade_admin/providers/channel.html.erb +0 -46
  557. data/app/views/rails_trade_admin/providers/edit.html.erb +0 -16
  558. data/app/views/rails_trade_admin/providers/index.html.erb +0 -27
  559. data/app/views/rails_trade_admin/providers/new.html.erb +0 -21
  560. data/app/views/rails_trade_admin/providers/posts.html.erb +0 -41
  561. data/app/views/rails_trade_admin/providers/products.html.erb +0 -23
  562. data/app/views/rails_trade_admin/providers/show.html.erb +0 -60
  563. data/app/views/rails_trade_admin/refunds/_search_form.html.erb +0 -13
  564. data/app/views/rails_trade_admin/serve_charges/_edit.html.erb +0 -13
  565. data/app/views/rails_trade_admin/serve_charges/_form.html.erb +0 -10
  566. data/app/views/rails_trade_admin/serve_charges/_new.html.erb +0 -13
  567. data/app/views/rails_trade_admin/serve_charges/_search_form.html.erb +0 -10
  568. data/app/views/rails_trade_admin/serve_charges/edit.js.erb +0 -7
  569. data/app/views/rails_trade_admin/serve_charges/index.html.erb +0 -56
  570. data/app/views/rails_trade_admin/serve_charges/new.js.erb +0 -8
  571. data/app/views/rails_trade_admin/serves/_form.html.erb +0 -9
  572. data/app/views/rails_trade_admin/serves/edit.html.erb +0 -9
  573. data/app/views/rails_trade_admin/serves/index.html.erb +0 -80
  574. data/app/views/rails_trade_admin/serves/new.html.erb +0 -9
  575. data/app/views/rails_trade_my/addresses/_edit.html.erb +0 -31
  576. data/app/views/rails_trade_my/addresses/_form.html.erb +0 -23
  577. data/app/views/rails_trade_my/addresses/_new.html.erb +0 -11
  578. data/app/views/rails_trade_my/addresses/create.js.erb +0 -2
  579. data/app/views/rails_trade_my/addresses/edit.js.erb +0 -39
  580. data/app/views/rails_trade_my/addresses/index.html.erb +0 -44
  581. data/app/views/rails_trade_my/addresses/new.js.erb +0 -39
  582. data/app/views/rails_trade_my/addresses/show.html.erb +0 -4
  583. data/app/views/rails_trade_my/base/_nav.html.erb +0 -22
  584. data/app/views/rails_trade_my/buyers/_form.html.erb +0 -5
  585. data/app/views/rails_trade_my/buyers/edit.html.erb +0 -2
  586. data/app/views/rails_trade_my/buyers/show.html.erb +0 -21
  587. data/app/views/rails_trade_my/cart_items/_additions.html.erb +0 -22
  588. data/app/views/rails_trade_my/cart_items/_single_price.html.erb +0 -6
  589. data/app/views/rails_trade_my/cart_items/_total_price.html.erb +0 -8
  590. data/app/views/rails_trade_my/cart_items/index.html.erb +0 -69
  591. data/app/views/rails_trade_my/cart_items/total.js.erb +0 -11
  592. data/app/views/rails_trade_my/cart_items/update.js.erb +0 -8
  593. data/app/views/rails_trade_my/my/index.html.erb +0 -17
  594. data/app/views/rails_trade_my/orders/_edit_payment_type.html.erb +0 -13
  595. data/app/views/rails_trade_my/orders/edit_payment_type.js.erb +0 -6
  596. data/app/views/rails_trade_my/orders/index.html.erb +0 -55
  597. data/app/views/rails_trade_my/orders/update_payment_type.js.erb +0 -3
  598. data/app/views/rails_trade_my/orders/wxpay_pay.js.erb +0 -16
  599. data/app/views/rails_trade_my/orders/wxpay_pay_err.js.erb +0 -5
  600. data/app/views/rails_trade_my/payment_methods/destroy.js.erb +0 -1
  601. data/app/views/rails_trade_my/payment_methods/update.js.erb +0 -2
  602. data/app/views/rails_trade_my/providers/_form.html.erb +0 -5
  603. data/app/views/rails_trade_my/providers/_provider.html.erb +0 -20
  604. data/app/views/rails_trade_my/providers/edit.html.erb +0 -2
  605. data/app/views/rails_trade_my/providers/index.html.erb +0 -12
  606. data/app/views/rails_trade_my/providers/new.html.erb +0 -10
  607. data/app/views/rails_trade_my/providers/show.html.erb +0 -13
  608. data/config/locales/zh.yml +0 -75
  609. data/db/migrate/20150514135720_create_providers.rb +0 -59
  610. data/db/migrate/20170601014520_create_payments.rb +0 -52
  611. data/db/migrate/20170602061859_create_payment_references.rb +0 -12
  612. data/db/migrate/20170702234123_create_orders.rb +0 -56
  613. data/db/migrate/20170714080032_create_payment_strategies.rb +0 -77
  614. data/db/migrate/20171115063702_create_promote_buyers.rb +0 -31
  615. data/db/schema.rb +0 -94
  616. data/lib/tasks/the_trade_tasks.rake +0 -4
@@ -1,4 +0,0 @@
1
- <p id="notice"><%= notice %></p>
2
-
3
- <%= link_to 'Edit', edit_address_path(@address) %> |
4
- <%= link_to 'Back', addresses_path %>
@@ -1,22 +0,0 @@
1
- <div class="ui menu vertical fluid">
2
- <div class="item">
3
- <span class="header">订单</span>
4
- <div class="menu">
5
- <%= link_to '购物信息', my_buyer_path, class: active_helper(controllers: ['buyers']) %>
6
- <%= link_to '购物车', my_cart_items_path, class: active_helper(controllers: ['cart_items']) %>
7
- <%= link_to '我的订单', my_orders_path, class: active_helper(controllers: ['orders']) %>
8
- </div>
9
- </div>
10
- <div class="item">
11
- <span class="header">服务商</span>
12
- <div class="menu">
13
- <%= link_to '供应商申请', my_provider_path, class: active_helper(controllers: ['providers']) %>
14
- </div>
15
- </div>
16
- </div>
17
-
18
-
19
-
20
-
21
-
22
-
@@ -1,5 +0,0 @@
1
- <%= form_with model: @buyer, scope: 'buyer', url: my_buyer_path, method: :patch do |f| %>
2
- <%= f.text_field :name %>
3
- <%= f.number_field :deposit_ratio %>
4
- <%= f.submit %>
5
- <% end %>
@@ -1,2 +0,0 @@
1
- <%= render 'form' %>
2
-
@@ -1,21 +0,0 @@
1
- <table class="ui very basic large table">
2
- <thead>
3
- <tr>
4
- <th class="three wide"></th>
5
- <th>
6
- <%= link_to '编辑', edit_my_buyer_path, class: 'ui mini blue right floated button' %>
7
- </th>
8
- </tr>
9
- </thead>
10
- <tbody>
11
- <tr>
12
- <td class="right aligned">称呼:</td>
13
- <td><%= @buyer.name %></td>
14
- </tr>
15
- <tr>
16
- <td class="right aligned">预付比例:</td>
17
- <td><%= @buyer.deposit_ratio %></td>
18
- </tr>
19
- </tbody>
20
- </table>
21
-
@@ -1,22 +0,0 @@
1
- <% @additions.promote_charges.each do |charge| %>
2
- <tr class="error">
3
- <td></td>
4
- <td><%= charge.item.name %></td>
5
- <td></td>
6
- <td></td>
7
- <td><%= charge.subtotal %></td>
8
- <td></td>
9
- </tr>
10
- <% end %>
11
- <% @additions.serve_charges.each do |charge| %>
12
- <tr class="warning">
13
- <td></td>
14
- <td><%= charge.item.name %></td>
15
- <td></td>
16
- <td></td>
17
- <td><%= charge.subtotal %></td>
18
- <td></td>
19
- </tr>
20
- <% end %>
21
-
22
-
@@ -1,6 +0,0 @@
1
- <% if cart_item.discount_price < 0 %>
2
- <span style="color: red;"><%= cart_item.discount_price %></span>
3
- <i class="info circle icon" style="color: grey;"></i>
4
- <% end %>
5
-
6
-
@@ -1,8 +0,0 @@
1
- <p>原价:<%= @additions.retail_price %></p>
2
- <p style="color: red;">批发折扣:<%= @additions.discount_price %></p>
3
- <p>折后价格: <%= @additions.bulk_price %></p>
4
- <p style="color: red;">优惠价格: <%= @additions.promote_price %></p>
5
- <p>附加服务: <%= @additions.serve_price %></p>
6
- <p>最终价格: <%= @additions.total_price %></p>
7
-
8
-
@@ -1,69 +0,0 @@
1
- <div class="ui segment top attached">
2
- </div>
3
-
4
- <table class="ui table">
5
- <thead>
6
- <tr class="">
7
- <th><%= check_box_tag :all %></th>
8
- <th>Name</th>
9
- <th>单价</th>
10
- <th>数量</th>
11
- <th>总价</th>
12
- <th></th>
13
- </tr>
14
- </thead>
15
- <tbody>
16
- <% @cart_items.each do |cart_item| %>
17
- <tr class="<%= 'active' if cart_item.checked %>" id="cart_item_<%= cart_item.id %>">
18
- <td><%= check_box_tag(:cart_item_id, cart_item.id, cart_item.checked) %></td>
19
- <td>
20
- <%= cart_item.good&.name %>
21
- <p style="color: grey;"><%= cart_item.good_type %></p>
22
- </td>
23
- <td>
24
- <p><%= cart_item.good.retail_price %></p>
25
- <p><%= cart_item.good&.quantity %><%= cart_item.good&.unit %></p>
26
- </td>
27
- <td>
28
- <div class="ui left right action input">
29
- <div class="ui button" onclick="decrease_quantity(<%= cart_item.id %>)"><i class="minus icon"></i></div>
30
- <%= text_field_tag :quantity, cart_item.quantity, id: "quantity_#{cart_item.id}", onkeyup: "update_quantity(#{cart_item.id})" %>
31
- <div class="ui button" onclick="increase_quantity(<%= cart_item.id %>)"><i class="plus icon"></i></div>
32
- </div>
33
- </td>
34
- <td>
35
- <p id="retail_price_<%= cart_item.id %>">
36
- <%= cart_item.bulk_price %>
37
- </p>
38
- <p id="discount_price_<%= cart_item.id %>">
39
- <%= render partial: 'single_price', locals: { cart_item: cart_item } %>
40
- </p>
41
- </td>
42
- <td>
43
- <%= link_to 'delete', my_cart_item_path(cart_item), method: :delete, remote: true %>
44
- </td>
45
- </tr>
46
- <% end %>
47
- </tbody>
48
- <tbody id="additions_body">
49
- <%= render 'additions' %>
50
- </tbody>
51
- <tfoot>
52
- <tr>
53
- <th colspan="4"></th>
54
- <th id="total_price">
55
- <%= render 'total_price' %>
56
- </th>
57
- <th></th>
58
- </tr>
59
- <tr>
60
- <th colspan="5">
61
- <div class="">
62
- <%= link_to '去结算', new_my_order_path(cart_item_ids: @checked_ids.join(',')), class: 'ui red right floated button', id: 'new_order' %>
63
- </div>
64
- </th>
65
- <th></th>
66
- </tr>
67
- </tfoot>
68
- </table>
69
-
@@ -1,11 +0,0 @@
1
- $('#additions_body').html('<%= j(render partial: 'additions') %>');
2
- $('#total_price').html('<%= j(render partial: 'total_price') %>');
3
-
4
- <% if params[:add_id].present? %>
5
- $("#cart_item_<%= params[:add_id] %>").addClass('active');
6
- <% end %>
7
-
8
- <% if params[:remove_id].present? %>
9
- $("#cart_item_<%= params[:remove_id] %>").removeClass('active');
10
- <% end %>
11
-
@@ -1,8 +0,0 @@
1
- $("#retail_price_<%= @cart_item.id %>").html('<%= @cart_item.retail_price %>');
2
-
3
- $("#discount_price_<%= @cart_item.id %>").html('<%= j(render partial: 'single_price', locals: { cart_item: @cart_item }) %>');
4
-
5
-
6
- $('#additions_body').html('<%= j(render partial: 'additions') %>');
7
-
8
- $('#total_price').html('<%= j(render partial: 'total_price') %>');
@@ -1,17 +0,0 @@
1
- <div class="ui grid page">
2
-
3
- <div class="four wide column">
4
- <%= render 'my/base/nav' %>
5
- </div>
6
-
7
- <div class="twelve wide column">
8
-
9
- <div class="ui segment">
10
- <div class="panel-heading"><%= link_to '编辑信息', edit_my_profile_path %></div>
11
- </div>
12
-
13
- </div>
14
-
15
- </div>
16
-
17
-
@@ -1,13 +0,0 @@
1
- <div class="ui modal" id="modal">
2
- <i class="close icon"></i>
3
- <div class="ui header blue">
4
- Select Payment Type
5
- </div>
6
-
7
- <div class="content">
8
- <%= form_with model: @order, url: payment_type_my_order_path(@order), method: :patch do |f| %>
9
- <%= f.select :payment_type, options_for_select(Order.options_i18n(:payment_type), @order.payment_type) %>
10
- <%= f.submit %>
11
- <% end %>
12
- </div>
13
- </div>
@@ -1,6 +0,0 @@
1
- $('#modal').replaceWith('<%= j(render 'edit_payment_type') %>')
2
-
3
- $('#modal').modal('setting', {
4
- autofocus: false
5
- }).modal('show');
6
- $('#order_payment_type').dropdown();
@@ -1,55 +0,0 @@
1
- <%= content_for(:wechat_js) do %>
2
- <%= wechat_config_js debug: false, api: ['chooseWXPay'] -%>
3
- <% end %>
4
-
5
- <div class="ui segment">
6
- <h1>订单列表</h1>
7
- </div>
8
-
9
- <table class="ui table">
10
- <thead>
11
- <tr>
12
- <th>订单号</th>
13
- <th>Amount</th>
14
- <th>Payment Status</th>
15
- <th>Pay</th>
16
- <th>Actions</th>
17
- </tr>
18
- </thead>
19
-
20
- <% @orders.each do |order| %>
21
- <tr>
22
- <td><%= order.uuid %></td>
23
- <td>
24
- <%= order.amount %>
25
- </td>
26
- <td><%= order.payment_status_i18n %></td>
27
- <td>
28
- <% if order.payment_type %>
29
- <span class="ui label"><%= order.payment_type %></span>
30
- <% else %>
31
- <%= link_to '选择支付方式', payment_type_my_order_path(order), remote: true, class: 'ui label' %>
32
- <% end %>
33
- <% if order.can_pay? %>
34
- <%= link_to 'pay', "/my/orders/#{order.id}/#{order.payment_type}_pay", remote: order.payment_type == 'wxpay' %>
35
- <% end %>
36
- </td>
37
- <td>
38
- <%= link_to my_order_path(order), data: { tooltip: t('.show') }, class: 'ui blue mini icon button' do %>
39
- <i class="location arrow icon"></i>
40
- <% end %>
41
- <%= link_to edit_my_order_path(order), remote: true, data: { tooltip: t('.edit') }, class: 'ui pink mini icon button' do %>
42
- <i class="pencil alternate icon"></i>
43
- <% end %>
44
- </td>
45
- </tr>
46
- <% end %>
47
- </table>
48
-
49
- <%= paginate @orders %>
50
-
51
-
52
-
53
-
54
-
55
-
@@ -1,3 +0,0 @@
1
- $('#modal').modal('hide');
2
-
3
- Turbolinks.visit(location);
@@ -1,16 +0,0 @@
1
- wx.ready(function() {
2
- wx.chooseWXPay({
3
- timestamp: "<%= @wxpay_order[:timeStamp] %>",
4
- nonceStr: "<%= @wxpay_order[:nonceStr] %>",
5
- package: "<%= @wxpay_order[:package] %>",
6
- signType: "<%= @wxpay_order[:signType] %>",
7
- paySign: "<%= @wxpay_order[:paySign] %>",
8
- success: function(res) {
9
- alert(res);
10
- window.location.href = '<%= my_orders_url %>';
11
- },
12
- error: function(e) {
13
- alert(e)
14
- }
15
- });
16
- });
@@ -1,5 +0,0 @@
1
- <% if @wxpay_order[:result_code] == 'FAIL' %>
2
- alert('<%= @wxpay_order[:err_code_des] %>');
3
- <% else %>
4
- alert('出现错误');
5
- <% end %>
@@ -1 +0,0 @@
1
- $('#payment_method_<%= @payment_method.id %>').remove();
@@ -1,2 +0,0 @@
1
- $('.ui.modal').modal('hide');
2
- $('#payment_method_<%= @payment_method.id %>').replaceWith('<%= j(render partial: 'item', locals: { payment_method: @payment_method }) %>')
@@ -1,5 +0,0 @@
1
- <%= form_with model: @provider, url: my_provider_path, method: :patch do |f| %>
2
- <%= f.text_field :name, label: 'Name' %>
3
- <%= f.file_field :logo, label: 'logo' %>
4
- <%= f.submit %>
5
- <% end %>
@@ -1,20 +0,0 @@
1
- <table class="ui very basic large table">
2
- <thead>
3
- <tr>
4
- <th class="three wide"></th>
5
- <th>
6
- <%= link_to '编辑', edit_my_provider_path, class: 'ui mini blue right floated button' %>
7
- </th>
8
- </tr>
9
- </thead>
10
- <tbody>
11
- <tr>
12
- <td class="right aligned">名称:</td>
13
- <td><%= @provider.name %></td>
14
- </tr>
15
- <tr>
16
- <td class="right aligned"></td>
17
- <td></td>
18
- </tr>
19
- </tbody>
20
- </table>
@@ -1,2 +0,0 @@
1
- <%= render 'form' %>
2
-
@@ -1,12 +0,0 @@
1
- <div class="ui basic segment">
2
-
3
- <h3 class="ui header">
4
- <%= link_to '申请供应商', new_my_provider_path, class: 'ui right floated mini blue button' %>
5
- </h3>
6
- <div class="ui divided items">
7
- <% @providers.each do |provider| %>
8
- <%= render partial: 'provider', locals: { provider: provider } %>
9
- <% end %>
10
- </div>
11
- </div>
12
-
@@ -1,10 +0,0 @@
1
- <div class="ui segment breadcrumb">
2
- <%= link_to '返回', my_providers_path, class: 'section' %>
3
- <div class="divider"> / </div>
4
- <div class="active section">新增</div>
5
- </div>
6
-
7
- <div class="ui segment">
8
- <%= render 'form' %>
9
- </div>
10
-
@@ -1,13 +0,0 @@
1
- <% if @provider.new_record? %>
2
- <%= render 'form' %>
3
- <% else %>
4
- <%= render 'provider' %>
5
-
6
- <h3 class="ui header">提供服务</h3>
7
- <div class="ui blue labels">
8
- <% @provider.facilitate_providers.verified.each do |facilitate_provider| %>
9
- <%= link_to facilitate_provider.facilitate.name, my_facilitate_provider_path(facilitate_provider), class: 'ui label' %>
10
- <% end %>
11
- </div>
12
- <% end %>
13
-
@@ -1,75 +0,0 @@
1
- zh:
2
- rails_trade_admin:
3
- payments:
4
- index:
5
- add_new: 新增
6
- import: 导入
7
- init: 预核销
8
- confirmed: 未预核销
9
- item:
10
- edit: 编辑
11
- destroy: 删除
12
- show: 支付方式
13
- checking: 核销
14
- analyze: 分析支付方式
15
- adjust: 平账
16
- payment_methods:
17
- index_layout:
18
- remove: 移除
19
- edit: 编辑
20
- destroy: 删除
21
- new: 新增
22
- relate: 关联买家
23
- activerecord:
24
- models:
25
- role: ''
26
- attributes:
27
- charge/type:
28
- SingleCharge: Single Charge
29
- TotalCharge: Total Charge
30
- payment/type:
31
- HandPayment: Hand Record
32
- BankPayment: Bank Record
33
- PaypalPayment: Paypal
34
- payment/state:
35
- init: 未核销
36
- part_checked: 部分核销
37
- all_checked: 全部核销
38
- abusive_checked: 问题核销
39
- payment:
40
- total_amount: 总金额
41
- income_amount: 净收入
42
- fee_amount: 手续费
43
- adjust_amount: 四舍五入
44
- buyer_name: 账号名称
45
- buyer_identifier: 账号
46
- buyer_bank: 银行
47
- notified_at: 通知时间
48
- uuid: 流水号
49
- type: 类别
50
- comment: 备注
51
- payment_method:
52
- account_name: 账号名称
53
- account_num: 账号
54
- bank: 银行
55
- verified: 已审核
56
- payment_references: 关联账号
57
- payment_order/state:
58
- init: 待确认
59
- confirmed: 已确认
60
- promote/type:
61
- QuantityPromote: 总重量
62
- NumberPromote: 购买件数
63
- AmountPromote: 总金额
64
- promote/scope:
65
- total: 全部应用
66
- single: 单独应用
67
- serve/type:
68
- QuantityServe: 总重量
69
- NumberServe: 购买件数
70
- serve/scope:
71
- total: 全部应用
72
- single: 单独应用
73
- serve_charge/type:
74
- SingleServeCharge: Single Charge
75
- TotalServeCharge: Total Charge