Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin

application/models/Webservice_model.php

@@ -2239,7 +2239,7 @@ class Webservice_model extends CI_Model {
  			$user_id = $this->auth_token_get($data['auth_token']);
  			if($user_id > 0){
  				$countryData = $this->getCountryData($user_id);
- 				$sql = "SELECT wallet_trans_id,amount,transaction_type,created_date,status FROM wallet_transactions WHERE customer_id='$user_id'";
+ 				$sql = "SELECT transaction_code AS transaction_number,amount,transaction_type,created_date,status FROM wallet_transactions WHERE customer_id='$user_id'";
  				$query = $this->db->query($sql);
  				if(empty($query) || empty($walletHistory = $query->result_array())){
  					$res = array('status'=>'error','message'=>'No History Found','code'=>'ER13');