git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update addorder view

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2019-05-24 15:33:35 +06:30
parent fe463c62e7
commit 83aa0a4f4c
7 changed files with 240 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

235
app/assets/javascripts/addorder.js
View File

@@ -1,3 +1,4 @@
//middle edit
$(function() { $(function() {
var role = $('#role').val(); var role = $('#role').val();
var second_display_lookup = $("#display_type").val(); var second_display_lookup = $("#display_type").val();
@@ -54,28 +55,16 @@ $(function() {
if (type ==-1 && modify_order == -1){ if (type ==-1 && modify_order == -1){
image_path = product[field].image_path.url; image_path = product[field].image_path.url;
} }
}else{
image_path = "/image/logo.png";
}
row = '<div class="col-md-3">'
row = '<div class="col-md-6 col-sm-6 col-lg-3 mt-3">'
+'<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">' +'<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
+'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">' +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
+'<div class="col-md-10">'+ product[field].name +'</div>' +'<div class="col-md-10">'+ product[field].name +'</div>'
+"<div class='col-md-2 menu_item_box' data-item-code='"
+ product[field].item_code +"' data-instance = '"
+JSON.stringify(item_attributes)+"' data-id = '"
+JSON.stringify(item_attributes)+"' data-item = '"
+JSON.stringify(item_attributes)+"' data-option = '"
+JSON.stringify(options)+"'data-opt = '"
+JSON.stringify(options)+"' data-item-sets = '"
+JSON.stringify(item_attributes)+"' data-image='"+image_path+"' data-toggle='modal' data-target='.sx_item_detailModal'>"
+"<i class='fa fa-bars material-icons m-l--10'>"
+'view_list</i>'
+'</div>'
+'</div>' +'</div>'
+"<div class='add_icon p-t-65' data-item-code='" +"<div class='add_icon p-t-65 p-b-65' data-item-code='"
+ product[field].item_code +"' data-name='" + product[field].item_code +"' data-name='"
+ product[field].name +"' data-qty = '"+ qty +"' data-price = '" + product[field].name +"' data-qty = '"+ qty +"' data-price = '"
+ product[field].unit_price +"' data-instance-code = '"+ product[field].item_code +"' data-instance = '" + product[field].unit_price +"' data-instance-code = '"+ product[field].item_code +"' data-instance = '"
@@ -83,16 +72,71 @@ $(function() {
+ JSON.stringify(item_attributes) +"' data-options = '" + JSON.stringify(item_attributes) +"' data-options = '"
+ JSON.stringify(options) +"' data-opt = '" + JSON.stringify(options) +"' data-opt = '"
+ JSON.stringify(options) +"' data-image='"+image_path+"'>" + JSON.stringify(options) +"' data-image='"+image_path+"'>"
+'</div>'
// +"<div class='card-block custom-card-block'>" +'<div class="card-footer custom-card-footer custom-flex-footer">'
// +"<img id='logo' height='125px' src='"+image_path+"'>" +'<span style="font-weight:900;flex-grow:1;">'+ product[field].unit_price +'</span>'
// +"</div>" +"<div class='col-md-2 menu_item_box' data-item-code='"
+ product[field].item_code +"' data-instance = '"
+'<div class="card-footer custom-card-footer">' +JSON.stringify(item_attributes)+"' data-id = '"
+'<span>'+ product[field].unit_price +'</span>' +JSON.stringify(item_attributes)+"' data-item = '"
+'</div>' +JSON.stringify(item_attributes)+"' data-option = '"
+JSON.stringify(options)+"'data-opt = '"
+JSON.stringify(options)+"' data-item-sets = '"
+JSON.stringify(item_attributes)+"' data-image='"+image_path+"' data-toggle='modal' data-target='.sx_item_detailModal'>"
+"<i class='fa fa-bars material-icons m-l--10'>"
+'view_list</i>'
+'</div>'
+'</div>' +'</div>'
+'</div>'; +'</div>';
}
else
{
row = '<div class="col-md-6 col-sm-6 col-lg-3 mt-1">'
+'<div class="card custom-card testimonial-card fadeInRight" style="height:100%;">'
+'<div class="custom-card-head custom-card-no-img-head card-head row" style="margin:0px;display:flex;!important">'
+"<div class='col-12 add_icon p-t-65 p-b-65' data-item-code='"
+ product[field].item_code +"' data-name='"
+ product[field].name +"' data-qty = '"+ qty +"' data-price = '"
+ product[field].unit_price +"' data-instance-code = '"+ product[field].item_code +"' data-instance = '"
+ product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '"
+ JSON.stringify(item_attributes) +"' data-options = '"
+ JSON.stringify(options) +"' data-opt = '"
+ JSON.stringify(options) +"' data-image=''>"
+'<div class="product_box">'+ product[field].name +'</div>'
+'</div>'
+'</div>'
+"<div class='add_icon' data-item-code='"
+ product[field].item_code +"' data-name='"
+ product[field].name +"' data-qty = '"+ qty +"' data-price = '"
+ product[field].unit_price +"' data-instance-code = '"+ product[field].item_code +"' data-instance = '"
+ product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '"
+ JSON.stringify(item_attributes) +"' data-options = '"
+ JSON.stringify(options) +"' data-opt = '"
+ JSON.stringify(options) +"' data-image=''>"
+'</div>'
+'<div class="card-footer custom-card-no-img-footer custom-flex-footer">'
+'<span style="font-weight:900;flex-grow:1;">'+ product[field].unit_price +'</span>'
+"<div class='col-2 menu_item_box menu_item_no_img_box' data-item-code='"
+ product[field].item_code +"' data-instance = '"
+JSON.stringify(item_attributes)+"' data-id = '"
+JSON.stringify(item_attributes)+"' data-item = '"
+JSON.stringify(item_attributes)+"' data-option = '"
+JSON.stringify(options)+"'data-opt = '"
+JSON.stringify(options)+"' data-item-sets = '"
+JSON.stringify(item_attributes)+"' data-image='' data-toggle='modal' data-target='.sx_item_detailModal'>"
+"<i class='fa fa-bars material-icons m-l--10'>"
+'view_list</i>'
+'</div>'
+'</div>'
+'</div>';
}
$('.menu_items_list').append(row); $('.menu_items_list').append(row);
} }
} }
@@ -499,7 +543,6 @@ $(function() {
//click item row for add order //click item row for add order
$(document).on('click', '.menu_item_box', function(event){ $(document).on('click', '.menu_item_box', function(event){
$('.attributes-list').empty(); $('.attributes-list').empty();
$('.options-list').empty(); $('.options-list').empty();
$('#modal_box_img').empty(); $('#modal_box_img').empty();
@@ -1379,6 +1422,7 @@ $(function() {
var menu_list = $('.menu_items_list'); var menu_list = $('.menu_items_list');
menu_list.empty(); menu_list.empty();
for(var field in menu_items) { for(var field in menu_items) {
console.log(menu_items[field].instances);
if (menu_items[field].is_sub_item == false) { if (menu_items[field].is_sub_item == false) {
instances = menu_items[field].instances ; instances = menu_items[field].instances ;
@@ -1439,52 +1483,109 @@ $(function() {
}else{ }else{
image_path = menu_items[field].image; image_path = menu_items[field].image;
} }
row = '<div class="col-md-6 col-sm-6 col-lg-3">'
+'<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
+'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" >'
+'<div class="col-md-10 " style="padding:0px !important;">'+ menu_items[field].name +'</div>'
}else{ +'</div>'
if (modify_order) { +"<div class='"+add_icon+" p-t-65 p-b-65 m-r-' "
image_path = "../../image/logo.png"; +" data-item-code='"+ menu_items[field].code +"' "
}else{ +" data-name='"+ menu_items[field].name +"' "
image_path = "image/logo.png"; +" data-qty = '"+ qty +"' "
} +" data-price = '" + price +"' "
} +" data-instance-code = '"+ code +"' "
+" data-instance = '" + name +"' "
+" data-promotion-price = '"+ promotion_price +"' "
+" data-attributes = '" + JSON.stringify(item_attributes) +"' "
+" data-options = '"+ JSON.stringify(menu_items[field].options) +"' "
+" data-opt = '" + JSON.stringify(menu_items[field].options) +"' "
+" data-image='"+image_path+"' "
+" data-toggle='"+data_modal+"' "
+" data-target='."+data_target+"' "
+" data-item-sets = '"+JSON.stringify(menu_items[field].item_sets)+""
+" 'data-instances = '"+JSON.stringify(menu_items[field].instances)+"'>"
+'</div>'
+'<div class="card-footer custom-card-footer custom-flex-footer" style="opacity:0.7">'
+'<span style="font-weight:900;flex-grow:1;">'+ price +'</span>'
+ "<div class='col-md-2 "+menu_item_box
+ "' data-item-code='" + menu_items[field].code
+ "' data-instance='" + JSON.stringify(menu_items[field].instances)
+ "' data-id='" + JSON.stringify(menu_items[field].attributes)
+ "' data-item='" + JSON.stringify(item_attributes)
+ "' data-option='" + JSON.stringify(menu_items[field].options)
+ "' data-opt='" + JSON.stringify(menu_items[field].options)
+ "' data-item-sets='" + JSON.stringify(menu_items[field].item_sets)
+ "' data-toggle='modal'"
+ " data-target='." + data_target +"'"
+ " style='padding:0px 5px 0px 5px' >"
+ "<i class='m-l--5 fa " + fa_plus + "'>"
+ add
+ "</i>"
+'</div>'
row = '<div class="col-md-3">' +'</div>'
+'<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">' +'</div>'; ;
+'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">' }else{
+'<div class="col-md-10 " style="padding:0px !important;">'+ menu_items[field].name +'</div>' row = '<div class="col-md-6 col-sm-6 col-lg-3 mt-1">'
+"<div class='col-md-2 "+menu_item_box+" ' data-item-code='" +'<div class="card custom-card testimonial-card fadeInRight" style="height:100%;">'
+ menu_items[field].code +"' data-instance = '" +'<div class="custom-card-no-img-head card-head '+add_icon+' " style="margin:0px;display:flex;!important "'
+JSON.stringify(menu_items[field].instances)+"' data-id = '" +" data-item-code='"+ menu_items[field].code +"' "
+JSON.stringify(menu_items[field].attributes)+"' data-item = '" +" data-name='" + menu_items[field].name +"' "
+JSON.stringify(item_attributes)+"' data-option = '" +" data-qty = '"+ qty +"' "
+JSON.stringify(menu_items[field].options)+"'data-opt = '" +" data-price = '" + price +"' "
+JSON.stringify(menu_items[field].options)+"' data-item-sets = '" +" data-instance-code = '"+ code +"' "
+JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' style='padding:0px 5px 0px 5px'>" +" data-instance = '" + name +"' "
+"<i class='m-l--5 fa "+fa_plus+" '>" +" data-promotion-price = '"+ promotion_price +"' "
+add+ '</i>' +" data-attributes = '" + JSON.stringify(item_attributes) +"' "
+'</div>' +" data-options = '"+ JSON.stringify(menu_items[field].options) +"' "
+'</div>' +" data-opt = '"+ JSON.stringify(menu_items[field].options) +"' "
+"<div class='"+add_icon+" p-t-65 m-r-' data-item-code='" +" data-image='' data-toggle='"+data_modal+"' "
+ menu_items[field].code +"' data-name='" +" data-target='."+data_target+"' "
+ menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '" +" data-item-sets = '"+JSON.stringify(menu_items[field].item_sets)+"'"
+ price +"' data-instance-code = '"+ code +"' data-instance = '" +" data-instances = '"+JSON.stringify(menu_items[field].instances)+"'>"
+ name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
+ JSON.stringify(item_attributes) +"' data-options = '"
+ JSON.stringify(menu_items[field].options) +"' data-opt = '"
+ JSON.stringify(menu_items[field].options) +"' data-image='"+image_path+"' data-toggle='"
+data_modal+"' data-target='."+data_target+"' data-item-sets = '"
+JSON.stringify(menu_items[field].item_sets)+"'data-instances = '"
+JSON.stringify(menu_items[field].instances)+"'>"
// +"<div class='card-block custom-card-block'>" +'<div class="product_box" style="width:100%;"><span>'+ menu_items[field].name +'<span></div>'
// +"<img id='logo' height='' src='"+image_path+"'>" +'</div>'
// +"</div>" +"<div class='"+add_icon+"' "
+" data-item-code='"+ menu_items[field].code +"' "
+" data-name='" + menu_items[field].name +"' "
+" data-qty = '"+ qty +"' "
+" data-price = '" + price +"' "
+" data-instance-code = '"+ code +"' "
+" data-instance = '" + name +"' "
+" data-promotion-price = '"+ promotion_price +"' "
+" data-attributes = '" + JSON.stringify(item_attributes) +"' "
+" data-options = '"+ JSON.stringify(menu_items[field].options) +"' "
+" data-opt = '"+ JSON.stringify(menu_items[field].options) +"' "
+" data-image='' data-toggle='"+data_modal+"' "
+" data-target='."+data_target+"' "
+" data-item-sets = '"+JSON.stringify(menu_items[field].item_sets)+"'"
+" data-instances = '"+JSON.stringify(menu_items[field].instances)+"'>"
+'</div>'
+'<div class="card-footer custom-card-no-img-footer custom-flex-footer">'
+'<span style="font-weight:900;flex-grow:1;">'+ price + '</span>'
+" <div class='offset-4 col-2 menu_item_no_img_box "+menu_item_box+" ' "
+" data-item-code='"+ menu_items[field].code +"' "
+" data-instance = '" +JSON.stringify(menu_items[field].instances)+"' "
+" data-id = '"+JSON.stringify(menu_items[field].attributes)+"' "
+" data-item = '" +JSON.stringify(item_attributes)+"' "
+" data-option = '"+JSON.stringify(menu_items[field].options)+"'"
+" data-opt = '"+JSON.stringify(menu_items[field].options)+"' "
+" data-item-sets = '"+JSON.stringify(menu_items[field].item_sets)+"' "
+" data-toggle='modal' "
+" data-target='."+data_target+"' "
+" style='padding:0px 5px 0px 5px'>"
+"<i class='m-l--5 fa "+fa_plus+" '>"
+add+ '</i>'
+'</div>'
+'</div>'
+'</div>'
+'</div>';
}
+'<div class="card-footer custom-card-footer" style="opacity:0.7">'
+'<span>'+ price +'</span>'
+'</div>'
+'</div>'
+'</div>'; ;
$('.menu_items_list').append(row); $('.menu_items_list').append(row);
} }
//end instances in menu-items alest 1 instance //end instances in menu-items alest 1 instance

41
app/assets/stylesheets/addorder.scss
View File

@@ -3,12 +3,12 @@ section .content{
} }
.custom-card-head{ .custom-card-head{
height: 40px; height: 40px;
#background-color: #54A5AF; background-color: #79D0F2;
background-color: #a1aade; color :#fff;
#background-color: #a1aade;
opacity: 0.8; opacity: 0.8;
padding:5px; padding:5px;
color :#000000; font-weight:400;
} }
.custom-card { .custom-card {
border: 2px solid rgba(0, 0, 0, 0.125) !important; border: 2px solid rgba(0, 0, 0, 0.125) !important;
@@ -16,6 +16,10 @@ section .content{
} }
.custom-card-footer{ .custom-card-footer{
padding:0.35rem 1.25rem !important; padding:0.35rem 1.25rem !important;
bottom:0;
position: absolute;
width: 100%;
font-weight:900;
} }
.custom-card-block { .custom-card-block {
@@ -301,3 +305,32 @@ i.logout_icon{
margin-left: 15px !important; margin-left: 15px !important;
margin-right: 15px !important; margin-right: 15px !important;
} }
.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;
}

26
app/models/printer/printer_worker.rb
View File

@@ -38,20 +38,20 @@ class Printer::PrinterWorker
end end
def print(file_path,printer_destination = nil ) def print(file_path,printer_destination = nil )
# if printer_destination.nil? if printer_destination.nil?
# printer_destination = self.printer_destination printer_destination = self.printer_destination
# end end
# puts printer_destination puts printer_destination
# puts '........Printer Destination..........' puts '........Printer Destination..........'
# copy = self.print_copies copy = self.print_copies
# #Print only when printer information is not null #Print only when printer information is not null
# if !self.printer_destination.nil? if !self.printer_destination.nil?
# (1..copy).each do (1..copy).each do
# page = Cups::PrintJob.new(file_path, printer_destination) page = Cups::PrintJob.new(file_path, printer_destination)
# page.print page.print
# end end
# end end
end end
end end

1
app/views/origami/addorders/detail.html.erb
View File

@@ -4,7 +4,6 @@
<% type = request.path_info.include?('quick_service') || request.path_info.include?('food_court')%> <% type = request.path_info.include?('quick_service') || request.path_info.include?('food_court')%>
<% modify_order = request.path_info.include?('modify_order')%> <% modify_order = request.path_info.include?('modify_order')%>
<div class="container-fluid " style="padding:0px 3px 0px 3px;"> <div class="container-fluid " style="padding:0px 3px 0px 3px;">
<div id="oqs_loading_wrapper" style="display:none;"> <div id="oqs_loading_wrapper" style="display:none;">
<div id="oqs_loading"></div> <div id="oqs_loading"></div>

12
config/initializers/action_controller.rb
View File

@@ -19,12 +19,12 @@ class ActionController::Base
render :json => [{ status: false, message: 'Invalid Access!'}] render :json => [{ status: false, message: 'Invalid Access!'}]
end end
else else
# check for license file check for license file
# if check_license if check_license
# current_license(ENV["SX_PROVISION_URL"]) current_license(ENV["SX_PROVISION_URL"])
# else else
# redirect_to activate_path redirect_to activate_path
# end end
end end
end end

20
config/puma.rb
View File

@@ -1,10 +1,10 @@
# application_path="#{File.expand_path("../..", __FILE__)}" application_path="#{File.expand_path("../..", __FILE__)}"
# directory application_path directory application_path
# #environment ENV.fetch("RAILS_ENV") { "production" } #environment ENV.fetch("RAILS_ENV") { "production" }
# environment "production" environment "production"
# pidfile "#{application_path}/tmp/puma/pid" pidfile "#{application_path}/tmp/puma/pid"
# state_path "#{application_path}/tmp/puma/state" state_path "#{application_path}/tmp/puma/state"
# stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
# port ENV.fetch("PORT") { 62158 } port ENV.fetch("PORT") { 62158 }
# workers 2 workers 2
# preload_app! preload_app!