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

Change Font and show status in origami

Browse Source
This commit is contained in:
Phyo
2017-06-23 11:14:48 +06:30
parent 62156e2e3e
commit 68403617a5
5 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,8 @@
// min-height: 75rem; // min-height: 75rem;
// padding-top: 4.5rem; // padding-top: 4.5rem;
// } // }
.card-columns {
font-size: 18px !important;}
.others-payment{ .others-payment{
line-height:100px; line-height:100px;
@@ -186,4 +188,4 @@ tr.discount-item-row:hover {
.jconfirm-box-container{ .jconfirm-box-container{
margin-left:-40px !important margin-left:-40px !important
} }

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

@@ -41,6 +41,11 @@
<div class="card tables red text-white" data-id="<%= table.id %>"> <div class="card tables red text-white" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<% if table.get_booking.nil? %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<% else %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
<% end %>
</div> </div>
</div> </div>
<% else %> <% else %>
@@ -62,6 +67,11 @@
<div class="card rooms red text-white" data-id="<%= room.id %>"> <div class="card rooms red text-white" data-id="<%= room.id %>">
<div class="card-block"> <div class="card-block">
<%= room.name %> <%= room.name %>
<% if room.get_booking.nil? %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<% else %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
<% end %>
</div> </div>
</div> </div>
<% else %> <% else %>

10
app/views/origami/orders/show.html.erb
View File

@@ -41,6 +41,11 @@
<div class="card tables red text-white" data-id="<%= table.id %>"> <div class="card tables red text-white" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<% if table.get_booking.nil? %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<% else %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
<% end %>
</div> </div>
</div> </div>
<% else %> <% else %>
@@ -62,6 +67,11 @@
<div class="card rooms red text-white" data-id="<%= room.id %>"> <div class="card rooms red text-white" data-id="<%= room.id %>">
<div class="card-block"> <div class="card-block">
<%= room.name %> <%= room.name %>
<% if room.get_booking.nil? %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<% else %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
<% end %>
</div> </div>
</div> </div>
<% else %> <% else %>

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

@@ -41,6 +41,11 @@
<div class="card tables red text-white" data-id="<%= table.id %>"> <div class="card tables red text-white" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<% if table.get_booking.nil? %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<% else %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
<% end %>
</div> </div>
</div> </div>
<% else %> <% else %>
@@ -62,6 +67,11 @@
<div class="card rooms red text-white" data-id="<%= room.id %>"> <div class="card rooms red text-white" data-id="<%= room.id %>">
<div class="card-block"> <div class="card-block">
<%= room.name %> <%= room.name %>
<% if room.get_booking.nil? %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<% else %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
<% end %>
</div> </div>
</div> </div>
<% else %> <% else %>
@@ -269,7 +279,7 @@ $(document).ready(function(){
var sale_id = $('#save_order_id').attr('data-order'); var sale_id = $('#save_order_id').attr('data-order');
} }
window.location.href = '/origami/'+ sale_id + "/customers" window.location.href = '/origami/'+ sale_id + "/customers"
}); });
// Discount for Payment // Discount for Payment
@@ -280,7 +290,7 @@ $(document).ready(function(){
}else{ }else{
var sale_id = $('#save_order_id').attr('data-order'); var sale_id = $('#save_order_id').attr('data-order');
} }
if(sale_id!=""){ if(sale_id!=""){
window.location.href = '/origami/' + sale_id + '/discount' window.location.href = '/origami/' + sale_id + '/discount'
} }

10
app/views/origami/sales/show.html.erb
View File

@@ -41,6 +41,11 @@
<div class="card tables red text-white" data-id="<%= table.id %>"> <div class="card tables red text-white" data-id="<%= table.id %>">
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
<% if table.get_booking.nil? %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<% else %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
<% end %>
</div> </div>
</div> </div>
<% else %> <% else %>
@@ -62,6 +67,11 @@
<div class="card rooms red text-white" data-id="<%= room.id %>"> <div class="card rooms red text-white" data-id="<%= room.id %>">
<div class="card-block"> <div class="card-block">
<%= room.name %> <%= room.name %>
<% if room.get_booking.nil? %>
<span style="font-size:12px;float:right;line-height:inherit;"> billed</span>
<% else %>
<span style="font-size:12px;float:right;line-height:inherit;"> new</span>
<% end %>
</div> </div>
</div> </div>
<% else %> <% else %>