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

Add color blue to orders

Browse Source
This commit is contained in:
Phyo
2017-06-26 14:39:25 +06:30
parent f878b2f1d8
commit 46ad87314a
6 changed files with 64 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/origami.scss
View File

@@ -160,6 +160,10 @@
background-color: #FF8C00 background-color: #FF8C00
} }
.blue{
background-color: blue
}
.left{ .left{
margin-left:1px; margin-left:1px;
} }

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

@@ -38,12 +38,21 @@
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @tables.each do |table| %> <% @tables.each do |table| %>
<% if table.status == 'occupied' %> <% if table.status == 'occupied' %>
<div class="card tables red text-white" data-id="<%= table.id %>"> <% if table.get_booking.nil? %>
<div class="card-block"> <div class="card tables red text-white" data-id="<%= table.id %>">
Zone <%= table.zone_id %> <br> <div class="card-block">
Table <%= table.name %> ( <%= table.seater %> Seat ) Zone <%= table.zone_id %> <br>
</div> Table <%= table.name %> ( <%= table.seater %> Seat )
</div> </div>
</div>
<% else %>
<div class="card tables blue text-white" data-id="<%= table.id %>">
<div class="card-block">
Zone <%= table.zone_id %> <br>
Table <%= table.name %> ( <%= table.seater %> Seat )
</div>
</div>
<% end %>
<% else %> <% else %>
<div class="card tables green text-white" data-id="<%= table.id %>"> <div class="card tables green text-white" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">

34
app/views/origami/home/show.html.erb
View File

@@ -38,16 +38,22 @@
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @tables.each do |table| %> <% @tables.each do |table| %>
<% if table.status == 'occupied' %> <% if table.status == 'occupied' %>
<div class="card tables red text-white" data-id="<%= table.id %>"> <% if table.get_booking.nil? %>
<div class="card-block"> <div class="card tables red text-white" data-id="<%= table.id %>">
<%= table.name %> <div class="card-block">
<% if table.get_booking.nil? %> <%= table.name %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span> <span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<% else %> <div style="font-size:12px;"></div>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span> </div>
<% end %> </div>
</div> <% else %>
</div> <div class="card tables blue text-white" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
</div>
</div>
<% end %>
<% else %> <% else %>
<div class="card tables green text-white" data-id="<%= table.id %>"> <div class="card tables green text-white" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
@@ -108,9 +114,9 @@
<div class="card" > <div class="card" >
<div class="card-header"> <div class="card-header">
<% if @status_order == 'order' && @status_sale != 'sale' %> <% if @status_order == 'order' && @status_sale != 'sale' %>
<div id="save_order_id" data-order="<%= @obj_order.order_id %>"><strong id="order-title">ORDER DETAILS </strong></div> <div id="save_order_id" data-order="<%= @obj_order.order_id %>"><strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %></div>
<% elsif @status_sale == 'sale' %> <% elsif @status_sale == 'sale' %>
<div><strong id="order-title">INVOICE DETAILS </strong></div> <div><strong id="order-title">INVOICE DETAILS </strong> | Table <%= @dining.name rescue "" %></div>
<% end %> <% end %>
</div> </div>
<div class="card-block"> <div class="card-block">
@@ -129,8 +135,8 @@
<div class="card-title row"> <div class="card-title row">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<p class="hidden customer-id"><%= @customer.customer_id %></p> <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
<p>Customer : <%= @customer.name %></p> <p>Customer : <%= @customer.name rescue "" %></p>
</div> </div>
</div> </div>

4
app/views/origami/room_invoices/show.html.erb
View File

@@ -35,8 +35,8 @@
<div class="card-title row customer_detail hide"> <div class="card-title row customer_detail hide">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<!-- <% if !@customer.nil? %> --> <!-- <% if !@customer.nil? %> -->
<p class="hidden customer-id"><%= @customer.customer_id %></p> <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
<p>Customer : <%= @customer.name %></p> <p>Customer : <%= @customer.name rescue "" %></p>
<!-- <% end %> --> <!-- <% end %> -->
</div> </div>

29
app/views/origami/rooms/show.html.erb
View File

@@ -38,16 +38,21 @@
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @tables.each do |table| %> <% @tables.each do |table| %>
<% if table.status == 'occupied' %> <% if table.status == 'occupied' %>
<div class="card tables red text-white" data-id="<%= table.id %>"> <% if table.get_booking.nil? %>
<div class="card-block"> <div class="card tables red text-white" data-id="<%= table.id %>">
<%= table.name %> <div class="card-block">
<% if table.get_booking.nil? %> <%= table.name %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span> <span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<% else %> </div>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span> </div>
<% end %> <% else %>
</div> <div class="card tables blue text-white" data-id="<%= table.id %>">
</div> <div class="card-block">
<%= table.name %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
</div>
</div>
<% end %>
<% else %> <% else %>
<div class="card tables green text-white" data-id="<%= table.id %>"> <div class="card tables green text-white" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
@@ -108,9 +113,9 @@
<div class="card" > <div class="card" >
<div class="card-header"> <div class="card-header">
<% if @status == 'order' %> <% if @status == 'order' %>
<div id="save_order_id" data-order="<%= @obj.order_id %>"><strong id="order-title">ORDER DETAILS </strong></div> <div id="save_order_id" data-order="<%= @obj.order_id %>"><strong id="order-title">ORDER DETAILS </strong> | Table <%= @room.name rescue "" %></div>
<% elsif @status_sale == 'sale' %> <% elsif @status_sale == 'sale' %>
<div><strong id="order-title">INVOICE DETAILS </strong></div> <div><strong id="order-title">INVOICE DETAILS </strong> | Table <%= @room.name rescue "" %></div>
<% end %> <% end %>
</div> </div>

4
app/views/origami/table_invoices/show.html.erb
View File

@@ -35,8 +35,8 @@
<div class="card-title row customer_detail hide"> <div class="card-title row customer_detail hide">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<!-- <% if !@customer.nil? %> --> <!-- <% if !@customer.nil? %> -->
<p class="hidden customer-id"><%= @customer.customer_id %></p> <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
<p>Customer : <%= @customer.name %></p> <p>Customer : <%= @customer.name rescue "" %></p>
<!-- <% end %> --> <!-- <% end %> -->
</div> </div>