educode_sales 0.9.54 → 0.9.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84fdcf31223897acf6ce4b8a31212f9fd0a3d837c90003db9b9f027bce499258
-  data.tar.gz: 0cea6c5b1b41b3c02b8b6cde0624a661ffcff690f3abbc3aa68de70b11cbb257
+  metadata.gz: d84bb1c7e9e34758e91acc40d652ddd0d5349078f7415634e9b543354e801f7a
+  data.tar.gz: e27fd016f131694941d502c8e9111fc3eb530f8f95484af1518754966602ca80
 SHA512:
-  metadata.gz: 393e7138ff2fde4621d4fde5cb5c647e1951d01685a8666989232aa8480cae3d4362058a404bb5236b721aebcc2374072eb91b5f7c630de18f420d4c174fa068
-  data.tar.gz: 89aa5b28c5182f533bc64b7950dae0bbc3d50609cf28ebb0075ed6be247d282b461e78b94123ff88012f07044c101360793e2480d0a0b488ef2e17886724e6bd
+  metadata.gz: be84a8610f48ec6db17c36264699f12e4de5adf8d3452b4a7ef07940c85d5003ad4f1667ae90c93f5434fbc781ada0fc08e8a2005c96267c4a74435a143bb06d
+  data.tar.gz: 78f9a6bdff957b4459d3792992c86a9bc7b53507e2f4acd51626535d9be53e474072f766196b71f6b626e896c235f90d2c18eb83ee4ec4ff540c2af82a10caf0

data/app/controllers/educode_sales/idea_recycles_controller.rb

@@ -18,7 +18,7 @@ module EducodeSales
 
           if params[:q] && params[:q][:created_at].present?
             date = params[:q][:created_at].split(" - ")
-            @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0], date[1])
+            @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0] + " 00:00:00", date[1] + " 23:59:59")
           end
           if params[:q].present? && params[:q][:name].present?
             @ideas = @ideas.where("educode_sales_ideas.name like ?", "%#{params[:q][:name]}%")

data/app/controllers/educode_sales/ideas_controller.rb

@@ -18,7 +18,7 @@ module EducodeSales
 
           if params[:q] && params[:q][:created_at].present?
             date = params[:q][:created_at].split(" - ")
-            @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0], date[1])
+            @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0] + " 00:00:00", date[1] + " 23:59:59")
           end
           if params[:q].present? && params[:q][:name].present?
             @ideas = @ideas.where("educode_sales_ideas.name like ?", "%#{params[:q][:name]}%")

data/app/views/educode_sales/ideas/index.html.erb

@@ -84,7 +84,7 @@
 <script type="text/html" id="currentTableBar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_edit">编辑</a>
-  <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="idea_recycle">删除</a>
+  <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="idea_recycle">移除</a>
 </script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.54'
+  VERSION = '0.9.55'
 end

metadata

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