Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/models/license.rb

@@ -61,7 +61,7 @@ class License
       @license = response.parsed_response
 
       if (@license["status"] == true)
-        assign()
+        assign(aes_key, aes_iv)
 
         Rails.logger.info "License - " + response.parsed_response.to_s
         
@@ -79,7 +79,7 @@ class License
       end
     else         
       @license = Marshal.load(cache_license)
-      assign()
+      assign(aes_key, aes_iv)
       Rails.logger.info 'API License'           
       return true
     end
@@ -330,7 +330,7 @@ class License
     end
 
     # Assign db info for Cloud
-   def assign
+   def assign(aes_key, aes_iv)
     # self.name = @license["name"]
     # self.address_1 = @license["address_1"]
     # self.address_2 = @license["address_2"]
@@ -354,10 +354,10 @@ class License
     # self.plan_active_connections = @license["plan_active_connections"].to_i
     # salt = @license["secret_key"]
 
-    key = Base64.decode64(ENV['AES_KEY'])
-    iv = Base64.decode64(ENV['AES_IV'])
+    key = Base64.decode64(aes_key)
+    iv = Base64.decode64(aes_iv)
     
-    if (@license["dbhost"] || @license["dbschema"] || @license["dbusername"] || @license["dbpassword"] )       
+    if (@license["dbhost"] || @license["dbschema"] || @license["dbusername"] || @license["dbpassword"] )           
       host = Base64.decode64(@license["dbhost"])
       dbschema = Base64.decode64(@license["dbschema"])
       dbusername = Base64.decode64(@license["dbusername"])

app/models/my_aes_crypt.rb

@@ -30,7 +30,7 @@ class MyAesCrypt
 	def export_to_file(passphrase)
 		file_path = "config/shops.json"
 		aes_key, aes_iv = export_key(passphrase)
-		tmpHash = { 
+		tmpHash = { 			
 			"lookup" => passphrase,
 			"value" => 
 			{
@@ -40,27 +40,20 @@ class MyAesCrypt
 		}
 
 		shop_data = File.read(file_path)
-		if shop_data != ""
-			shop_json = JSON.parse(shop_data)	
-			shop_json.each do |j|
-				byebug
-				if j == passphrase
-					j.each do |k|
-						return k["key"], k["iv"]
-					end
-				end
+
+		shop_json = JSON.parse(shop_data)	
+		shop_json["data"].each do |j|
+			if j["lookup"] == passphrase				
+				return j["value"]["key"], j["value"]["iv"]
 			end
-
-			shop_json << tmpHash
-
-			File.open(file_path, "w") { |io|
-				io.puts JSON.pretty_generate(shop_json)
-			}
-		else
-			File.open(file_path, "w") { |io|
-				io.write(tmpHash.to_json)
-			}
 		end
+
+		shop_json["data"] << tmpHash
+
+		File.open(file_path, "w") { |io|
+			io.puts JSON.pretty_generate(shop_json)
+		}
+
 		return aes_key, aes_iv
 	end
 

app/models/sale.rb

@@ -764,23 +764,19 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
 
     query = Sale.all
     if shift.present?
-
       query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sales.payment_status= 'paid' and sale_payments.payment_amount != 0", shift.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
-
     elsif shift_sale_range.present?
-
       query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.payment_status= 'paid' and sales.shift_sale_id in (?)",shift_sale_range.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
-
     else
-
       query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sales.payment_status= 'paid' and sale_payments.payment_amount != 0",from,to)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
     end
+    return query
 end
 
 def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to)