prepare for payment bill

app/assets/javascripts/origami.js

@@ -19,10 +19,10 @@
 //= require bootstrap-datepicker
 
 $(document).ready(function(){
-	// auto refresh every 10 seconds
+	// auto refresh every 60 seconds
 	setTimeout(function(){
 	   window.location.reload(1);
-	}, 10000);
+	}, 60000);
 
 	// For selected order return
 	var order_status = "";

app/controllers/origami/payments_controller.rb

@@ -11,6 +11,21 @@ class Origami::PaymentsController < BaseOrigamiController
       saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, @user, cash, "cash")
+
+      unique_code = "ReceiptBillPdf"   
+      customer= Customer.where('customer_id=' + saleObj.customer_id)
+
+      # get member information
+      response = get_member_information(customer, "get_all_member_account")
+
+      # get printer info
+      print_settings=PrintSetting.find_by_unique_code(unique_code)
+
+      # Calculate Food and Beverage Total
+      food_total, beverage_total = SaleItem.calculate_food_beverage(saleObj.sale_items)
+
+      printer = Printer::ReceiptPrinter.new(print_settings)   
+      printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total)
     end
   end
 
@@ -25,19 +40,8 @@ class Origami::PaymentsController < BaseOrigamiController
       #get customer amount
       @customer       = Customer.find(@sale_data.customer_id)
 
-      membership      = MembershipSetting.find_by_membership_type("paypar_url")
+      # get member information
-
+      response = get_member_information(@customer, "get_all_member_account")
-      memberaction    = MembershipAction.find_by_membership_type("get_all_member_account")
-      merchant_uid    = memberaction.merchant_account_id.to_s
-      auth_token       = memberaction.auth_token.to_s
-      url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
-
-     response        = HTTParty.get(url, :body => { membership_id: @customer.membership_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json,
-                                             :headers => {
-                                                      'Content-Type' => 'application/json',
-                                                      'Accept'       => 'application/json'
-                                              }
-                      )
 
       @balance = 0.00
       @accountable_type = ''
@@ -64,5 +68,4 @@ class Origami::PaymentsController < BaseOrigamiController
       end
     end
   end
-
 end

app/controllers/origami/request_bills_controller.rb

@@ -1,6 +1,5 @@
 class Origami::RequestBillsController < BaseOrigamiController
-
+  # Print Request Bill and add to sale tables
-
   def print
     @sale = Sale.new
     sale_order=SaleOrder.new
@@ -20,10 +19,11 @@ class Origami::RequestBillsController < BaseOrigamiController
     unique_code = "ReceiptBillPdf"   
     customer= Customer.where('customer_id=' + @sale_data.customer_id)
 
+    # get printer info
     print_settings=PrintSetting.find_by_unique_code(unique_code)
 
     # find order id by sale id
-    sale_order = SaleOrder.find_by_sale_id(@sale_data.sale_id)
+    # sale_order = SaleOrder.find_by_sale_id(@sale_data.sale_id)
 
     # Calculate Food and Beverage Total
     food_total, beverage_total = SaleItem.calculate_food_beverage(@sale_items)

app/views/transactions/sales/show.html.erb

@@ -167,16 +167,17 @@
 
     <div class="col-lg-2 col-md-2 col-sm-2">
 
-       <a href="<%= transactions_sales_path%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
+      <a href="<%= transactions_sales_path%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
-       <i class="fa fa-arrow-left fa-lg"></i> Back
+        <i class="fa fa-arrow-left fa-lg"></i> Back
-     </a>
+      </a>
       
-       <a href="<%= transactions_sales_path%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
+      <!-- Temporary No Needs -->
+      <!-- <a href="<%= transactions_sales_path%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
         <i class="fa fa-trash fa-lg"></i>  Void Sale
        </a>
       <a href="<%= transactions_sales_path%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
         <i class="fa fa-invoice fa-lg"></i> Complete Sale
-      </a>
+      </a> -->
     </div>
 
 </div>