diff --git a/app/assets/javascripts/channels/check_new_order.js b/app/assets/javascripts/channels/check_new_order.js
index a6317af6..92e0e715 100644
--- a/app/assets/javascripts/channels/check_new_order.js
+++ b/app/assets/javascripts/channels/check_new_order.js
@@ -19,33 +19,34 @@ App.check_new_order = App.cable.subscriptions.create('CheckNewOrderChannel', {
       });
 
       // alert(order_lists);
-      swal({
-        title: 'Information',
-        target: document.getElementById(shop_code+"_notify_new_order"),
-        text: "You have new orders <br/>"+
-              "Are you accept or reject for these orders <b>"+order_lists+"</b>?",
-        type: 'success',
-        html: true,
-        closeOnConfirm: false,
-        closeOnCancel: false,
-        allowOutsideClick: false
-      }, function (isConfirm) {
-        if(isConfirm){
-          swal.close();
-        }
-      });
-      // $("#notify_new_order_lists").text(order_lists);
+      // swal({
+      //   title: 'Information',
+      //   target: document.getElementById(shop_code+"_notify_new_order"),
+      //   text: "You have new orders <br/>"+
+      //         "Are you accept or reject for these orders <b>"+order_lists+"</b>?",
+      //   type: 'success',
+      //   html: true,
+      //   closeOnConfirm: false,
+      //   closeOnCancel: false,
+      //   allowOutsideClick: false
+      // }, function (isConfirm) {
+      //   if(isConfirm){
+      //     swal.close();
+      //   }
+      // });
+      $("#notify_new_order_lists").text(order_lists);
       // if($("#notify_new_order").hasClass("hidden")){
-        // $("#notify_new_order").removeClass("hidden");
+        $("#notify_new_order").removeClass("hidden");
       // }
-      // $("#notify_new_order").on('show.bs.modal', function(e){
-      //   $("#notify_order_send_to_kitchen").addClass("hidden");
-      //   $("#notify_order_ready_to_delivery").addClass("hidden");
-      // }).on('shown.bs.modal', function(e){
-      //   $("#notify_new_order").focus();
-      // }).on('hide.bs.modal', function (e) {
-      //   $("#notify_new_order").addClass("hidden");
-      // }).modal({show: true, keyboard: false, backdrop: false});
+      $("#notify_new_order").on('shown.bs.modal', function(e){
+        $(document).off('focusin.modal');
+        $("#notify_new_order").focus();
+        $("#"+shop_code+"_doemal_new_order").addClass("hidden");
+        $("#notify_order_send_to_kitchen").addClass("hidden");
+        $("#notify_order_ready_to_delivery").addClass("hidden");
+      }).on('hide.bs.modal', function (e) {
+        $("#notify_new_order").addClass("hidden");
+      }).modal({show: true, keyboard: false, backdrop: false});
     }
   }
 });
diff --git a/app/assets/javascripts/channels/check_order_ready_to_delivery.js b/app/assets/javascripts/channels/check_order_ready_to_delivery.js
index 319f7781..05a257b3 100644
--- a/app/assets/javascripts/channels/check_order_ready_to_delivery.js
+++ b/app/assets/javascripts/channels/check_order_ready_to_delivery.js
@@ -19,33 +19,34 @@ App.check_order_ready_to_delivery = App.cable.subscriptions.create('CheckOrderRe
       });
 
       // alert(order_lists);
-      swal({
-        title: 'Information',
-        target: document.getElementById(shop_code+"_notify_order_ready_to_delivery"),
-        text: "You have orders that are ready to deliver <br/>"+
-              "Could you ready these orders <b>"+order_lists+"</b> to deliver?",
-        type: 'success',
-        html: true,
-        closeOnConfirm: false,
-        closeOnCancel: false,
-        allowOutsideClick: false
-      }, function (isConfirm) {
-        if(isConfirm){
-          swal.close();
-        }
-      });
-      // $("#notify_order_ready_to_delivery_lists").text(order_lists);
+      // swal({
+      //   title: 'Information',
+      //   target: document.getElementById(shop_code+"_notify_order_ready_to_delivery"),
+      //   text: "You have orders that are ready to deliver <br/>"+
+      //         "Could you ready these orders <b>"+order_lists+"</b> to deliver?",
+      //   type: 'success',
+      //   html: true,
+      //   closeOnConfirm: false,
+      //   closeOnCancel: false,
+      //   allowOutsideClick: false
+      // }, function (isConfirm) {
+      //   if(isConfirm){
+      //     swal.close();
+      //   }
+      // });
+      $("#notify_order_ready_to_delivery_lists").text(order_lists);
       // if($("#notify_order_ready_to_delivery").hasClass("hidden")){
-        // $("#notify_order_ready_to_delivery").removeClass("hidden");
+        $("#notify_order_ready_to_delivery").removeClass("hidden");
       // }
-      // $("#notify_order_ready_to_delivery").on('shown.bs.modal', function(e){
-      //   $("#notify_new_order").addClass("hidden");
-      //   $("#notify_order_send_to_kitchen").addClass("hidden");
-      // }).on('shown.bs.modal', function(e){
-      //   $("#notify_order_ready_to_delivery").focus();
-      // }).on('hide.bs.modal', function (e) {
-      //   $("#notify_order_ready_to_delivery").addClass("hidden");
-      // }).modal({show: true, keyboard: false, backdrop: false});
+      $("#notify_order_ready_to_delivery").on('shown.bs.modal', function(e){
+        // $(document).off('focusin.modal');
+        $("#notify_order_ready_to_delivery").focus();
+        $("#"+shop_code+"_doemal_new_order").addClass("hidden");
+        $("#notify_new_order").addClass("hidden");
+        $("#notify_order_send_to_kitchen").addClass("hidden");
+      }).on('hide.bs.modal', function (e) {
+        $("#notify_order_ready_to_delivery").addClass("hidden");
+      }).modal({show: true, keyboard: false, backdrop: false});
     }
   }
 });
diff --git a/app/assets/javascripts/channels/check_order_send_to_kitchen.js b/app/assets/javascripts/channels/check_order_send_to_kitchen.js
index df9eb324..f9432810 100644
--- a/app/assets/javascripts/channels/check_order_send_to_kitchen.js
+++ b/app/assets/javascripts/channels/check_order_send_to_kitchen.js
@@ -19,33 +19,34 @@ App.check_order_send_to_kitchen = App.cable.subscriptions.create('CheckOrderSend
       });
 
       // alert(order_lists);
-      swal({
-        title: 'Information',
-        target: document.getElementById(shop_code+"_notify_order_send_to_kitchen"),
-        text: "You have to send order to kitchen <br/>"+
-              "Could you send these orders <b>"+order_lists+"</b> to kitchen?",
-        type: 'success',
-        html: true,
-        closeOnConfirm: false,
-        closeOnCancel: false,
-        allowOutsideClick: false
-      }, function (isConfirm) {
-        if(isConfirm){
-          swal.close();
-        }
-      });
-      // $("#notify_order_send_to_kitchen_lists").text(order_lists);
+      // swal({
+      //   title: 'Information',
+      //   target: document.getElementById(shop_code+"_notify_order_send_to_kitchen"),
+      //   text: "You have to send order to kitchen <br/>"+
+      //         "Could you send these orders <b>"+order_lists+"</b> to kitchen?",
+      //   type: 'success',
+      //   html: true,
+      //   closeOnConfirm: false,
+      //   closeOnCancel: false,
+      //   allowOutsideClick: false
+      // }, function (isConfirm) {
+      //   if(isConfirm){
+      //     swal.close();
+      //   }
+      // });
+      $("#notify_order_send_to_kitchen_lists").text(order_lists);
       // if($("#notify_order_send_to_kitchen").hasClass("hidden")){
-        // $("#notify_order_send_to_kitchen").removeClass("hidden");
+        $("#notify_order_send_to_kitchen").removeClass("hidden");
       // }
-      // $("#notify_order_send_to_kitchen").on('show.bs.modal', function(e){
-      //   $("#notify_new_order").addClass("hidden");
-      //   $("#notify_order_ready_to_delivery").addClass("hidden");
-      // }).on('shown.bs.modal', function(e){
-      //   $("#notify_order_send_to_kitchen").focus();
-      // }).on('hide.bs.modal', function (e) {
-      //   $("#notify_order_send_to_kitchen").addClass("hidden");
-      // }).modal({show: true, keyboard: false, backdrop: false});
+      $("#notify_order_send_to_kitchen").on('shown.bs.modal', function(e){
+        // $(document).off('focusin.modal');
+        $("#notify_order_send_to_kitchen").focus();
+        $("#"+shop_code+"_doemal_new_order").addClass("hidden");
+        $("#notify_new_order").addClass("hidden");
+        $("#notify_order_ready_to_delivery").addClass("hidden");
+      }).on('hide.bs.modal', function (e) {
+        $("#notify_order_send_to_kitchen").addClass("hidden");
+      }).modal({show: true, keyboard: false, backdrop: false});
     }
   }
 });
diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
index 83618770..d674926a 100644
--- a/app/assets/javascripts/order_reservation.js
+++ b/app/assets/javascripts/order_reservation.js
@@ -157,6 +157,7 @@ $(function() {
     }
   });
 
+
   // $('button[data-dismiss="modal"]').on('click', function(){ $(this).parent().parent().parent().parent().modal('hide'); });
 
   // $(".new_order_close").on("click",function(){
@@ -473,36 +474,36 @@ function showNewOrder(order_reservation,shop_code){
       audio.play();
     // },10000);
 
-    // $("#new_order").text(order_reservation.order_reservation_id);
-    // $("#new_order_date").text(requested_date);
+    $("#new_order").text(order_reservation.order_reservation_id);
+    $("#new_order_date").text(requested_date);
     // if($("#"+shop_code+"_doemal_new_order").hasClass("hidden")){
-    //   $("#"+shop_code+"_doemal_new_order").removeClass("hidden");
+      $("#"+shop_code+"_doemal_new_order").removeClass("hidden");
     // }
-    // $("#"+shop_code+"_doemal_new_order").on('show.bs.modal', function(e){
-    //   $("#notify_new_order").addClass("hidden");
-    //   $("#notify_order_send_to_kitchen").addClass("hidden");
-    //   $("#notify_order_ready_to_delivery").addClass("hidden");
-    // }).on('shown.bs.modal', function(e){
-    //   $("#"+shop_code+"_doemal_new_order").focus();
-    // }).on('hide.bs.modal', function (e) {
-    //   $("#"+shop_code+"_doemal_new_order").addClass("hidden");
-    // }).modal({show: true, keyboard: false, backdrop: false});
-    swal({
-      title: 'Information',
-      target: document.getElementById(shop_code+"_notify_new_order"),
-      text: "You have new order "+
-            "<b>"+order_reservation.order_reservation_id+"</b> requested for "+requested_date+"?",
-      type: 'success',
-      html: true,
-      closeOnConfirm: false,
-      closeOnCancel: false,
-      allowOutsideClick: false
-    }, function (isConfirm) {
-      if(isConfirm){
-        audio.pause();
-        swal.close();
-      }
-    });
+    $("#"+shop_code+"_doemal_new_order").on('shown.bs.modal', function(e){
+      // $(document).off('focusin.modal');
+      $("#"+shop_code+"_doemal_new_order").focus();
+      $("#notify_new_order").addClass("hidden");
+      $("#notify_order_send_to_kitchen").addClass("hidden");
+      $("#notify_order_ready_to_delivery").addClass("hidden");
+    }).on('hide.bs.modal', function (e) {
+      $("#"+shop_code+"_doemal_new_order").addClass("hidden");
+    }).modal({show: true, keyboard: false, backdrop: false});
+    // swal({
+    //   title: 'Information',
+    //   target: document.getElementById(shop_code+"_notify_new_order"),
+    //   text: "You have new order "+
+    //         "<b>"+order_reservation.order_reservation_id+"</b> requested for "+requested_date+"?",
+    //   type: 'success',
+    //   html: true,
+    //   closeOnConfirm: false,
+    //   closeOnCancel: false,
+    //   allowOutsideClick: false
+    // }, function (isConfirm) {
+    //   if(isConfirm){
+    //     audio.pause();
+    //     swal.close();
+    //   }
+    // });
   }
 }
 
diff --git a/app/controllers/oqs/backhome_controller.rb b/app/controllers/oqs/backhome_controller.rb
index f809ef9f..4ac5f0a2 100755
--- a/app/controllers/oqs/backhome_controller.rb
+++ b/app/controllers/oqs/backhome_controller.rb
@@ -89,7 +89,6 @@ class Oqs::HomeController < BaseOqsController
 
   # Query for OQS with delivery status
   def queue_items_query(status) 
-    byebug
     AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type as type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at")
     .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
               left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index acce6c65..3b2fe081 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -81,6 +81,8 @@ class Origami::ShiftsController < BaseOrigamiController
         #get tax
         shift_obj      = ShiftSale.where('id =?',@shift.id)
         @sale_taxes    = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
+        @total_waste   = Sale.get_total_waste(shift_id).sum(:grand_total)
+        @total_spoile  = Sale.get_total_spoile(shift_id).sum(:grand_total)
         #other payment details for mpu or visa like card
         @other_payment = ShiftSale.get_by_shift_other_payment(@shift)
 
@@ -94,10 +96,9 @@ class Origami::ShiftsController < BaseOrigamiController
         
         # get printer info
         print_settings = PrintSetting.find_by_unique_code(unique_code)
-        #byebug
         printer = Printer::CashierStationPrinter.new(print_settings)
-
-        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges)
+        
+        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile)
       end
     end
     Employee.logout(session[:session_token])
diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index 63239cdc..73813d1a 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -38,7 +38,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
   #   self.print(filename, cashier_terminal.printer_name)
   # end
 
-  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
+  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile)
 
     #Use CUPS service
     #Generate PDF
@@ -46,7 +46,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     cashier = shift_sale.employee.name
     shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p")
     filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf"
-    pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
+    pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_waste,total_spoile)
     close_cashier_pdf = Lookup.collection_of("print_settings") #print_settings with name:CloseCashierPdf
     
     if !close_cashier_pdf.empty?
@@ -55,7 +55,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
           if close_cashier[1] == '1'
             pdf = CloseCashierCustomisePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
           else
-            pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
+            pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_waste,total_spoile)
           end
         end
       end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 60cf0d7a..0e19e65f 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1092,6 +1092,14 @@ end
      return sale_arr
 end
 
+def self.get_total_waste(shift_id)
+  query = Sale.where("sale_status = 'waste' and shift_sale_id = ?", shift_id)
+end
+
+def self.get_total_spoile(shift_id)
+  query = Sale.where("sale_status = 'spoile' and shift_sale_id = ?", shift_id)
+end
+
 def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
 
 # wrong amount tax for service and commercial tax 
diff --git a/app/pdf/close_cashier_customise_pdf.rb b/app/pdf/close_cashier_customise_pdf.rb
index 84311caa..5a094a7b 100644
--- a/app/pdf/close_cashier_customise_pdf.rb
+++ b/app/pdf/close_cashier_customise_pdf.rb
@@ -70,7 +70,7 @@ class CloseCashierCustomisePdf < Prawn::Document
     stroke_horizontal_rule
   end
 
-  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter,total_dinein,total_takeway,total_other_charges)
+  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter,total_dinein,total_takeway,total_other_charges,total_spoile)
         move_down 7
          y_position = cursor
         bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index a1c92637..82203fb8 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -2,7 +2,7 @@ class CloseCashierPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width
 
-  def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount)
+  def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_waste,total_spoile)
     self.page_width = printer_settings.page_width  #PrintSetting.where("name = ?","Close Cashier").first.page_width
     self.page_height = printer_settings.page_height
     self.header_font_size = printer_settings.header_font_size.to_i
@@ -54,7 +54,7 @@ class CloseCashierPdf < Prawn::Document
 
     stroke_horizontal_rule
 
-    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter) 
+    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter,total_waste,total_spoile) 
   end
 
   def header (shop_details)
@@ -70,7 +70,7 @@ class CloseCashierPdf < Prawn::Document
     stroke_horizontal_rule
   end
 
-  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter)
+  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter,total_waste,total_spoile)
         move_down 7
          y_position = cursor
         bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
@@ -333,7 +333,7 @@ class CloseCashierPdf < Prawn::Document
          text "(#{ number_with_precision(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
         end     
 
-        y_position = cursor
+        y_position = cursor 
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
          text "Total Void :", :size => self.item_font_size, :align => :right
         end
@@ -341,6 +341,22 @@ class CloseCashierPdf < Prawn::Document
          text "(#{shift_sale.total_void})", :size => self.item_font_size, :align => :right
         end
 
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Waste :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "(#{ number_with_precision(total_waste, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+        end
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
+         text "Total Spoile :", :size => self.item_font_size, :align => :right
+        end
+        bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
+         text "(#{ number_with_precision(total_spoile, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+        end
+
         # y_position = cursor
         # bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
         #  text "Grand Total :", :size => self.item_font_size, :align => :right
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index d2903041..c44fe3bf 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -463,11 +463,10 @@
         </div>
       </div>
     </div>
-
-    <div id="<%= @shop.shop_code ? @shop.shop_code : '' %>_doemal_new_order"></div>
+    <!-- <div id="<%= @shop.shop_code ? @shop.shop_code : '' %>_doemal_new_order"></div>
     <div id="<%= @shop.shop_code ? @shop.shop_code : '' %>_notify_new_order"></div>
     <div id="<%= @shop.shop_code ? @shop.shop_code : '' %>_notify_order_send_to_kitchen"></div>
-    <div id="<%= @shop.shop_code ? @shop.shop_code : '' %>_notify_order_ready_to_delivery"></div>
+    <div id="<%= @shop.shop_code ? @shop.shop_code : '' %>_notify_order_ready_to_delivery"></div> -->
   </div>
   
 <p id="ref_no" class="hidden"></p>
@@ -584,7 +583,8 @@
   </div>
 </div> 
 
-<!-- <div class="modal fade text-center" id="<%= @shop.shop_code ? @shop.shop_code : '' %>_doemal_new_order" tabindex="-1" role="dialog">
+<div class="modal fade text-center" id="<%= @shop.shop_code ? @shop.shop_code : '' %>_doemal_new_order" tabindex="-1" role="dialog">
+>>>>>>> 8fda04372d3c2d7255bbd4c14ed3b3c8d9f5937e
   <div class="modal-dialog modal-md" role="document">
     <div class="modal-content">
       <div class="modal-header">
@@ -598,7 +598,7 @@
       <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-blue waves-effect new_order_close" data-value="<%= @shop.shop_code ? @shop.shop_code : '' %>" data-dismiss="modal">CLOSE</button>
+            <button type="button" class="btn btn-link p-t-5 p-b-5 bg-blue new_order_close" data-value="<%= @shop.shop_code ? @shop.shop_code : '' %>"data-dismiss="modal">CLOSE</button>
           </div>
         </div>
       </div>
@@ -620,7 +620,7 @@
       <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-blue waves-effect" data-dismiss="modal">CLOSE</button>
+            <button type="button" class="btn btn-link p-t-5 p-b-5 bg-blue" data-dismiss="modal">CLOSE</button>
           </div>
         </div>
       </div>
@@ -642,7 +642,7 @@
       <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-blue waves-effect" data-dismiss="modal">CLOSE</button>
+            <button type="button" class="btn btn-link p-t-5 p-b-5 bg-blue" data-dismiss="modal">CLOSE</button>
           </div>
         </div>
       </div>
@@ -664,11 +664,11 @@
       <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-blue waves-effect" data-dismiss="modal">CLOSE</button>
+            <button type="button" class="btn btn-link p-t-5 p-b-5 bg-blue" data-dismiss="modal">CLOSE</button>
           </div>
         </div>
       </div>
     </div>
   </div>
 </div>
-</div> -->
+</div>
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index 8d4c0840..09230d7c 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -24,7 +24,7 @@
           <span style='font-size:20px;'><b><%= t :closing_balance %></b></span>
         </div>
         <div class='col-md-6'>
-          <span style='font-size:20px;'><b><input type='text' class="form-control" id='closing_balance_amount' value=''></b></span>
+          <span style='font-size:20px;'><b><input type='number' class="form-control" id='closing_balance_amount' value='' onkeypress="return isNumberKey(event);" onkeyup="notNegative(this.value);"></b></span>
         </div>
       </div>
     </div>
@@ -58,6 +58,20 @@
   </div>
 </div>
 <script>
+
+  function isNumberKey(evt) {
+    var charCode = (evt.which) ? evt.which : event.keyCode;
+    if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) {
+      return false;
+    } else {
+      return true;
+    }      
+  }
+
+  function greaterThanOne(val){
+    if(parseInt(val)==0) $("#closing_balance_amount").val(1);
+  }
+
   var cashier_type = '<%= @cashier_type %>';
   $('#close_cashier').on('click',function(){
     var amount = $('#closing_balance_amount').val();
diff --git a/public/AC-beep.mp3 b/public/AC-beep.mp3
new file mode 100644
index 00000000..1ba1c352
Binary files /dev/null and b/public/AC-beep.mp3 differ