educode_sales 1.10.12 → 1.10.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527f28a2fd7c3c37f33e50c8e548738f4a1cc0f3c9abdea333a0923556931111
-  data.tar.gz: 0bd0f7f605e9824cf213efd5cc7545da1a6bf6c27497de5379c4245b94825e9a
+  metadata.gz: e1f2900e20d8d02f6f0fbaa6a05a857523a48ddbc6bf5109490b3a03c867dbc0
+  data.tar.gz: 7315b80cdbb66086120ca83a0e3727c3c7b75ec926c842001f7516379423a560
 SHA512:
-  metadata.gz: d6d96d56c3dce18d9af2130eb82a3027aa9df79835053064eebbf0e8a7d6403da499433f241f2890c036a5b76a4aefb1f0724cc1bfb3deaf74245838f2784665
-  data.tar.gz: 0d1e0bb773080e9fd5b8ebed30623fc449b4b59bb57c04d76b0f7bef5d4382dfd4d88fe4b4a508f9dee739e5ffef92dcaf55ee1ca0fbeb74e046848b877406dd
+  metadata.gz: 3f3cb902472a53c44add57b45c082f7f42ba04e18e07d84f8a903a04f3395fc24ed759bd90d315ebb2e73055399f61648bcf23620232badc46f131ac4782cafa
+  data.tar.gz: 91b19a1cbfa4770b4e78e9347a47ed0b14412b00d3c1f66663b560b714133ba6aa5faedf16e38cb3e520562041185081f90c35b8cc5751bfeb8595d3384633d0

data/app/controllers/educode_sales/home_controller.rb

@@ -122,7 +122,7 @@ module EducodeSales
       # @data = MoneyPlan.joins(business: [:school, :last_follow_up])
       @data = MoneyPlan.joins("JOIN educode_sales_businesses ON educode_sales_businesses.last_follow_up_id = educode_sales_money_plans.follow_up_id JOIN schools ON schools.id = educode_sales_businesses.school_id")
       if params[:q].present?
-        @data = @data.where("educode_sales_businesses.name like :q OR educode_sales_businesses.number like :q OR schools.name like :q ", q: "%#{params[:q]}%").limit(20)
+        @data = @data.where.not(business_id: nil).where("educode_sales_businesses.name like :q OR educode_sales_businesses.number like :q OR schools.name like :q ", q: "%#{params[:q]}%").limit(20)
       end
     end
 

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -11,7 +11,7 @@ module EducodeSales
         end
         format.json do
           last_follow_up_ids = Business.all.pluck(:last_follow_up_id)
-          @money_plans = MoneyPlan.where(follow_up_id: last_follow_up_ids).joins(:business).left_joins(:money_plan_claims).group("educode_sales_money_plans.id").select("educode_sales_money_plans.*, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
+          @money_plans = MoneyPlan.where(follow_up_id: last_follow_up_ids).joins(:business).left_joins(:money_plan_claims).group("educode_sales_money_plans.id").select("educode_sales_money_plans.*, SUM(educode_sales_money_plan_claims.amount) AS return_money, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
           if @current_admin.is_admin?
           else
             level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level

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

@@ -102,6 +102,14 @@
                     width: 120,
                     sort: true,
                     title: '金额',
+                }, {
+                    field: 'return_money',
+                    width: 120,
+                    title: '已回款',
+                }, {
+                    field: 'residue_money',
+                    width: 120,
+                    title: '未回款',
                 }, {
                     field: 'rate',
                     width: 100,

data/app/views/educode_sales/money_plans/index.json.jbuilder

@@ -22,13 +22,20 @@ json.data do
     json.rate d.business&.last_follow_up&.actual_amount ? (d.amount / d.business.last_follow_up.actual_amount * 100.0).round(2) : ''
     json.staff_manages d.business&.last_follow_up&.assign_follow_ups.present? ? (d.business.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.business.staff&.user&.real_name
     if d['claim_num'] > 0
-      json.state '已回款'
+      if d['return_money'].to_f >= d.amount
+        json.state '已回款'
+      else
+        json.state '部分回款'
+      end
     elsif d['claim_num'] == 0 && d.date_at > Time.now
       json.state '正常'
     else
       json.state '已逾期'
     end
     json.claim_num d['claim_num']
+
+    json.return_money d['return_money'] || 0
+    json.residue_money (d.amount - d['return_money'].to_f) > 0 ? d.amount - d['return_money'].to_f : 0
     if d['claim_num'] > 0
       json.accounts_state ''
     else

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.12'
+  VERSION = '1.10.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.12
+  version: 1.10.13
 platform: ruby
 authors:
 - anke1460