educode_sales 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5e839ca204d0d75cfbc7e2aed02d9f851ec1738
-  data.tar.gz: a17e964f87c735baab65a4f74606c971089d3243
+  metadata.gz: e11b0c160f2894e96d39dff5b6f90e895950940a
+  data.tar.gz: fcb96df55ddd39ed2dc9e67e4cd6313cdd6c8259
 SHA512:
-  metadata.gz: 652f290cc81c82085321724b3f38d5e5aeeecebb5f92be9d30799afb8435785e5476deacf49a32f6280e1ef76a7cb2ccc5ec16bb95183ec142972e907ee55dcf
-  data.tar.gz: a53d53730c2d7e1a701f2c46b6e60dd1a7c4832987d4f0fe29febeb88cc116b0d391da48d770add7bb4f75d1e75940b174fea63152b8790f0c4ea47d78043a4d
+  metadata.gz: f5fba1e9ca510c1803807abb69e41a1482a0858b4e7e54757fdf894ae5460b110ae8bd1faf0559de01cc108f47594bdc2f8cd0e4f90c91e59054a47f7f99d5b8
+  data.tar.gz: 0c6e805fe44da4508bc033bbf63846bda0bd24248a3f8face88ae839fc06ceabb90e9dbb061f6f8cae7fd91b711806f0c841b0c9aa2fcc9541166e77cbce4e7a

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

@@ -243,7 +243,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

@@ -7,7 +7,13 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @activities = Activity.page(params[:page]).per(params[:per_page])
+          @activities = Activity
+          if params[:sort].present? && params[:sort][:field]
+            @activities = @activities.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @activities = @activities.order("created_at desc")
+          end
+          @activities = @activities.page(params[:page]).per(params[:per_page])
         end
       end
     end

data/app/controllers/educode_sales/application_controller.rb

@@ -12,7 +12,6 @@ module EducodeSales
     end
 
     def current_user
-      @current_admin = Staff.first
       @current_admin ||= Staff.find_by_id(session[:admin_id])
     end
 

data/app/controllers/educode_sales/businesses_controller.rb

@@ -4,6 +4,7 @@ module EducodeSales
   class BusinessesController < ApplicationController
 
     def index
+      authorize! :read, Business
       respond_to do |format|
         format.html do
           @staffs = Staff.joins(:user).map { |d| [d.user.real_name, d.id]}
@@ -17,20 +18,14 @@ module EducodeSales
             when '自己'
               @businesses = Business.where(staff_id: @current_admin.id)
             when '区域'
-              schools = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
-              @businesses = Business.joins("JOIN departments ON businesses.department_id = departments.id").where("departments.school_id in ?", school_ids)
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+              @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}", school_ids)
             else
               @businesses = Business
             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
@@ -69,11 +64,23 @@ module EducodeSales
             @businesses = @businesses.where("created_at > ? AND created_at < ?", date[0], date[1])
           end
 
+          @businesses = @businesses.page(params[:page]).per(params[:per_page])
+
           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[:per_page])
         end
       end
     end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -17,8 +17,12 @@ module EducodeSales
     end
 
     def destroy
-      follow_up = @current_admin.follow_ups.find(params[:id])
+      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: follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: follow_ups.last&.id).sum(:amount))
+        end
         render_success
       else
         render_failure follow_up
@@ -26,7 +30,7 @@ module EducodeSales
     end
 
     def update
-      follow_up = @current_admin.follow_ups.find(params[:id])
+      follow_up = FollowUp.find(params[:id])
       follow_up.assign_attributes(follow_up_params)
       follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
@@ -37,7 +41,7 @@ module EducodeSales
     end
 
     def teachers
-      follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+      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])
       else
@@ -46,12 +50,12 @@ module EducodeSales
     end
 
     def money_plans
-      follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+      follow_up = FollowUp.find_by(id: params[:id])
       @money_plans = follow_up.money_plans.page(params[:page]).per(params[:per_page])
     end
 
     def add_money
-      follow_up = @current_admin.follow_ups.find(params[:id])
+      follow_up = FollowUp.find(params[:id])
       money_plan = follow_up.money_plans.build(date_at: params[:date_at], amount: params[:amount], clazz: params[:clazz])
       money_plan.staff = @current_admin
       if money_plan.save
@@ -62,7 +66,7 @@ module EducodeSales
     end
 
     def update_money
-      follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+      follow_up = FollowUp.find_by(id: params[:id])
       money_plan = follow_up.money_plans.find(params[:plan_id])
       if money_plan.update(date_at: params[:date_at], amount: params[:amount], clazz: params[:clazz])
         render_success
@@ -72,7 +76,7 @@ module EducodeSales
     end
 
     def delete_money
-      follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+      follow_up = FollowUp.find_by(id: params[:id])
       money_plan = follow_up.money_plans.find(params[:plan_id])
       if money_plan.destroy
         render_success
@@ -82,7 +86,7 @@ module EducodeSales
     end
 
     def add_keys
-      follow_up = @current_admin.follow_ups.find(params[:id])
+      follow_up = FollowUp.find(params[:id])
       if params[:name].blank?
         return render_failure '请从平台里选择教师'
       end

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -2,23 +2,104 @@ require_dependency "educode_sales/application_controller"
 
 module EducodeSales
   class OperationPlansController < ApplicationController
+    def index
+      # authorize! :read, SalePlan
+      respond_to do |format|
+        format.html do
+          common = Common.find_by(clazz: 'staff_type', name: '运营')
+          @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
+          @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
+          @months = (1..12).map { |d| d }
+        end
+        format.json do
+          if @current_admin.is_admin?
+            @sale_plans = OperationPlan
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '销售计划').level
+            case level
+            when '自己'
+              @sale_plans = OperationPlan.where(staff_id: @current_admin.id)
+            when '区域'
+              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
+              @sale_plans = OperationPlan.where("staff_id in ?", staff_ids)
+            else
+              @sale_plans = OperationPlan
+            end
+          end
+          if params[:clazz] == 'week'
+            @sale_plans = @sale_plans.where.not(weekly: nil)
+          else
+            @sale_plans = @sale_plans.where(weekly: nil)
+
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            @sale_plans = @sale_plans.where(staff_id: params[:q][:staff_id])
+          end
+          if params[:q].present? && params[:q][:year].present?
+            @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)
+          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])
+        end
+      end
+    end
     def new_week
+      @teacher = Teacher.find_by(id: params[:teacher_id])
+      week = Time.now.strftime('%W').to_i
+      if week > 3
+        @weeks = [week, week - 1, week - 2]
+      elsif week == 2
+        @weeks = [week, week - 1]
+      else
+        @weeks = [week]
+      end
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       render layout: false
     end
 
+
+    def create
+      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
+        render_success
+      else
+        render_failure plan
+      end
+    end
+
     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.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
+
     end
 
     def new_month
+      @teacher = Teacher.find_by(id: params[:teacher_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.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
+      @departments_count = sale_plans.joins(:teacher).count("distinct(department_id)")
       render layout: false
     end
 
     def show_week
+      @sale_plan = OperationPlan.find(params[:id])
       render layout: false
     end
 
@@ -35,6 +116,26 @@ module EducodeSales
     end
 
     def edit_week
+      @teacher = Teacher.find_by(id: params[:teacher_id])
+      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @sale_plan = OperationPlan.find(params[:id])
+      if @sale_plan.weekly.present?
+        week = Time.now.strftime('%W').to_i
+        if week > 3
+          @weeks = [week, week - 1, week - 2]
+        elsif week == 2
+          @weeks = [week, week - 1]
+        else
+          @weeks = [week]
+        end
+        @weeks << @sale_plan.weekly
+        @weeks = @weeks.uniq.sort
+      end
+      @months = [Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]
+      @months << @sale_plan.month.strftime("%Y-%m")
+      @months = @months.uniq.sort
+      @finish_rates = []
+      11.times { |d| @finish_rates << ["#{d * 10}%", d * 10] }
       render layout: false
     end
 
@@ -43,11 +144,65 @@ module EducodeSales
     end
 
     def edit_month
+      @teacher = Teacher.find_by(id: params[:teacher_id])
+      @teachers = @current_admin.teachers.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")
+      @months = @months.uniq.sort
+      @finish_rates = []
+      11.times { |d| @finish_rates << ["#{d * 10}%", d * 10] }
       render layout: false
     end
 
     def edit_monthly
       render layout: false
     end
+
+    def my_week
+      @sale_plans = OperationPlan.where(staff_id: @current_admin.id, month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: Time.now.strftime('%W').to_i)
+      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])
+    end
+
+    def my_month
+      @sale_plans = OperationPlan.where(staff_id: @current_admin.id, month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: nil)
+      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])
+    end
+
+    def update
+      operation_plan = OperationPlan.find(params[:id])
+      params["month"] = params["month"] + "-1"
+      if operation_plan.update(params.permit(:month, :weekly, :content, :finish_rate, :teacher_id))
+        render_success
+      else
+        render_failure operation_plan
+      end
+    end
+
+    def destroy
+       operation_plan = OperationPlan.find(params[:id])
+       operation_plan.destroy
+       render_success
+    end
+
+
+
+
+
+    private
+
+    def plan_params
+      params.permit(:month, :weekly, :content, :finish_rate)
+    end
   end
 end

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -2,5 +2,130 @@ require_dependency "educode_sales/application_controller"
 
 module EducodeSales
   class OperationReportsController < ApplicationController
+
+    def index
+      # authorize! :read, SalePlan
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          if @current_admin.is_admin?
+            @sale_reports = OperationReport
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '销售计划').level
+            case level
+            when '自己'
+              @sale_reports = OperationReport.where(staff_id: @current_admin.id)
+            when '区域'
+              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
+              @sale_reports = OperationReport.where("staff_id in ?", staff_ids)
+            else
+              @sale_reports = OperationReport
+            end
+          end
+          if params[:clazz] == 'week'
+            @sale_reports = @sale_reports.where.not(weekly: nil)
+          else
+            @sale_reports = @sale_reports.where(weekly: nil)
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            @sale_reports = @sale_reports.where(staff_id: params[:q][:staff_id])
+          end
+          if params[:q].present? && params[:q][:year].present?
+            @sale_reports = @sale_reports.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_reports = @sale_reports.where("month = ?", "#{params[:q][:month]}-01 00:00:00".to_date)
+          end
+          if params[:sort].present? && params[:sort][:field]
+            @sale_reports = @sale_reports.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @sale_reports = @sale_reports.order("updated_at desc")
+          end
+          @sale_reports = @sale_reports.page(params[:page]).per(params[:per_page])
+        end
+      end
+    end
+
+
+    def create
+      if params[:month].present?
+        sale_report = @current_admin.operation_reports.build(month: Date.today.beginning_of_month)
+      else
+        sale_report = @current_admin.operation_reports.build(month: Date.today.beginning_of_month, weekly: Time.now.strftime('%W').to_i)
+      end
+
+      sale_report.finish_rate = params[:finish_rate]
+      sale_report.client = params[:client]
+      sale_report.content = params[:content]
+      if sale_report.save
+        render_success
+      else
+        render_failure sale_report
+      end
+    end
+
+    def show
+      @sale_report = OperationReport.find(params[:id])
+      render layout: false
+    end
+
+    def destroy
+      sale_report = @current_admin.operation_reports.find(params[:id])
+      sale_report.destroy
+        render_success
+    end
+
+    def edit
+      @sale_report = @current_admin.operation_reports.find(params[:id])
+      render layout: false
+    end
+
+    def update
+      sale_report = @current_admin.operation_reports.find(params[:id])
+      sale_report.content = params[:content]
+      if sale_report.save
+        render_success
+      else
+        render_failure sale_report
+      end
+    end
+
+    def update_audit
+      authorize! :audit, EducodeSales::OperationReport
+      sale_report = OperationReport.find(params[:id])
+      sale_report.assign_attributes(audit_params)
+      if sale_report.level1_opinion_changed? || sale_report.level1_score_changed?
+        sale_report.audit1_user_id = @current_admin.id
+      end
+      if sale_report.level2_opinion_changed? || sale_report.level2_score_changed?
+        sale_report.audit2_user_id = @current_admin.id
+      end
+      if sale_report.level3_opinion_changed? || sale_report.level3_score_changed?
+        sale_report.audit3_user_id = @current_admin.id
+      end
+      if sale_report.save
+        render_success
+      else
+        render_failure sale_report
+      end
+    end
+
+    def audit
+      @sale_report = OperationReport.find(params[:id])
+      render layout: false
+    end
+
+    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])
+    end
+
+    private
+    def audit_params
+      params.permit(:level1_opinion, :level2_opinion, :level3_opinion, :level1_score, :level2_score, :level3_score)
+    end
+
+    
   end
 end