diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 2670dcc4..d6588a94 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -9,6 +9,8 @@ // min-height: 75rem; // padding-top: 4.5rem; // } +.card-columns { + font-size: 18px !important;} .others-payment{ line-height:100px; @@ -186,4 +188,4 @@ tr.discount-item-row:hover { .jconfirm-box-container{ margin-left:-40px !important -} \ No newline at end of file +} diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 50d13fe4..f92fa1c4 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -41,6 +41,11 @@
<%= table.name %> + <% if table.get_booking.nil? %> + billed + <% else %> + new + <% end %>
<% else %> @@ -62,6 +67,11 @@
<%= room.name %> + <% if room.get_booking.nil? %> + billed + <% else %> + new + <% end %>
<% else %> diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb index 0763c43f..92ffc7f1 100644 --- a/app/views/origami/orders/show.html.erb +++ b/app/views/origami/orders/show.html.erb @@ -41,6 +41,11 @@
<%= table.name %> + <% if table.get_booking.nil? %> + billed + <% else %> + new + <% end %>
<% else %> @@ -62,6 +67,11 @@
<%= room.name %> + <% if room.get_booking.nil? %> + billed + <% else %> + new + <% end %>
<% else %> diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 4f15eea5..6430c83c 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -41,6 +41,11 @@
<%= table.name %> + <% if table.get_booking.nil? %> + billed + <% else %> + new + <% end %>
<% else %> @@ -62,6 +67,11 @@
<%= room.name %> + <% if room.get_booking.nil? %> + billed + <% else %> + new + <% end %>
<% else %> @@ -269,7 +279,7 @@ $(document).ready(function(){ 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 @@ -280,7 +290,7 @@ $(document).ready(function(){ }else{ var sale_id = $('#save_order_id').attr('data-order'); } - + if(sale_id!=""){ window.location.href = '/origami/' + sale_id + '/discount' } diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index 5f3056fb..cd716052 100644 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -41,6 +41,11 @@
<%= table.name %> + <% if table.get_booking.nil? %> + billed + <% else %> + new + <% end %>
<% else %> @@ -62,6 +67,11 @@
<%= room.name %> + <% if room.get_booking.nil? %> + billed + <% else %> + new + <% end %>
<% else %>