Subversion Repositories SmartDukaan

Rev

Rev 25721 | Rev 27489 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 25721 Rev 25789
Line 32... Line 32...
32 
 
 32 
 
33 
					$('#fetchCustomerData .modal-content').html(response);
 33 
					$('#fetchCustomerData .modal-content').html(response);
34 
					$('#schedule').hide();
 34 
					$('#schedule').hide();
35 
 
 35 
 
36 
					$('#hygiene-detail').hide();
 36 
					$('#hygiene-detail').hide();
- 
 
 37 
					$("#textRemark").hide();
37 
 
 38 
 
38 
				});
 39 
				});
39 
			});
 40 
			});
40 
 
 41 
 
41 
	$(".add-customer-feedback").live(
 42 
	$(".add-customer-feedback").live(
42 
			'click',
 43 
			'click',
43 
			function() {
 44 
			function() {
44 
				var hygieneData = {}
 45 
				var hygieneData = {}
45 
				var status = $('#status').val();
 46 
				var status = $('#status').val();
- 
 
 47
46 
				var remark = $('#remark').val();
 48 
				var val = $("#remark").val();
- 
 
 49 
				console.log(val);
- 
 
 50 
				if (val == "other") {
- 
 
 51 
					remark = $('input[name="textRemark"]').val();
- 
 
 52 
				} else {
- 
 
 53 
					remark = val;
- 
 
 54 
				}
47 
				var orderId = $(this).data('orderid');
 55 
				var orderId = $(this).data('orderid');
48 
 
 56 
 
49 
				if (status === "" && remark === "") {
 57 
				if (status === "" && remark === "") {
50 
					alert("Field can't be empty");
 58 
					alert("Field can't be empty");
51 
					return;
 59 
					return;
Line 56... Line 64...
56 
				}
 64 
				}
57 
				if (status === "") {
 65 
				if (status === "") {
58 
					alert("Status is required");
 66 
					alert("Status is required");
59 
					return;
 67 
					return;
60 
				}
 68 
				}
61 
 
 69
62 
				if (status == "Not connected") {
 70 
				if (status == "Not connected") {
63 
 
 71 
 
64 
					hygieneData['orderId'] = orderId;
 72 
					hygieneData['orderId'] = orderId;
65 
					hygieneData['status'] = $('#status').val();
 73 
					hygieneData['status'] = $('#status').val();
66 
					hygieneData['remark'] = $('#remark').val();
 74 
					hygieneData['remark'] = remark;
67 
					hygieneData['hygieneRating'] = $('#hygieneRating').val();
 75 
					hygieneData['hygieneRating'] = $('#hygieneRating').val();
68 
					hygieneData['scheduleTime'] = startDate;
 76 
					hygieneData['scheduleTime'] = startDate;
69 
				} else if (status == "Not Connected Closed") {
 77 
				} else if (status == "Not Connected Closed") {
70 
 
 78 
 
71 
					hygieneData['orderId'] = orderId;
 79 
					hygieneData['orderId'] = orderId;
72 
					hygieneData['status'] = $('#status').val();
 80 
					hygieneData['status'] = $('#status').val();
73 
					hygieneData['hygieneRating'] = $('#hygieneRating').val();
 81 
					hygieneData['hygieneRating'] = $('#hygieneRating').val();
74 
					hygieneData['remark'] = $('#remark').val();
 82 
					hygieneData['remark'] = remark
75 
				}
 83 
				}
76 
 
 84 
 
77 
				else if (status == "connected") {
 85 
				else if (status == "connected") {
78 
					hygieneData['orderId'] = orderId;
 86 
					hygieneData['orderId'] = orderId;
79 
					hygieneData['status'] = $('#status').val();
 87 
					hygieneData['status'] = $('#status').val();
80 
					hygieneData['remark'] = $('#remark').val();
 88 
					hygieneData['remark'] = remark;
81 
					hygieneData['hygieneRating'] = $('#hygieneRating').val();
 89 
					hygieneData['hygieneRating'] = $('#hygieneRating').val();
82 
					hygieneData['dop'] = startDate
 90 
					hygieneData['dop'] = startDate
83 
					hygieneData['quesPhone'] = $('#quest1').val();
 91 
					hygieneData['quesPhone'] = $('#quest1').val();
84 
					hygieneData['quesInformation'] = $('#quest2').val();
 92 
					hygieneData['quesInformation'] = $('#quest2').val();
85 
					hygieneData['quesInvoice'] = $('#quest3').val();
 93 
					hygieneData['quesInvoice'] = $('#quest3').val();
Line 131... Line 139...
131 
function loadHygiene(domId) {
 139 
function loadHygiene(domId) {
132 
	doGetAjaxRequestHandler(context + "/getHygieneData", function(response) {
 140 
	doGetAjaxRequestHandler(context + "/getHygieneData", function(response) {
133 
		$('#' + domId).html(response);
 141 
		$('#' + domId).html(response);
134 
	});
 142 
	});
135 
}
 143 
}
- 
 
 144 
 
- 
 
 145 
 
- 
 
 146 
function changeRemark() {
- 
 
 147 
	var val = $("#remark").val();
- 
 
 148 
	console.log(val);
- 
 
 149 
	if (val == "other") {
- 
 
 150 
		$("#textRemark").show();
- 
 
 151 
	} else {
- 
 
 152 
		$("#textRemark").hide();
- 
 
 153 
	}
- 
 
 154 
 
- 
 
 155 
}