update merge with admibbsb-materi for multiple set item and report

app/models/license.rb

@@ -134,24 +134,36 @@ class License
   def verify_license    
     api_token = read_license_no_decrypt("api_token")    
     @params = { query: {lookup_type: "application", api_token: api_token} }
-    response = self.class.get("/verify", @params)
+    
+    begin
+        response = self.class.get("/verify", @params)
+        @varified = response.parsed_response
+        Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
+        if (@varified["status"])
+          if (!check_expired(@varified["renewable_date"]))
+            return true
+          end
+        else
+          delete_license_file
+        end 
 
-    rescue SocketError => e
-      Rails.logger.debug  "In Socket errror"
-      return true
-    rescue => e
-      @varified = response.parsed_response
-      Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
-      if (@varified["status"])
-        if (!check_expired(@varified["renewable_date"]))
-          return true
-        end
-      else
-        delete_license_file
-      end  
+      rescue SocketError => e
+        Rails.logger.debug  "In SocketError No Internet connection ! "
+        return true
+      rescue HTTParty::Error
+        Rails.logger.debug  "Server Error HTTParty"
+        return true
+      rescue Net::OpenTimeout
+         Rails.logger.debug  "connection Timeout"
+        return true
+      rescue OpenURI::HTTPError
+        Rails.logger.debug  "Can't connect server"
+        return true
+    end 
     return false  
   end
 
+
   # Check Expired before 30 days
   def check_expiring(renewal_date_str)        
     if !renewal_date_str.empty?
@@ -164,7 +176,6 @@ class License
   def check_expired(renewal_date_str)    
     expired_date_str = read_license("renewable_date")
     renewal_date = DateTime.parse(renewal_date_str)
-   
     if(renewal_date_str != expired_date_str)
       update_license("renewable_date", renewal_date_str)
     end

app/models/sale.rb

@@ -806,6 +806,15 @@ def self.get_by_shift_sale(from,to,status)
   return query = query.where("shift_sales.shift_started_at >= ?" + " AND shift_sales.shift_closed_at <= ?", from,to)
 end
 
+def self.get_by_shift_sale_by_item(from,to,status)
+  query = ShiftSale.select("shift_sales.id ,shift_started_at AS opening_date,
+                          shift_closed_at As closing_date," +
+                          " grand_total AS grand_total, cash_sales AS cash," +
+                          "total_taxes AS total_tax,total_discounts As total_discount")
+                          .order("shift_sales.id DESC")
+  return query = query.where("shift_sales.shift_started_at >= ?" , from)
+end
+
 def self.get_item_query(type)
 
   if type == "revenue" || type.nil?