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
@@ -0,0 +1,35 @@
1
+ module RailsTrade::Buyer
2
+ extend ActiveSupport::Concern
3
+
4
+ included do
5
+ attribute :name, :string
6
+
7
+ has_many :carts, as: :buyer, dependent: :destroy
8
+ has_many :orders, as: :buyer, inverse_of: :buyer, dependent: :nullify
9
+
10
+ has_many :promote_buyers, -> { valid }, as: :buyer, dependent: :destroy
11
+ has_many :promotes, through: :promote_buyers
12
+
13
+ has_many :payment_references, as: :buyer, dependent: :destroy, autosave: true
14
+ has_many :payment_methods, through: :payment_references, autosave: true
15
+
16
+ scope :credited, -> { where(payment_strategy_id: self.credit_ids) }
17
+ end
18
+
19
+ def name_detail
20
+ "#{name} (#{id})"
21
+ end
22
+
23
+ def last_overdue_date
24
+ orders.order(overdue_date: :asc).first&.overdue_date
25
+ end
26
+
27
+ class_methods do
28
+
29
+ def credit_ids
30
+ PaymentStrategy.where.not(period: 0).pluck(:id)
31
+ end
32
+
33
+ end
34
+
35
+ end
@@ -0,0 +1,64 @@
1
+ # 数据定期清理
2
+ # 改变数据动作:
3
+ # * 新增(check)
4
+ # * 更新数量
5
+ # * 选择或更换优惠券
6
+ # * 选择服务
7
+ module RailsTrade::Cart
8
+ extend ActiveSupport::Concern
9
+
10
+ included do
11
+ attribute :session_id, :string, limit: 128
12
+ attribute :amount, :decimal, precision: 10, scale: 2
13
+ attribute :trade_items_count, :integer, default: 0
14
+ attribute :retail_price, :decimal, default: 0, comment: '商品汇总的原价'
15
+ attribute :discount_price, :decimal, default: 0
16
+ attribute :bulk_price, :decimal, default: 0
17
+ attribute :reduced_amount, :decimal, default: 0, comment: '汇总的减少价格'
18
+ attribute :additional_amount, :decimal, default: 0
19
+ attribute :total_quantity, :decimal, default: 0
20
+ attribute :deposit_ratio, :integer, default: 100, comment: '最小预付比例'
21
+ attribute :payment_strategy_id, :integer
22
+ attribute :default, :boolean, default: false
23
+
24
+ belongs_to :organ, optional: true
25
+ belongs_to :user, optional: true
26
+ belongs_to :buyer, polymorphic: true, optional: true
27
+ belongs_to :payment_strategy, optional: true
28
+ has_many :orders, dependent: :nullify
29
+
30
+ validates :deposit_ratio, numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 100 }, allow_nil: true
31
+
32
+ validates :user_id, presence: true, if: -> { session_id.blank? }
33
+ validates :session_id, presence: true, if: -> { user_id.blank? }
34
+
35
+ after_update :set_default, if: -> { self.default? && saved_change_to_default? }
36
+ end
37
+
38
+ def compute_price
39
+ self.retail_price = trade_items.checked.sum(&:retail_price)
40
+ self.discount_price = trade_items.checked.sum(&:discount_price)
41
+ self.bulk_price = self.retail_price - self.discount_price
42
+
43
+ self.reduced_amount = trade_items.checked.sum(&:reduced_amount)
44
+ self.additional_amount = trade_items.checked.sum(&:additional_amount)
45
+
46
+ self.amount = trade_items.checked.sum(&:amount)
47
+
48
+ self.total_quantity = trade_items.checked.sum(&:original_quantity)
49
+ self
50
+ end
51
+
52
+ def set_default
53
+ self.class.where.not(id: self.id).where(user_id: self.user_id).update_all(default: false)
54
+ end
55
+
56
+ class_methods do
57
+
58
+ def default
59
+ find_by(default: true)
60
+ end
61
+
62
+ end
63
+
64
+ end
@@ -0,0 +1,71 @@
1
+ module RailsTrade::Good
2
+ extend ActiveSupport::Concern
3
+
4
+ included do
5
+ attribute :name, :string
6
+ attribute :sku, :string, default: -> { SecureRandom.hex }
7
+ attribute :price, :decimal, default: 0
8
+ attribute :advance_price, :decimal, default: 0
9
+ attribute :extra, :json, default: {}
10
+ attribute :unit, :string
11
+ attribute :quantity, :decimal, default: 0
12
+ attribute :unified_quantity, :decimal, default: 0
13
+
14
+ has_many :trade_items, as: :trade, autosave: true, dependent: :destroy
15
+ has_many :orders, through: :trade_items, source: :trade
16
+
17
+ has_many :promote_goods, as: :good
18
+ end
19
+
20
+ def final_price
21
+ compute_order_amount
22
+ #self.retail_price + self.promote_price
23
+ end
24
+
25
+ def valid_promote_goods
26
+ PromoteGood.valid.where(good_type: self.class.base_class.name, good_id: [nil, self.id]).where.not(promote_id: self.promote_goods.select(:promote_id).unavailable)
27
+ end
28
+
29
+ def default_promote_goods
30
+ PromoteGood.default.where(good_type: self.class.base_class.name, good_id: [nil, self.id])
31
+ end
32
+
33
+ def generate_order!(buyer: nil, cart: nil, maintain_id: nil, **params)
34
+ o = generate_order(buyer: buyer, cart: cart, maintain_id: maintain_id, **params)
35
+ o.check_state
36
+ o.save!
37
+ o
38
+ end
39
+
40
+ def generate_order(buyer: nil, cart: nil, maintain_id: nil, **params)
41
+ if buyer
42
+ o = buyer.orders.build
43
+ elsif cart
44
+ o = cart.orders.build
45
+ else
46
+ raise 'please assign buyer or cart'
47
+ end
48
+
49
+ o.organ_id = self.organ_id if self.respond_to?(:organ_id)
50
+ if o.respond_to?(:maintain_id)
51
+ o.maintain_id = maintain_id
52
+ o.organ_id ||= o.maintain&.organ_id
53
+ end
54
+
55
+ ti = o.trade_items.build(good: self)
56
+ ti.assign_attributes params.slice(:number)
57
+ ti.init_amount
58
+ ti.compute_promote
59
+ ti.sum_amount
60
+
61
+ o.assign_attributes params.slice(:extra, :currency)
62
+ o.compute_promote
63
+ o.compute_amount
64
+ o
65
+ end
66
+
67
+ def order_done
68
+ puts 'Should realize in good entity'
69
+ end
70
+
71
+ end
@@ -1,111 +1,98 @@
1
- class Order < ApplicationRecord
2
- include ThePayment
3
- include TheRefund
4
- include PaymentInterfaceBase
5
-
6
- belongs_to :payment_strategy, optional: true
7
- belongs_to :buyer, optional: true
8
- has_many :payment_orders, inverse_of: :order, dependent: :destroy
9
- has_many :payments, through: :payment_orders, inverse_of: :orders
10
- has_many :order_items, dependent: :destroy, autosave: true, inverse_of: :order
11
- has_many :refunds, dependent: :nullify, inverse_of: :order
12
- has_many :order_promotes, autosave: true, inverse_of: :order
13
- has_many :order_serves, autosave: true
14
- has_many :pure_order_promotes, -> { where(order_item_id: nil) }, class_name: 'OrderPromote'
15
- has_many :pure_order_serves, -> { where(order_item_id: nil) }, class_name: 'OrderServe'
16
-
17
- accepts_nested_attributes_for :order_items
18
- accepts_nested_attributes_for :order_serves
19
- accepts_nested_attributes_for :order_promotes
20
-
21
- scope :credited, -> { where(payment_strategy_id: PaymentStrategy.where.not(period: 0).pluck(:id)) }
22
- scope :to_pay, -> { where(payment_status: ['unpaid', 'part_paid']) }
23
-
24
- after_initialize if: :new_record? do |o|
25
- self.uuid = UidHelper.nsec_uuid('OD')
26
- self.payment_status = 'unpaid'
27
- self.buyer_id = self.user&.buyer_id if self.buyer_id.blank?
28
- self.payment_strategy_id = self.buyer&.payment_strategy_id
29
-
30
- compute_sum
31
- end
32
-
33
- after_create_commit :confirm_ordered!
34
-
35
- enum payment_status: {
36
- unpaid: 0,
37
- part_paid: 1,
38
- all_paid: 2,
39
- refunding: 3,
40
- refunded: 4,
41
- denied: 5
42
- }
1
+ module RailsTrade::Order
2
+ extend ActiveSupport::Concern
3
+ include RailsTrade::Ordering::Payment
4
+ include RailsTrade::Ordering::Refund
5
+
6
+ included do
7
+ attribute :uuid, :string
8
+ attribute :state, :string
9
+ attribute :item_amount, :decimal, precision: 10, scale: 2
10
+ attribute :overall_additional_amount, :decimal, precision: 10, scale: 2
11
+ attribute :overall_reduced_amount, :decimal, precision: 10, scale: 2
12
+ attribute :amount, :decimal, precision: 10, scale: 2
13
+ attribute :received_amount, :decimal, precision: 10, scale: 2
14
+ attribute :payment_id, :integer, comment: 'for paypal'
15
+ attribute :myself, :boolean, default: true
16
+ attribute :note, :string, limit: 4096
17
+ attribute :expire_at, :datetime
18
+ attribute :payment_status, :string, default: 'unpaid', index: true
19
+ attribute :received_amount, :decimal, default: 0
20
+ attribute :expire_at, :datetime, default: -> { Time.current + RailsTrade.config.expire_after }
21
+ attribute :extra, :json, default: {}
22
+ attribute :currency, :string, default: RailsTrade.config.default_currency
23
+ attribute :trade_items_count, :integer, default: 0
24
+ attribute :lock_version, :integer
25
+
26
+ belongs_to :organ, optional: true
27
+ belongs_to :cart, optional: true
28
+ belongs_to :user, optional: true
29
+ belongs_to :payment_strategy, optional: true
30
+ has_many :payment_orders, dependent: :destroy
31
+ has_many :payments, through: :payment_orders, inverse_of: :orders
32
+ has_many :refunds, dependent: :nullify, inverse_of: :order
33
+
34
+ scope :credited, -> { where(payment_strategy_id: PaymentStrategy.where.not(period: 0).pluck(:id)) }
35
+ scope :to_pay, -> { where(payment_status: ['unpaid', 'part_paid']) }
36
+
37
+ enum payment_status: {
38
+ unpaid: 'unpaid',
39
+ part_paid: 'part_paid',
40
+ all_paid: 'all_paid',
41
+ refunding: 'refunding',
42
+ refunded: 'refunded',
43
+ denied: 'denied'
44
+ }
45
+
46
+ after_initialize if: :new_record? do
47
+ if cart
48
+ self.user_id = cart.user_id
49
+ self.payment_strategy_id = cart.payment_strategy_id
50
+ end
51
+ end
52
+ before_validation do
53
+ self.uuid ||= UidHelper.nsec_uuid('OD')
54
+ end
55
+ after_save :sync_from_cart, if: -> { saved_change_to_cart_id? && cart }
56
+ after_create_commit :confirm_ordered!
43
57
 
44
- def extra
45
- {}
58
+ delegate :url_helpers, to: 'Rails.application.routes'
46
59
  end
47
60
 
48
61
  def subject
49
- order_items.map { |oi| oi.good&.name || 'Goods' }.join(', ')
62
+ trade_items.map { |oi| oi.good&.name || 'Goods' }.join(', ')
50
63
  end
51
64
 
52
- def migrate_from_cart_item(cart_item_id)
53
- cart_item = CartItem.find cart_item_id
54
- self.user = cart_item.user
55
- self.buyer = user.buyer
56
- self.order_items.build(cart_item_id: cart_item_id, good_type: cart_item.good_type, good_id: cart_item.good_id, quantity: cart_item.quantity)
57
-
58
- cart_item.total_serve_charges.each do |serve_charge|
59
- self.order_serves.build(serve_charge_id: serve_charge.id, serve_id: serve_charge.serve_id, amount: serve_charge.subtotal)
60
- end
61
- cart_item.total_promote_charges.each do |promote_charge|
62
- self.order_promotes.build(promote_charge_id: promote_charge.id, promote_id: promote_charge.promote_id, amount: promote_charge.subtotal)
63
- end
64
- compute_sum
65
+ def user_name
66
+ user&.name.presence || "#{user&.id}"
65
67
  end
66
68
 
67
- def migrate_from_cart_items(cart_item_ids: nil)
68
- cart_items = user.cart_items.checked.default_where(myself: self.myself)
69
- cart_items.each do |cart_item|
70
- self.order_items.build cart_item_id: cart_item.id, good_type: cart_item.good_type, good_id: cart_item.good_id, quantity: cart_item.quantity
71
- end
72
- init_with_default_serves
69
+ def amount_money
70
+ amounto_money(self.currency)
73
71
  end
74
72
 
75
- def init_with_default_serves(cart_item_ids: nil)
76
- summary = CartItem.checked_items(user_id: self.user_id, myself: self.myself, extra: self.extra)
77
-
78
- summary.promote_charges.each do |promote_charge|
79
- self.order_promotes.build(promote_charge_id: promote_charge.id, promote_id: promote_charge.promote_id, amount: promote_charge.subtotal)
80
- end
81
- summary.serve_charges.each do |serve_charge|
82
- self.order_serves.build(serve_charge_id: serve_charge.id, serve_id: serve_charge.serve_id, amount: serve_charge.subtotal)
83
- end
84
- compute_sum
73
+ def compute_promote
85
74
  end
86
75
 
87
- def compute_sum
88
- _pure_order_serves = self.order_serves.select { |os| os.order_item_id.nil? }
89
- _pure_order_promotes = self.order_promotes.select { |op| op.order_item_id.nil? }
90
-
91
- self.pure_serve_sum = _pure_order_serves.sum { |o| o.amount }
92
- self.pure_promote_sum = _pure_order_promotes.sum { |o| o.amount }
93
- self.subtotal = self.order_items.sum { |o| o.amount }
94
- self.amount = self.subtotal.to_d + self.pure_serve_sum.to_d + self.pure_promote_sum.to_d
76
+ def metering_attributes
77
+ attributes.slice 'quantity', 'amount'
95
78
  end
96
79
 
97
- def promote_amount
98
- order_promotes.sum(:amount)
99
- end
80
+ def sync_from_cart
81
+ cart.trade_items.checked.default_where(myself: myself).update_all(trade_type: self.class.name, trade_id: self.id)
82
+ cart.trade_promotes.update_all(trade_type: self.class.name, trade_id: self.id)
100
83
 
101
- def serve_amount
102
- serve_promotes.sum(:amount)
84
+ self.compute_amount
85
+ self.save
103
86
  end
104
87
 
105
88
  def confirm_ordered!
106
- self.order_items.each do |oi|
107
- oi.confirm_ordered!
108
- end
89
+ self.trade_items.each(&:confirm_ordered!)
90
+ end
91
+
92
+ def compute_received_amount
93
+ _received_amount = self.payment_orders.where(state: 'confirmed').sum(:check_amount)
94
+ _refund_amount = self.refunds.where.not(state: 'failed').sum(:total_amount)
95
+ _received_amount - _refund_amount
109
96
  end
110
97
 
111
- end unless RailsTrade.config.disabled_models.include?('Order')
98
+ end
@@ -0,0 +1,113 @@
1
+ # payment_id
2
+ # payment_type
3
+ # amount
4
+ # received_amount
5
+ module RailsTrade::Ordering::Payment
6
+
7
+ def can_pay?
8
+ self.payment_status != 'all_paid'
9
+ end
10
+
11
+ def unreceived_amount
12
+ self.amount.to_d - self.received_amount.to_d
13
+ end
14
+
15
+ def init_received_amount
16
+ self.payment_orders.confirmed.sum(:check_amount)
17
+ end
18
+
19
+ def pending_payments
20
+ Payment.where.not(id: self.payment_orders.pluck(:payment_id)).where(payment_method_id: self.buyer.payment_method_ids, state: ['init', 'part_checked'])
21
+ end
22
+
23
+ def exists_payments
24
+ Payment.where.not(id: self.payment_orders.pluck(:payment_id)).exists?(payment_method_id: self.buyer.payment_method_ids, state: ['init', 'part_checked'])
25
+ end
26
+
27
+ def confirm_paid!
28
+ self.expire_at = nil
29
+ self.trade_items.each(&:confirm_paid!)
30
+ sent_notice
31
+ end
32
+
33
+ def confirm_part_paid!
34
+ self.expire_at = nil
35
+ self.trade_items.each(&:confirm_part_paid!)
36
+ end
37
+
38
+ def change_to_paid!(type:, payment_uuid:, params: {})
39
+ payment = self.payments.find_by(type: type, payment_uuid: payment_uuid)
40
+
41
+ if payment
42
+ self.check_state!
43
+ payment
44
+ else
45
+ payment = self.payments.build(type: type, payment_uuid: payment_uuid)
46
+ payment.assign_detail params
47
+
48
+ payment_order = self.payment_orders.find { |i| i.id.nil? }
49
+ payment_order.check_amount = payment.total_amount
50
+
51
+ begin
52
+ self.class.transaction do
53
+ payment_order.confirm!
54
+ payment.save!
55
+ self.save!
56
+ end
57
+ rescue ActiveRecord::RecordInvalid => e
58
+ payment.errors.add :base, 'can not save'
59
+ logger.error "#{payment.errors.full_messages.join(', ')}"
60
+ raise e
61
+ end
62
+ payment
63
+ end
64
+ end
65
+
66
+ def sent_notice
67
+ return unless self.user
68
+ PaidChannel.broadcast_to(
69
+ self.user_id,
70
+ link: url_helpers.my_order_url(id),
71
+ )
72
+ end
73
+
74
+ def payment_result(payment_kind: payment_type)
75
+ if self.payment_status == 'all_paid'
76
+ return self
77
+ end
78
+
79
+ if self.amount == 0
80
+ self.received_amount = self.amount
81
+ self.check_state!
82
+ end
83
+
84
+ if payment_kind.present?
85
+ begin
86
+ self.send payment_kind.to_s + '_result'
87
+ rescue NoMethodError
88
+ self
89
+ end
90
+ end
91
+
92
+ self
93
+ end
94
+
95
+ def check_state
96
+ if self.received_amount.to_d >= self.amount
97
+ self.payment_status = 'all_paid'
98
+ self.confirm_paid!
99
+ elsif self.received_amount.to_d > 0 && self.received_amount.to_d < self.amount
100
+ self.payment_status = 'part_paid'
101
+ self.confirm_part_paid!
102
+ elsif self.received_amount.to_d <= 0
103
+ self.payment_status = 'unpaid'
104
+ end
105
+ end
106
+
107
+ def check_state!
108
+ self.received_amount = init_received_amount
109
+ self.check_state
110
+ self.save!
111
+ end
112
+
113
+ end