Merge branch 'r-1902001-01' into foodcourt

app/views/transactions/bookings/index.html.erb

@@ -1,4 +1,12 @@
-<% breadcrumb_add t(:bookings), "", (@food_court && current_user.role=='cashier') ? foodcourt_food_court_path : dashboard_path %>
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t :booking %></li>
+    <span class="float-right">
+      <%= link_to 'Back', root_path %>
+    </span>
+  </ol>
+</div>
 <style>
   @media screen and (max-width: 785px) {
     section.content{

app/views/transactions/bookings/show.html.erb

@@ -1,5 +1,13 @@
-<% breadcrumb_add t('bookings'), transactions_bookings_path, transactions_bookings_path, t('details') %>
-
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= transactions_bookings_path %>"><%= t :booking %></a></li>
+    <li class="breadcrumb-item active"><%= t :details %></li>
+    <span class="float-right">
+      <%= link_to 'Back', transactions_bookings_path %>
+    </span>
+  </ol>
+</div>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-sm-12">
     <!-- Nav tabs -->

app/views/transactions/card_sale_trans/index.html.erb

@@ -1,9 +1,9 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
     <li class="breadcrumb-item active"><%= t :sale %></li>
     <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to 'Back', root_path %>
     </span>
   </ol>
 </div>

app/views/transactions/card_settle_trans/index.html.erb

@@ -1,9 +1,9 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
     <li class="breadcrumb-item active"><%= t :sale %></li>
     <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
+      <%= link_to 'Back', root_path %>
     </span>
   </ol>
 </div>

app/views/transactions/credit_notes/index.html.erb

@@ -1,5 +1,12 @@
-<% breadcrumb_add t("views.right_panel.detail.credit_note"), "", dashboard_path %>
-
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.credit_note") %></li>
+    <span class="float-right">
+      <%= link_to 'Back', root_path %>
+    </span>
+  </ol>
+</div>
 <style>
   @media screen and (max-width: 785px) {
     section.content{

app/views/transactions/order_reservations/index.html.erb

@@ -1,5 +1,12 @@
-<% breadcrumb_add t('order_reservation'), "", dashboard_path %>
-
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t :order_reservation %></li>
+    <span class="float-right">
+      <%= link_to 'Back', root_path %>
+    </span>
+  </ol>
+</div>
 <style>
   @media screen and (max-width: 785px) {
     section.content{

app/views/transactions/order_reservations/show.html.erb

@@ -1,6 +1,6 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
     <li class="breadcrumb-item"><a href="<%= transactions_order_reservations_path %>"><%= t :order_reservation %></a></li>
     <li class="breadcrumb-item active"><%= t :details %></li>
     <span class="float-right">

app/views/transactions/orders/index.html.erb

@@ -1,4 +1,12 @@
-<% breadcrumb_add t('views.right_panel.detail.order'), "", (@food_court && current_user.role=='cashier') ? foodcourt_food_court_path : dashboard_path %>
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.order") %></li>
+    <span class="float-right">
+      <%= link_to 'Back', root_path %>
+    </span>
+  </ol>
+</div>
 <style>
   @media screen and (max-width: 785px) {
     section.content{

app/views/transactions/orders/show.html.erb

@@ -1,4 +1,13 @@
-<% breadcrumb_add t("views.right_panel.detail.order"), transactions_orders_path, transactions_orders_path, t('details') %>
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= transactions_orders_path %>"><%= t("views.right_panel.detail.order") %></a></li>
+    <li class="breadcrumb-item active"><%= t :details %></li>
+    <span class="float-right">
+      <%= link_to 'Back', transactions_orders_path %>
+    </span>
+  </ol>
+</div>
 <hr>
 
 <div class="row">
@@ -14,7 +23,7 @@
                 <th><%= t :customer %></th>
                 <th><%= t("views.right_panel.detail.order_status") %></th>
                 <th><%= t("views.right_panel.detail.order_date") %></th>
-               
+
               </tr>
             </thead>
 
@@ -26,8 +35,8 @@
                   <td><%= @order.customer.name rescue '-' %></td>
                   <td><%= @order.status %></td>
                   <td> <%= @order.date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
-                  
-                </tr>             
+
+                </tr>
             </tbody>
           </table>
           <h5><%= t("views.right_panel.detail.order_items") %></h5>
@@ -62,7 +71,7 @@
               <% end %>
             </tbody>
           </table>
-         
+
         </div>
       </div>
 
@@ -73,8 +82,3 @@
        </a>
   </div> -->
 </div>
-
-
-
-     
-

app/views/transactions/sales/index.html.erb

@@ -1,4 +1,12 @@
-<% breadcrumb_add t('sale'), "", (@food_court && current_user.role=='cashier') ? foodcourt_food_court_path : dashboard_path %>
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t :sale %></li>
+    <span class="float-right">
+      <%= link_to 'Back', root_path %>
+    </span>
+  </ol>
+</div>
 <style>
   @media screen and (max-width: 785px) {
     section.content{

app/views/transactions/sales/show.html.erb

@@ -1,4 +1,13 @@
-<% breadcrumb_add t('sale'), transactions_sales_path, :back, t('details') %>
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= transactions_sales_path %>"><%= t :sale %></a></li>
+    <li class="breadcrumb-item active"><%= t :details %></li>
+    <span class="float-right">
+      <%= link_to 'Back', transactions_sales_path %>
+    </span>
+  </ol>
+</div>
 <div class="row">
   <div class="col-lg-12 col-md-12 col-sm-12">
   <!-- Column One -->

app/views/transactions/shift_sales/index.html.erb

@@ -1,5 +1,12 @@
-<% breadcrumb_add t('shiftsale'), "", dashboard_path %>
-
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t :shiftsale %></li>
+    <span class="float-right">
+      <%= link_to 'Back', root_path %>
+    </span>
+  </ol>
+</div>
 <style>
   @media screen and (max-width: 785px) {
     section.content{

app/views/transactions/shift_sales/show.html.erb

@@ -1,6 +1,6 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
     <li class="breadcrumb-item"><a href="<%= transactions_shift_sales_path %>"><%= t :shiftsale %></a></li>
     <li class="breadcrumb-item active"><%= t :details %></li>
     <span class="float-right">

app/views/transactions/surveys/index.html.erb

@@ -1,5 +1,12 @@
-<% breadcrumb_add t("views.right_panel.detail.survey"), "", dashboard_path %>
-
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.survey") %></li>
+    <span class="float-right">
+      <%= link_to 'Back', root_path %>
+    </span>
+  </ol>
+</div>
 <style>
   @media screen and (max-width: 785px) {
     section.content{