merge with r-19

2020-01-11 11:08:33 +06:30
parent d43266bd7d 2d57faf7cf
commit 314cc507a3
106 changed files with 2722 additions and 3024 deletions
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -19,7 +19,7 @@ class ShiftSale < ApplicationRecord

  def self.current_shift
    # today_date = DateTime.now.strftime("%Y-%m-%d")
-    shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null").first
+    shift = ShiftSale.where.not(shift_started_at: nil).where(shift_closed_at: nil).first
    return shift
  end