From 8291a0a99278be8d67679f3681ece7e5d1862a2a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 16 Feb 2018 17:20:32 +0630 Subject: [PATCH] update addorder view --- app/assets/javascripts/addorder.js | 18 +++++++++--------- app/assets/stylesheets/addorder.scss | 6 ++++-- app/views/origami/addorders/detail.html.erb | 5 ++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 91c02552..ac582ab1 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -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 = '
' - +'
' + row = '
' + +'
' +'
'+ menu_items[field].name +'
' +"
' +'
' +'
' - +"
" - +"
" - +"" - +"
" + // +"
" + // +"" + // +"
" - +''; @@ -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"]); diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 368f21c9..9cc5e7d7 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -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 { diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 2ec7ad24..f26409fe 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -10,7 +10,8 @@
-