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

update addorder button and plus icon etcc..

Browse Source
This commit is contained in:
Aung Myo
2017-10-23 17:28:48 +06:30
parent 2e41037d5f
commit dd08fd4298
3 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,8 @@ $(function(){
} }
row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">' row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
+'<div class="custom-card-head card-head" style="line-height:14px;">' +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
+'<small class="col-md-9">'+ product[field].name +'</small>' +'<div class="col-md-9">'+ product[field].name +'</div>'
+"<div class='col-md-3 add_icon' data-item-code='" +"<div class='col-md-3 add_icon' 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 = '"
@@ -46,9 +46,8 @@ $(function(){
+ product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '" + product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '"
+ JSON.stringify(item_attributes) +"' data-options = '" + JSON.stringify(item_attributes) +"' data-options = '"
+ options +"' data-image='"+image_path+"'>" + options +"' data-image='"+image_path+"'>"
+"<i class='fa fa-plus '" +"<i class='fa fa-plus material-icons'>"
+ 'style="margin-top:4px;">' +'add</i>'
+'</i>'
+'</div>' +'</div>'
+'</div>' +'</div>'
@@ -65,7 +64,7 @@ $(function(){
+"</div>" +"</div>"
+'<div class="card-footer custom-card-footer">' +'<div class="card-footer custom-card-footer">'
+'<small>'+ product[field].unit_price +'</small>' +'<span>'+ product[field].unit_price +'</span>'
+'</div>' +'</div>'
+'</div>'; +'</div>';
$('.menu_items_list').append(row); $('.menu_items_list').append(row);
@@ -109,6 +108,7 @@ $(function(){
if (JSON.stringify(menu_items[field].item_sets)!='[]') { if (JSON.stringify(menu_items[field].item_sets)!='[]') {
fa_plus = ''; fa_plus = '';
add = '';
menu_item_box = 'set_item_box'; menu_item_box = 'set_item_box';
data_target = 'sx_item_set_detailModal'; data_target = 'sx_item_set_detailModal';
@@ -120,7 +120,8 @@ $(function(){
item_attributes = menu_items[field].attributes; item_attributes = menu_items[field].attributes;
promotion_price = menu_items[field].promotion_price; promotion_price = menu_items[field].promotion_price;
}else{ }else{
fa_plus = 'fa-plus'; fa_plus = 'material-icons';
add = 'add'
menu_item_box = 'menu_item_box'; menu_item_box = 'menu_item_box';
data_target = 'sx_item_detailModal'; data_target = 'sx_item_detailModal';
@@ -146,8 +147,8 @@ $(function(){
} }
row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">' row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
+'<div class="custom-card-head card-head" style="line-height:14px;">' +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
+'<small class="col-md-9">'+ menu_items[field].name +'</small>' +'<div class="col-md-9">'+ menu_items[field].name +'</div>'
+"<div class='col-md-3 add_icon' data-item-code='" +"<div class='col-md-3 add_icon' data-item-code='"
+ menu_items[field].code +"' data-name='" + menu_items[field].code +"' data-name='"
+ menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '" + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
@@ -155,9 +156,8 @@ $(function(){
+ name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '" + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
+ JSON.stringify(item_attributes) +"' data-options = '" + JSON.stringify(item_attributes) +"' data-options = '"
+ options +"' data-image='"+image_path+"'>" + options +"' data-image='"+image_path+"'>"
+"<i class='fa "+fa_plus+" '" +"<i class='fa "+fa_plus+" '>"
+ 'style="margin-top:4px;">' +add+ '</i>'
+'</i>'
+'</div>' +'</div>'
+'</div>' +'</div>'
@@ -174,7 +174,7 @@ $(function(){
+"</div>" +"</div>"
+'<div class="card-footer custom-card-footer">' +'<div class="card-footer custom-card-footer">'
+'<small>'+ price +'</small>' +'<span>'+ price +'</span>'
+'</div>' +'</div>'
+'</div>'; +'</div>';
$('.menu_items_list').append(row); $('.menu_items_list').append(row);
@@ -216,14 +216,14 @@ $(function(){
+"' data-max-qty='"+item_sets[field]["max_selectable_qty"] +"' data-max-qty='"+item_sets[field]["max_selectable_qty"]
+"'>" +"'>"
+'<div class="custom-card-head card-head" style="line-height:14px;">' +'<div class="custom-card-head card-head" style="line-height:14px;">'
+'<small class="">'+result["name"]+'</small>' +'<span class="">'+result["name"]+'</span>'
+'</div>' +'</div>'
+'<div class="card-block custom-card-block">' +'<div class="card-block custom-card-block">'
+'<img id="" src="/image/logo.png" height="40px">' +'<img id="" src="/image/logo.png" height="40px">'
+' <small style="float:" id="instance_option"></small>' +' <small style="float:" id="instance_option"></small>'
+'</div>' +'</div>'
+'<div class="card-footer custom-card-footer">' +'<div class="card-footer custom-card-footer">'
+' <small>'+result["price"]+'</small>' +' <span>'+result["price"]+'</span>'
// +' <small style="float:right" id="instance_option"></small>' // +' <small style="float:right" id="instance_option"></small>'
+'</div>' +'</div>'
+'</div>' +'</div>'
@@ -433,8 +433,8 @@ $(function(){
disabled = "disabled"; disabled = "disabled";
} }
row +="<button id='selected-attribute' data-instances='"+JSON.stringify(instances)+"' data-type='" row +="<button id='selected-attribute' data-instances='"+JSON.stringify(instances)+"' data-type='"
+type+"' data-value='"+value[i]+"' class='btn btn-default attribute_btn " +type+"' data-value='"+value[i]+"' class='btn btn- waves-effect attribute_btn "
+ status +" "+ type +" "+ disabled +" '>" + status +" "+ type +" '"+ disabled +" >"
+value[i] +value[i]
+"</button>"; +"</button>";
}); });
@@ -446,7 +446,7 @@ $(function(){
type = item_options[field]["type"]; type = item_options[field]["type"];
row = "<h4>"+type+"</h4>" row = "<h4>"+type+"</h4>"
$(value).each(function(i){ $(value).each(function(i){
row +="<button class='btn btn-default option_btn "+ type +"' data-type='" row +="<button class='btn btn- waves-effect option_btn "+ type +"' data-type='"
+type+"' data-value='"+value[i]+"' data-group='simple_menu'>"+value[i]+"</button>"; +type+"' data-value='"+value[i]+"' data-group='simple_menu'>"+value[i]+"</button>";
}); });
$(".options-list").append(row); $(".options-list").append(row);

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

@@ -1,3 +1,6 @@
section .content{
padding:50px 15px 0 225px !important;
}
.custom-card-head{ .custom-card-head{
height: 40px; height: 40px;
background-color: #54A5AF; background-color: #54A5AF;
@@ -78,11 +81,9 @@ element.style {
} }
.selected-attribute { .selected-attribute {
color: #fff !important;
background-color: green !important; background-color: green !important;
} }
.selected-option { .selected-option {
color: #fff !important;
background-color: green !important; background-color: green !important;
} }
@@ -94,12 +95,14 @@ element.style {
white-space: normal !important; white-space: normal !important;
margin-bottom: 5px; margin-bottom: 5px;
margin-right: 5px; margin-right: 5px;
color:#111 !important;
} }
.option_btn { .option_btn {
white-space: normal !important; white-space: normal !important;
margin-bottom: 5px; margin-bottom: 5px;
margin-right: 5px; margin-right: 5px;
color:#111 !important;
} }
#logo{ #logo{
margin: auto; margin: auto;

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

@@ -23,8 +23,7 @@
</div> </div>
<div class="col-md-3 col-lg-3 col-sm-3"> <div class="col-md-3 col-lg-3 col-sm-3">
<button type="button" class="btn btn-primary btn-md float-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br>
<button type="button" class="btn btn-primary btn-md pull-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br><br>
<div class="card-header"> <div class="card-header">
<div> <div>
<strong id="order-title">ORDER DETAILS </strong> | Table <%=@table.name%> <strong id="order-title">ORDER DETAILS </strong> | Table <%=@table.name%>
@@ -121,13 +120,14 @@
<div class="input-group"> <div class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="button" class="btn btn-danger btn-number" value="-" id="minus"> <button type="button" class="btn btn-danger btn-number" value="-" id="minus">
<span class="glyphicon glyphicon-minus"></span> <i class="material-icons">remove</i>
</button> </button>
</span> </span>
<input type="text" value="1" id="count" class="change_qty form-control col-md-12 "> <input type="text" value="1" id="count" class="change_qty form-control col-md-12 ">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="button" class="btn btn-success btn-number" value="+" id="plus"> <button type="button" class="btn btn-success btn-number" value="+" id="plus">
<span class="glyphicon glyphicon-plus"></span> <i class="material-icons">add</i>
</button> </button>
</span> </span>
</div> </div>
@@ -154,8 +154,8 @@
<div class="mr-auto"> <div class="mr-auto">
<h4 class=" pull-left">Total : <span id="total_price"></span></h4> <h4 class=" pull-left">Total : <span id="total_price"></span></h4>
</div> </div>
<button type="button" class="btn btn-primary" data-dismiss="modal" id="close">Close</button> <button type="button" class="btn btn-primary m-r-20" data-dismiss="modal" id="close">Close</button>
<button type="button" class="btn btn-success add_to_order" data-dismiss="modal" id="add_to_order">Add to Order</button> <button type="button" class="btn btn-success add_to_order m-r-10" data-dismiss="modal" id="add_to_order">Add to Order</button>
</div> </div>
</div> </div>
</div> </div>
@@ -183,13 +183,13 @@
<div class="input-group"> <div class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="button" class="btn btn-danger btn-number" value="-" id="set_minus"> <button type="button" class="btn btn-danger btn-number" value="-" id="set_minus">
<span class="glyphicon glyphicon-minus"></span> <i class="material-icons">remove</i>
</button> </button>
</span> </span>
<input type="text" value="1" id="set_count" class="set_change_qty form-control col-md-12 "> <input type="text" value="1" id="set_count" class="set_change_qty form-control col-md-12 ">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="button" class="btn btn-success btn-number" value="+" id="set_plus"> <button type="button" class="btn btn-success btn-number" value="+" id="set_plus">
<span class="glyphicon glyphicon-plus"></span> <i class="material-icons">add</i>
</button> </button>
</span> </span>
</div> </div>
@@ -207,7 +207,7 @@
</div> </div>
<div class="col-md-8"> <div class="col-md-8">
<div class="instance-list"></div> <div class="instance-list row"></div>
</div> </div>
</div> </div>
</div> </div>