educode_sales 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90a0d369409f2ebe29b56d92f7a254eb2704751c
-  data.tar.gz: 0ce02076698626fbc2065281c9643069a6454a71
+  metadata.gz: 701b98e32352e12147e3d299f1fc472104e79900
+  data.tar.gz: '09bf0ee2949ccfa809b77fae0fdee56cebc10941'
 SHA512:
-  metadata.gz: 3825dfa734ae7cc135b650630e8a6e018a1e0d7fff9678b18df835922eff20cc04d24550b45eeab273baa03a9401285198cd82afe311c2be8347e90863b83af3
-  data.tar.gz: '029f778234ed11d66f786259ffe72a6861ddbf0c10e984d9db30c67fc160435532fe055d6947df9c9c04e4dba749caabc79ceb478b6e0eeb97efde1321c4f28d'
+  metadata.gz: a69e25dab404aafef54c493263e10df1cf3541a687b5d1b56ff2fa630f7bdc7df70aef76eb968896499625f4a05579c94f1871991c99fd563821141195c14558
+  data.tar.gz: c736a30571dfe038f29da56b9563b1ab62edf49cd33ec76024dca760d31e44bfbb7a4553f47cf40a67f9f0313b2566a19d51e1e37396c93575353733210c29be

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

@@ -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

@@ -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,21 +41,21 @@ 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])
+        @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:limit])
       else
         @teachers = FollowUp.none
       end
     end
 
     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])
+      follow_up = FollowUp.find_by(id: params[:id])
+      @money_plans = follow_up.money_plans.page(params[:page]).per(params[:limit])
     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

@@ -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,7 +60,7 @@ 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
 
@@ -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
@@ -118,7 +118,7 @@ module EducodeSales
     def edit_week
       @teacher = Teacher.find_by(id: params[:teacher_id])
       @teachers = @current_admin.teachers.pluck(:name, :id)
-      @sale_plan = @current_admin.operation_plans.find(params[:id])
+      @sale_plan = OperationPlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
         if week > 3
@@ -135,7 +135,7 @@ module EducodeSales
       @months << @sale_plan.month.strftime("%Y-%m")
       @months = @months.uniq.sort
       @finish_rates = []
-      10.times { |d| @finish_rates << ["#{d * 10}%", d * 10] }
+      11.times { |d| @finish_rates << ["#{d * 10}%", d * 10] }
       render layout: false
     end
 
@@ -146,12 +146,12 @@ module EducodeSales
     def edit_month
       @teacher = Teacher.find_by(id: params[:teacher_id])
       @teachers = @current_admin.teachers.pluck(:name, :id)
-      @sale_plan = @current_admin.operation_plans.find(params[: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 = []
-      10.times { |d| @finish_rates << ["#{d * 10}%", d * 10] }
+      11.times { |d| @finish_rates << ["#{d * 10}%", d * 10] }
       render layout: false
     end
 
@@ -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,11 +176,11 @@ 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
-      operation_plan = @current_admin.operation_plans.find(params[:id])
+      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
@@ -190,7 +190,7 @@ module EducodeSales
     end
 
     def destroy
-       operation_plan = @current_admin.operation_plans.find(params[:id])
+       operation_plan = OperationPlan.find(params[:id])
        operation_plan.destroy
        render_success
     end

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
@@ -84,7 +84,7 @@ module EducodeSales
 
     def new_weekly
       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 ? (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(:business).count("distinct(department_id)")
       @total_amount = sale_plans.joins(business: :last_follow_up).sum("total_amount")
       render layout: false
@@ -98,7 +98,7 @@ module EducodeSales
 
     def new_monthly
       sale_plans = SalePlan.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(:business).count("distinct(department_id)")
       @total_amount = sale_plans.joins(business: :last_follow_up).sum("total_amount")
       render layout: false
@@ -124,7 +124,7 @@ module EducodeSales
 
     def edit_week
       @businesses = @current_admin.businesses.pluck(:name, :id)
-      @sale_plan = @current_admin.sale_plans.find(params[:id])
+      @sale_plan = SalePlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
         if week > 3
@@ -141,12 +141,12 @@ module EducodeSales
       @months << @sale_plan.month.strftime("%Y-%m")
       @months = @months.uniq.sort
       @finish_rates = []
-      10.times { |d| @finish_rates << ["#{d * 10}%", d * 10] }
+      11.times { |d| @finish_rates << ["#{d * 10}%", d * 10] }
       render layout: false
     end
 
     def update
-      sale_plan = @current_admin.sale_plans.find(params[:id])
+      sale_plan = SalePlan.find(params[:id])
       params["month"] = params["month"] + "-1"
       if sale_plan.update(plan_params)
         render_success
@@ -156,7 +156,7 @@ module EducodeSales
     end
 
     def destroy
-      sale_plan = @current_admin.sale_plans.find(params[:id])
+      sale_plan = SalePlan.find(params[:id])
       if sale_plan.destroy
         render_success
       else
@@ -170,9 +170,9 @@ module EducodeSales
 
     def edit_month
       @businesses = @current_admin.businesses.pluck(:name, :id)
-      @sale_plan = @current_admin.sale_plans.find(params[:id])
+      @sale_plan = SalePlan.find(params[:id])
       @finish_rates = []
-      10.times { |d| @finish_rates << ["#{d*10}%", d * 10]}
+      11.times { |d| @finish_rates << ["#{d*10}%", d * 10]}
       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])