shops

2019-11-18 12:22:31 +06:30
parent 9138a1e38e
commit 54ab9e0ca5
12 changed files with 93 additions and 49 deletions
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1589,9 +1589,10 @@ end
            end
          end
        end
-      end
+       end
    else
      if current_user.nil?
+         puts "Run employee "
        total = query.where('DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',today,today)
      else
        if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account'  || current_user.role == 'supervisor'
@@ -1602,7 +1603,7 @@ end
            total = query.where('DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and shift_sale_id=?',today,today,shift.id)
          end
        end
-      end
+       end
    end
  end