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

app/controllers/origami/credit_payments_controller.rb

@@ -2,9 +2,31 @@ class Origami::CreditPaymentsController < BaseOrigamiController
 
 
   def index
+    @sale_id = params[:sale_id]
+
+    # limit visa_amount
+    sale_data = Sale.find_by_sale_id(@sale_id)
+    total = sale_data.grand_total
+    @creditcount = 0
+    others = 0
+    sale_data.sale_payments.each do |sale_payment|
+        if sale_payment.payment_method == "visa"
+          @creditcount = @creditcount + sale_payment.payment_amount
+        else
+          others = others + sale_payment.payment_amount
+        end
+    end
+    @can_credit = total - @creditcount - others
   end
 
   def create
+    cash = params[:amount]
+    sale_id = params[:sale_id]
+    if(Sale.exists?(sale_id))
+      saleObj = Sale.find(sale_id)
+      sale_payment = SalePayment.new
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "creditnote")
+    end
   end
 
 end

app/controllers/origami/home_controller.rb

@@ -35,7 +35,7 @@ class Origami::HomeController < BaseOrigamiController
            @status_order = 'order'
          else
           sale = Sale.find(booking.sale_id)
-           if sale.sale_status != "completed"
+           if sale.sale_status != "completed" && sale.sale_status != 'void'
              puts "enter"
              @sale_array.push(sale)
              if @status_order == 'order'

app/controllers/origami/payments_controller.rb

@@ -41,6 +41,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @visacount= 0.0
       @jcbcount= 0.0
       @mastercount = 0.0
+      @credit = 0.0
       @sale_data = Sale.find_by_sale_id(sale_id)
 
       #get customer amount
@@ -77,6 +78,8 @@ class Origami::PaymentsController < BaseOrigamiController
            @jcbcount += spay.payment_amount
          elsif spay.payment_method == "master"
            @mastercount += spay.payment_amount
+         elsif spay.payment_method == "creditnote"
+           @credit += spay.payment_amount
          end
       end
     end

app/controllers/origami/void_controller.rb

@@ -0,0 +1,28 @@
+class Origami::VoidController < BaseOrigamiController
+
+  def overall_void
+
+    sale_id = params[:sale_id]
+    if Sale.exists?(sale_id)
+      sale = Sale.find_by_sale_id(sale_id)
+      sale.payment_status = 'void'
+      sale.sale_status = 'void'
+      sale.save
+
+      table_avaliable = true
+      table = sale.bookings[0].dining_facility
+      table.bookings.each do |booking|
+        if booking.sale.sale_status == 'new'
+          table_avaliable = false
+        end
+      end
+
+      if table_avaliable == true
+        table.status = 'available'
+        table.save
+      end
+
+    end
+  end
+
+end