merge origin master

app/controllers/origami/payments_controller.rb

@@ -11,7 +11,7 @@ class Origami::PaymentsController < BaseOrigamiController
       saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
        sale_payment.process_payment(saleObj, @user, cash, "cash")
-     
+
       rebate_amount = nil
 
       unique_code = "ReceiptBillPdf"
@@ -53,7 +53,8 @@ class Origami::PaymentsController < BaseOrigamiController
          response["data"].each do |res|
           if res["accountable_type"] == "RebateAccount"
              @balance = res["balance"]
-             @accountable_type = res["accountable_type"]
+            #  @accountable_type = res["accountable_type"]
+             @accountable_type = "Rebate Balance"
           end
         end
       end

app/controllers/origami/sale_edit_controller.rb

@@ -0,0 +1,8 @@
+class Origami::SaleEditController < BaseOrigamiController
+
+   def edit
+     sale_id = params[:sale_id]
+     @table_id = params[:table_id]
+     @saleobj = Sale.find(sale_id)
+   end
+end