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

app/controllers/origami/home_controller.rb

@@ -7,7 +7,7 @@ class Origami::HomeController < BaseOrigamiController
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders   = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders   = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @shop     = Shop.first
 
     # @shift = ShiftSale.current_open_shift(current_user.id)
@@ -20,7 +20,7 @@ class Origami::HomeController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
 
     @status_order = ""
     @status_sale = ""

app/controllers/origami/moveroom_controller.rb

@@ -14,7 +14,8 @@ class Origami::MoveroomController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
     @dining = DiningFacility.find(params[:dining_id])
-    @dining.bookings.each do |booking|
+    @dining_room = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
+    @dining_room.each do |booking|
          if booking.sale_id.nil?
            @order_items = Array.new
            booking.booking_orders.each do |booking_order|

app/controllers/origami/orders_controller.rb

@@ -8,7 +8,7 @@ class Origami::OrdersController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @order = Order.find(params[:order_id])
     booking = Booking.select('bookings.booking_id, bookings.dining_facility_id')
               .joins(" JOIN booking_orders as bo on bo.booking_id = bookings.booking_id")

app/controllers/origami/rooms_controller.rb

@@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     # @shift = ShiftSale.current_open_shift(current_user.id)
     @webview = false
     if check_mobile
@@ -20,7 +20,7 @@ class Origami::RoomsController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
 
     @room = DiningFacility.find(params[:room_id])
 

app/controllers/origami/sales_controller.rb

@@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @sale = Sale.find(params[:sale_id])
     @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
     @booking = BookingOrder.find_by_order_id(@order).booking_id

app/models/sale_payment.rb

@@ -69,7 +69,8 @@ class SalePayment < ApplicationRecord
       sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by)
 
       # update complete order items in oqs
-      SaleOrder.where("sale_id = '#{ invoice.sale_id }'").find_each do |sodr|
+      booking = Booking.find_by_sale_id(sale_id)
+      booking.booking_orders.each do |sodr|
         AssignedOrderItem.where("order_id = '#{ sodr.order_id }'").find_each do |aoi|
           aoi.delivery_status = 1
           aoi.save

app/views/reports/commission/index.xls.erb

@@ -14,12 +14,14 @@
           <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
         </tr>
         <tr>
-          <th>Commissioner Name</th>
-          <th>Product Name</th>
-          <th>Qty</th>
-          <th>Commission Price</th>
-          <th>Commission Amount</th>
-          <th>Date</th>
+          <th><%= t :sale %></th>
+          <th><%= t :sale %> <%= t("views.right_panel.detail.item") %></th>
+          <th><%= t :commissioner %> <%= t("views.right_panel.detail.name") %></th>
+          <th><%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.name") %></th>
+          <th><%= t("views.right_panel.detail.qty") %></th>
+          <th><%= t("views.right_panel.detail.commission_price") %></th>
+          <th><%= t("views.right_panel.detail.commission_amount") %></th>
+          <th><%= t("views.right_panel.detail.date") %></th>
         </tr>
         </thead>
         <tbody>
@@ -29,12 +31,10 @@
 
         <% @transaction.each do |result| %>
             <tr>
-              <td>
-                <%= result.commissioner.name rescue '-' %>
-              </td>
-              <td>
-                <%= result.commission.menu_item.name rescue '-' %>
-              </td>
+              <td><%= result.sale_id rescue '-' %></td>
+              <td><%= result.sale_item_id rescue '-' %></td>
+              <td><%= result.commissioner.name rescue '-' %></td>
+              <td><%= result.porduct_name rescue '-' %></td>
               <td><%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %></td>
               <td><%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %></td>
               <td><%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %></td>