Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/controllers/api/bill_controller.rb

@@ -9,6 +9,7 @@ class Api::BillController < Api::ApiController
     #create Bill by Booking ID
     if (params[:booking_id])
       booking  = Booking.find(params[:booking_id])
+
         if booking
           if booking.sale_id.nil?
             @sale = Sale.new
@@ -18,6 +19,7 @@ class Api::BillController < Api::ApiController
             @sale_id = booking.sale_id
           end
         end
+        
     elsif (params[:order_id])
       @sale = Sale.new
       @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee)

app/controllers/api/bookings_controller.rb

@@ -6,11 +6,9 @@ class Api::BookingsController < Api::ApiController
   end
 
   def show
-    @booking = Booking.find(params[:id])
+    booking = Booking.find(params[:id])
+    if booking.dining_facility_id.to_i == params[:table_id].to_i
+       @booking = booking
+    end
   end
-
-  # private
-  # def Bookings_params
-  #   params.permit(:id, :order_id)
-  # end
 end

app/controllers/api/orders_controller.rb

@@ -7,11 +7,45 @@ class Api::OrdersController <  Api::ApiController
       order = Order.find(params[:order_id])
       order.order_items
   end
+
    def get_order
       order = Order.find(params[:order_id])
       order.order_items
   end
 
+  # API - This api will retrive current booking for android with table or room id
+  def view_orders
+    booking_id = params[:booking_id]
+    table_id = params[:table_id]
+    if Booking.exists?(booking_id)
+      booking = Booking.find(booking_id)
+
+      if booking
+        if booking.dining_facility_id.to_i == table_id.to_i
+          @booking = booking
+        else
+          table = DiningFacility.find(table_id)
+          booking = table.get_current_booking
+          if booking
+            if booking.dining_facility_id.to_i == table_id.to_i
+              @booking = booking
+            end
+          end
+        end
+      end
+    else
+      puts "only table"
+      table = DiningFacility.find(table_id)
+      booking = table.get_current_booking
+      puts booking
+      if booking
+        if booking.dining_facility_id.to_i == table_id.to_i
+          @booking = booking
+        end
+      end
+    end
+  end
+
   # Description
   # This API allow new order creation
   # Input Params
@@ -38,6 +72,8 @@ class Api::OrdersController <  Api::ApiController
       if !params["booking_id"].nil?
         # check booking id is already completed.
         booking = Booking.find(params[:booking_id])
+        if booking
+          if booking.dining_facility_id.to_i == params[:table_id].to_i
             if !booking.sale_id.nil?
               if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed"
                 @order.new_booking = true
@@ -50,6 +86,36 @@ class Api::OrdersController <  Api::ApiController
               @order.booking_id = params[:booking_id]
               puts "booking sale is  null"
             end
+          else
+            # booking.table id not equal current table
+            table =  DiningFacility.find(params[:table_id])
+            if table
+               booking = table.get_current_booking
+               if booking
+                 if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed"
+                   @order.new_booking = true
+                 else
+                   @order.new_booking = false
+                   @order.booking_id = booking.booking_id
+                 end
+               end
+            end
+          end
+        end #booking exists
+      else
+        #no booking id
+       table =  DiningFacility.find(params[:table_id])
+       if table
+          booking = table.get_current_booking
+          if booking
+            if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed"
+              @order.new_booking = true
+            else
+              @order.new_booking = false
+              @order.booking_id = booking.booking_id
+            end
+          end
+       end
       end
 
     @status, @booking = @order.generate

app/controllers/origami/home_controller.rb

@@ -4,7 +4,7 @@ class Origami::HomeController < BaseOrigamiController
   def index
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.complete_sale
     @orders = Order.all.order('date desc')
   end
 
@@ -12,13 +12,16 @@ class Origami::HomeController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.complete_sale
     @orders = Order.all.order('date desc')
     @status_order = ""
+    @status_sale = ""
+    @sale_array = Array.new
     @dining.bookings.each do |booking|
          if booking.sale_id.nil?
             @order_items = Array.new
            booking.booking_orders.each do |booking_order|
+
               order = Order.find(booking_order.order_id)
               @obj_order = order
               @date = order.created_at
@@ -30,6 +33,7 @@ class Origami::HomeController < BaseOrigamiController
          else
           sale = Sale.find(booking.sale_id)
            if sale.sale_status != "completed"
+             @sale_array.push(sale)
              if @status_order == 'order'
                @status_order = 'sale'
              end

app/controllers/origami/movetable_controller.rb

@@ -5,13 +5,16 @@ class Origami::MovetableController < BaseOrigamiController
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.all
     @orders = Order.all.order('date desc')
+    @dining = DiningFacility.find(params[:dining_id])
 
     @status_order = ""
-    @dining = DiningFacility.find(params[:dining_id])
+    @status_sale = ""
+    @sale_array = Array.new
     @dining.bookings.each do |booking|
          if booking.sale_id.nil?
             @order_items = Array.new
            booking.booking_orders.each do |booking_order|
+
               order = Order.find(booking_order.order_id)
               @obj_order = order
               @date = order.created_at
@@ -23,6 +26,7 @@ class Origami::MovetableController < BaseOrigamiController
          else
           sale = Sale.find(booking.sale_id)
            if sale.sale_status != "completed"
+             @sale_array.push(sale)
              if @status_order == 'order'
                @status_order = 'sale'
              end

app/controllers/origami/orders_controller.rb

@@ -3,8 +3,13 @@ class Origami::OrdersController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.complete_sale
-    @orders = Order.all.order('date desc')
+    @orders = Order.all.order('status desc')
     @order = Order.find(params[:order_id])
+    sale_order = SaleOrder.find_by_order_id(@order.order_id)
+    if sale_order
+      sale = Sale.find(sale_order.sale_id)
+      @sale_status = sale.sale_status
+    end
   end
 end

app/controllers/origami/rooms_controller.rb

@@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.complete_sale
     @orders = Order.all.order('date desc')
     @room = DiningFacility.find(params[:room_id])
     @room.bookings.each do |booking|

app/controllers/origami/sales_controller.rb

@@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.complete_sale
     @orders = Order.all.order('date desc')
     @sale = Sale.find(params[:sale_id])
   end

app/models/dining_facility.rb

@@ -19,11 +19,10 @@ class DiningFacility < ApplicationRecord
   end
 
   def get_current_booking
-    puts "enter booking"
     booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1)
 
     if booking.count > 0 then
-      return booking[0].booking_id
+      return booking[0]
     else
       return nil
     end

app/models/order.rb

@@ -4,7 +4,7 @@ class Order < ApplicationRecord
   #primary key - need to be unique
   before_create :generate_custom_id
   before_create :set_order_date
-
+  has_many :sale_orders
   belongs_to :customer
   has_many :order_items, autosave: true , inverse_of: :order
   has_many :assigned_order_items

app/views/api/bookings/show.json.jbuilder

@@ -1,4 +1,5 @@
 if (@booking)
+  json.success true
   json.id @booking.booking_id
   json.status @booking.booking_status
   if Sale.exists?(@booking.sale_id)
@@ -43,5 +44,6 @@ if (@booking)
   json.sub_total @total_amount
   json.commerical_tax @total_amount * 0.05
   json.total @total_amount + (@total_amount * 0.05)
-
+else
+  json.success false
 end

app/views/api/orders/view_orders.json.jbuilder

@@ -0,0 +1,49 @@
+if (@booking)
+  json.success true
+  json.booking_id @booking.booking_id
+  json.status @booking.booking_status
+  if Sale.exists?(@booking.sale_id)
+    json.sale_status Sale.find(@booking.sale_id).sale_status
+  else
+    json.sale_status ""
+  end
+  json.checkin_at @booking.checkin_at.strftime("%d-%m-%Y")
+  json.checkin_by @booking.checkin_by
+  json.table_name @booking.dining_facility.name
+
+  if @booking.type == "TableBooking"
+    json.table_id @booking.dining_facility_id
+  else
+    json.room_id @booking.dining_facility_id
+  end
+  @total_amount = 0.00
+  @total_tax = 0.00
+
+  if @booking.booking_orders
+    order_items = []
+    @booking.booking_orders.each do |bo|
+      order = Order.find(bo.order_id)
+      #if (order.status == "new")
+        order_items = order_items + order.order_items
+      #end
+    end
+
+    json.order_items order_items do |item|
+        json.item_instance_code    item.item_code
+        json.item_name             item.item_name
+        json.price                 item.price
+        json.qty                   item.qty
+        json.options               item.options
+        json.remark                item.remark
+        json.item_status           item.order_item_status
+        @total_amount = @total_amount + (item.price * item.qty)
+    end
+
+  end
+
+  json.sub_total @total_amount
+  json.commerical_tax @total_amount * 0.05
+  json.total @total_amount + (@total_amount * 0.05)
+else
+  json.success false
+end

app/views/api/restaurant/zones/index.json.jbuilder

@@ -8,7 +8,7 @@ if @zones
       json.name table.name
       json.status table.status
       json.zone_id table.zone_id #Add this zone_id to keep data structure consistance
-      json.current_booking table.get_current_booking
+      json.current_booking table.get_current_booking.booking_id rescue ""
     end
 
     json.rooms zone.rooms do |room|
@@ -16,7 +16,7 @@ if @zones
       json.name room.name
       json.status room.status
       json.zone_id room.zone_id #Add this zone_id to keep data structure consistance
-      json.current_booking room.get_current_booking
+      json.current_booking room.get_current_booking.booking_id rescue ""
 
     end
   end
@@ -26,7 +26,7 @@ else #list all tables and rooms with out zones
     json.name table.name
     json.status table.status
     json.zone_id table.zone_id #Add this zone_id to keep data structure consistance
-    json.current_booking table.get_current_booking
+    json.current_booking table.get_current_booking.booking_id rescue ""
 
   end
 
@@ -35,7 +35,7 @@ else #list all tables and rooms with out zones
     json.name room.name
     json.status room.status
     json.zone_id room.zone_id #Add this zone_id to keep data structure consistance
-    json.current_booking room.get_current_booking
+    json.current_booking room.get_current_booking.booking_id rescue ""
 
 
   end

app/views/origami/home/show.html.erb

@@ -97,7 +97,7 @@
   <div class="col-lg-5 col-md-5 col-sm-5">
      <div class="card"  >
        <div class="card-header">
-         <% if @status_order == 'order' %>
+         <% 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>
          <% elsif @status_sale == 'sale' %>
             <div><strong id="order-title">INVOICE DETAILS </strong></div>
@@ -108,7 +108,7 @@
            <div class="col-lg-6 col-md-6 col-sm-6">
              <p> Receipt No: <span id="receipt_no">
                <% if @status_sale == 'sale' %>
-                 <%= @obj_sale.receipt_no rescue '' %>
+                 <%= @sale_array[0].receipt_no rescue '' %>
                <% end %>
              </span></p>
            </div>
@@ -126,6 +126,7 @@
            <table class="table table-striped" id="order-items-table">
              <thead>
                <tr>
+                 <th>#</th>
                  <th class="item-name">Items</th>
                  <th class="item-attr">QTY</td>
                  <th class="item-attr">Price</td>
@@ -133,14 +134,18 @@
              </thead>
              <tbody>
                <%
+                 count = 0
                  sub_total = 0
                  if @status_sale == "sale"
-                  @obj_sale.sale_items.each do |sale_item|
+                   puts @sale_array[0]
+                  @sale_array[0].sale_items.each do |sale_item|
+                    count += 1
                   sub_total = sub_total + sale_item.price
                %>
-               <input type="hidden" id="sale_id" value="<%= @obj_sale.sale_id %>">
+               <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
                <% unless sale_item.price <= 0 %>
                <tr>
+                 <td><%= count %></td>
                  <td class='item-name'><%= sale_item.product_name %></td>
                  <td class='item-attr'><%= sale_item.qty %></td>
                  <td class='item-attr'><%= sale_item.price %></td>
@@ -150,13 +155,18 @@
                    end
                  end
 
-                 if @status_order == 'order'
+                 if @status_order == 'order' && @status_sale != 'sale'
                     unless @order_items.nil?
+                       count = 0
                     @order_items.each do |order_item |
+                      puts @order_items.size
+                      puts "view"
+                        count += 1
                     sub_total = sub_total + order_item.price
 
                 unless order_item.price <= 0 %>
                <tr>
+                 <td><%= count %></td>
                  <td class='item-name'><%= order_item.item_name %></td>
                  <td class='item-attr'><%= order_item.qty %></td>
                  <td class='item-attr'><%= order_item.qty*order_item.price %></td>
@@ -217,6 +227,22 @@
                      </table>
                     <button class='btn btn-primary'> Add to existing invoice </button>
                    <%
+                 else
+                    @sale_array.each do |sale|
+                      if @sale_array.size > 1
+                      unless sale.receipt_no == @sale_array[0].receipt_no
+                      %>
+                       Pending New Invoice
+                        <table class="table table-striped">
+                          <tr>
+                            <td>Receipt No - <%= sale.receipt_no %></td>
+                            <td><button class='btn btn-sm btn-primary '>Show Detail </button></td>
+                          </tr>
+                        </table>
+                      <%
+                        end
+                       end
+                     end
                   end
                 end
           %>
@@ -229,6 +255,7 @@
  <div class="col-lg-1 col-md-1 col-sm-1">
    <!-- Waiter Buttons -->
    <button type="button" class="btn btn-primary btn-block" id='back' >Back</button>
+   <% if @dining.bookings.length >= 1 %>
    <button type="button" class="btn btn-primary btn-block" disabled>Add Order</button>
    <button type="button" class="btn btn-primary btn-block" disabled>Edit</button>
    <button type="button" class="btn btn-primary btn-block" id='move'>Move</button>
@@ -243,6 +270,7 @@
    <!-- Cashier Buttons -->
    <button type="button" id="discount" class="btn btn-primary btn-block" >Discount</button>
    <button type="button" id="re-print" class="btn btn-primary btn-block" >Re.Print</button>
+   <% end %>
  </div>
 </div>
 <script>

app/views/origami/movetable/move_dining.html.erb

@@ -81,7 +81,7 @@
            <div class="col-lg-6 col-md-6 col-sm-6">
              <p> Receipt No: <span id="receipt_no">
                <% if @status_sale == 'sale' %>
-                 <%= @obj_sale.receipt_no rescue '' %>
+                 <%= @sale_array[0].receipt_no rescue '' %>
                <% end %>
              </span></p>
            </div>
@@ -99,6 +99,7 @@
            <table class="table table-striped" id="order-items-table">
              <thead>
                <tr>
+                 <th>#</th>
                  <th class="item-name">Items</th>
                  <th class="item-attr">QTY</td>
                  <th class="item-attr">Price</td>
@@ -106,14 +107,18 @@
              </thead>
              <tbody>
                <%
+                 count = 0
                  sub_total = 0
                  if @status_sale == "sale"
-                  @obj_sale.sale_items.each do |sale_item|
+                   puts @sale_array[0]
+                  @sale_array[0].sale_items.each do |sale_item|
+                    count += 1
                   sub_total = sub_total + sale_item.price
                %>
-               <input type="hidden" id="sale_id" value="<%= @obj_sale.sale_id %>">
+               <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
                <% unless sale_item.price <= 0 %>
                <tr>
+                 <td><%= count %></td>
                  <td class='item-name'><%= sale_item.product_name %></td>
                  <td class='item-attr'><%= sale_item.qty %></td>
                  <td class='item-attr'><%= sale_item.price %></td>
@@ -123,13 +128,18 @@
                    end
                  end
 
-                 if @status_order == 'order'
+                 if @status_order == 'order' && @status_sale != 'sale'
                     unless @order_items.nil?
+                       count = 0
                     @order_items.each do |order_item |
+                      puts @order_items.size
+                      puts "view"
+                        count += 1
                     sub_total = sub_total + order_item.price
 
                 unless order_item.price <= 0 %>
                <tr>
+                 <td><%= count %></td>
                  <td class='item-name'><%= order_item.item_name %></td>
                  <td class='item-attr'><%= order_item.qty %></td>
                  <td class='item-attr'><%= order_item.qty*order_item.price %></td>
@@ -143,6 +153,47 @@
              </tbody>
            </table>
          </div>
+         <%
+           if @status_sale == 'sale'
+               unless @order_items.nil?
+                 %>
+                 Pending New Order
+                  <table class="table table-striped">
+                 <%
+                 @order_items.each do |order_item |
+                 %>
+
+                 <tr>
+                   <td class='item-name'><%= order_item.item_name %></td>
+                   <td class='item-attr'><%= order_item.qty %></td>
+                   <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                 </tr>
+
+                 <%
+                  end
+                  %>
+                    </table>
+                   <button class='btn btn-primary'> Add to existing invoice </button>
+                  <%
+                else
+                   @sale_array.each do |sale|
+                     if @sale_array.size > 1
+                     unless sale.receipt_no == @sale_array[0].receipt_no
+                     %>
+                      Pending New Invoice
+                       <table class="table table-striped">
+                         <tr>
+                           <td>Receipt No - <%= sale.receipt_no %></td>
+                           <td><button class='btn btn-sm btn-primary '>Show Detail </button></td>
+                         </tr>
+                       </table>
+                     <%
+                       end
+                      end
+                    end
+                 end
+               end
+         %>
          <div class="row">
            <div class="col-md-12">
              <div class="pay purple" id="move_table">MOVE TABLE</div>

app/views/origami/orders/show.html.erb

@@ -81,7 +81,20 @@
          <% @orders.each do |order| %>
          <div class="card orders red text-white" data-id = "<%= order.order_id %>">
            <div class="card-block">
-              <%= order.order_id %>
+              <%
+                order_status = ""
+                sale_order = SaleOrder.find_by_order_id(order)
+                if sale_order
+                  sale = Sale.find(sale_order.sale_id)
+                  order_status = sale.sale_status
+                  if order_status == 'new'
+                    order_status  = order.status
+                  end
+                else
+                  order_status = order.status
+                end
+              %>
+              <%= order.order_id %> | <%= order_status %>
            </div>
          </div>
          <% end %>
@@ -137,10 +150,8 @@
                  <td class='item-attr'><%= sale_item.price %></td>
                </tr>
                <%
-
                    end
                  end
-
                 %>
              </tbody>
            </table>
@@ -165,6 +176,9 @@
  <!-- Column Three -->
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
+   <% if @sale_status != 'completed' %>
+     <button type="button" class="btn btn-primary btn-block" id='move'>MOVE</button>
+   <% end %>
    <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button>
  </div>
 </div>
@@ -193,5 +207,8 @@ $('#pay').on('click',function() {
 });
 $('#back').on('click',function(){
   window.location.href = '/origami/';
+})
+$('#move').on('click',function(){
+
 })
 </script>

config/routes.rb

@@ -44,10 +44,9 @@ Rails.application.routes.draw do
 
     #Order Controller
     resources :orders, only: [:create, :show, :update] do
-
       post "bill" => "bill#create"
-
     end
+    get 'view_orders' => "orders#view_orders"
 
     #Current active bookings
     resources :bookings, only: [:index, :show, :create, :update]