educode_sales 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff567b174c17bc652954bfeb48e7782de31affa2fd4995a1565bfc970b1654af
-  data.tar.gz: 8e3cb25e06155a626a838c6f96605be47e8f8f0d7bd65351210c9fae24d2a0fa
+  metadata.gz: 4d8bedbdcc700c3e37997808523860f75848a078352a86063239219a19992301
+  data.tar.gz: 0dd303bd7b2fc3ce8f24c3ec4300e31ef4aeec4f9a3a84f1d3b17854dcbbb20b
 SHA512:
-  metadata.gz: c8e37e4e9cd7ffa20ab9294d8f929dcc11a7c1ef0c385cb801bef72edf8f7b849664d3c0fa09725e7bc4c2abdd19d704a79ad6cd06d27cca389fa79551720bb9
-  data.tar.gz: a7ac56a8babcb87de9fef65ffcca053be0925608b345505f00e5ed26960714e8c24405af3ff2e5fe56851ed12bda269b07b348b403b92a5a2bd1da4bae6438f1
+  metadata.gz: 9ef8a07852f16502421892cb9f7103e2ff428d85f2f1be25cedf1dfef984ba8953af1acddb9526b78b3d9336e4bc305124f1a0f7633173556b114eed3af89ca5
+  data.tar.gz: 384480cc86552819dbce83f34f4c24a28501e167c16e66625343e26c3611502a15408c3d135a0f379bdbd5197e9e48e3ad232410146429d23320058a64182a38

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -21,8 +21,8 @@ module EducodeSales
         s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
         @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:total_amount).round(2)
         @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:actual_amount).round(2)
-        # @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).sum(:amount).round(2)
-        @return_amount = total_return[0]['return_money']&.round(2) || 0
+        @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).sum(:amount).round(2)
+        # @return_amount = total_return[0]['return_money']&.round(2) || 0
         @receivable_amount = @goal_amount - @return_amount
 
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)
@@ -45,8 +45,8 @@ module EducodeSales
         s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
         @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids).sum(:total_amount).round(2)
         @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids).sum(:actual_amount).round(2)
-        # @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
-        @return_amount = total_return[0]['return_money']&.round(2) || 0
+        @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
+        # @return_amount = total_return[0]['return_money']&.round(2) || 0
         @receivable_amount = @goal_amount - @return_amount
 
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)

data/db/migrate/20220920080302_add_column_number_to_educode_sales_businesses.rb

@@ -0,0 +1,6 @@
+class AddColumnNumberToEducodeSalesBusinesses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :number, :string, comment: "只有o类商机才有编号 "
+
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.8'
+  VERSION = '0.9.9'
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2022-09-22 00:00:00.000000000 Z
@@ -105,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
@@ -474,6 +473,7 @@ files:
 - db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb
 - db/migrate/20220523101628_update_column_to_follow_ups.rb
 - db/migrate/20220827130438_create_educode_sales_login_histories.rb
+- db/migrate/20220920080302_add_column_number_to_educode_sales_businesses.rb
 - db/migrate/20220921131116_add_change_clazz_to_follow_up.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
@@ -483,7 +483,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -498,8 +498,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: []