From 027e066f129e7108609a982dd3b59d168ff47329 Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 3 Oct 2018 16:34:32 +0530 Subject: [PATCH] PD MODIFIED4 --- api/application/config/constants.php | 4 +++- api/application/controllers/PD_Controller.php | 5 +++-- api/index.php | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index c84d2813..a711bde3 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -86,7 +86,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto // define login route name for token verification //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getFullPDDetails'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getListOfLenders'); // no errors /*********************AWS resources Constants*************************************************/ defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); @@ -109,6 +109,8 @@ defined('PD_CHNAGE_REQUEST') OR define('PD_CHNAGE_REQUEST','13'); // From Lender defined('ALLOCATED_TO_PARTNER') OR define('ALLOCATED_TO_PARTNER','14'); // PD Allocated to PD agency not for PD officer defined('ARCHIVED') OR define('ARCHIVED','15'); defined('CANCELLED') OR define('CANCELLED','16'); +defined('RESCHEDULED') OR define('RESCHEDULED','17'); +defined('PLANNEDSCHEDULED') OR define('PLANNEDSCHEDULED','18'); /*******************End Of Constants PD status**************************/ diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 40ad7917..25c191db 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -61,7 +61,8 @@ class PD_Controller extends REST_Controller { $fields = array('subproduct_id','name as subproduct_name','abbr as subproduct_abbr'); $where_condition_array = array('isactive' => 1,'fk_product_id' => $product['product_id']); $subproducts = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,SUBPRODUCTS); - array_push($result_data[$key],$subproducts); + //array_push($result_data[$key],$subproducts); + $result_data[$key]['subproducts'] = $subproducts; } $data['dataStatus'] = true; @@ -262,7 +263,7 @@ class PD_Controller extends REST_Controller { /***********************END OF PD ALLOCATION TYPE AND PROCESS***********/ - + $pd_details['pd_date_of_initiation'] = date("Y-m-d H:i:s"); $pd_id = $this->PD_Model->saveRecords(PDTRIGGER,$pd_details); diff --git a/api/index.php b/api/index.php index c27a78ea..732c98ca 100644 --- a/api/index.php +++ b/api/index.php @@ -54,6 +54,8 @@ * NOTE: If you change these, also change the error_reporting() code below */ define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development'); + date_default_timezone_set('Asia/Kolkata'); + /* *---------------------------------------------------------------