fixed conflict after merge with dev branch for report query updated

2019-11-27 14:09:16 +06:30
parent 98b74af6cf 47c12c6faa
commit a0b7557f06
75 changed files with 1509 additions and 1940 deletions
--- a/app/models/lookup.rb
+++ b/app/models/lookup.rb
@@ -3,6 +3,8 @@ class Lookup < ApplicationRecord
  has_many :accounts
  belongs_to :shop

+  scope :number_formats, -> { where(lookup_type: 'number_format')}
+
  def available_types
    {'Employee Roles' => 'employee_roles',
      'Dining Facilities Status' => 'dining_facilities_status',