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/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index f082dc1a..7b483a75 100644
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -13,7 +13,7 @@ Amount :
     var sale_id = "<%= @sale_id %>";
 
     $.ajax({type: "POST",
-      url: "<%= origami_create_mpu_payment_path  %>",
+      url: "<%= origami_payment_mpu_path  %>",
       data: "amount="+ amount + "&sale_id="+ sale_id,
       success:function(result){
         if(result){
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index e8d35206..7eb890f4 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -229,7 +229,7 @@ $( document ).ready(function() {
       var card = $('#card').text();
       var sale_id = $('#sale_id').text();
       $.ajax({type: "POST",
-        url: "<%= origami_payment_process_path %>",
+        url: "<%= origami_payment_cash_path %>",
         data: "cash="+ cash + "&sale_id=" + sale_id,
         success:function(result){
           alert("Thank you")
diff --git a/config/routes.rb b/config/routes.rb
index ddf7d9cd..6337f4ee 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
@@ -86,13 +86,13 @@ Rails.application.routes.draw do
 
     #--------- Payment ------------#
     get 'sale/:sale_id/payment' => 'payments#show'
-    post 'payment_process' => 'payments#create'
+    post 'payment/cash' => 'payments#create'
     post 'paypar_payment_process' => 'paypar_payments#create'
     get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/payment/others_payment' => "others_payments#index"
     # get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index"
     get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index"
-    post 'create_mpu_payment' => "mpu#create"
+    post 'payment/mpu' => "mpu#create"
     get 'sale/:sale_id/payment/others_payment/REDEEMREBATE' => "redeem_payments#index"
 
     #---------Add Customer --------------#
diff --git a/db/seeds.rb b/db/seeds.rb
index fe7bdcc7..ae2d617d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -51,6 +51,10 @@ menu_item_type = Lookup.create([{lookup_type:'menu_item_type', name: 'SIMPLE', v
                                 {lookup_type:'menu_item_type', name: 'Set Menu', value: 'setMenu'},
                                 {lookup_type:'menu_item_type', name: 'DIY', value: 'diy'}])
 
+member_group_type = Lookup.create([{lookup_type:'member_group_type', name: 'Platinum', value: '1'},
+                                {lookup_type:'member_group_type', name: 'Silver', value: '2'}
+                                ])
+
 #menu_item_attribute:[size|]
 menu_item_attribute_type = Lookup.create([{lookup_type:'menu_item_attribute_type', name: 'Size', value: 'size'}])
                                         #  {lookup_type:'menu_item_attribute_type', name: 'Spicy', value: 'spicy'},
@@ -141,7 +145,7 @@ order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSu
 request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"})
 crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"})
 
-member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "192.168.1."})
+member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http//192.168.1.47:3006"})
 
 member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1}},
   {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1}},
@@ -151,6 +155,7 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance",
   {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1}},
   {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data"}
   ])
+payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006"})
 
 # shop = Shop.create(
 #   {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", 
diff --git a/dump.rdb b/dump.rdb
index ebdb6db6..9a81a61e 100644
Binary files a/dump.rdb and b/dump.rdb differ