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/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|