some changes for order reservation

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()));
+      }
     }
   }
 });

app/assets/javascripts/custom.js

@@ -176,4 +176,25 @@ function audioPlayBackground(shop_code,audio){
     audio.play();
   // },10000);
 }
-/* end order reservation function */
+/* 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*/

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 */
+/* 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*/

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;
 }

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 */
+
 /* *************************************************** */

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

app/views/layouts/_header.html.erb

@@ -36,12 +36,22 @@
             </span>
         </div>
         <!-- Start Shop Info -->
-        <div class="navbar-right">
+        <div class="navbar-right shop-name-margin">
-            <div class="col-lg-12 col-md-12 col-sm-12 navbar-brand">
+            <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 navbar-brand">
                 <span class="navbar-brand-txt"><%= shop_detail.name %></span>
             </div>
         </div>
         <!-- End Shop Info -->
+        
+        <div class="navbar-right online-order-margin">
+            <% if order_reservation %>
+            <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 online_order">
+                <span class="navbar-brand-txt header-default-color"><%= t :order_reservation %></span>
+                <span class="order_no"></span>
+            </div>
+            <% end %>
+        </div>
+        
         <!-- Start Delete confirrm text !-->
         <div class="navbar-right">
             <a href="javascript:void(0);" class="dropdown-toggle waves-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> 
@@ -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()));
+        }
+        
     });
 </script>

app/views/origami/dashboard/index.html.erb

@@ -22,7 +22,7 @@
     <!-- Widgets -->
     <div class="row clearfix">
     <% if @quick_service == '1' %>
-      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 qs_view">
+      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-10 qs_view">
         <div class="info-box bg-purple">
           <div class="icon" >
             <i class="material-icons">arrow_forward</i>
@@ -32,7 +32,7 @@
       </div>
       <% end %>
       <% if @dinein_cashier == '1' %>
-      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 cashier_view">
+      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-10 cashier_view">
         <div class="info-box bg-green">
           <div class="icon" >
             <i class="material-icons">arrow_forward</i>
@@ -42,7 +42,7 @@
       </div>
        <% end %>
       <% if @order_reservation == '1' %>
-      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 order_reservation">
+      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-10 order_reservation">
         <div class="info-box bg-blue">
           <div class="icon" >
             <i class="material-icons">arrow_forward</i>

app/views/origami/order_reservation/index.html.erb

@@ -325,7 +325,7 @@
 
     <div class="col-lg-4 col-md-4 col-sm-4 div_card_order">
       <div class="card m-b-5 p-t-5">
-          <div class="card-header custom-card-header" style="color:">
+          <div class="card-header custom-card-header">
             <table class="table">
               <tr>
                 <td width ="10%" class="header-td align-left">
@@ -343,7 +343,7 @@
             </table>
           </div>
         <div class="card-block custom-card-block">
-          <div id="order-detail-slimscroll" data-height="220">
+          <div id="order-detail-slimscroll" data-height="100">
             <table class="table  summary-items">
               <tbody>
                 <!-- <tr>
@@ -393,39 +393,6 @@
             </tbody>
           </table>
         </div>
-        <div class="card-footer grand-card-footer">
-          <table class="table">
-            <tbody>
-              <tr>
-                <td width ="70%" class="footer-td align-left col-blue">
-                   GRAND TOTAL
-                </td>
-                <td width ="30%" class="footer-td align-right col-blue" id="grand_total">0.00</td>
-              </tr>
-              <tr>
-                <td width ="50%" class="footer-td align-left col-blue">
-                  <button type="button" class="btn btn-lg bg-red waves-effect" id="cancel" data-value="rejected">
-                      <strong>REJECT</strong>
-                  </button>
-                </td>
-                <td width ="50%" class="footer-td align-right col-blue">
-                <button type="button" class="btn btn-lg bg-blue waves-effect " id="accepted" data-value="accepted">
-                   ACCEPT
-                </button>
-                <!-- <button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="delivery">
-                   <strong>SEND TO KITCHEN</strong>
-                </button>
-                <button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="completed">
-                   <strong>READY TO DELIVERY</strong>
-                </button>
-                <button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="pick-up">
-                   <strong>PICK UP</strong>
-                </button> -->
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
       </div>  
     </div>
     
@@ -454,7 +421,7 @@
                 </tr>
                 <tr>
                   <td class="body-td align-left">
-                    <span class="font-13">REQUESTED TIME</span><br>
+                    <span class="font-13">DELIVERY REQUESTED TIME</span><br>
                     <b id="requested_time"></b>
                   </td>
                   <td class="body-td align-right expected_time">
@@ -463,26 +430,22 @@
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="2" class="body-td align-left">
+                  <td class="body-td align-left">
                      <span class="font-13">NAME</span><br>
                      <b id="customer_name"></b>
                   </td>
-                </tr>
+                  <td class="body-td align-left">
-                <tr>
-                  <td colspan="2" class="body-td align-left">
                      <span class="font-13">PHONE</span><br>
                      <b id="phone"></b>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="2" class="body-td align-left">
+                  <td class="body-td align-left">
                      <span class="font-13">ADDRESS</span><br>
                      <b id="address"></b>
                   </td>
-                </tr>
+                  <td class="body-td align-left">
-                <tr>
+                     <span class="font-13">DELIVERY</span><br>
-                  <td colspan="2" class="body-td align-left">
-                     <span class="font-13">DELEVERY</span><br>
                      <b id="delivery_to"></b>
                   </td>
                 </tr>
@@ -499,8 +462,62 @@
                 </tr>
               </tbody>
           </table>
+          <table class="table">
+            <tr>
+              <td colspan="2" class="body-td align-left">
+                 <span class="font-13">ACCEPTED</span><br>
+                 <b id="accepted_time">Sept 06, 2018(Weds) 10:00 AM</b>
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="body-td align-left">
+                 <span class="font-13">SEND TO KITCHEN</span><br>
+                 <b id="send_kitchen_time">Sept 06, 2018(Weds) 11:00 AM</b>
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="body-td align-left">
+                 <span class="font-13">READY TO DELIVERY</span><br>
+                 <b id="ready_delivery_time">Sept 06, 2018(Weds) 12:00 PM</b>
+              </td>
+            </tr>
+          </table>
         </div>
-        <div class="card-footer order_close_cashier">
+
+        <div class="card-footer grand-card-footer">
+          <table class="table">
+            <tbody>
+              <tr>
+                <td width ="70%" class="footer-td align-left col-blue grand-total-padding">
+                   GRAND TOTAL
+                </td>
+                <td width ="30%" class="footer-td align-right col-blue grand-total-padding" id="grand_total">0.00</td>
+              </tr>
+              <tr class="order_btns">
+                <td width ="50%" class="footer-td align-left col-blue">
+                  <button type="button" class="btn btn-lg btn-link bg-red waves-effect" id="cancel" data-value="rejected">
+                      <strong>REJECT</strong>
+                  </button>
+                </td>
+                <td width ="50%" class="footer-td align-right col-blue">
+                  <button type="button" class="btn btn-lg btn-link bg-blue waves-effect " id="accepted" data-value="accepted">
+                     ACCEPT
+                  </button>
+                </td>
+              </tr>
+              
+              <% if current_user.role != "waiter" %>
+                <tr class="order_close_cashier" style="display:none">
+                  <td colspan="2" width="100%" class="footer-td align-right col-blue">
+                    <button id="order_close_cashier" class="btn btn-lg btn-link bg-blue waves-effect"><%= t("views.btn.close_cashier") %></button>
+                  </td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+        </div>
+
+       <!--  <div class="card-footer order_close_cashier">
           <% if current_user.role != "waiter" %>
             <div class="row">
               <div class="col-sm-7 col-xs-7 col-md-7 col-lg-7"></div>
@@ -509,7 +526,7 @@
               </div>
             </div>
           <% end %>
-        </div>
+        </div> -->
       </div>
     </div>
     <div id="<%= @shop.shop_code ? @shop.shop_code : '' %>_doemal_new_order"></div>
@@ -530,12 +547,12 @@
       <h4 class="modal-title" id="waiting_timeModalLabel">Expected Waiting Time for <span id="requested_order_time"></span></h4>
       </div>
       <div class="modal-body">
-        <div class="row text-center m-t-20">
+        <!-- <div class="row text-center m-t-20">
           <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3"></div>
           <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
             <button type="button" class="btn btn-lg btn-link bg-info timer_type" data-value="after">After</button>
           </div>
-        </div>
+        </div> -->
 
         <div class="row text-center m-t-20">
           <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
@@ -561,11 +578,19 @@
             <button type="button" class="btn btn-lg btn-link bg-info time_interval" data-value="90">90 Mins.</button>
           </div>
         </div>
+        <div class="row text-center m-t-20">
+          <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
+            <button type="button" class="btn btn-lg btn-link bg-info time_interval" data-value="105">105 Mins.</button>
+          </div>
+          <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
+            <button type="button" class="btn btn-lg btn-link bg-info time_interval" data-value="120">120 Mins.</button>
+          </div>
+        </div>
       </div>
       <div class="modal-footer ">
         <div class="row p-r-20">
           <div class="col-md-5">
-            <button type="button" class="btn btn-link p-t-5 p-b-5 bg-red waves-effect" data-dismiss="modal">CLOSE</button>
+            <button type="button" style="margin-bottom: 10px;" class="btn btn-lg btn-link bg-red waves-effect" data-dismiss="modal">CLOSE</button>
           </div>
         </div>
       </div>
@@ -587,11 +612,11 @@
       </div>
       <div class="modal-footer ">
         <div class="row p-r-20">
-          <div class="col-md-5">
+          <div class="col-md-5 mr-1">
-            <button type="button" class="btn btn-link p-t-5 p-b-5 bg-blue waves-effect send_status">SEND</button>
+            <button type="button" class="btn btn-lg btn-link p-t-5 p-b-5 bg-blue waves-effect send_status">SEND</button>
           </div>
           <div class="col-md-5">
-            <button type="button" class="btn btn-link p-t-5 p-b-5 bg-red waves-effect" data-dismiss="modal">CLOSE</button>
+            <button type="button" class="btn btn-lg btn-link p-t-5 p-b-5 bg-red waves-effect" data-dismiss="modal">CLOSE</button>
           </div>
         </div>
       </div>

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"

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"

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' }