From 121fb92b9b35d924f666f1b938c412d8ba938199 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 12 Jun 2017 10:12:55 +0630
Subject: [PATCH] update orgami js

---
 app/assets/javascripts/origami.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 0838e1a2..5626634f 100644
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -56,17 +56,16 @@ $(document).ready(function(){
 
 		// AJAX call for order
 		$.ajax({
-<<<<<<< HEAD
 			type: "POST",
 		    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
+// =======
+// 			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);
@@ -250,14 +249,11 @@ function control_button(order_status){
 		$("#request_bills").prop('disabled', false);
 		$("#discount").prop('disabled', true);
 		$("#pay-bill").prop('disabled', true);
-<<<<<<< HEAD
 	}
 	else {
 		$("#request_bills").prop('disabled', true);
 		$("#discount").prop('disabled', true);
 		$("#pay-bill").prop('disabled', true);
-=======
->>>>>>> 5ee3ae257a59269b651dcc5c0232b95d7f41fb77
 	}
 }