Merge branch 'master' into 'local_production'

application/controllers/Webservices.php

@@ -2113,6 +2113,28 @@
 			echo json_encode($result);exit;
 		}
 
+		public function cancel_order(){
+			header('Content-type:application/json');
+			$headers = apache_request_headers();
+
+			if(!isset($headers['Auth']) || empty($headers['Auth'])){
+				$respArr['status'] = 'error';
+				$respArr['message'] = 'Authtoken is Required';
+				echo json_encode($respArr);exit;
+			}
+			
+			$authRes = $this->Webservice_model->get_customer_authtoken($headers['Auth']); 
+			if($authRes['status'] == 'error'){
+				echo json_encode($authRes);exit;
+			}
+
+			$post = file_get_contents("php://input");
+			$postData = json_decode($post,true);
+
+			$result = $this->Webservice_model->cancelOrder($postData);
+			echo json_encode($result);exit;
+		}
+
 		public function getCartData(){
 			header('Content-type:application/json');
 			$headers = apache_request_headers();