diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 64835a3b..005d6c6a 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -82,7 +82,15 @@ $(document).ready(function() { touchScrollStep : 45 }); - + $('#pending-order-slimscroll').slimScroll({ + height: height-$('#pending-order-slimscroll').attr('data-height'), + size: '5px', + color: 'rgba(0,0,0,0.5)', + alwaysVisible: false, + borderRadius: '0', + railBorderRadius: '0', + touchScrollStep : 50 + }); // $('.delete').click(function(){ // var method = $(this).attr('data-method'); // var url = $(this).attr('data-ref'); diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index ada129dc..91708815 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -519,4 +519,9 @@ nav.pagination .page a:hover, z-index: 101; filter: alpha(opacity=100); /* ie */ -moz-opacity: 1; /* mozilla */ +} +.existing_invoice{ + background-color:#009688; + color:#fff; + } \ 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 00bfbead..345d089d 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -16,10 +16,10 @@
  • <%= t :rooms %>
    • -
  • - <%= t :orders %> -
    • - +
  • + <%= t :orders %> +
    • +
    @@ -48,38 +48,28 @@ <% else %>
    <% end %> -
    - <%= table.name %> - - billed -
    +
    + <%= table.name %> + billed +
    +
    -
    <% else %> <% if table.get_checkout_booking.nil? %>
    <% else %>
    <% end %> -
    - <%= table.name %> - - new +
    + <%= table.name %> + new +
    -
    <% end %> <% else %>
    -
    - <%= table.name %> +
    + <%= table.name %> new
    @@ -95,33 +85,23 @@ <% if room.status == 'occupied' %> <% if room.get_booking.nil? %> <% if room.get_checkout_booking.nil? %> -
    +
    <% else %> -
    +
    <% end %> -
    - <%= room.name %> - - billed +
    + <%= room.name %> + billed +
    -
    <% else %> <% if room.get_checkout_booking.nil? %> -
    +
    <% else %> -
    +
    <% end %> -
    +
    <%= room.name %> - new
    @@ -144,22 +124,22 @@ <% @orders.each do |order| %>
    text-white" data-id="<%= order.order_id %>">
    - <% - order_status = "" - sale_order = order.sale_orders.first - if sale_order - unless sale_order.sale_id.nil? - sale = Sale.find(sale_order.sale_id) - order_status = sale.sale_status - if order_status == 'new' - order_status = order.status - end - end - else - order_status = order.status - end - %> - <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %> + <% order_status = "" %> + <% sale_order = order.sale_orders.first %> + <% if sale_order %> + <% unless sale_order.sale_id.nil? %> + <% sale = Sale.find(sale_order.sale_id) %> + <% order_status = sale.sale_status %> + <% if order_status == 'new' %> + <% order_status = order.status %> + <% end %> + <% end %> + <% else %> + <% order_status = order.status %> + <% end %> + <%= order.order_id %> + <% if !order_status.empty? %>| <%= order_status %> + <% end %>
    <% end %> @@ -174,7 +154,12 @@
    -
    + <% existing_class = "" %> + <% if @status_sale == 'sale' && (!@order_items.nil?) %> + <% existing_class = "existing_invoice"%> + <% tooltip = ' data-toggle=modal title=Add_To_Existing data-target=#invoiceModal'%> + <%end%> +
    > <% if @status_order == 'order' && @status_sale != 'sale' %> <% if !@obj_order.nil? %>
    @@ -222,7 +207,6 @@   Order No: <% if @status_order == 'order' %> <%= @obj_order.order_id rescue '' %> - <% end %>
    @@ -234,109 +218,84 @@ <% end %>
    -
    - - <% if @status_sale == 'sale' %> - -   Customer : <%= @sale_array[0].customer.name rescue '' %> - <% elsif @status_order == 'order' - %> - -   Customer : <%= @customer.name rescue "" %> - <% end %> - -
    +
    + <% if @status_sale == 'sale' %> + +   Customer : <%= @sale_array[0].customer.name rescue '' %> + <% elsif @status_order == 'order' + %> + +   Customer : <%= @customer.name rescue "" %> + <% end %> +
    ">
    - - - - - - - + + + + + + - <% - count = 0 + <% count = 0 sub_total = 0 if @status_sale == "sale" @sale_array[0].sale_items.each do |sale_item| - - sub_total = sub_total + sale_item.price - %> + sub_total = sub_total + sale_item.price%> - <% - # Can't check for discount - # unless sale_item.price == 0 - count += 1 - %> + <%count += 1 %> + <%end %> + <% end %> + <% if @status_order == 'order' && @status_sale != 'sale' + unless @order_items.nil? || @order_items.empty? + count = 0 + @order_items.each do |order_item| + set_item_prices = 0 + count += 1 + sub_total = sub_total + (order_item.price * order_item.qty) + # unless order_item.price == 0 %> + + + - - - - - - <% - - # end - end - end - end - %> + <% end %> + + <% end + sub_total += set_item_prices + end %> + + + + + <% end %> + <% end %> + <% end %>
    #ItemsQTY - Price -
    #ItemsQTYPrice
    <%= count %> <%= sale_item.product_name %> <%= sale_item.qty %> <%= sale_item.price %>
    <%= count %><%= order_item.item_name %> + <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %> + <% JSON.parse(order_item.options).each do |option| %> +
    <%= option %> + <% end %> + <% end %> - <% - end - end - - if @status_order == 'order' && @status_sale != 'sale' - puts - unless @order_items.nil? || @order_items.empty? - count = 0 - @order_items.each do |order_item| - set_item_prices = 0 - count += 1 - sub_total = sub_total + (order_item.price * order_item.qty) - - # unless order_item.price == 0 %> -
    <%= count %> - <%= order_item.item_name %> - <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %> - <% JSON.parse(order_item.options).each do |option| %> -
    - <%= option %> - + <% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]' + JSON.parse(order_item.set_menu_items).each do |item_instance| + set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f %> +
    + + <%= item_instance["item_instance_name"] %> + <% if !item_instance["options"].nil? && !item_instance["options"].empty? %> + <% (item_instance["options"]).each do |set_item_option| %> +
    <%= set_item_option %> <% end %> - <% end %> - - <% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]' - JSON.parse(order_item.set_menu_items).each do |item_instance| - set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f %> -
    - <%= item_instance["item_instance_name"] %> - <% if !item_instance["options"].nil? && !item_instance["options"].empty? %> - <% (item_instance["options"]).each do |set_item_option| %> -
    - <%= set_item_option %> - - <% end %> - <% end %> -     - <% end - sub_total += set_item_prices - end %> -     		<%= order_item.qty %><%= (order_item.qty*order_item.price).to_f + set_item_prices %>
    <%= order_item.qty %><%= (order_item.qty*order_item.price).to_f + set_item_prices %>
    @@ -348,64 +307,60 @@ <%= sub_total %> - <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%> - Member Discount: - <%else%> - Discount: - <%end%> + <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%> + Member Discount: + <%else%> + Discount: + <%end%> - (<%= @obj_sale.total_discount rescue 0%>) - + (<%= @obj_sale.total_discount rescue 0%>) + <% if @status_sale == "sale" %> - - - <% if !@sale_taxes.empty? %> - Tax: - (<% @i = 0 - @sale_taxes.each do |ct| %> - <%=ct.tax_name%> - <% if @sale_taxes.count != @i+1%> - + <% @i =+1 %> - <%end%> - <%end %>) - <% else %> - No Tax - <% end %>
    - <%if !@webview %> - - <% end %> - - <%= @obj_sale.total_tax rescue 0%> - - Rounding Adj: - <%= @obj_sale.rounding_adjustment rescue 0%> - - - Grand Total: - <%= @obj_sale.grand_total rescue 0%> - - <% end %> + + <% if !@sale_taxes.empty? %> + Tax: + (<% @i = 0 + @sale_taxes.each do |ct| %> + <%=ct.tax_name%> + <% if @sale_taxes.count != @i+1%> + + <% @i =+1 %> + <%end%> + <%end %>) + <% else %> + No Tax + <% end %>
    + <%if !@webview %> + + <% end %> + + <%= @obj_sale.total_tax rescue 0%> + + + Rounding Adj: + <%= @obj_sale.rounding_adjustment rescue 0%> + + + Grand Total: + <%= @obj_sale.grand_total rescue 0%> + + <% end %> - -
    + +
    - <% - if @status_sale == 'sale' - unless @order_items.nil? || @order_items.empty? - %> - Pending New Order - - <% - count = 0 - @order_items.each do |order_item| - set_item_prices = 0 - count += 1 - %> - -
    <%= count %> - - <%= order_item.item_name %> + <% if @status_sale == 'sale' + unless @order_items.nil? || @order_items.empty?%> + - + <% end %> <% if @sale_array.size > 1 %>

    @@ -449,24 +404,21 @@ <% @sale_array.each do |sale| if @sale_array.size > 1 unless sale.receipt_no == @sale_array[0].receipt_no - %> - - - - - + +
    Receipt No - <%= sale.receipt_no %> - +
    + <%end%> + <% end%> + <% end%> + <%end %> @@ -642,6 +594,84 @@ +<% if @status_sale == 'sale' && (!@order_items.nil?) %> + +<%end%>