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:
Aung Myo
2018-02-16 17:20:32 +06:30
parent 941204afc1
commit 8291a0a992
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,7 +166,7 @@ $(function() {
if (menu_items[field].image) {
image_path = menu_items[field].image;
}else{
image_path = "/image/logo.png";
image_path = "image/logo.png";
}
// if (menu_item_box == "set_item_box") {
@@ -174,8 +174,8 @@ $(function() {
// }
row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
+'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
row = '<div class="card custom-card testimonial-card animated 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="col-md-9">'+ menu_items[field].name +'</div>'
+"<div class='col-md-3 "+menu_item_box+"' data-item-code='"
+ menu_items[field].code +"' data-instance = '"
@@ -188,7 +188,7 @@ $(function() {
+add+ '</i>'
+'</div>'
+'</div>'
+"<div class='"+add_icon+"' data-item-code='"
+"<div class='"+add_icon+" p-t-50 m-r--5' 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 = '"
@@ -199,11 +199,11 @@ $(function() {
+JSON.stringify(menu_items[field].item_sets)+"'data-instances = '"
+JSON.stringify(menu_items[field].instances)+"'>"
+"<div class='card-block custom-card-block'>"
+"<img id='logo' height='125px' src='"+image_path+"'>"
+"</div>"
// +"<div class='card-block custom-card-block'>"
// +"<img id='logo' height='' src='"+image_path+"'>"
// +"</div>"
+'<div class="card-footer custom-card-footer">'
+'<div class="card-footer custom-card-footer" style="opacity:0.5">'
+'<span>'+ price +'</span>'
+'</div>'
+'</div>';
@@ -230,7 +230,7 @@ $(function() {
item_sets = $(this).data('item-sets');
instances = $(this).data('instances');
// item_sets = $(data).attr('data-item-sets');
console.log(instances)
for(var field in item_sets) {
$('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]);

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

@@ -3,9 +3,11 @@ section .content{
}
.custom-card-head{
height: 40px;
background-color: #54A5AF;
#background-color: #54A5AF;
background-color: #2196f3;
opacity: 0.5;
padding:5px;
color :#fff;
color :#111;
}
.custom-card {

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

@@ -10,7 +10,8 @@
<input type="hidden" name="type" id="modify_order" value="<%=modify_order%>">
<div class="row m-t--20">
<div class="col-lg-2 col-md-2 col-sm-2">
<ul class="nav nav-tabs flex-column" role="tablist" id="ul-navbar">
<ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
<li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
</li>
@@ -54,8 +55,6 @@
<% end%>
<% end %>
<%end %>
</ul>
</div>
<div class="col-md-7 col-lg-7 col-sm-7 m-t-10">