From 4212ad45b332b72247f976bc8793fb4419adf9c5 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 12 Jun 2017 14:11:13 +0630
Subject: [PATCH] updated for food and beverage bugs

---
 app/assets/javascripts/origami.js        | 34 ++++++++++--------------
 app/models/sale_item.rb                  | 17 ++++++------
 app/views/origami/payments/show.html.erb |  1 -
 config/routes.rb                         |  2 +-
 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 14f9fbe9..d3ac9e76 100644
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -64,12 +64,6 @@ $(document).ready(function(){
 		    url: "/origami/" + unique_id,
 		    data: { 'booking_id' : unique_id },
 		    success:function(result){		    		    
-// =======
-// 			type: "GET",
-// 		    url: "origami/" + unique_id,
-// 		    data: { 'id' : unique_id },
-// 		    success:function(result){
-// >>>>>>> 5ee3ae257a59269b651dcc5c0232b95d7f41fb77
 		    	for (i = 0; i < result.length; i++) {
 		    		var data = JSON.stringify(result[i]);
         			var parse_data = JSON.parse(data);
@@ -191,20 +185,20 @@ $(document).ready(function(){
 	});
 
 	function show_customer_details(customer_id){ 
-	$('.customer_detail').removeClass('hide'); 
-  //Start Ajax
-    $.ajax({      
-	      type: "GET",         
-	      url: "origami/"+customer_id+"/get_customer/",
-	      data: {},
-	      dataType: "json",
-	        success: function(data) {
-	           $("#customer_name").text(data.name);
-	           $("#customer_name").text(data.name);
-	        }
-        });
-    //End Ajax 
-}
+		$('.customer_detail').removeClass('hide'); 
+	  	//Start Ajax
+	    $.ajax({      
+		      type: "GET",         
+		      url: "origami/"+customer_id+"/get_customer/",
+		      data: {},
+		      dataType: "json",
+		        success: function(data) {
+		           $("#customer_name").text(data.name);
+		           $("#customer_name").text(data.name);
+		        }
+	        });
+	    //End Ajax 
+	}
 
 	/* For Receipt - Calculate discount or tax */
 	$('.cashier_number').on('click', function(event){
diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb
index 0aed9a23..25b37178 100644
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -36,24 +36,25 @@ class SaleItem < ApplicationRecord
 
     sale_items.each do |si|
       food_price = self.get_food_price(si.sale_item_id)
-      beverage_price = self.get_beverage_price(si.sale_item_id)
-puts food_price
-      # food_prices = food_prices + food_price.price
-      # beverage_prices = beverage_prices + beverage_price.price
+      beverage_price = self.get_beverage_price(si.sale_item_id)      
+      food_prices = food_prices + food_price
+      beverage_prices = beverage_prices + beverage_price
     end
     return food_prices, beverage_prices
   end
 
   def self.get_food_price(sale_item_id)
-    food_price=SaleItem.select("sale_items.price")
+    food=SaleItem.select("sale_items.price")
                           .joins("left join menu_items on menu_items.item_code = sale_items.product_code")
-                          .where("sale_items.sale_item_id=? and menu_items.account_id=0", sale_item_id)
+                          .where("sale_items.sale_item_id=? and menu_items.account_id=1", sale_item_id.to_s)
+    food_price = food[0].price rescue 0                        
   end
 
   def self.get_beverage_price(sale_item_id)
-    beverage_price=SaleItem.select("sale_items.price")
+    beverage=SaleItem.select("sale_items.price")
                           .joins("left join menu_items on menu_items.item_code = sale_items.product_code")
-                          .where("sale_items.sale_item_id=? and menu_items.account_id=1", sale_item_id)
+                          .where("sale_items.sale_item_id=? and menu_items.account_id=2", sale_item_id.to_s)
+    beverage_price = beverage[0].price rescue 0                          
   end
   
   private
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 198b9518..f52c99a1 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -216,7 +216,6 @@ $( document ).ready(function() {
  });
 
  $('#pay').click(function() {
-
      if($('#balance').text() > 0){
         alert(" Insufficient Amount!")
      }else{
diff --git a/config/routes.rb b/config/routes.rb
index 0666e0c4..ddb6e3ff 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,7 +72,7 @@ Rails.application.routes.draw do
   #--------- Cashier ------------#
   namespace :origami do
     root "home#index"
-    get "/:booking_id" => "home#show" do #origami/:booking_id will show
+    get "/:booking_id" => "home#index" do #origami/:booking_id will show
       # resources :discounts, only: [:index,:new, :create ] #add discount type
       resources :customers #add customer type
     end