educode_sales 0.6.3 → 0.6.7

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 (51) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/educode_sales/money_plans.png +0 -0
  3. data/app/controllers/educode_sales/activities_controller.rb +0 -2
  4. data/app/controllers/educode_sales/businesses_controller.rb +103 -47
  5. data/app/controllers/educode_sales/money_plans_controller.rb +65 -0
  6. data/app/controllers/educode_sales/roles_controller.rb +4 -1
  7. data/app/controllers/educode_sales/sale_trends_controller.rb +145 -30
  8. data/app/controllers/educode_sales/staffs_controller.rb +3 -4
  9. data/app/controllers/educode_sales/teacher_follows_controller.rb +1 -93
  10. data/app/models/educode_sales/business_export_record.rb +5 -0
  11. data/app/models/educode_sales/permission.rb +2 -1
  12. data/app/models/educode_sales/role_area.rb +1 -0
  13. data/app/views/educode_sales/activities/index.html.erb +7 -1
  14. data/app/views/educode_sales/activities/new.html.erb +1 -1
  15. data/app/views/educode_sales/businesses/_follows.html.erb +15 -15
  16. data/app/views/educode_sales/businesses/edit_follow_record.html.erb +13 -4
  17. data/app/views/educode_sales/businesses/edit_plan.html.erb +5 -2
  18. data/app/views/educode_sales/businesses/export_records.html.erb +53 -0
  19. data/app/views/educode_sales/businesses/export_records.json.jbuilder +11 -0
  20. data/app/views/educode_sales/businesses/file.html.erb +8 -4
  21. data/app/views/educode_sales/businesses/index.html.erb +121 -14
  22. data/app/views/educode_sales/businesses/index.json.jbuilder +34 -4
  23. data/app/views/educode_sales/businesses/new_follow_record.html.erb +10 -5
  24. data/app/views/educode_sales/businesses/show_follow.html.erb +1 -0
  25. data/app/views/educode_sales/commons/index.html.erb +7 -1
  26. data/app/views/educode_sales/customers/edit.html.erb +690 -10
  27. data/app/views/educode_sales/customers/edit_follow_record.html.erb +1 -1
  28. data/app/views/educode_sales/customers/index.json.jbuilder +2 -1
  29. data/app/views/educode_sales/customers/new.html.erb +691 -11
  30. data/app/views/educode_sales/customers/new_follow_record.html.erb +1 -1
  31. data/app/views/educode_sales/customers/show_follow.html.erb +1 -1
  32. data/app/views/educode_sales/money_plans/index.html.erb +222 -0
  33. data/app/views/educode_sales/money_plans/index.json.jbuilder +21 -0
  34. data/app/views/educode_sales/places/index.html.erb +16 -2
  35. data/app/views/educode_sales/places/index.json.jbuilder +3 -1
  36. data/app/views/educode_sales/plans/_monthPlan.html.erb +2 -1
  37. data/app/views/educode_sales/plans/_weekPlan.html.erb +2 -1
  38. data/app/views/educode_sales/recycles/business.json.jbuilder +2 -2
  39. data/app/views/educode_sales/roles/edit.html.erb +8 -0
  40. data/app/views/educode_sales/roles/index.html.erb +7 -1
  41. data/app/views/educode_sales/sale_trends/trends.html.erb +145 -33
  42. data/app/views/educode_sales/sale_trends/trends.json.jbuilder +4 -14
  43. data/app/views/educode_sales/sales/index.html.erb +2 -0
  44. data/app/views/educode_sales/sales/index.json.jbuilder +2 -2
  45. data/app/views/educode_sales/sales/operations.json.jbuilder +2 -2
  46. data/app/views/educode_sales/teachers/index.html.erb +15 -7
  47. data/app/views/layouts/educode_sales/application.html.erb +18 -2
  48. data/config/routes.rb +4 -0
  49. data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb +10 -0
  50. data/lib/educode_sales/version.rb +1 -1
  51. metadata +9 -2
data/app/views/educode_sales/customers/edit_follow_record.html.erb CHANGED
@@ -12,7 +12,7 @@
12
12
  <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id),@follow_up.department_id)%>
13
13
  </div>
14
14
  </div>
15
- <div class="layui-form-item " style="padding-left: 110px">
15
+ <div class="layui-form-item " style="padding-left: 150px">
16
16
  <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_follow_up">提交
17
17
  </button>
18
18
  </div>
data/app/views/educode_sales/customers/index.json.jbuilder CHANGED
@@ -1,3 +1,4 @@
1
+ x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
1
2
  json.data do
2
3
  json.array! @customers do |d|
3
4
  business_ids = EducodeSales::Business.where(school_id: d.id).ids
@@ -14,7 +15,7 @@ json.data do
14
15
  json.name d.name
15
16
  json.area d.province
16
17
  json.department d.departments.size
17
- json.business business_ids.size
18
+ json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
18
19
  json.follow follow_ups.size + customer_follows.size
19
20
  json.staff EducodeSales::CustomerExtension.find_by(school_id: d.id)&.customer_staff&.user&.real_name
20
21
  end