git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update orgami js

Browse Source
This commit is contained in:
Yan
2017-06-12 10:12:55 +06:30
parent 09f9a29cde
commit 121fb92b9b
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/origami.js
View File

@@ -56,17 +56,16 @@ $(document).ready(function(){
// AJAX call for order // AJAX call for order
$.ajax({ $.ajax({
<<<<<<< HEAD
type: "POST", type: "POST",
url: "/origami/" + unique_id, url: "/origami/" + unique_id,
data: { 'booking_id' : unique_id }, data: { 'booking_id' : unique_id },
success:function(result){ success:function(result){
======= // =======
type: "GET", // type: "GET",
url: "origami/" + unique_id, // url: "origami/" + unique_id,
data: { 'id' : unique_id }, // data: { 'id' : unique_id },
success:function(result){ // success:function(result){
>>>>>>> 5ee3ae257a59269b651dcc5c0232b95d7f41fb77 // >>>>>>> 5ee3ae257a59269b651dcc5c0232b95d7f41fb77
for (i = 0; i < result.length; i++) { for (i = 0; i < result.length; i++) {
var data = JSON.stringify(result[i]); var data = JSON.stringify(result[i]);
var parse_data = JSON.parse(data); var parse_data = JSON.parse(data);
@@ -250,14 +249,11 @@ function control_button(order_status){
$("#request_bills").prop('disabled', false); $("#request_bills").prop('disabled', false);
$("#discount").prop('disabled', true); $("#discount").prop('disabled', true);
$("#pay-bill").prop('disabled', true); $("#pay-bill").prop('disabled', true);
<<<<<<< HEAD
} }
else { else {
$("#request_bills").prop('disabled', true); $("#request_bills").prop('disabled', true);
$("#discount").prop('disabled', true); $("#discount").prop('disabled', true);
$("#pay-bill").prop('disabled', true); $("#pay-bill").prop('disabled', true);
=======
>>>>>>> 5ee3ae257a59269b651dcc5c0232b95d7f41fb77
} }
} }