educode_sales 1.10.26 → 1.10.29

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/educode_sales/businesses_controller.rb +8 -1
  3. data/app/controllers/educode_sales/contracts_controller.rb +33 -12
  4. data/app/controllers/educode_sales/follow_ups_controller.rb +1 -1
  5. data/app/controllers/educode_sales/ideas_controller.rb +20 -1
  6. data/app/controllers/educode_sales/money_plan_records_controller.rb +6 -2
  7. data/app/controllers/educode_sales/money_plans_controller.rb +5 -1
  8. data/app/controllers/educode_sales/plans_controller.rb +43 -1
  9. data/app/models/educode_sales/idea.rb +13 -1
  10. data/app/models/educode_sales/idea_follow.rb +7 -0
  11. data/app/views/educode_sales/businesses/index.html.erb +62 -4
  12. data/app/views/educode_sales/businesses/index.json.jbuilder +5 -0
  13. data/app/views/educode_sales/businesses/key_person.html.erb +5 -0
  14. data/app/views/educode_sales/businesses/new_follow_record.html.erb +56 -6
  15. data/app/views/educode_sales/businesses/show_follow_record.html.erb +40 -2
  16. data/app/views/educode_sales/ideas/_index.html.erb +70 -17
  17. data/app/views/educode_sales/ideas/edit.html.erb +3 -3
  18. data/app/views/educode_sales/ideas/new.html.erb +4 -4
  19. data/app/views/educode_sales/ideas/new_follow_up.html.erb +47 -10
  20. data/app/views/educode_sales/plans/_monthPlan.html.erb +2 -0
  21. data/app/views/educode_sales/plans/_monthly.html.erb +1 -1
  22. data/app/views/educode_sales/plans/_weekly.html.erb +1 -0
  23. data/app/views/educode_sales/plans/_yearPlan.html.erb +1 -1
  24. data/app/views/educode_sales/plans/index.html.erb +57 -30
  25. data/app/views/educode_sales/plans/month_plan.js.erb +1 -0
  26. data/app/views/educode_sales/plans/monthly.js.erb +1 -0
  27. data/app/views/educode_sales/plans/weekly.js.erb +1 -0
  28. data/app/views/educode_sales/plans/year_plan.js.erb +1 -0
  29. data/app/views/educode_sales/teachers/add_keys.html.erb +0 -1
  30. data/app/views/layouts/educode_sales/application.html.erb +384 -338
  31. data/config/routes.rb +5 -0
  32. data/db/migrate/20230704124921_add_plan_a_date_to_follow_ups.rb +9 -0
  33. data/lib/educode_sales/version.rb +1 -1
  34. metadata +7 -2
data/config/routes.rb CHANGED
@@ -261,6 +261,11 @@ EducodeSales::Engine.routes.draw do
261
261
  get :edit_bussiness_info_extra
262
262
  post :update_business_info_extra
263
263
  get :staff_businesses
264
+ get :week_plan
265
+ get :weekly
266
+ get :month_plan
267
+ get :monthly
268
+ get :year_plan
264
269
  end
265
270
  member do
266
271
  delete :delete_business_info
@@ -0,0 +1,9 @@
1
+ class AddPlanADateToFollowUps < ActiveRecord::Migration[5.2]
2
+ def change
3
+ add_column :educode_sales_follow_ups, :plan_a_date, :date, comment: '计划a类时间'
4
+ add_column :educode_sales_follow_ups, :plan_a_money, :double, comment: '计划a类金额'
5
+ add_column :educode_sales_follow_ups, :invitation_money, :double, comment: '计划投标金额'
6
+ add_column :educode_sales_follow_ups, :plan_return_date, :date, comment: '计划回款时间'
7
+ add_column :educode_sales_follow_ups, :plan_return_money, :double, comment: '计划回款金额'
8
+ end
9
+ end
@@ -1,3 +1,3 @@
1
1
  module EducodeSales
2
- VERSION = '1.10.26'
2
+ VERSION = '1.10.29'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: educode_sales
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.26
4
+ version: 1.10.29
5
5
  platform: ruby
6
6
  authors:
7
7
  - anke1460
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-07-04 00:00:00.000000000 Z
11
+ date: 2023-07-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -518,6 +518,8 @@ files:
518
518
  - app/views/educode_sales/plans/edit_year_plan.html.erb
519
519
  - app/views/educode_sales/plans/index.html.erb
520
520
  - app/views/educode_sales/plans/index.json.jbuilder
521
+ - app/views/educode_sales/plans/month_plan.js.erb
522
+ - app/views/educode_sales/plans/monthly.js.erb
521
523
  - app/views/educode_sales/plans/my_month.json.jbuilder
522
524
  - app/views/educode_sales/plans/my_week.json.jbuilder
523
525
  - app/views/educode_sales/plans/new_month.html.erb
@@ -531,6 +533,8 @@ files:
531
533
  - app/views/educode_sales/plans/show_monthly.html.erb
532
534
  - app/views/educode_sales/plans/show_week.html.erb
533
535
  - app/views/educode_sales/plans/show_weekly.html.erb
536
+ - app/views/educode_sales/plans/weekly.js.erb
537
+ - app/views/educode_sales/plans/year_plan.js.erb
534
538
  - app/views/educode_sales/plans/years_plan.json.jbuilder
535
539
  - app/views/educode_sales/project_charts/_sales_analysis.html.erb
536
540
  - app/views/educode_sales/project_charts/sales_analysis.js.erb
@@ -745,6 +749,7 @@ files:
745
749
  - db/migrate/20230614141628_create_educode_sales_follow_up_tags.rb
746
750
  - db/migrate/20230614142145_create_educode_sales_watch_follow_ups.rb
747
751
  - db/migrate/20230629130033_add_clazz_to_money_plans.rb
752
+ - db/migrate/20230704124921_add_plan_a_date_to_follow_ups.rb
748
753
  - lib/educode_sales.rb
749
754
  - lib/educode_sales/engine.rb
750
755
  - lib/educode_sales/version.rb