fixed conflict file

app/views/layouts/_header.html.erb

@@ -27,8 +27,8 @@
         <li class="navbar-nav mr-auto dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Transactions</a>
           <ul class="dropdown-menu">
-            <li><%= link_to "Orders ", origami_root_path, :tabindex =>"-1" %></li>
-            <li><%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %></li>
+            <li><%= link_to "Orders ", settings_orders_path, :tabindex =>"-1" %></li>
+            <li><%= link_to "Sales ", settings_sales_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
         <li class="navbar-nav mr-auto dropdown">

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

@@ -60,7 +60,7 @@
               <p class="hidden orders-id"><%= unique_id  %></p>
               <p class="hidden customer-id"><%= customer_id  %></p>
               <p class="hidden order-cid"><%= cpo.order_id  %></p>
-              <h4 class="card-title orders-table"><%= cpo.table_name %></h4> 
+              <h4 class="card-title orders-table"><%= cpo.table_name %></h4>
               <p class="card-text">
                 Receipt No :
                 <span class="orders-receipt-no">
@@ -87,6 +87,11 @@
         <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
           <%
             @booking_orders.each do |bko|
+              # No Show completed 
+              if bko.sale_status == 'completed'
+                next
+              end
+
               # Assigned Id for new Order? Sale?
               unique_id=""
               customer_id=""
@@ -96,7 +101,7 @@
                 unique_id=bko.booking_id
                 customer_id=bko.order_customer_id
                 # check selected item and assign
-                if @selected_item != nil
+                if !@selected_item.nil?
                   if bko.order_id == @selected_item.order_id
                     sale_status = sale_status + " selected-item"
                   end
@@ -145,6 +150,11 @@
         <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
           <%
             @booking_rooms.each do |rmo|
+              # No Show completed 
+              if rmo.sale_status == 'completed'
+                next
+              end
+
               # Assigned Id for new Order? Sale?
               unique_id=""
               customer_id=""
@@ -204,6 +214,10 @@
         <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
           <%
             @orders.each do |odr|
+              # No Show completed 
+              if odr.sale_status == 'completed'
+                next
+              end
               # Assigned Id for new Order? Sale?
               unique_id=""
               customer_id=""
@@ -302,7 +316,7 @@
                   sub_total = 0
                   if @selected_item_type == "Sale"
                     @selected_item.sale_items.each do |sale_item|
-                      sub_total += sale_item.qty*sale_item.unit_price
+                      sub_total += (sale_item.qty*sale_item.unit_price)
                 %>
                 <tr>
                   <td class='item-name'><%= sale_item.product_name %></td>
@@ -319,7 +333,7 @@
                   sub_total = 0
                   if @selected_item_type == "Order"
                     @selected_item.order_items.each do |order_item|
-                      sub_total += order_item.qty*order_item.unit_price
+                      sub_total += (order_item.qty*order_item.unit_price)
                 %>
                 <tr>
                   <td class='item-name'><%= order_item.item_name %></td>
@@ -337,7 +351,7 @@
             <table class="table" id="order-charges-table" border="0">
               <tr>
                 <td class="charges-name"><strong>Sub Total:</strong></td>
-                <td class="item-attr"><strong id="order-sub-total"><%=sub_total%></strong></td>
+                <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
               </tr>
               <!-- <tr>
                 <td class="charges-name"><strong>Food:</strong></td>

app/views/reports/receipt_no/_shift_sale_report_filter.html.erb

@@ -1,5 +1,6 @@
 <%= form_tag report_path, :method => :get, :id=>"frm_report" do %>
 <div class="row">
+	<div class="col-md-12"></div>
 	<div class="span3">
 		<% if defined? product_account %>
 			<%= select_tag "account", options_from_collection_for_select(@accounts,"id","title", :selected => params[:account])%>	

app/views/reports/receipt_no/index.html.erb

@@ -8,6 +8,7 @@
   </span>
  </ul>
 </div>
+
 <div class="card">
   <table class="table table-striped">
     <thead>