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

application/controllers/Api.php

@@ -234,7 +234,7 @@ class Api extends CI_Controller {
     if($res['status']!=0){
       if(isset($res['data']['reqData']) && !empty($res['data']['reqData'])){
         $reqData = $this->encrypt(json_encode($res['data']['reqData']),$this->local_key,$this->local_iv);
-        $reqData = urlencode($reqData);
+        $reqData = urlencode(base64_encode($reqData));
         $res['data']['reqData'] = $reqData;
       }
       $this->response($res['data']);
@@ -699,18 +699,7 @@ class Api extends CI_Controller {
   }
 
   public function addCard(){
-    // $data = (array) json_decode(file_get_contents('php://input'));
-    // $dmyData = '{"auth_token":"cc731b6bd572eb452d85c96aaec77898","cardNumber":"5111111111111118",
-    //              "expMonthYear":"0622","cardHolderName":"John","cvv":"100","cardType":"MasterCard",
-    //              "cardMode":"DD"}';
-
-    // $dmyData = '{"amount":"1","event_id":"123","auth_token":"cc731b6bd572eb452d85c96aaec77898",
-    //              "booking_id":"TO1911145705","cardData":{"cardNumber":"5111111111111118",
-    //              "expMonthYear":"0622","cardHolderName":"John","cvv":"100","cardType":"MasterCard",
-    //              "cardMode":"DD"}}';
-    // $data['requestData'] = $this->encrypt($dmyData,$this->local_key,$this->local_iv);
-    // pr(urlencode(base64_encode($data['requestData'])));
-
+    $data = (array) json_decode(file_get_contents('php://input'));
     $reqData = $this->decrypt($data['requestData'],$this->local_key,$this->local_iv);
     if(empty($reqData) || empty($reqData = json_decode($reqData,true)) || 
        !isset($reqData['auth_token']) || empty($reqData['auth_token'])){
@@ -724,7 +713,7 @@ class Api extends CI_Controller {
                       'booking_id'=>'ADD_CARD','custData'=>$res['custData'],'cardData'=>$reqData);
 
       $reqData = $this->encrypt(json_encode($params),$this->local_key,$this->local_iv);
-      $reqData = urlencode($reqData);
+      $reqData = urlencode(base64_encode($reqData));
 
       $this->paymentGateway($reqData);
     }else{

application/models/Api_model.php

@@ -626,8 +626,9 @@ class Api_model extends CI_Model {
 										   'redeem_amount'=>$post_data['redeem_amount'],
 										   'created_date'=>date('Y-m-d H:i:s'),'status'=>$promoStatus);
 				}
+				$card_data = $post_data['cardData'];
 				$auth_token = $post_data['auth_token'];
- 				unset($post_data['auth_token'],$post_data['has_payment'],
+ 				unset($post_data['auth_token'],$post_data['has_payment'],$post_data['cardData'],
  					  $post_data['promocode_id'],$post_data['redeem_amount']);
 
 				$rs = $this->db->insert('booking', $post_data);
@@ -635,14 +636,35 @@ class Api_model extends CI_Model {
 					if(!empty($promocodeData)){
 						$this->db->insert('promocode_used',$promocodeData);
 					}
+					$cardDetails = array();
+					if(!empty($card_data)){
+						// (CC)-Credit ,(DC)-Debit ,(DD)-Direct Debit,(PAYPAL)-PayPal,(NB)-Net Banking 
+						switch($card_data->card_type) {
+							case '1': $cardDetails['cardMode'] = 'CC'; break;
+							case '2': $cardDetails['cardMode'] = 'DC'; break;
+							case '3': $cardDetails['cardMode'] = 'DD'; break;
+							default : $cardDetails['cardMode'] = 'DD'; break;
+						}
+
+						switch(substr($card_data->card_number,0,1)) {
+							case '4': $cardDetails['cardType'] = 'VisaCard'; break;
+							case '5': $cardDetails['cardType'] = 'Mastercard'; break;
+							case '6': $cardDetails['cardType'] = 'DiscoverCard'; break;
+							default : $cardDetails['cardType'] = 'Mastercard'; break;
+						}
+
+						$cardDetails['cvv'] = $card_data->card_cvv;
+						$cardDetails['cardNumber'] = $card_data->card_number;
+						$cardDetails['expMonthYear'] = $card_data->exp_date.$card_data->exp_year;
+						$cardDetails['cardHolderName'] = $card_data->holder_name;
+					}
 		 			$reqData = array('amount'=>$post_data['amount'],'event_id'=>$post_data['event_id'],
-		 							 'cardData'=>array('1'),'auth_token'=>$auth_token,
+		 							 'cardData'=>$cardDetails,'auth_token'=>$auth_token,
 		 							 'booking_id'=>$post_data['bookId']);
 
 		 			$res = array('status'=>1,'data'=>array('user_id'=>$user_id,
 		 						 'bookingCode'=>$post_data['bookId'],'reqData'=>$reqData));
 
-
 		 			if($status == 1){
 		 				$sql = "SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone,
 					            	   CONCAT(EDATE.date,' ',EDATE.time) AS show_time

application/views/Category/categoryAddForm.php

@@ -85,8 +85,8 @@
                   <div class="form-group">
                     <label>Category Name (<?= $lang ?>)</label>
                     <input type="text" class="form-control" data-parsley-trigger="change"
-                    data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" 
-                    name="category_name_<?= $lang ?>" value="<?= (isset($categoryData->{'category_name_'.$lang}))?$categoryData->{'category_name_'.$lang}:'' ?>" placeholder="Category Name (English)">
+                    data-parsley-minlength="2" name="category_name_<?= $lang ?>" 
+                    value="<?= (isset($categoryData->{'category_name_'.$lang}))?$categoryData->{'category_name_'.$lang}:'' ?>" placeholder="Category Name (English)">
                     <span class="glyphicon form-control-feedback"></span>
                   </div>
                 </div>