educode_sales 1.10.6 → 1.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 138761e29a054edfe513ee47574a20a739ca870ff0e3e6b782fc56f223aa687f
-  data.tar.gz: 0d20d394776e51dbeb4951d3bcb4f65d34ffca723652030ffd4029e6f627843f
+  metadata.gz: 93a3c4bdda6df52bc58177a34c5a39c7330d04d9cbaf4a5d4f4bbe3691d72759
+  data.tar.gz: dd64cb53bd80774ab02cdbd72a94b5684a827c47bd1d5aa51698b1183dbb758e
 SHA512:
-  metadata.gz: ea3c74b8b148f37fe9c623ec9e54edb4c7bc8bfdebe2db06e3c786342931907ba87284a0c09d7d9c2bc5e0b17f3f69f7fc36301c4cc97a6ee5d2b6a1a1adb028
-  data.tar.gz: 3afa2866dd5e880647952a5b5c2386145b7633a228bca49363b38c226216035ebf6033961b273912aa80144c8bc68344f0414a89260b88f20cc148e2dcda93cc
+  metadata.gz: 19f7047b112cad5d0f53580aed23fe2fb65955d7418dd28169d7da3c6a5b96c0a30f14485a5b644961deb734b9fb0c59b968c38a5af6920409cdd2143e0de2d7
+  data.tar.gz: 4e3e0da1a8d21ed9d8cdb8cf8a3970dfa5ce554f8f87ad8b8dc30bc19248b63d555bc7ac0b52de91740753ac3ffa93c8b01b6ab9c1b8c415afaa584ca807d20f

data/app/controllers/educode_sales/assessments_controller.rb

@@ -434,17 +434,27 @@ module EducodeSales
       render layout: false
     end
 
+    #批量删除签到记录
+    def batch_delete
+      begin
+        ActiveRecord::Base.transaction do
+          if params[:ids].present?
+            ids = params[:ids]
+            attendances = EducodeSales::Attendance.where(id: ids)
+            attendances.destroy_all
+          end
+        end
+        render_success
+      rescue Exception => e
+        render_failure(e.message)
+      end
+    end
+
     #导入签到记录接口
     def import_attendances
       render_failure("文件不存在或格式错误") if params[:file].blank? || !params[:file].is_a?(ActionDispatch::Http::UploadedFile)
-      Rails.logger.info "导入签到数据"
-      begin
-        doc = SimpleXlsxReader.open(params[:file])
-      rescue
-        return render_failure("文件不存在或格式错误")
-      end
+      doc = SimpleXlsxReader.open(params[:file].to_io)
       size = doc.sheets.size
-      Rails.logger.info size
       attendance_attrs = %i[name attendance_date longitude latitude location address mobile_id ip_address customer target created_at updated_at]
       attendance_vales = []
       (0..size - 1).each do |index|
@@ -456,23 +466,37 @@ module EducodeSales
           longitude = d[3]
           latitude = d[4]
           location = d[5]
-              address = d[6]
-              mobile_id = d[7]
-              ip_address = d[8]
-              customer = d[9]
-              target = d[10]
-              attendance_vales << {name: name, attendance_date: attendance_date, longitude: longitude, latitude: latitude, location: location,
-                                   address: address, mobile_id: mobile_id, ip_address: ip_address, customer: customer, target: target}
-
-            end
-          end
-          EducodeSales::Attendance.bulk_insert(*attendance_attrs) do |worker|
-            attendance_vales.each do |attendance|
-              worker.add(name: attendance[:name], attendance_date: attendance[:attendance_date].to_datetime, longitude: attendance[:longitude], latitude: attendance[:latitude],
-                         location: attendance[:location], address: attendance[:address], mobile_id: attendance[:mobile_id], ip_address: attendance[:ip_address], customer: attendance[:customer], target: attendance[:target])
+          address = d[6]
+          mobile_id = d[7]
+          ip_address = d[8]
+          if d[9].blank?
+            school_college_name = d[5].split("学院")[0]
+            school_university_name = d[5].split("大学")[0] + "大学"
+            school = School.where("name like ?", "%#{school_college_name}%").first
+            school01 = School.where("name like ?", "%#{school_university_name}%").first
+            if school.present?
+              customer = school.name
+            elsif school01.present?
+              customer = school01.name
+            else
+              customer = ""
             end
+          else
+            customer = d[9]
           end
-          render_success
+          target = d[10]
+          attendance_vales << {name: name, attendance_date: attendance_date, longitude: longitude, latitude: latitude, location: location,
+                               address: address, mobile_id: mobile_id, ip_address: ip_address, customer: customer, target: target}
+
+        end
+      end
+      EducodeSales::Attendance.bulk_insert(*attendance_attrs) do |worker|
+        attendance_vales.each do |attendance|
+          worker.add(name: attendance[:name], attendance_date: attendance[:attendance_date].to_datetime, longitude: attendance[:longitude], latitude: attendance[:latitude],
+                     location: attendance[:location], address: attendance[:address], mobile_id: attendance[:mobile_id], ip_address: attendance[:ip_address], customer: attendance[:customer], target: attendance[:target])
+        end
+      end
+      render_success
     end
 
 

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -296,12 +296,43 @@ module EducodeSales
       render layout: false
     end
 
+    def add_tag
+      followup = FollowUp.find(params[:id])
+      gon.tags = []
+      tags = Tag.all.pluck(:name)
+      selecte_tags = followup.follow_up_tags.includes(:tag).map { |d| d.tag.name }
+      tags.each do |d|
+        gon.tags << {name: d, value: d, selected: selecte_tags.include?(d)}
+      end
+      render layout: false
+    end
+
+    def update_tags
+      followup = FollowUp.find(params[:id])
+      tags = []
+      tags_name = []
+      params[:tags].split(",").uniq.each do |d|
+        tag = Tag.find_or_initialize_by(name: d) do |d|
+          d.staff = @current_admin
+        end
+        tags_name << tag.name
+        tag.save unless tag.persisted?
+        t = FollowUpTag.find_or_initialize_by(tag_id: tag.id, follow_up_id: followup.id)
+        t.staff = @current_admin
+        tags << t
+      end
+      followup.follow_up_tags = tags
+      followup.save
+      render json: {success: true, tags: tags_name}
+    end
+
+
     private
 
     def edu_setting name
       EduSetting.get(name)
     end
-    
+
     def load_business
       @business = Business.find(params[:business_id])
     end

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -100,6 +100,26 @@ module EducodeSales
       render json: { succcess: true}
     end
 
+    def edit
+      @money_plan_record = MoneyPlanRecord.find(params[:id])
+      render layout: false
+    end
+
+    def update
+      money_plan_record = MoneyPlanRecord.find(params[:id])
+      if money_plan_record.update(money_plan_record_params)
+        render json: { succcess: true}
+      else
+        render_failure money_plan_record
+      end
+    end
+
+    def destroy
+      money_plan_record = MoneyPlanRecord.find(params[:id])
+      money_plan_record.destroy
+      render json: { succcess: true}
+    end
+
     def confirm
       money_plan_record = MoneyPlanRecord.find(params[:id])
       money_plan_record.money_plan_claims.where.not(money_plan_id: params[:money_plan_ids]).delete_all
@@ -114,8 +134,13 @@ module EducodeSales
           business.update(return_money: claim.money_plan.money_plan_claims.sum(:amount))
         end
       end
-      
       render_success
     end
+
+    private
+
+    def money_plan_record_params
+      params.permit(:amount, :payer_name, :date_at)
+    end
   end
 end

data/app/models/educode_sales/follow_up.rb

@@ -22,6 +22,7 @@ module EducodeSales
     has_many :key_person
     has_many :teachers, through: :key_person
     has_many :assign_follow_ups
+    has_many :follow_up_tags, dependent: :destroy
     belongs_to :staff
     belongs_to :stage, class_name: 'Common'
     belongs_to :clazz, class_name: 'Common'

data/app/models/educode_sales/follow_up_tag.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class FollowUpTag < ApplicationRecord
+    belongs_to :follow_up
+    belongs_to :staff
+    belongs_to :tag
+  end
+end

data/app/models/educode_sales/money_plan.rb

@@ -42,11 +42,11 @@ module EducodeSales
     private
 
     def update_return_money
-      if follow_up.business.last_follow_up_id == self.follow_up_id
-        follow_up.business.update(return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: self.follow_up_id).sum(:amount))
-      else
-        follow_up.update(return_money: follow_up.money_plans.where(clazz: '实际回款').sum(:amount))
-      end
+      # if follow_up.business.last_follow_up_id == self.follow_up_id
+      #   follow_up.business.update(return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: self.follow_up_id).sum(:amount))
+      # else
+      #   follow_up.update(return_money: follow_up.money_plans.where(clazz: '实际回款').sum(:amount))
+      # end
     end
   end
 end

data/app/models/educode_sales/money_plan_claim.rb

@@ -3,5 +3,14 @@ module EducodeSales
     belongs_to :money_plan
     belongs_to :money_plan_record
     belongs_to :staff
+
+    after_destroy :update_return_money
+
+
+    private
+
+    def update_return_money
+      self.money_plan.business.update(return_money: self.money_plan.money_plan_claims.sum(:amount))
+    end
   end
 end

data/app/models/educode_sales/money_plan_record.rb

@@ -2,6 +2,6 @@ module EducodeSales
   class MoneyPlanRecord < ApplicationRecord
     belongs_to :staff
     belongs_to :business, optional: true
-    has_many :money_plan_claims
+    has_many :money_plan_claims, dependent: :destroy
   end
 end

data/app/models/educode_sales/tag.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class Tag < ApplicationRecord
+    belongs_to :staff
+
+    enum clazz: ["follow_up"]
+  end
+end

data/app/models/educode_sales/watch_follow_up.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class WatchFollowUp < ApplicationRecord
+    belongs_to :follow_up
+    belongs_to :staff
+  end
+end

data/app/views/educode_sales/assessments/_attendances.html.erb

@@ -34,7 +34,8 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">签到列表</span>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import_attendances">批量导入签到数据</button>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import_attendances"><i class="layui-icon layui-icon-add-circle-fine"></i> 批量导入签到数据</button>
+    <button class="layui-btn layui-btn-normal layui-btn-sm layui-btn-danger data-delete-btn pull-right" lay-event="batch_delete"><i class="layui-icon layui-icon-delete"></i> 批量删除签到数据</button>
   </div>
 </script>
 
@@ -71,6 +72,10 @@
           defaultToolbar: ['filter'],
           cols: [
               [
+                  {
+                      type: 'checkbox',
+                      fixed: 'left'
+                  },
                   {
                       field: 'id',
                       width: 100,
@@ -184,8 +189,13 @@
           return false;
       });
 
+      //监听表格复选框选择
+      table.on('checkbox(attendance_table)',function (obj) {});
+
       //toorbar事件监听
       table.on('toolbar(attendance_table)', function (obj) {
+          var data = obj.data;
+          var checkStatus = table.checkStatus(obj.config.id);
           if (obj.event === 'import_attendances') {  //批量导入签到记录
               var content = miniPage.getHrefContent('/missions/assessments/import');
               var openWH = miniPage.getOpenWidthHeight();
@@ -202,6 +212,30 @@
               $(window).on("resize", function () {
                   layer.full(index);
               });
+          }if (obj.event === 'batch_delete') { //批量删除签到记录
+              //定义数组存放批量删除的数据id
+              var ids = [];
+              //获取所有选中行的数据
+              var dataList = checkStatus.data;
+              //遍历选中的数据,将每一行的id存储到数据中
+              $.each(dataList,function (index, data) {
+                  ids.push(data.id)
+              });
+              if (ids.length <= 0){
+                  layer.msg('请选择要删除的签到记录', {icon: 5})
+              }else{
+                  layer.confirm('确定要删除这些签到记录吗？', function (index) {
+                      request.authPost("missions/assessments/batch_delete", {'ids': ids}, function (res) {
+                          if (res.success === false){
+                              layer.alert(res.msg)
+                          }else{
+                              layer.msg('删除成功');
+                              layer.close(index);
+                              table.reload("attendance_table")
+                          }
+                      })
+                  })
+              }
           }
       });
 

data/app/views/educode_sales/businesses/time_line.html.erb

@@ -26,8 +26,14 @@
         <br/>
         评论: <span><%= f.comment %></span> <a href="javascript:;" class="add_comment" data-id=<%= f.id %>>评论</a> <a href="javascript:;" class="uploadFile" data-id=<%= f.id %>>附件上传</a> 
         <br/>
+        <br/>
+        <span id="tag_<%= f.id %>">
+        <% f.follow_up_tags.each do |d| %>
+          <span class="layui-badge layui-bg-green"><%= d.tag.name %></span>
+        <% end %>
+        </span>
         <!-- <span class="layui-badge layui-bg-green"></span> -->
-        <button type="button" class="layui-btn layui-btn-xs layui-btn-primary add-tag"><i class="layui-icon layui-icon-addition"></i>标签设置</button>
+        <button type="button" class="layui-btn layui-btn-xs layui-btn-primary add-tag" data-id="<%= f.id %>"><i class="layui-icon layui-icon-addition"></i>标签设置</button>
       </p>
     </div>
   </li>
@@ -106,7 +112,7 @@
 
     $(".uploadFile").on("click", function(e) {
       var data = e.currentTarget.dataset;
-      follow_up_id = parent.id
+      follow_up_id = data.id
       var content = miniPage.getHrefContent('/missions/follow_ups/' + follow_up_id + '/file');
       var openWH = miniPage.getOpenWidthHeight();
       lsindex = layer.open({
@@ -124,6 +130,28 @@
       });
     })
 
+    $(".add-tag").on("click", function(e) {
+      var data = e.currentTarget.dataset;
+      follow_up_id = data.id
+      var content = miniPage.getHrefContent('/missions/follow_ups/' + follow_up_id + '/add_tag');
+      var openWH = miniPage.getOpenWidthHeight();
+      tindex = layer.open({
+        title: '标签设置',
+        type: 1,
+        shade: 0.2,
+        maxmin: true,
+        shadeClose: true,
+        area: ['700px','600px'],
+       // offset: [openWH[2] + 'px', openWH[3] + 'px'],
+        content: content
+      });
+      $(window).on("resize", function () {
+          layer.full(sindex);
+      });
+    })
+
+    
+
     });
     function demo(){
         layer.closeAll()

data/app/views/educode_sales/follow_ups/add_tag.html.erb

@@ -0,0 +1,48 @@
+<%= Gon::Base.render_data %>
+    <div class="layui-form layuimini-form">
+        <div class="layui-form-item" style="padding: 25px">
+            <div id="tag"></div>
+            <div class="layui-form-item text-center" style="margin-top: 60px;">
+                <button class="layui-btn layui-btn-normal" lay-submit lay-filter="btn">提交</button>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.use(['form', 'request', 'xmSelect'], function() {
+            var form = layui.form,
+                request = layui.request,
+                xmSelect = layui.xmSelect,
+                $ = layui.$;
+
+            var place_list = xmSelect.render({
+                el: '#tag',
+                name: "tags",
+                tips: '请输入或选择标签',
+                clickClose: true,
+                paging: true,
+                filterable: true,
+                data: gon.tags,
+                create: function(val, arr) {
+                    return {
+                        name: val,
+                        value: val
+                    }
+                },
+            })
+
+            form.on("submit(btn)", function(form) {
+                request.post('missions/follow_ups/' + parent.follow_up_id + '/update_tags',
+                    form.field,
+                    function(res) {
+                        if (res.success) {
+                            $("#tag_" + parent.follow_up_id).html("");
+                            res.tags.forEach(function(tag) {
+                                $("#tag_" + parent.follow_up_id).append(' <span class="layui-badge layui-bg-green">' + tag + '</span')
+                            })
+                        }
+                        layer.close(tindex);
+                    })
+            })
+
+        })
+    </script>

data/app/views/educode_sales/home/search_money_plans.json.jbuilder

@@ -1,7 +1,7 @@
 json.data do
   json.array! @data do |d|
     json.value d.id
-    json.name "#{d.business.number} / #{d.business.department&.school&.name.to_s}#{d.business.department&.name.to_s} / #{d.business.name} / #{d.business.last_follow_up&.actual_amount}万 /  #{d.business.last_follow_up&.return_money}万 /#{d.date_at.to_s(:date)}"
+    json.name "#{d.business&.number} / #{d.business.department&.school&.name.to_s}#{d.business.department&.name.to_s} / #{d.business.name} / #{d.business.last_follow_up&.actual_amount}万 /  #{d.amount}万 /#{d.date_at.to_s(:date)}"
   end
 end
 json.count @data.size

data/app/views/educode_sales/money_plan_records/_index.html.erb

@@ -37,9 +37,11 @@
     </form>
 </div>
 <script type="text/html" id="toolbar_money_plan_record">
+  <% if can? :add_record, EducodeSales::MoneyPlan %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" id="upload_money_plan_btn" style="margin-left: 20px;">批量导入回款计划</button>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" style="margin-left: 20px;"
         lay-event="add_record">添加回款记录</button>
+  <% end %>
 </script>
 
 <table class="layui-hide" id="money_plan_record_table" lay-filter="money_plan_record_table"></table>
@@ -50,6 +52,12 @@
 </script>
 
 <script type="text/html" id="currentTableBarmoney_record">
+    <% if can? :update_record, EducodeSales::MoneyPlan %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    <% end %>
+    <% if can? :delete_update_record, EducodeSales::MoneyPlan %>
+    <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="delete">删除</a>
+    <% end %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="confirm">认领回款</a>
 </script>
 
@@ -210,8 +218,29 @@
                 $(window).on("resize", function() {
                     layer.full(sindex);
                 });
-            } else if (obj.event === 'business') {
-               
+            }  else if (obj.event === 'edit') {
+                var content = miniPage.getHrefContent('/missions/money_plan_records/' + data.id + '/edit')
+                var openWH = miniPage.getOpenWidthHeight();
+                sindex = layer.open({
+                    title: '编辑回款记录',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: [openWH[0] + 'px', openWH[1] + 'px'],
+                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content
+                });
+                $(window).on("resize", function() {
+                    layer.full(sindex);
+                });
+            } else if (obj.event == 'delete') {
+              layer.confirm('确定删除' + data.business + "的回款记录", function (index) {
+                request.delete('missions/money_plan_records/' + data.id, {}, function (res) {
+                  layer.close(index);
+                  table.reload("money_plan_record_table");
+                })
+              });
             }
         });
 

data/app/views/educode_sales/money_plan_records/edit.html.erb

@@ -0,0 +1,58 @@
+<div style="padding:10px">
+  <div class="layui-form layuimini-form" lay-filter="searchform">
+      <div class="layui-form-item">
+          <label class="layui-form-label" style="width: 80px !important;">合同名称：</label>
+          <div class="layui-input-inline" style="line-height: 38px;">
+            <%= @money_plan_record.business.name %>
+          </div>
+      </div>
+      <div class="layui-form-item">
+          <div class="layui-inline">
+              <label class="layui-form-label required">付款单位：</label>
+              <div class="layui-input-inline">
+                  <input type="text" name="payer_name" value="<%= @money_plan_record.payer_name %>" class="layui-input" lay-verify="required">
+              </div>
+          </div>
+          <div class="layui-inline">
+              <label class="layui-form-label required">回款金额：</label>
+              <div class="layui-input-inline">
+                  <input type="text" name="amount" value="<%= @money_plan_record.amount %>" class="layui-input" lay-verify="required">
+              </div>
+          </div>
+          <div class="layui-inline">
+              <label class="layui-form-label required" style="width: 110px;">回款日期：</label>
+              <div class="layui-input-inline">
+                  <input type="text" name="date_at" value="<%= @money_plan_record.date_at %>" class="layui-input" lay-verify="required" id="date_at">
+              </div>
+          </div>
+
+      </div>
+      <div class="layui-form-item">
+          <div class="layui-input-block">
+              <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">保存</button>
+          </div>
+      </div>
+  </div>
+</div>
+
+<script>
+  layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'laydate', 'selectInput'], function() {
+      var form = layui.form,
+          table = layui.table,
+          laydate = layui.laydate,
+          request = layui.request,
+          $ = layui.$;
+      form.render();
+      laydate.render({
+          elem: '#date_at',
+      });
+   
+      form.on('submit(saveBtn)', function(data) {
+          request.put("missions/money_plan_records/" + parent.id, data.field, function(res) {
+              layer.close(parent.sindex)
+              parent.table.reload('money_plan_record_table')
+          })
+          return false;
+      });
+  });
+</script>

data/app/views/educode_sales/money_plans/list.html.erb

@@ -2,16 +2,20 @@
 <div class="layui-tab" lay-filter="money_plan_tab">
     <ul class="layui-tab-title">
         <li class="layui-this">回款计划</li>
+        <% if can? :record, EducodeSales::MoneyPlan %>
         <li class="">回款记录</li>
+        <% end %>
         <li class="">开票记录</li>
     </ul>
     <div class="layui-tab-content">
         <div class="layui-tab-item layui-show">
             <%=render 'index' %>
         </div>
+        <% if can? :record, EducodeSales::MoneyPlan %>
         <div class="layui-tab-item">
           <div id="monley_plan_record_wraper"></div>
         </div>
+        <% end %>
         <div class="layui-tab-item">
           <div id="invoice_wraper"></div>
         </div>
@@ -32,14 +36,21 @@
 
 
         element.render();
-        element.on('tab(money_plan_tab)', function(data) {
-          if (data.index == 1 && $("#money_plan_record").length == 0) {
-            loadPage('/missions/money_plan_records')
-          } else if (data.index == 2 && $("#invoice_apply").length == 0) {
-            loadPage('/missions/invoices/apply_records')
-          }
-        });
-
+        <% if can? :record, EducodeSales::MoneyPlan %>
+          element.on('tab(money_plan_tab)', function(data) {
+            if (data.index == 1 && $("#money_plan_record").length == 0) {
+              loadPage('/missions/money_plan_records')
+            } else if (data.index == 2 && $("#invoice_apply").length == 0) {
+              loadPage('/missions/invoices/apply_records')
+            }
+          });
+        <% else %>
+          element.on('tab(money_plan_tab)', function(data) {
+            if (data.index == 1 && $("#invoice_apply").length == 0) {
+              loadPage('/missions/invoices/apply_records')
+            }
+          });
+        <% end %>
 
         function loadPage(url) {
           var layer_index = layer.load(0, {shade: [0.1, '#fff']});

data/config/routes.rb

@@ -155,6 +155,8 @@ EducodeSales::Engine.routes.draw do
       put :comment
       get :file
       get :upload_file
+      get :add_tag
+      post :update_tags
     end
   end
 
@@ -271,6 +273,7 @@ EducodeSales::Engine.routes.draw do
       get :attendances
       get :import
       post :import_attendances
+      post :batch_delete
     end
     member do
       get :edit_attendance

data/db/migrate/20230614141225_create_educode_sales_tags.rb

@@ -0,0 +1,11 @@
+class CreateEducodeSalesTags < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_tags do |t|
+      t.string :name
+      t.integer :clazz
+      t.references :staff
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230614141628_create_educode_sales_follow_up_tags.rb

@@ -0,0 +1,11 @@
+class CreateEducodeSalesFollowUpTags < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_follow_up_tags do |t|
+      t.references :follow_up
+      t.references :tag
+      t.references :staff
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230614142145_create_educode_sales_watch_follow_ups.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesWatchFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_watch_follow_ups do |t|
+      t.references :follow_up
+      t.references :staff
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.6'
+  VERSION = '1.10.8'
 end

data/lib/educode_sales.rb

@@ -1,6 +1,5 @@
 require "educode_sales/engine"
 require 'cancancan'
-require 'simple_xlsx_reader'
 module EducodeSales
   # Your code goes here...
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.6
+  version: 1.10.8
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.0
-- !ruby/object:Gem::Dependency
-  name: simple_xlsx_reader
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -238,6 +223,7 @@ files:
 - app/models/educode_sales/eco_staff.rb
 - app/models/educode_sales/filter.rb
 - app/models/educode_sales/follow_up.rb
+- app/models/educode_sales/follow_up_tag.rb
 - app/models/educode_sales/follow_up_trend.rb
 - app/models/educode_sales/idea.rb
 - app/models/educode_sales/idea_follow.rb
@@ -272,10 +258,12 @@ files:
 - app/models/educode_sales/staff_permission.rb
 - app/models/educode_sales/staff_school.rb
 - app/models/educode_sales/staff_school_tag.rb
+- app/models/educode_sales/tag.rb
 - app/models/educode_sales/teacher.rb
 - app/models/educode_sales/teacher_assign_follow.rb
 - app/models/educode_sales/teacher_follow.rb
 - app/models/educode_sales/user_stat_service.rb
+- app/models/educode_sales/watch_follow_up.rb
 - app/services/return_forecast_service.rb
 - app/views/educode_sales/activities/_follows.html.erb
 - app/views/educode_sales/activities/_index.html.erb
@@ -376,6 +364,7 @@ files:
 - app/views/educode_sales/customers/show_follow.json.jbuilder
 - app/views/educode_sales/customers/show_follow_record.html.erb
 - app/views/educode_sales/customers/show_majors.html.erb
+- app/views/educode_sales/follow_ups/add_tag.html.erb
 - app/views/educode_sales/follow_ups/file.html.erb
 - app/views/educode_sales/follow_ups/index.json.jbuilder
 - app/views/educode_sales/follow_ups/money_plans.json.jbuilder
@@ -467,6 +456,7 @@ files:
 - app/views/educode_sales/money_plan_records/_index.html.erb
 - app/views/educode_sales/money_plan_records/add.html.erb
 - app/views/educode_sales/money_plan_records/confirm_plan.html.erb
+- app/views/educode_sales/money_plan_records/edit.html.erb
 - app/views/educode_sales/money_plan_records/index.js.erb
 - app/views/educode_sales/money_plan_records/index.json.jbuilder
 - app/views/educode_sales/money_plans/_index.html.erb
@@ -742,6 +732,9 @@ files:
 - db/migrate/20230531144834_create_educode_sales_invoice_applies.rb
 - db/migrate/20230601011835_create_educode_sales_invoices.rb
 - db/migrate/20230601011943_create_educode_sales_invoice_details.rb
+- db/migrate/20230614141225_create_educode_sales_tags.rb
+- db/migrate/20230614141628_create_educode_sales_follow_up_tags.rb
+- db/migrate/20230614142145_create_educode_sales_watch_follow_ups.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -750,7 +743,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -765,8 +758,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []