From 808b123a91849be899f6a7895021e2b66999c725 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 15 Mar 2018 15:27:11 +0630
Subject: [PATCH] Add Date in Cashier's Dashboard and remove no need breadcrumb

---
 app/assets/javascripts/origami.js             | 24 ++++---------------
 app/views/origami/addorders/detail.html.erb   |  1 -
 app/views/origami/cash_ins/new.html.erb       |  3 ---
 app/views/origami/cash_mgmt/new.html.erb      |  4 +---
 app/views/origami/cash_outs/new.html.erb      |  3 ---
 app/views/origami/dashboard/index.html.erb    |  8 ++-----
 app/views/origami/home/index.html.erb         |  1 -
 app/views/origami/home/show.html.erb          |  1 -
 .../origami/moveroom/move_dining.html.erb     |  1 -
 .../origami/movetable/move_dining.html.erb    |  1 -
 app/views/origami/orders/show.html.erb        |  1 -
 .../origami/pending_order/index.html.erb      |  3 ---
 .../load_commissioners.html.erb               |  2 +-
 .../origami/room_invoices/index.html.erb      |  1 -
 app/views/origami/rooms/show.html.erb         |  1 -
 .../origami/second_display/index.html.erb     |  1 -
 app/views/origami/shifts/show.html.erb        |  3 ---
 .../origami/table_invoices/index.html.erb     |  1 -
 .../origami/table_invoices/show.html.erb      |  1 -
 config/initializers/action_controller.rb      |  2 +-
 20 files changed, 9 insertions(+), 54 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 4dda94e2..7f3febba 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -17,40 +17,24 @@
 //= require custom.js
 
 /* Constant Varaibles */
-_ADD_ORDER_			= "/&nbsp;&nbsp;&nbsp;ADD ORDER";
-_CASH_IN_			= "/&nbsp;&nbsp;&nbsp;CASH IN";
-_CASH_OUT_			= "/&nbsp;&nbsp;&nbsp;CASH OUT";
-_CASH_MGMT_			= "/&nbsp;&nbsp;&nbsp;CASH MGMT";
 _CREDIT_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;CREDIT PAYMENTS";
 _CUSTOMERS_			= "/&nbsp;&nbsp;&nbsp;CUSTOMERS";
-_DASHBOARD_			= "/&nbsp;&nbsp;&nbsp;DASHBOARD";
 _DISCOUNTS_			= "/&nbsp;&nbsp;&nbsp;DISCOUNTS";
-_CASHIER_			= "/&nbsp;&nbsp;&nbsp;CASHIER";
 _IN_DUTIES_			= "/&nbsp;&nbsp;&nbsp;IN DUTIES";
 _JCB_				= "/&nbsp;&nbsp;&nbsp;JCB PAYMENT";
 _MASTER_			= "/&nbsp;&nbsp;&nbsp;MASTER PAYMENT";
-_MOVE_ROOM_			= "/&nbsp;&nbsp;&nbsp;MOVE ROOM";
-_MOVE_TABLE_		= "/&nbsp;&nbsp;&nbsp;MOVE TABLE";
 _MPU_				= "/&nbsp;&nbsp;&nbsp;MPU PAYMENT";
-_ORDERS_			= "/&nbsp;&nbsp;&nbsp;ORDERS";
-_OTHER_CHARGES_		= "/&nbsp;&nbsp;&nbsp;OTHER CHARGES";
-_OTHER_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;OTHER PAYMENTS";
-_PAYMENTS_ 			= "/&nbsp;&nbsp;&nbsp;PAYMENTS";
+_OTHER_CHARGES_		= "/&nbsp;&nbsp;&nbsp;CHARGES";
+_OTHER_PAYMENTS_	= "/&nbsp;&nbsp;&nbsp;OTHER PAYMENT";
+_PAYMENTS_ 			= "/&nbsp;&nbsp;&nbsp;PAYMENT";
 _PAYPAR_PAYMENT_	= "/&nbsp;&nbsp;&nbsp;PAYPAR PAYMENT";
-_PENDING_ORDER_		= "/&nbsp;&nbsp;&nbsp;PENDING ORDER";
-_PRODUCT_COMMISSIONS_= "/&nbsp;&nbsp;&nbsp;PRODUCT COMMISSIONS";
+_COMMISSIONS_		= "/&nbsp;&nbsp;&nbsp;COMMISSIONS";
 _REDEEM_PAYMENT_	= "/&nbsp;&nbsp;&nbsp;REDEEM PAYMENT";
-_ROOM_INVOICES_		= "/&nbsp;&nbsp;&nbsp;ROOM INVOICES";
-_ROOM_ 				= "/&nbsp;&nbsp;&nbsp;ROOM";
 _SALE_EDIT_			= "/&nbsp;&nbsp;&nbsp;SALE EDIT";
-_SECOND_DISPLAY_	= "/&nbsp;&nbsp;&nbsp;CUSTOMER VIEW";
-_CLOSE_CASHIER_		= "/&nbsp;&nbsp;&nbsp;CLOSE CASHIER";
 _SPLIT_BILL_		= "/&nbsp;&nbsp;&nbsp;SPLIT BILL";
-_TABLE_INVOICE_		= "/&nbsp;&nbsp;&nbsp;TABLE INVOICE";
 _UNION_				= "/&nbsp;&nbsp;&nbsp;UNION PAYMENT";
 _VISA_				= "/&nbsp;&nbsp;&nbsp;VISA PAYMENT";
 _VOUCHER_			= "/&nbsp;&nbsp;&nbsp;VOUCHER";
-_TABLE_ 			= "/&nbsp;&nbsp;&nbsp;TABLE";
 _SURVEY_ 			= "/&nbsp;&nbsp;&nbsp;SURVEY";
 /* Constant Varaibles */
 
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index aba0f3f7..6c580f40 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -493,7 +493,6 @@
        jQuery('.first_'+id).click();
     });
     $(document).ready(function () {
-      setHeaderBreadCrumb(_ADD_ORDER_);
     $(".tables").on('click', function () {
         $('.tables').css('background-color','');
         $('.tables').removeClass('purple')
diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb
index 32d5215a..bda159e2 100755
--- a/app/views/origami/cash_ins/new.html.erb
+++ b/app/views/origami/cash_ins/new.html.erb
@@ -56,9 +56,6 @@
 </div>
 
 <script>
-  $(document).ready(function () {
-      setHeaderBreadCrumb(_CASH_IN_);
-  });
   var payment_method = "";
   $('.payment-type').on('click',function(){
     $('.payment-type').css("background-color","#7a62d3")
diff --git a/app/views/origami/cash_mgmt/new.html.erb b/app/views/origami/cash_mgmt/new.html.erb
index 6912d981..b06a8d2d 100755
--- a/app/views/origami/cash_mgmt/new.html.erb
+++ b/app/views/origami/cash_mgmt/new.html.erb
@@ -1,5 +1,3 @@
 <h1>CashMgmt#new</h1>
 <p>Find me in app/views/cash_mgmt/new.html.erb</p>
-$(document).ready(function () {
-      setHeaderBreadCrumb(_CASH_MGMT_);
- });
+
diff --git a/app/views/origami/cash_outs/new.html.erb b/app/views/origami/cash_outs/new.html.erb
index 47558928..64b3909f 100755
--- a/app/views/origami/cash_outs/new.html.erb
+++ b/app/views/origami/cash_outs/new.html.erb
@@ -25,9 +25,6 @@
   </div>
 </div>
 <script>
-  $(document).ready(function () {
-        setHeaderBreadCrumb(_CASH_OUT_);
-  });
   $('#cash_out').on('click',function(){
     var reference = $('#reference').val();
     var remark = $('#remark').val();
diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb
index 246110f5..b0fcb1a1 100644
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -1,6 +1,7 @@
 <div class="container-fluid">
   <div class="block-header">
-    <h2><%= t :dashboard %></h2>
+    <!-- <h2><%= t :dashboard %></h2> -->
+    <h2><%= t :date_time %> : <%= Time.zone.now.utc.getlocal.strftime("%Y-%m-%d %I:%M %p") %></h2>
   </div>
   <% if @print_settings.precision.to_i > 0
     precision = @print_settings.precision
@@ -191,11 +192,6 @@
     </div>
  <button type="button" data-href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect second_view hidden" style="height: 45px">Customer View</button>
 <script>
-  $(document).ready(function () {
-    setHeaderBreadCrumb(_DASHBOARD_);
-  });
-
-
 
   $(".cashier_view").on('click', function() {
     window.location.href = '/origami';
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 46ec6153..3577aa48 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -139,7 +139,6 @@
  <!-- Column One -->
 <script>
 $(document).ready(function(){
-  setHeaderBreadCrumb(_CASHIER_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index f1b1629e..8c2e58bc 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -543,7 +543,6 @@
 <script>
   var cashier_type = "cashier";
     $(document).ready(function () {
-      setHeaderBreadCrumb(_TABLE_);
       /* start check first bill or not*/
         var receipt_no = "";
         if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
diff --git a/app/views/origami/moveroom/move_dining.html.erb b/app/views/origami/moveroom/move_dining.html.erb
index d721aaa5..b46834ca 100755
--- a/app/views/origami/moveroom/move_dining.html.erb
+++ b/app/views/origami/moveroom/move_dining.html.erb
@@ -166,7 +166,6 @@
 </div>
 <script>
 $(document).ready(function(){
-  setHeaderBreadCrumb(_MOVE_ROOM_);
   $(".tables").on('click', function(){
       $('.tables').removeClass('selected-item');
 	    $(this).addClass('selected-item');
diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index 98d44028..4385cad7 100755
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -284,7 +284,6 @@ end
 </div>
 <script>
   $(document).ready(function(){
-    setHeaderBreadCrumb(_MOVE_TABLE_);
     $(".tables").on('click', function(){
       $('.tables').removeClass('selected-item');
       $(this).addClass('selected-item');
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index ffdc3d80..fe3a62ef 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -253,7 +253,6 @@
 </div>
 <script>
   $(document).ready(function(){
-    setHeaderBreadCrumb(_ORDERS_);
     $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb
index 16c468bd..8fa9a7af 100644
--- a/app/views/origami/pending_order/index.html.erb
+++ b/app/views/origami/pending_order/index.html.erb
@@ -39,9 +39,6 @@
     </div>
 </div>
 <script>
-    $(document).ready(function(){
-      setHeaderBreadCrumb(_PENDING_ORDER_);
-    });  
     cashier_type = "quick_service"
     $(".sales").on('click',function(){
 	    var sale_id = $(this).attr("data-id");
diff --git a/app/views/origami/product_commissions/load_commissioners.html.erb b/app/views/origami/product_commissions/load_commissioners.html.erb
index eaf38e0d..6383f1fa 100755
--- a/app/views/origami/product_commissions/load_commissioners.html.erb
+++ b/app/views/origami/product_commissions/load_commissioners.html.erb
@@ -121,7 +121,7 @@
 </div>
 <script>
   $(document).ready(function () {
-    setHeaderBreadCrumb(_PRODUCT_COMMISSIONS_);
+    setHeaderBreadCrumb(_COMMISSIONS_);
     var selected_sale_item = 0;
 
     $('.sale_item').on('click', function () {
diff --git a/app/views/origami/room_invoices/index.html.erb b/app/views/origami/room_invoices/index.html.erb
index 8c6666d3..e482490a 100755
--- a/app/views/origami/room_invoices/index.html.erb
+++ b/app/views/origami/room_invoices/index.html.erb
@@ -82,7 +82,6 @@
 </div>
 <script>
 $(document).ready(function(){
-    setHeaderBreadCrumb(_ROOM_INVOICES_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/<%= @room.id %>/table_invoice/' + dining_id;
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 5dff1385..1edb07cf 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -484,7 +484,6 @@
 <script>
 var cashier_type = "cashier";
 $(document).ready(function(){
-  setHeaderBreadCrumb(_ROOM_);
   // $(".tables").on('click', function(){
   //     var customer_id=$(".customer-id").text();
   //     show_customer_details(customer_id);
diff --git a/app/views/origami/second_display/index.html.erb b/app/views/origami/second_display/index.html.erb
index 0fc62a38..dbcd1f73 100644
--- a/app/views/origami/second_display/index.html.erb
+++ b/app/views/origami/second_display/index.html.erb
@@ -10,7 +10,6 @@
 </div>
 <script type="text/javascript">
 	$(document).ready(function () {
-    setHeaderBreadCrumb(_SECOND_DISPLAY_);
       $('#s_reload').on('click', function () {
       window.location.href = '/origami/second_display';
       });
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index f8da7e63..4ea71dec 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -58,9 +58,6 @@
   </div>
 </div>
 <script>
-  $(document).ready(function(){
-    setHeaderBreadCrumb(_CLOSE_CASHIER_);
-  });
   $('#close_cashier').on('click',function(){
     var amount = $('#closing_balance_amount').val();
     var shift_id = "<%= @shift.id rescue ""%>"
diff --git a/app/views/origami/table_invoices/index.html.erb b/app/views/origami/table_invoices/index.html.erb
index a29392f2..b0c328be 100755
--- a/app/views/origami/table_invoices/index.html.erb
+++ b/app/views/origami/table_invoices/index.html.erb
@@ -82,7 +82,6 @@
 </div>
 <script>
 $(document).ready(function(){
-    setHeaderBreadCrumb(_TABLE_INVOICE_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/<%= @table.id %>/table_invoice/' + dining_id;
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index 150121bb..515973f1 100644
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -212,7 +212,6 @@
 </div>
 <script>
 $(document).ready(function(){
-  setHeaderBreadCrumb(_TABLE_INVOICE_);
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/<%= @table.id %>/table_invoice/' + dining_id;
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 2bcdd944..20c5624c 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -19,7 +19,7 @@ class ActionController::Base
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end      
     else         
-      check for license file
+      #check for license file
       if check_license
         current_license(ENV["SX_PROVISION_URL"])
       else