From b6bba9ecd416d47cd880bb89d52160669c6863be Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 12 Jun 2017 10:55:04 +0630
Subject: [PATCH] merge conflict

---
 app/controllers/origami/home_controller.rb |  5 ----
 app/views/origami/home/index.html.erb      | 29 +++++++---------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 4c97c80e..669c8a7f 100644
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -17,12 +17,7 @@ class Origami::HomeController < BaseOrigamiController
   	@booking_orders = Order.get_booking_order_table()
   	@booking_rooms = Order.get_booking_order_rooms()
   	@orders = Order.get_orders()
-<<<<<<< HEAD
   end  
-=======
-
-  end
->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
 
   def item_show
   	selection(params[:booking_id],1)
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 426d0533..394d494b 100644
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -25,6 +25,7 @@
         <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
           <%   
             @completed_orders.each do |cpo| 
+              # ToDo no need check new
               # Assigned Id for new Order? Sale?
               unique_id=""
               # For CSS- Class for Order? Sale?
@@ -50,13 +51,9 @@
           %>
           <div class="card orders <%= sale_status  %>">
             <div class="card-block">
-              <p class="hidden orders-id"><%= unique_id  %></p>   
-<<<<<<< HEAD
-              <h4 class="card-title orders-table"><%= cpo.table_name %></h4>                                 
-=======
+              <p class="hidden orders-id"><%= unique_id  %></p> 
               <p class="hidden customer-id"><%= bko.customer_id  %></p>   
-              <h4 class="card-title orders-table"><%= bko.table_name %></h4>                                 
->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
+              <h4 class="card-title orders-table"><%= cpo.table_name %></h4>  
               <p class="card-text">
                 Receipt No :
                 <span class="orders-receipt-no">
@@ -162,14 +159,10 @@
           %>
           <div class="card orders <%= sale_status  %>">
             <div class="card-block">
-<<<<<<< HEAD
               <p class="hidden orders-id"><%= unique_id  %></p>
-              <h4 class="card-title orders-table"><%= rmo.room_name %></h4>
-=======
-              <p class="hidden orders-id"><%= unique_id  %></p>  
-              <p class="hidden customer-id"><%= rmo.customer_id  %></p>   
-              <h4 class="card-title orders-table"><%= rmo.room_name %></h4>                                
->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
+              <p class="hidden customer-id"><%= rmo.customer_id  %></p>  
+              <h4 class="card-title orders-table"><%= rmo.room_name %></h4>            
+
               <p class="card-text">
                 Receipt No :
                 <span class="orders-receipt-no">
@@ -222,14 +215,10 @@
           %>
           <div class="card orders <%= sale_status  %>">
             <div class="card-block">
-<<<<<<< HEAD
-              <p class="hidden orders-id"><%= unique_id %></p>   
-              <h4 class="card-title orders-table"><%= odr.table_name %></h4>                              
-=======
-              <p class="hidden orders-id"><%= unique_id  %></p>  
+              <p class="hidden orders-id"><%= unique_id %></p> 
               <p class="hidden customer-id"><%= odr.customer_id  %></p>   
-              <h4 class="card-title orders-table"><%= odr.table_name %></h4>                                 
->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
+              <h4 class="card-title orders-table"><%= odr.table_name %></h4>                              
+
               <p class="card-text">
                 Receipt No :
                 <span class="orders-receipt-no">