diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js index e1c67b76..1d7dfa97 100644 --- a/app/assets/javascripts/channels/order_reservation.js +++ b/app/assets/javascripts/channels/order_reservation.js @@ -76,6 +76,11 @@ App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel' if (typeof customTableClick !== 'undefined' && $.isFunction(customTableClick)) { customTableClick(); } + + if(parseInt(getOnlineOrderCount()) > 0){ + $('.order_no').addClass("order-badge"); + $('.order_no').html(parseInt(getOnlineOrderCount())); + } } } }); diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 005d6c6a..02024651 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -176,4 +176,25 @@ function audioPlayBackground(shop_code,audio){ audio.play(); // },10000); } -/* end order reservation function */ \ No newline at end of file +/* end order reservation function */ + +/* online order count*/ +function getOnlineOrderCount(){ + var count = 0; + //Start Ajax + $.ajax({ + async: false, + type: "GET", + url: "/origami/get_order_info", + dataType: "json", + success: function(data){ + if(parseInt(data) > 0){ + count = parseInt(data); + } + } + }); + //end Ajax + // alert(count); + return count; +} +/* online order count*/ \ No newline at end of file diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index 46d035fe..d1ed693e 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -20,6 +20,7 @@ $(function() { $('#cancel').hide(); $(".tbl_customer").hide(); $(".order_close_cashier").hide(); + $(".order_btns").show(); refreshDetailData(); if (type == "pending") { $(".first-1").click(); @@ -41,6 +42,7 @@ $(function() { }else if(type == "processed"){ $(".fifth-1").click(); $(".order_close_cashier").show(); + $(".order_btns").hide(); // $('#accepted').hide(); // $('#cancel').hide(); } @@ -501,6 +503,10 @@ function callback_url(callback,ref_no,order_id,status,min_type,time,exptime,reas // } // } // }); + if(parseInt(getOnlineOrderCount()) > 0){ + $('.order_no').addClass("order-badge"); + $('.order_no').html(parseInt(getOnlineOrderCount())); + } } function showNewOrderAlert(order_reservation,shop_code){ @@ -601,4 +607,25 @@ function timeFormat(date){ (isPM ? ' PM' : ' AM'); return time; } -/* end order reservation function */ \ No newline at end of file +/* end order reservation function */ + +/* online order count*/ +function getOnlineOrderCount(){ + var count = 0; + //Start Ajax + $.ajax({ + async: false, + type: "GET", + url: "/origami/get_order_info", + dataType: "json", + success: function(data){ + if(parseInt(data) > 0){ + count = parseInt(data); + } + } + }); + //end Ajax + // alert(count); + return count; +} +/* online order count*/ \ No newline at end of file diff --git a/app/assets/stylesheets/order_reservation.scss b/app/assets/stylesheets/order_reservation.scss index 4a5c591a..e46ce76d 100644 --- a/app/assets/stylesheets/order_reservation.scss +++ b/app/assets/stylesheets/order_reservation.scss @@ -54,6 +54,7 @@ .custom-card-footer .table td:first-child, .custom-card-footer .table td:nth-child(2){ border-top:0px solid !important; + height: 20px; } .custom-card-footer .footer-td , @@ -62,13 +63,16 @@ border-bottom:0px solid !important; font-weight: bold; padding:6px 10px; + height: 64px; } .custom-card-header{ border-bottom: 1px solid #F8BBD0 !important; padding:13px 5px !important; + height: 50px; } .custom-card-footer{ border-top: 1px solid #F8BBD0 !important; + border-bottom: 1px solid #FAFAFA !important; } .custom-card-block, .grand-card-footer, @@ -87,8 +91,12 @@ background-color : #FFCDD2; } .div_order_margin { - margin: 0px 0px 0px -5px !important + margin: -4px 0px 0px -5px !important } .div_card_order { margin: 0px -5px !important +} +td.grand-total-padding { + font-size: 17px; + padding-top: 20px !important; } \ No newline at end of file diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css index 78f23e15..1326a293 100644 --- a/app/assets/stylesheets/reset.css +++ b/app/assets/stylesheets/reset.css @@ -283,4 +283,41 @@ section.content { padding: 0.5rem 0.44rem; } /* End Reset Theme */ + +/* shop name margin */ +.shop-name-margin { + margin-left : 20%; +} +/* shop name margin */ + +/* online order margin */ +.online-order-margin { + margin-left : 22%; + margin-bottom : 9.9999px; +} +/* online order margin */ +/* default-header-color */ +div.online-order-margin > div > span { + color : #FAFAFA; +} +/* default-header-color */ +/* order-no color */ +.order-badge { + position: absolute; + background: #ff6600; + height: 1.8rem; + bottom: -0.1rem; + right: -1.3rem; + width: 1.8rem; + text-align: center; + line-height: 1.7rem; + font-size: 0.9rem; + border-radius: 50%; + color: white; + border: 1px solid #ff6600; + font-family: sans-serif; + font-weight: bold; +} +/* order-no color */ + /* *************************************************** */ \ No newline at end of file diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb index fcfdcbb4..f4f993d5 100644 --- a/app/controllers/origami/order_reservation_controller.rb +++ b/app/controllers/origami/order_reservation_controller.rb @@ -96,4 +96,9 @@ class Origami::OrderReservationController < BaseOrigamiController render :json => response end + def get_order_info + order_reservation = OrderReservation.where("status = 'new' OR status='accepted' OR status='send_to_kitchen' OR status = 'ready_to_delivery'").count() + render :json => order_reservation + end + end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index d21b1743..c8cec5ea 100755 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -36,12 +36,22 @@ -
-
+
+
<%= shop_detail.name %>
+ +
+ <% if order_reservation %> +
+ <%= t :order_reservation %> + +
+ <% end %> +
+
@@ -111,5 +121,15 @@ } }); }); + + $('.online_order').on('click',function(){ + window.location.href = '/origami/order_reservation'; + }); + + if(parseInt(getOnlineOrderCount()) > 0){ + $('.order_no').addClass("order-badge"); + $('.order_no').html(parseInt(getOnlineOrderCount())); + } + }); \ No newline at end of file diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index 88ce8afc..25c64303 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -22,7 +22,7 @@
<% if @quick_service == '1' %> -
+
arrow_forward @@ -32,7 +32,7 @@
<% end %> <% if @dinein_cashier == '1' %> -
+
arrow_forward @@ -42,7 +42,7 @@
<% end %> <% if @order_reservation == '1' %> -
+
arrow_forward diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 96dac54b..348d875c 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -325,7 +325,7 @@
-
+
@@ -343,7 +343,7 @@
-
+
- - - -
-
@@ -454,7 +421,7 @@ - REQUESTED TIME
+ DELIVERY REQUESTED TIME
@@ -463,26 +430,22 @@ - + NAME
- - - + PHONE
- + ADDRESS
- - - - DELEVERY
+ + DELIVERY
@@ -499,8 +462,62 @@ + + + + + + + + + + +
+ ACCEPTED
+ Sept 06, 2018(Weds) 10:00 AM +
+ SEND TO KITCHEN
+ Sept 06, 2018(Weds) 11:00 AM +
+ READY TO DELIVERY
+ Sept 06, 2018(Weds) 12:00 PM +
-
+ +
+ + + + + + + + + + + + <% if current_user.role != "waiter" %> + + + + <% end %> + +
+ GRAND TOTAL +
+ + + +
+
+ +
@@ -530,12 +547,12 @@
-
+
@@ -561,11 +578,19 @@
+
+
+ +
+
+ +
+
- +
@@ -587,11 +612,11 @@
-
- +
+
- +
diff --git a/config/locales/en.yml b/config/locales/en.yml index b089780f..8f5127d2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -76,7 +76,7 @@ en: date_time: "DateTime" dine_in_cashier: "Dine-in Cashier" quick_service: "Quick Service" - order_reservation: "Order & Reservation" + order_reservation: "Online Order" pending: "Pending" processing: "Processing" delivering: "Delivering" @@ -479,7 +479,7 @@ en: adult: "Adult" foreigner: "Foreigner" local: "Local" - order_reservation_report: "Order Reservation" + order_reservation_report: "Online Order" requested_time: "Requested Time" provider: "Provider" delivery_fee: "Delivery Fee" @@ -489,7 +489,7 @@ en: convenience_tax: "Convenience Tax" commercial_tax: "Commercial Tax" select_providers: "Select Providers" - order_reservation: "Order Reservation" + order_reservation: "Online Order" cooking_time: "Cooking Time" township: "Township" induty_report: "Induty Report" diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 45166af2..d5440b72 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -71,7 +71,7 @@ mm: date_time: "ရက်စွဲအချိန်" dine_in_cashier: "Dine-in Cashier" quick_service: "Quick Service" - order_reservation: "Order & Reservation" + order_reservation: "Online Order မွာယူျခင္း" pending: "Pending" processing: "Processing" delivering: "Delivering" @@ -473,7 +473,7 @@ mm: adult: "လူကြီး" foreigner: "နိုင်ငံခြားသား" local: "နိုင်ငံသား" - order_reservation_report: "ၾကိဳတင္ order မွာယူျခင္း" + order_reservation_report: "online order မွာယူျခင္း" requested_time: "Requested Time" provider: "Provider" delivery_fee: "Delivery Fee" @@ -483,7 +483,7 @@ mm: convenience_tax: "Convenience Tax" commercial_tax: "Commercial Tax" select_providers: "Select Providers" - order_reservation: "Order Reservation" + order_reservation: "online order မွာယူျခင္း" cooking_time: "Cooking Time" township: "Township" induty_report: "Induty Report" diff --git a/config/routes.rb b/config/routes.rb index 4278588c..d1cde5da 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -288,6 +288,7 @@ scope "(:locale)", locale: /en|mm/ do get 'order_reservation/get_order/:id' => "order_reservation#get_order",:as => "get_order", :defaults => { :format => 'json' } post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' } post 'order_reservation/send_status', to: "order_reservation#send_status", :defaults => { :format => 'json' } + get 'get_order_info', to: "order_reservation#get_order_info", :as => "get_order_info", :defaults => { :format => 'json' } #credit payment routes post '/:type/credit_sales' => "dashboard#get_credit_sales", :as => "get_credit_sales", :defaults => { :format => 'json' }