educode_sales 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6baded80505507fdcdbd19b692cb8aea834ed542
-  data.tar.gz: e1c6c03ff6afc8f1d9b311b2ac1a443a74937694
+  metadata.gz: b0b586bc3b1634320b6fb34e4646577e51cd2eed
+  data.tar.gz: a05dcbb55cc2e2e8f3e7dfbc7671d5f89c24fca5
 SHA512:
-  metadata.gz: 2f29bf7099856cbbd37f27b0b35f0181b74e16b9ac0b8570a66f5f99cdbc2addd71936a608dc449d6a3dc393aa76a90fa0128f4c80813b19d339fc97233e8978
-  data.tar.gz: 9f56ff2aa864e839270995775e73fb43a5353bfdfeaa8a0ad2db0af9210dc1f1e80e1fd6f4ce76b19a8ca0e3b10adc7850d3d61ed9455fc50a9c303a7c097ed2
+  metadata.gz: 7099d303b654990b619fcad31ddf547c3412be01a359bb00c0fec6534f32a7764326d512916536d1dbd1710193bddb08b370096250c21fc5dedc976bfc786f12
+  data.tar.gz: 17ac1d2f5b4b134147ca1b77b53c340c04389269e2f1b8b89c9b89c90893eed640c5cb5980f0be28a10e8ada7c18f927d2b326069d1a0f47d237902f13b5f832

data/app/assets/stylesheets/educode_sales/app.css

@@ -109,6 +109,7 @@
 
 .welcome .layui-bg-number {
   background-color: #F8F8F8;
+  height: 90px;
 }
 
 .welcome .layuimini-notice:hover {
@@ -243,7 +244,8 @@ td .layui-table-cell .layui-form-select {
   margin-top: 5px;
 }
 
-.edit-table .layui-table-body.layui-table-main {
+.edit-table .layui-table-body.layui-table-main,
+.min-height-table .layui-table-body.layui-table-main {
   min-height: 200px;
 }
 

data/app/controllers/educode_sales/activities_controller.rb

@@ -13,7 +13,7 @@ module EducodeSales
           else
             @activities = @activities.order("created_at desc")
           end
-          @activities = @activities.page(params[:page]).per(params[:per_page])
+          @activities = @activities.page(params[:page]).per(params[:limit])
         end
       end
     end

data/app/controllers/educode_sales/businesses_controller.rb

@@ -25,13 +25,7 @@ module EducodeSales
             end
           end
           
-          @businesses = @businesses.select("
-            educode_sales_businesses.*,
-            last_follow.invitation_at,
-            last_follow.reception_at,
-            last_follow.total_amount").joins(" 
-            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
-          ")
+          @businesses = @businesses
           if params[:q].present? && params[:q][:name].present?
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
@@ -70,11 +64,22 @@ module EducodeSales
             @businesses = @businesses.where("created_at > ? AND created_at < ?", date[0], date[1])
           end
 
+
           if params[:sort].present? && params[:sort][:field]
             @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
             @businesses = @businesses.order("created_at desc")
           end
+
+          @business_count = @businesses.count
+          
+          @businesses = @businesses.select("
+            educode_sales_businesses.*,
+            last_follow.invitation_at,
+            last_follow.reception_at,
+            last_follow.total_amount").joins(" 
+            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
+          ").page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -139,7 +144,7 @@ module EducodeSales
           else
             @follow_ups = @follow_ups.order("created_at desc")
           end
-          @follow_ups = @follow_ups.page(params[:page]).per(params[:per_page])
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -156,7 +161,7 @@ module EducodeSales
 
     def unfinish_plans
       load_business
-      @plans = @business.sale_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:per_page])
+      @plans = @business.sale_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:limit])
     end
 
     def show_follow_record

data/app/controllers/educode_sales/commons_controller.rb

@@ -8,7 +8,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @commons = Common.group("clazz")
+          @commons = Common.group("clazz").page(params[:page]).per(params[:limit])
         end
       end
     end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -18,7 +18,11 @@ module EducodeSales
 
     def destroy
       follow_up = FollowUp.find(params[:id])
+      business = follow_up.business
       if follow_up.destroy
+        if follow_up.id == business.last_follow_up_id
+          business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: business.follow_ups.last&.id).sum(:amount))
+        end
         render_success
       else
         render_failure follow_up
@@ -39,7 +43,7 @@ module EducodeSales
     def teachers
       follow_up = FollowUp.find_by(id: params[:id])
       if follow_up.present?
-        @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:per_page])
+        @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:limit])
       else
         @teachers = FollowUp.none
       end
@@ -47,7 +51,7 @@ module EducodeSales
 
     def money_plans
       follow_up = FollowUp.find_by(id: params[:id])
-      @money_plans = follow_up.money_plans.page(params[:page]).per(params[:per_page])
+      @money_plans = follow_up.money_plans.page(params[:page]).per(params[:limit])
     end
 
     def add_money

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -39,14 +39,14 @@ module EducodeSales
             @sale_plans = @sale_plans.where("month >= ? and month <= ?", "#{params[:q][:year]}-01-01 00:00:00".to_date, "#{params[:q][:year]}-12-31 23:59:00".to_date)
           end
           if params[:q].present? && params[:q][:month].present?
-            @sale_plans = @sale_plans.where("month >= ?", "#{params[:q][:month]}-01 00:00:00".to_date)
+            @sale_plans = @sale_plans.where("month = ?", "#{params[:q][:month]}-01 00:00:00".to_date)
           end
           if params[:sort].present? && params[:sort][:field]
             @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
             @sale_plans = @sale_plans.order("updated_at desc")
           end
-          @sale_plans = @sale_plans.page(params[:page]).per(params[:per_page])
+          @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -60,13 +60,13 @@ module EducodeSales
       else
         @weeks = [week]
       end
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       render layout: false
     end
 
 
     def create
-      plan = OperationPlan.build(plan_params)
+      plan = @current_admin.operation_plans.build(plan_params)
       plan.month = params["month"] + "-1"
       plan.teacher_id = @current_admin.teachers.find(params[:teacher_id]).id
       if plan.save
@@ -78,7 +78,7 @@ module EducodeSales
 
     def new_weekly
       sale_plans = OperationPlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: Time.now.strftime('%W').to_i, staff_id: @current_admin.id)
-      @rate = sale_plans ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
+      @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:teacher).count("distinct(department_id)")
       # @departments_count = 1
       render layout: false
@@ -87,13 +87,13 @@ module EducodeSales
 
     def new_month
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       render layout: false
     end
 
     def new_monthly
       sale_plans = OperationPlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", staff_id: @current_admin.id, weekly: nil)
-      @rate = sale_plans ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
+      @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:teacher).count("distinct(department_id)")
       render layout: false
     end
@@ -117,7 +117,7 @@ module EducodeSales
 
     def edit_week
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       @sale_plan = OperationPlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
@@ -145,7 +145,7 @@ module EducodeSales
 
     def edit_month
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       @sale_plan = OperationPlan.find(params[:id])
       @months = [Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]
       @months << @sale_plan.month.strftime("%Y-%m")
@@ -166,7 +166,7 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     def my_month
@@ -176,7 +176,7 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     def update

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -42,7 +42,7 @@ module EducodeSales
           else
             @sale_reports = @sale_reports.order("updated_at desc")
           end
-          @sale_reports = @sale_reports.page(params[:page]).per(params[:per_page])
+          @sale_reports = @sale_reports.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -118,7 +118,7 @@ module EducodeSales
 
     def plans
       sale_report = OperationReport.find(params[:id])
-      @sale_plans = OperationPlan.where(staff_id: sale_report.staff_id, month: sale_report.month, weekly: sale_report.weekly).order("updated_at desc").page(params[:page]).per(params[:per_page])
+      @sale_plans = OperationPlan.where(staff_id: sale_report.staff_id, month: sale_report.month, weekly: sale_report.weekly).order("updated_at desc").page(params[:page]).per(params[:limit])
     end
 
     private

data/app/controllers/educode_sales/places_controller.rb

@@ -8,7 +8,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @places = Place.page(params[:page]).per(params[:per_page])
+          @places = Place.page(params[:page]).per(params[:limit])
           @stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
         end
       end
@@ -29,7 +29,6 @@ module EducodeSales
 
     def create
       place = @current_admin.places.new(name: params[:name])
-      # place = Place.new(name: params[:name])
       commons = []
       params[:area_ids].each do |d|
         commons << Common.find(d)
@@ -43,7 +42,6 @@ module EducodeSales
     end
 
     def update
-      # id = @current_admin.id
       place = Place.find(params[:id])
       place.assign_attributes(name: params[:name])
       commons = []
@@ -62,8 +60,8 @@ module EducodeSales
       place = Place.find(params[:id])
       place.destroy
       render_success
-      # rescue ActiveRecord::DeleteRestrictionError => e
-      #   render_failure '该用户已有数据产生，暂不能删除'
+    rescue ActiveRecord::DeleteRestrictionError => e
+      render_failure '渠道下已有关联数据产生，暂不能删除'
     end
 
   end

data/app/controllers/educode_sales/plans_controller.rb

@@ -39,7 +39,7 @@ module EducodeSales
             @sale_plans = @sale_plans.where("month >= ? and month <= ?", "#{params[:q][:year]}-01-01 00:00:00".to_date, "#{params[:q][:year]}-12-31 23:59:00".to_date)
           end
           if params[:q].present? && params[:q][:month].present?
-            @sale_plans = @sale_plans.where("month >= ?", "#{params[:q][:month]}-01 00:00:00".to_date)
+            @sale_plans = @sale_plans.where("month = ?", "#{params[:q][:month]}-01 00:00:00".to_date)
           end
           if params[:sort].present? && params[:sort][:field]
             @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
@@ -47,7 +47,7 @@ module EducodeSales
             @sale_plans = @sale_plans.order("updated_at desc")
           end
 
-          @sale_plans = @sale_plans.page(params[:page]).per(params[:per_page])
+          @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -86,7 +86,7 @@ module EducodeSales
       sale_plans = SalePlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: Time.now.strftime('%W').to_i, staff_id: @current_admin.id)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:business).count("distinct(department_id)")
-      @total_amount = sale_plans.joins(business: :last_follow_up).sum("total_amount")
+      @total_amount = sale_plans.joins(business: :last_follow_up).distinct.sum("total_amount")
       render layout: false
     end
 
@@ -100,7 +100,7 @@ module EducodeSales
       sale_plans = SalePlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", staff_id: @current_admin.id, weekly: nil)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:business).count("distinct(department_id)")
-      @total_amount = sale_plans.joins(business: :last_follow_up).sum("total_amount")
+      @total_amount = sale_plans.joins(business: :last_follow_up).distinct.sum("total_amount")
       render layout: false
     end
 
@@ -187,7 +187,7 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     def my_month
@@ -197,13 +197,13 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     private
 
     def plan_params
-      params.permit(:month, :weekly, :content, :finish_rate)
+      params.permit(:month, :weekly, :content, :finish_rate, :business_id)
     end
 
   end

data/app/controllers/educode_sales/roles_controller.rb

@@ -9,7 +9,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @roles = Role.all
+          @roles = Role.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -35,6 +35,17 @@ module EducodeSales
       render layout: false
     end
 
+    def update_role
+      role = Role.find(params[:id])
+      if role.update(name: params[:name])
+        render_success
+      else
+        render_failure role
+      end
+    end
+
+
+
     def update
       permissions = []
       role = Role.find(params[:id])

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -75,7 +75,7 @@ module EducodeSales
           else
             @sale_reports = @sale_reports.order("updated_at desc")
           end
-          @sale_reports = @sale_reports.page(params[:page]).per(params[:per_page])
+          @sale_reports = @sale_reports.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -123,7 +123,7 @@ module EducodeSales
 
     def plans
       sale_report = SaleReport.find(params[:id])
-      @sale_plans = SalePlan.where(staff_id: sale_report.staff_id, month: sale_report.month, weekly: sale_report.weekly).order("updated_at desc").page(params[:page]).per(params[:per_page])
+      @sale_plans = SalePlan.where(staff_id: sale_report.staff_id, month: sale_report.month, weekly: sale_report.weekly).order("updated_at desc").page(params[:page]).per(params[:limit])
     end
 
     private

data/app/controllers/educode_sales/sales_controller.rb

@@ -16,7 +16,7 @@ module EducodeSales
           @b_clazz = Common.find_by(clazz: 'business_type', name: 'B类')
           @step_ids = Common.where(name: %w(已中标 已签单 已验收 回款中 服务中 已结束), clazz: 'business_step').pluck(:id)
           
-          @staffs = Staff.where(job_type: common.id).page(params[:page]).per(params[:per_page])
+          @staffs = Staff.where(job_type: common.id).page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -44,7 +44,7 @@ module EducodeSales
         end
         format.json do
           common_id = Common.where(clazz: 'staff_type', name: ['销售', '运营']).pluck(:id)
-          @staffs = Staff.where(job_type: common_id).page(params[:page]).per(params[:per_page])
+          @staffs = Staff.where(job_type: common_id).page(params[:page]).per(params[:limit])
         end
       end
     end

data/app/controllers/educode_sales/sessions_controller.rb

@@ -15,6 +15,7 @@ module EducodeSales
       elsif user
         staff = Staff.find_by(user_id: user.id)
         if staff
+          return render_failure('该账号已禁止使用') if staff.expired_at < Time.now
           check_pwd(user, staff)
         else
           render_failure('账号不存在')

data/app/controllers/educode_sales/staffs_controller.rb

@@ -8,7 +8,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @staffs = Staff.where(is_admin: false).page(params[:page]).per(params[:per_page])
+          @staffs = Staff.where(is_admin: false).page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -67,13 +67,13 @@ module EducodeSales
 
     def follow_up_schools
       staff = Staff.find(params[:id])
-      @schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at").page(params[:page]).per(params[:per_page])
+      @schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at").page(params[:page]).per(params[:limit])
       @count =  EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").count
     end
 
     def follow_up_departments
       staff = Staff.find(params[:id])
-      @schools = EducodeSales::Business.joins(:last_follow_up, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.name, schools.name AS school, educode_sales_follow_ups.updated_at").page(params[:page]).per(params[:per_page])
+      @schools = EducodeSales::Business.joins(:last_follow_up, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.name, schools.name AS school, educode_sales_follow_ups.updated_at").page(params[:page]).per(params[:limit])
     end
 
 

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -44,7 +44,7 @@ module EducodeSales
     # def teachers
     #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
     #   if follow_up.present?
-    #     @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:per_page])
+    #     @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:limit])
     #   else
     #     @teachers = FollowUp.none
     #   end
@@ -52,7 +52,7 @@ module EducodeSales
     #
     # def money_plans
     #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
-    #   @money_plans = follow_up.money_plans.page(params[:page]).per(params[:per_page])
+    #   @money_plans = follow_up.money_plans.page(params[:page]).per(params[:limit])
     # end
     #
     # def add_money