eric_weixin 0.3.3 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +17 -8
  3. data/app/assets/stylesheets/eric_weixin/wz/base.css.scss +72 -0
  4. data/app/controllers/eric_weixin/cms/weixin/media_news_controller.rb +1 -1
  5. data/app/controllers/eric_weixin/cms/weixin/weixin_users_controller.rb +24 -0
  6. data/app/controllers/eric_weixin/cms/weixin/xiaodian/orders_controller.rb +37 -4
  7. data/app/controllers/eric_weixin/wz/xiaodian/orders_controller.rb +8 -0
  8. data/app/models/eric_weixin/customs_service_record.rb +1 -1
  9. data/app/models/eric_weixin/media_news.rb +2 -2
  10. data/app/models/eric_weixin/public_account.rb +46 -2
  11. data/app/models/eric_weixin/redpack_order.rb +10 -1
  12. data/app/models/eric_weixin/reply_message_rule.rb +2 -1
  13. data/app/models/eric_weixin/weixin_user.rb +43 -20
  14. data/app/models/eric_weixin/xiaodian/order.rb +147 -86
  15. data/app/views/eric_weixin/cms/weixin/url_encodes/index.html.erb +2 -2
  16. data/app/views/eric_weixin/cms/weixin/weixin_users/index.html.erb +6 -0
  17. data/app/views/eric_weixin/cms/weixin/xiaodian/orders/index.html.erb +111 -26
  18. data/app/views/eric_weixin/wz/xiaodian/orders/index.html.erb +84 -0
  19. data/config/initializers/assets.rb +1 -0
  20. data/config/routes.rb +9 -0
  21. data/lib/eric_weixin/modules/snsapi.rb +1 -1
  22. data/lib/eric_weixin/version.rb +1 -1
  23. metadata +33 -2
data/config/routes.rb CHANGED
@@ -7,6 +7,8 @@ EricWeixin::Engine.routes.draw do
7
7
 
8
8
  get "/weixin/pay" => "wz/pays#prepay"
9
9
 
10
+ get "/weixin/orders" => "wz/xiaodian/orders#index"
11
+
10
12
  namespace :cms do
11
13
  namespace :weixin do
12
14
  namespace :xiaodian do
@@ -14,6 +16,9 @@ EricWeixin::Engine.routes.draw do
14
16
  collection do
15
17
  post :save_delivery_info
16
18
  get :download_orders
19
+ get :update_hb_infos
20
+ get :update_order_infos
21
+ post :update_delivery_info_by_excel
17
22
  end
18
23
  end
19
24
  resources :products do
@@ -30,6 +35,10 @@ EricWeixin::Engine.routes.draw do
30
35
  end
31
36
  end
32
37
  resources :weixin_users do
38
+ collection do
39
+ get :quick_get_user_infos
40
+ get :batch_update_user_infos
41
+ end
33
42
  member do
34
43
  post :modify_remark
35
44
  end
data/lib/eric_weixin/modules/snsapi.rb CHANGED
@@ -10,7 +10,7 @@ module EricWeixin::Snsapi
10
10
  # * schema_host 当前项目的域名(包含http://)：如http://www.baidu.com
11
11
  # * state 这个参数可以直接带到业务页面。
12
12
  # ===调用示例
13
- #
13
+ #EricWeixin::Snsapi.get_snsapi_base_url url:'/eric_weixin/weixin/orders?a=1', app_id: 'wxaa334fd34be16fca', schema_host: "http://www.uguoyuan.cn"
14
14
  def self.get_snsapi_base_url options
15
15
  require 'base64'
16
16
  p_zhongzhuan = []
data/lib/eric_weixin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EricWeixin
2
- VERSION = "0.3.3"
2
+ VERSION = "0.4.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: eric_weixin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.3
4
+ version: 0.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - 刘晓琦
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-01-11 00:00:00.000000000 Z
11
+ date: 2016-03-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -24,6 +24,34 @@ dependencies:
24
24
  - - '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: 4.1.4
27
+ - !ruby/object:Gem::Dependency
28
+ name: foundation-rails
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - '='
32
+ - !ruby/object:Gem::Version
33
+ version: 5.4.3
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - '='
39
+ - !ruby/object:Gem::Version
40
+ version: 5.4.3
41
+ - !ruby/object:Gem::Dependency
42
+ name: jquery-ui-rails
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - ~>
46
+ - !ruby/object:Gem::Version
47
+ version: 5.0.5
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ~>
53
+ - !ruby/object:Gem::Version
54
+ version: 5.0.5
27
55
  description: 快速开发微信公众账号
28
56
  email:
29
57
  - ericliu@ikidstv.com
@@ -39,6 +67,7 @@ files:
39
67
  - app/assets/stylesheets/eric_weixin/application.css
40
68
  - app/assets/stylesheets/eric_weixin/cms/base.css.scss
41
69
  - app/assets/stylesheets/eric_weixin/cms/foundation_and_overrides.scss
70
+ - app/assets/stylesheets/eric_weixin/wz/base.css.scss
42
71
  - app/controllers/eric_weixin/application_controller.rb
43
72
  - app/controllers/eric_weixin/cms/base_controller.rb
44
73
  - app/controllers/eric_weixin/cms/weixin/article_datas_controller.rb
@@ -57,6 +86,7 @@ files:
57
86
  - app/controllers/eric_weixin/cms/weixin/xiaodian/products_controller.rb
58
87
  - app/controllers/eric_weixin/wz/pays_controller.rb
59
88
  - app/controllers/eric_weixin/wz/weixin_controller.rb
89
+ - app/controllers/eric_weixin/wz/xiaodian/orders_controller.rb
60
90
  - app/helpers/eric_weixin/application_helper.rb
61
91
  - app/helpers/eric_weixin/cms/weixin/public_accounts_helper.rb
62
92
  - app/models/eric_weixin/access_token.rb
@@ -135,6 +165,7 @@ files:
135
165
  - app/views/eric_weixin/wz/pays/pay_fail.html.erb
136
166
  - app/views/eric_weixin/wz/pays/pay_ok.html.erb
137
167
  - app/views/eric_weixin/wz/pays/prepay.html.erb
168
+ - app/views/eric_weixin/wz/xiaodian/orders/index.html.erb
138
169
  - app/views/layouts/eric_weixin/application.html.erb
139
170
  - app/views/layouts/eric_weixin/cms/base.html.erb
140
171
  - app/views/layouts/eric_weixin/weixin/aa.erb