git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Yan
2017-06-12 10:55:04 +06:30
parent e1481eb591
commit b6bba9ecd4
2 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/origami/home_controller.rb
View File

@@ -17,12 +17,7 @@ class Origami::HomeController < BaseOrigamiController
@booking_orders = Order.get_booking_order_table() @booking_orders = Order.get_booking_order_table()
@booking_rooms = Order.get_booking_order_rooms() @booking_rooms = Order.get_booking_order_rooms()
@orders = Order.get_orders() @orders = Order.get_orders()
<<<<<<< HEAD
end end
=======
end
>>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
def item_show def item_show
selection(params[:booking_id],1) selection(params[:booking_id],1)

29
app/views/origami/home/index.html.erb
View File

@@ -25,6 +25,7 @@
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% <%
@completed_orders.each do |cpo| @completed_orders.each do |cpo|
# ToDo no need check new
# Assigned Id for new Order? Sale? # Assigned Id for new Order? Sale?
unique_id="" unique_id=""
# For CSS- Class for Order? Sale? # For CSS- Class for Order? Sale?
@@ -50,13 +51,9 @@
%> %>
<div class="card orders <%= sale_status %>"> <div class="card orders <%= sale_status %>">
<div class="card-block"> <div class="card-block">
<p class="hidden orders-id"><%= unique_id %></p> <p class="hidden orders-id"><%= unique_id %></p>
<<<<<<< HEAD
<h4 class="card-title orders-table"><%= cpo.table_name %></h4>
=======
<p class="hidden customer-id"><%= bko.customer_id %></p> <p class="hidden customer-id"><%= bko.customer_id %></p>
<h4 class="card-title orders-table"><%= bko.table_name %></h4> <h4 class="card-title orders-table"><%= cpo.table_name %></h4>
>>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
<p class="card-text"> <p class="card-text">
Receipt No : Receipt No :
<span class="orders-receipt-no"> <span class="orders-receipt-no">
@@ -162,14 +159,10 @@
%> %>
<div class="card orders <%= sale_status %>"> <div class="card orders <%= sale_status %>">
<div class="card-block"> <div class="card-block">
<<<<<<< HEAD
<p class="hidden orders-id"><%= unique_id %></p> <p class="hidden orders-id"><%= unique_id %></p>
<h4 class="card-title orders-table"><%= rmo.room_name %></h4> <p class="hidden customer-id"><%= rmo.customer_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="card-text"> <p class="card-text">
Receipt No : Receipt No :
<span class="orders-receipt-no"> <span class="orders-receipt-no">
@@ -222,14 +215,10 @@
%> %>
<div class="card orders <%= sale_status %>"> <div class="card orders <%= sale_status %>">
<div class="card-block"> <div class="card-block">
<<<<<<< HEAD <p class="hidden orders-id"><%= unique_id %></p>
<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 customer-id"><%= odr.customer_id %></p> <p class="hidden customer-id"><%= odr.customer_id %></p>
<h4 class="card-title orders-table"><%= odr.table_name %></h4> <h4 class="card-title orders-table"><%= odr.table_name %></h4>
>>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
<p class="card-text"> <p class="card-text">
Receipt No : Receipt No :
<span class="orders-receipt-no"> <span class="orders-receipt-no">