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/lookup.rb
+++ b/app/models/lookup.rb
@@ -60,7 +60,7 @@ class Lookup < ApplicationRecord
  end

  def self.collection_of(type)
-    Lookup.select("name, value").where("lookup_type" => type ).map { |l| [l.name, l.value] }
+    Lookup.where("lookup_type" => type ).pluck("name, value")
  end

  def self.create_shift_sale_lookup(shop_code)