'; ;
+ }else{
+ row = '
'
- +'
'
- +'
'
- +'
'+ menu_items[field].name +'
'
- +"'
- +'
'
- +"
"
-
- // +"
"
- // +"

"
- // +"
"
-
- +''
- +'
'
- +'
'; ;
$('.menu_items_list').append(row);
}
//end instances in menu-items alest 1 instance
diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss
index 1ffdb8f0..1cda9286 100755
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -3,12 +3,12 @@ section .content{
}
.custom-card-head{
height: 40px;
- #background-color: #54A5AF;
- background-color: #a1aade;
+ background-color: #79D0F2;
+ color :#fff;
+ #background-color: #a1aade;
opacity: 0.8;
padding:5px;
- color :#000000;
-
+ font-weight:400;
}
.custom-card {
border: 2px solid rgba(0, 0, 0, 0.125) !important;
@@ -16,6 +16,10 @@ section .content{
}
.custom-card-footer{
padding:0.35rem 1.25rem !important;
+ bottom:0;
+ position: absolute;
+ width: 100%;
+ font-weight:900;
}
.custom-card-block {
@@ -192,7 +196,7 @@ section.content{
}
.menu_item_box{
- cursor: pointer;
+ cursor: pointer;
}
/*Logout Icon*/
@@ -300,4 +304,33 @@ i.logout_icon{
.ls-closed section.content {
margin-left: 15px !important;
margin-right: 15px !important;
-}
\ No newline at end of file
+}
+.product_box{
+ position:relative;
+ text-align:center;
+ font-weight:900;
+ color:#fff;
+ font-size:1.5em;
+ margin:auto;
+}
+.custom-card-no-img-head{
+ #background-color: #54A5AF;
+ opacity: 0.8;
+ padding:5px;
+ color :#273040;
+ min-height:100px;
+ height: 150px;
+ background-color:#79D0F2;
+
+}
+.menu_item_no_img_box{
+ cursor: pointer;
+
+}
+.custom-card-no-img-footer{
+ padding:0.35rem 1.25rem !important;
+
+}
+.custom-flex-footer{
+ display:flex;
+}
diff --git a/app/assets/stylesheets/sx_font.css b/app/assets/stylesheets/sx_font.css
index b8b08f2a..b08657e5 100755
--- a/app/assets/stylesheets/sx_font.css
+++ b/app/assets/stylesheets/sx_font.css
@@ -39,4 +39,4 @@
/* Support for IE. */
font-feature-settings: 'liga';
-}
\ No newline at end of file
+}
diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb
index 8bbf1c6d..fee19a31 100755
--- a/app/models/printer/printer_worker.rb
+++ b/app/models/printer/printer_worker.rb
@@ -38,20 +38,20 @@ class Printer::PrinterWorker
end
def print(file_path,printer_destination = nil )
- # if printer_destination.nil?
- # printer_destination = self.printer_destination
- # end
+ if printer_destination.nil?
+ printer_destination = self.printer_destination
+ end
- # puts printer_destination
- # puts '........Printer Destination..........'
+ puts printer_destination
+ puts '........Printer Destination..........'
- # copy = self.print_copies
- # #Print only when printer information is not null
- # if !self.printer_destination.nil?
- # (1..copy).each do
- # page = Cups::PrintJob.new(file_path, printer_destination)
- # page.print
- # end
- # end
+ copy = self.print_copies
+ #Print only when printer information is not null
+ if !self.printer_destination.nil?
+ (1..copy).each do
+ page = Cups::PrintJob.new(file_path, printer_destination)
+ page.print
+ end
+ end
end
end
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 50f25902..80fba22e 100644
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -4,7 +4,6 @@
<% type = request.path_info.include?('quick_service') || request.path_info.include?('food_court')%>
<% modify_order = request.path_info.include?('modify_order')%>
-
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index bea510a5..214da8ec 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -19,12 +19,12 @@ class ActionController::Base
render :json => [{ status: false, message: 'Invalid Access!'}]
end
else
- # check for license file
- # if check_license
- # current_license(ENV["SX_PROVISION_URL"])
- # else
- # redirect_to activate_path
- # end
+ check for license file
+ if check_license
+ current_license(ENV["SX_PROVISION_URL"])
+ else
+ redirect_to activate_path
+ end
end
end
diff --git a/config/puma.rb b/config/puma.rb
index 6a545bed..fd89392f 100755
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,10 +1,10 @@
-# application_path="#{File.expand_path("../..", __FILE__)}"
-# directory application_path
-# #environment ENV.fetch("RAILS_ENV") { "production" }
-# environment "production"
-# pidfile "#{application_path}/tmp/puma/pid"
-# state_path "#{application_path}/tmp/puma/state"
-# stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-# port ENV.fetch("PORT") { 62158 }
-# workers 2
-# preload_app!
+application_path="#{File.expand_path("../..", __FILE__)}"
+directory application_path
+#environment ENV.fetch("RAILS_ENV") { "production" }
+environment "production"
+pidfile "#{application_path}/tmp/puma/pid"
+state_path "#{application_path}/tmp/puma/state"
+stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+port ENV.fetch("PORT") { 62158 }
+workers 2
+preload_app!