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

* 'master' of ssh://bitbucket.org/code2lab/sxrestaurant:
  billed
  rake task
  Pending Payment
  Credit payment
  update page height bill pdf
  not show price 0 fixed
  multiple invoice void
  rake task fix
  Shop View
  Shop View
  get update
  not to show price 0 and 10

app/controllers/api/bill_controller.rb

@@ -19,7 +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)
@@ -29,12 +29,7 @@ class Api::BillController < Api::ApiController
     @sale_items = SaleItem.where("sale_id=?",@sale_id)
 
     unique_code = "ReceiptBillPdf"
-    #shop detail
-    shop_details = Shop.find(1)
-
-    customer= Customer.where('customer_id=' + @sale_data.customer_id)
-    # get member information
-    member_info = Customer.get_member_account(customer)
+    customer= Customer.find(@sale_data.customer_id)
 
     # get printer info
     print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -43,7 +38,7 @@ class Api::BillController < Api::ApiController
     item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
 
     printer = Printer::ReceiptPrinter.new(print_settings)
-    printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details)
+    printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts)
   end
 
 

app/controllers/oqs/home_controller.rb

@@ -117,7 +117,7 @@ class Oqs::HomeController < BaseOqsController
               left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
               left join dining_facilities as df on df.id = bk.dining_facility_id")
-    .where("assigned_order_items.delivery_status = #{status}")
+    .where("assigned_order_items.delivery_status = #{status}  AND odt.price <> 0")
     .group("assigned_order_items.assigned_order_item_id")
   end
 end

app/controllers/origami/orders_controller.rb

@@ -8,8 +8,10 @@ class Origami::OrdersController < BaseOrigamiController
     @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
+      unless sale_order.sale_id.nil?
+        sale = Sale.find(sale_order.sale_id)
+        @sale_status = sale.sale_status
+      end
     end
   end
 end

app/controllers/origami/table_invoices_controller.rb

@@ -25,7 +25,7 @@ class Origami::TableInvoicesController < BaseOrigamiController
          else
            sale = Sale.find(booking.sale_id)
 
-            if sale.sale_status != "completed"
+            if sale.sale_status != "completed" && sale.sale_status != 'void'
               @sale_array.push(sale)
             end
          end

app/controllers/origami/void_controller.rb

@@ -9,6 +9,14 @@ class Origami::VoidController < BaseOrigamiController
       sale.sale_status = 'void'
       sale.save
 
+      bookings = sale.bookings
+      bookings.each do |booking|
+        orders = booking.orders
+        orders.each do |order|
+          # order.status = 'void'
+        end
+      end
+
       table_avaliable = true
       table = sale.bookings[0].dining_facility
       table.bookings.each do |booking|