From e3cf15c09654fef9851b69f01b1329d0e8615f75 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 16 Oct 2017 11:41:53 +0630 Subject: [PATCH] update admin bsb design --- app/assets/javascripts/addorder.js | 4 +- app/assets/javascripts/application.js | 2 +- .../origami/addorders_controller.rb | 2 + app/views/oqs/edit/index.html.erb | 42 +++- app/views/oqs/home/index.html.erb | 237 +++++++++++++++++- app/views/origami/addorders/detail.html.erb | 4 +- config/routes.rb | 5 +- 7 files changed, 279 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 28bbb7c6..f615a28d 100644 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -79,7 +79,8 @@ $(function(){ //click menu sidebar menu category $(".menu_category").on("click", function(){ var menu_id = $(this).find(".menu-id").text(); - var url = $(this).attr('data-ref'); + var url = "get_menu_category/"+menu_id; + console.log(url) show_menu_item_list(url); }); //End menu category Click @@ -100,7 +101,6 @@ $(function(){ menu_items_list.empty(); menu_items = data.menu_items; - for(var field in menu_items) { if (menu_items[field].is_sub_item == false) { instances = menu_items[field].instances ; diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e355c13c..84958b8d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -75,7 +75,7 @@ $(function(){ }); $('#order-detail-slimscroll').slimScroll({ - height: height-180, + height: height-160, size: '5px', color: 'rgba(0,0,0,0.5)', alwaysVisible: false, diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 35567356..0f1026a2 100644 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -34,6 +34,8 @@ class Origami::AddordersController < BaseOrigamiController def get_menu_category () if (params[:id]) + puts "sssssssssssss" + puts params[:id] #Pull this menu @menu = MenuCategory.find_by_id(params[:id]) # puts @menu.menu_items[1].item_attributes.to_json diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb index 15d48144..385a6b68 100644 --- a/app/views/oqs/edit/index.html.erb +++ b/app/views/oqs/edit/index.html.erb @@ -1,17 +1,28 @@ + +
Update Quantity
-
-

<%= @order_item[0].item_name + " - [" + @order_item[0].qty.to_s + "]" %>

+ + +
+
+ +
+
+ + + + +
+
+
+
+ +
+
+ + + + +
+ diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 61c9f3bc..afa90efd 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -17,11 +17,8 @@ <%= form_tag oqs_root_path, :method => :get do %>
-
-
- -
-
+ +
@@ -75,7 +72,7 @@ -
+
@@ -160,7 +157,7 @@
-
+
@@ -189,4 +186,230 @@ + diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 3195c45d..078d10f4 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -4,7 +4,9 @@