Merge branch 'master' into 'dev_production'

application/models/Webservice_model.php

@@ -989,9 +989,13 @@ class Webservice_model extends CI_Model {
 					$imgExt  = strtolower($imgName[1]);
 
 					if($imgExt=='png' || $imgExt=='jpeg' || $imgExt == 'jpg' || $imgExt == 'gif'){
-						$imgPath = 'assets/uploads/user/CUST_'.$user_id.'.'.$imgExt;
-					 	$imgQRPath = 'assets/uploads/user/CUST_QR_'.$user_id.'.png';
+						$imgPath = 'assets/uploads/user/CUST_'.$user_id.'_'.time().'.'.$imgExt;
+					 	$imgQRPath = 'assets/uploads/user/CUST_QR_'.$user_id.'_'.time().'.png';
 					 	$imgFramePath = 'assets/images/bitmojiFrame.png';
+
+						array_map('unlink', glob('assets/uploads/user/CUST_'.$user_id.'_*.*'));
+						array_map('unlink', glob('assets/uploads/user/CUST_QR_'.$user_id.'_*.*'));
+						
 						move_uploaded_file($data['file']['tmp_name'],"./".$imgPath);
 						$this->imageResize($imgPath,array('width'=>'300','height'=>'300'));