diff --git a/api/application/config/constants.php b/api/application/config/constants.php index c5e2e380..5e0dcf37 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -85,17 +85,98 @@ defined('EXIT__AUTO_MIN') OR define('EXIT__AUTO_MIN', 9); // lowest automat defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code // define login route name for token verification -defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getListOfMaster'); // no errors +defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'login'); // no errors defined('ROUTE_LOGIN2') OR define('ROUTE_LOGIN2', 'login2'); // no errors defined('ROUTE_LOGIN3') OR define('ROUTE_LOGIN3', 'login3'); // no errors +//AWS resources Constants +defined('PROFILEPICTUREBUCKETNAME') OR define('PROFILEPICTUREBUCKETNAME','sineedgedevprofilepic'); - -//encript database table name +//Define Constants for Table Names and Primarykeys defined('INDUSTRYCLASSIFICATION') OR define('INDUSTRYCLASSIFICATION','m_industry_classification'); defined('INDUSTRYCLASSIFICATIONID') OR define('INDUSTRYCLASSIFICATIONID','industry_classification_id'); defined('PRODUCTS') OR define('PRODUCTS','m_products'); defined('PRODUCTSID') OR define('PRODUCTSID','product_id'); + +defined('UOM') OR define('UOM','m_uom'); +defined('UOMID') OR define('UOMID','uom_id'); + +defined('SUBPRODUCTS') OR define('SUBPRODUCTS','m_subproducts'); +defined('SUBPRODUCTSID') OR define('SUBPRODUCTSID','subproduct_id'); + +defined('OCCUPATIONMEMBERS') OR define('OCCUPATIONMEMBERS','m_occupation_non_earning_members'); +defined('OCCUPATIONMEMBERSID') OR define('OCCUPATIONMEMBERSID','occupation_non_earning_member_id'); + +defined('TYPEOFACTIVITY') OR define('TYPEOFACTIVITY','m_type_of_activity'); +defined('TYPEOFACTIVITYID') OR define('TYPEOFACTIVITYID','type_of_activity_id'); + +defined('TYPEOFACTIVITY') OR define('TYPEOFACTIVITY','m_type_of_activity'); +defined('TYPEOFACTIVITYID') OR define('TYPEOFACTIVITYID','type_of_activity_id'); + +defined('TITLES') OR define('TITLES','m_titles'); +defined('TITLESID') OR define('TITLESID','title_id'); + +defined('RELATIONSHIPS') OR define('RELATIONSHIPS','m_relationships'); +defined('RELATIONSHIPSID') OR define('RELATIONSHIPSID','relationship_id'); + +defined('FREQUENCY') OR define('FREQUENCY','m_frequency'); +defined('FREQUENCYID') OR define('FREQUENCYID','frequency_id'); + +defined('CUSTOMERBEHAVIOUR') OR define('CUSTOMERBEHAVIOUR','m_customer_behaviour'); +defined('CUSTOMERBEHAVIOURID') OR define('CUSTOMERBEHAVIOURID','customer_behaviour_id'); + +defined('REGIONS') OR define('REGIONS','m_regions'); +defined('REGIONSID') OR define('REGIONSID','region_id'); + +defined('STATE') OR define('STATE','m_states'); +defined('STATEID') OR define('STATEID','state_id'); + +defined('CITY') OR define('CITY','m_city'); +defined('CITYID') OR define('CITYID','city_id'); + +defined('BRANCH') OR define('BRANCH','m_branch'); +defined('BRANCHID') OR define('BRANCHID','branch_id'); + +defined('PDLOCATIONAPPROACH') OR define('PDLOCATIONAPPROACH','m_pd_location_approach'); +defined('PDLOCATIONAPPROACHID') OR define('PDLOCATIONAPPROACHID','pd_location_approach_id'); + +defined('LISTOFMASTERS') OR define('LISTOFMASTERS','m_list_of_masters'); +defined('LISTOFMASTERSID') OR define('LISTOFMASTERSID','master_id'); + +defined('COMMENTSONLOCALITY') OR define('COMMENTSONLOCALITY','m_comments_on_locality'); +defined('COMMENTSONLOCALITYID') OR define('COMMENTSONLOCALITYID','comments_on_locality_id'); + +defined('ENTITYTYPE') OR define('ENTITYTYPE','m_entity_type'); +defined('ENTITYTYPEID') OR define('ENTITYTYPEID','entity_type_id'); + +defined('COMPANY') OR define('COMPANY','m_company'); +defined('COMPANYID') OR define('COMPANYID','company_id'); + +defined('DESIGNATION') OR define('DESIGNATION','m_designation'); +defined('DESIGNATIONID') OR define('DESIGNATIONID','designation_id'); + +defined('LENDERHIERARCHY') OR define('LENDERHIERARCHY','m_lender_hierarchy'); +defined('LENDERHIERARCHYID') OR define('LENDERHIERARCHYID','lender_hierarchy_id'); + +defined('USERPROFILE') OR define('USERPROFILE','m_user_profile'); +defined('USERPROFILEID') OR define('USERPROFILEID','userid'); + +defined('ENTITY') OR define('ENTITY','m_entities'); +defined('ENTITYID') OR define('ENTITYID','entity_id'); + +defined('ENTITYCHILD') OR define('ENTITYCHILD','m_entity_child'); +defined('ENTITYCHILDID') OR define('ENTITYCHILDID','entity_child_id'); + +defined('USERPROFILEHIERARCHY') OR define('USERPROFILEHIERARCHY','m_user_lender_hierarchy'); +defined('USERPROFILEHIERARCHYID') OR define('USERPROFILEHIERARCHYID','user_lender_hierarchy_id'); + +defined('USERPROFILEROLES') OR define('USERPROFILEROLES','m_user_roles'); +defined('USERPROFILEROLESID') OR define('USERPROFILEROLESID','user_role_id'); + +defined('LENDER') OR define('LENDER','m_lender'); +defined('LENDERID') OR define('LENDERID','lender_id'); + + diff --git a/api/application/config/routes.php b/api/application/config/routes.php index d81cce3a..ad13c02a 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -61,46 +61,9 @@ $route['translate_uri_dashes'] = FALSE; */ /* Routes regards Common Masters CRUD operations*/ -$route['getListOfMasters'] = 'Common_Masters_Controller/getListOfMasters'; +$route['saveNewUser'] = 'Common_Masters_Controller/saveNewUser'; +$route['listAllUsers'] = 'Common_Masters_Controller/listAllUsers'; -$route['getListOfIndustryClassifications'] = 'Common_Masters_Controller/getListOfIndustryClassifications'; -$route['saveIndustryClassification'] = 'Common_Masters_Controller/saveIndustryClassification'; - -$route['getListOfProducts'] = 'Common_Masters_Controller/getListOfProducts'; -$route['saveProducts'] = 'Common_Masters_Controller/saveProducts'; - -$route['getListOfSubProducts'] = 'Common_Masters_Controller/getListOfSubProducts'; -$route['saveSubProducts'] = 'Common_Masters_Controller/saveSubProducts'; - -$route['getListOfUOM'] = 'Common_Masters_Controller/getListOfUOM'; -$route['saveUOM'] = 'Common_Masters_Controller/saveUOM'; - -$route['getListOfOccupationNonEarningMembers'] = 'Common_Masters_Controller/getListOfOccupationNonEarningMembers'; -$route['saveOccupationNonEarningMembers'] = 'Common_Masters_Controller/saveOccupationNonEarningMembers'; - -$route['getListOfTypeOfActivities'] = 'Common_Masters_Controller/getListOfTypeOfActivities'; -$route['saveTypeOfActivity'] = 'Common_Masters_Controller/saveTypeOfActivity'; - -$route['getListOfTitles'] = 'Common_Masters_Controller/getListOfTitles'; -$route['saveTitle'] = 'Common_Masters_Controller/saveTitle'; - -$route['getListOfRelationships'] = 'Common_Masters_Controller/getListOfRelationships'; -$route['saveRelationship'] = 'Common_Masters_Controller/saveRelationship'; - -$route['getListOfFrequencies'] = 'Common_Masters_Controller/getListOfFrequencies'; -$route['saveFrequency'] = 'Common_Masters_Controller/saveFrequency'; - -$route['getListOfCustomerBehaviours'] = 'Common_Masters_Controller/getListOfCustomerBehaviours'; -$route['saveCustomerBehaviour'] = 'Common_Masters_Controller/saveCustomerBehaviour'; - -$route['getListOfRegions'] = 'Common_Masters_Controller/getListOfRegions'; -$route['saveRegion'] = 'Common_Masters_Controller/saveRegion'; - - $route['getListOfCites'] = 'Common_Masters_Controller/getListOfCites'; -$route['saveCity'] = 'Common_Masters_Controller/saveCity'; - -// $route['getListOfCites'] = 'Common_Masters_Controller/getListOfCites'; -// $route['saveCity'] = 'Common_Masters_Controller/saveCity'; $route['getListOfBranches'] = 'Common_Masters_Controller/getListOfBranches'; $route['saveBranch'] = 'Common_Masters_Controller/saveBranch'; @@ -108,5 +71,5 @@ $route['saveBranch'] = 'Common_Masters_Controller/saveBranch'; $route['getListOfMaster'] = 'Common_Masters_Controller/getListOfMaster'; $route['saveMaster'] = 'Common_Masters_Controller/saveMaster'; -//$route['login'] = 'User_Management_Controller/saveNewUser'; + diff --git a/api/application/controllers/Branch_Controller.php b/api/application/controllers/Branch_Controller.php index 86d8c460..b8875e83 100644 --- a/api/application/controllers/Branch_Controller.php +++ b/api/application/controllers/Branch_Controller.php @@ -36,7 +36,7 @@ class Branch_Controller extends REST_Controller { // load the model $this->load->model('Branch_model', 'branch_model'); - //$this->load->library('AWS_S3'); + $this->load->library('AWS_S3'); //$this->load->library('AWS_SNS'); //$this->load->library('AWS_SES'); } @@ -70,7 +70,7 @@ class Branch_Controller extends REST_Controller { } } - public function testAWSS3_get() + public function testAWSS3_post() { /* CREATE NEW BUCKETS*/ // $b = $this->aws_s3->createNewBucket('thecucumber'); @@ -92,15 +92,24 @@ class Branch_Controller extends REST_Controller { /* STORE FILE TO S3*/ - // $file = $_FILES['myfile']['tmp_name']; - // $file2 = $_FILES['myfile']['name']; + $file = $_FILES['myfile']['tmp_name']; + $file2 = $_FILES['myfile']['name']; //print_r($file); - // print_r($file2); + //print_r($file2); - // $s3pathname = 'byapi/'.$file2; - // $data = array('bucket_name'=>'thecucumber','key'=>$s3pathname,'sourcefile'=>$file); - // $res = $this->aws_s3->uploadFileToS3Bucket($data); - // print_r($res); + $s3pathname = 'byapi/'.$file2; + $data = array('bucket_name'=>'thecucumber','key'=>$s3pathname,'sourcefile'=>$file); + $res = $this->aws_s3->uploadFileToS3Bucket($data); + //print_r($res); + echo is_object($res); + echo is_array($res); + echo "*********\n\n"; + echo $res['ObjectURL']; + echo $res['@metadata']['statusCode']; + // foreach($res as $key => $value) + // { + // echo $key."\n\n"; + // } /* STORE FILE TO S3*/ diff --git a/api/application/controllers/Common_masters_Controller.php b/api/application/controllers/Common_masters_Controller.php index 39499571..386eb852 100644 --- a/api/application/controllers/Common_masters_Controller.php +++ b/api/application/controllers/Common_masters_Controller.php @@ -20,950 +20,950 @@ class Common_Masters_Controller extends REST_Controller { $this->load->model('Common_Masters_Model'); } - - /* Get List Of Mastsers for DropDown */ - public function getListOfMasters_get() - { - $result = $this->Common_Masters_Model->getListOfMasters(); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); + + // /* Get List Of Mastsers for DropDown */ + // public function getListOfMasters_get() + // { + // $result = $this->Common_Masters_Model->getListOfMasters(); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } - } + // } - /* Industry Classification Masters */ + // /* Industry Classification Masters */ - public function getListOfIndustryClassifications_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_industry_classification'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfIndustryClassifications_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_industry_classification'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveIndustryClassification_post() - { - $industryClassifications = $this->post('industryClassifications'); + // public function saveIndustryClassification_post() + // { + // $industryClassifications = $this->post('industryClassifications'); - if($industryClassifications['industry_classification_id']) //Update Record - { - $where_condition_array = array('industry_classification_id'=>$industryClassificationData['industry_classification_id']); + // if($industryClassifications['industry_classification_id']) //Update Record + // { + // $where_condition_array = array('industry_classification_id'=>$industryClassificationData['industry_classification_id']); - $result = $this->Common_Masters_Model->updateRecords($industryClassifications,'m_industry_classification',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($industryClassifications,'m_industry_classification',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($industryClassifications,'m_industry_classification'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($industryClassifications,'m_industry_classification'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of Industry Classification Masters */ + // /* End Of Industry Classification Masters */ - /* Producsts Masters */ + // /* Producsts Masters */ - public function getListOfProducts_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_products'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfProducts_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_products'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveProducts_post() - { - $products = $this->post('products'); + // public function saveProducts_post() + // { + // $products = $this->post('products'); - if($products['product_id']) //Update Record - { - $where_condition_array = array('product_id'=>$products['product_id']); + // if($products['product_id']) //Update Record + // { + // $where_condition_array = array('product_id'=>$products['product_id']); - $result = $this->Common_Masters_Model->updateRecords($products,'m_products',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($products,'m_products',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($products,'m_products'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($products,'m_products'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of Producsts Masters */ + // /* End Of Producsts Masters */ - /* Sub - producsts Master */ + // /* Sub - producsts Master */ - public function getListOfSubProducts_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_subproducts'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfSubProducts_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_subproducts'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveSubProducts_post() - { - $subproducts = $this->post('subproducts'); + // public function saveSubProducts_post() + // { + // $subproducts = $this->post('subproducts'); - if($subproducts['subproduct_id']) //Update Record - { - $where_condition_array = array('subproduct_id'=>$subproducts['subproduct_id']); + // if($subproducts['subproduct_id']) //Update Record + // { + // $where_condition_array = array('subproduct_id'=>$subproducts['subproduct_id']); - $result = $this->Common_Masters_Model->updateRecords($subproducts,'m_subproducts',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($subproducts,'m_subproducts',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($subproducts,'m_subproducts'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($subproducts,'m_subproducts'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of Sub - producsts Master */ + // /* End Of Sub - producsts Master */ - /* UOM Master */ + // /* UOM Master */ - public function getListOfUOM_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_uom'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfUOM_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_uom'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveUOM_post() - { - $uom = $this->post('uom'); + // public function saveUOM_post() + // { + // $uom = $this->post('uom'); - if($uom['uom_id']) //Update Record - { - $where_condition_array = array('uom_id'=>$uom['uom_id']); + // if($uom['uom_id']) //Update Record + // { + // $where_condition_array = array('uom_id'=>$uom['uom_id']); - $result = $this->Common_Masters_Model->updateRecords($uom,'m_uom',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($uom,'m_uom',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($uom,'m_uom'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($uom,'m_uom'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of UOM Master */ + // /* End Of UOM Master */ - /* Occupation_non_earning_members Master */ + // /* Occupation_non_earning_members Master */ - public function getListOfOccupationNonEarningMembers_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_occupation_non_earning_members'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfOccupationNonEarningMembers_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_occupation_non_earning_members'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveOccupationNonEarningMembers_post() - { - $occupationnonearningmembers = $this->post('occupationnonearningmembers'); + // public function saveOccupationNonEarningMembers_post() + // { + // $occupationnonearningmembers = $this->post('occupationnonearningmembers'); - if($occupationnonearningmembers['occupation_non_earning_member_id']) //Update Record - { - $where_condition_array = array('occupation_non_earning_member_id'=>$occupationnonearningmembers['occupation_non_earning_member_id']); + // if($occupationnonearningmembers['occupation_non_earning_member_id']) //Update Record + // { + // $where_condition_array = array('occupation_non_earning_member_id'=>$occupationnonearningmembers['occupation_non_earning_member_id']); - $result = $this->Common_Masters_Model->updateRecords($occupationnonearningmembers,'m_occupation_non_earning_members',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($occupationnonearningmembers,'m_occupation_non_earning_members',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($occupationnonearningmembers,'m_occupation_non_earning_members'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($occupationnonearningmembers,'m_occupation_non_earning_members'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of Occupation_non_earning_members Master */ + // /* End Of Occupation_non_earning_members Master */ - /* Type Of Activity Master */ + // /* Type Of Activity Master */ - public function getListOfTypeOfActivities_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_type_of_activity'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfTypeOfActivities_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_type_of_activity'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveTypeOfActivity_post() - { - $typeofactivity = $this->post('typeofactivity'); + // public function saveTypeOfActivity_post() + // { + // $typeofactivity = $this->post('typeofactivity'); - if($typeofactivity['type_of_activity_id']) //Update Record - { - $where_condition_array = array('type_of_activity_id'=>$typeofactivity['type_of_activity_id']); + // if($typeofactivity['type_of_activity_id']) //Update Record + // { + // $where_condition_array = array('type_of_activity_id'=>$typeofactivity['type_of_activity_id']); - $result = $this->Common_Masters_Model->updateRecords($typeofactivity,'m_type_of_activity',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($typeofactivity,'m_type_of_activity',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($typeofactivity,'m_type_of_activity'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($typeofactivity,'m_type_of_activity'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of Type Of Activity Master */ + // /* End Of Type Of Activity Master */ - /* Titles Master */ + // /* Titles Master */ - public function getListOfTitles_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_titles'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfTitles_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_titles'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveTitle_post() - { - $title = $this->post('title'); + // public function saveTitle_post() + // { + // $title = $this->post('title'); - if($title['title_id']) //Update Record - { - $where_condition_array = array('title_id'=>$title['title_id']); + // if($title['title_id']) //Update Record + // { + // $where_condition_array = array('title_id'=>$title['title_id']); - $result = $this->Common_Masters_Model->updateRecords($title,'m_titles',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($title,'m_titles',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($title,'m_titles'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($title,'m_titles'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of Titles Master */ + // /* End Of Titles Master */ - /* Relationships Master */ + // /* Relationships Master */ - public function getListOfRelationships_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_relationships'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfRelationships_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_relationships'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveRelationship_post() - { - $relationship = $this->post('relationship'); + // public function saveRelationship_post() + // { + // $relationship = $this->post('relationship'); - if($relationship['relationship_id']) //Update Record - { - $where_condition_array = array('relationships'=>$relationship['relationship_id']); + // if($relationship['relationship_id']) //Update Record + // { + // $where_condition_array = array('relationships'=>$relationship['relationship_id']); - $result = $this->Common_Masters_Model->updateRecords($relationship,'m_relationship',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($relationship,'m_relationship',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($relationship,'m_relationship'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($relationship,'m_relationship'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of Relationships Master */ + // /* End Of Relationships Master */ - /* Frequency Master */ + // /* Frequency Master */ - public function getListOfFrequencies_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_frequency'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfFrequencies_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_frequency'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveFrequency_post() - { - $frequency = $this->post('frequency'); + // public function saveFrequency_post() + // { + // $frequency = $this->post('frequency'); - if($frequency['frequency_id']) //Update Record - { - $where_condition_array = array('frequency_id'=>$frequency['frequency_id']); + // if($frequency['frequency_id']) //Update Record + // { + // $where_condition_array = array('frequency_id'=>$frequency['frequency_id']); - $result = $this->Common_Masters_Model->updateRecords($frequency,'m_frequency',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($frequency,'m_frequency',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($frequency,'m_frequency'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($frequency,'m_frequency'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of Frequency Master */ + // /* End Of Frequency Master */ - /* Customer Behaviour Master */ + // /* Customer Behaviour Master */ - public function getListOfCustomerBehaviours_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_customer_behaviour'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfCustomerBehaviours_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_customer_behaviour'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveCustomerBehaviour_post() - { - $customerbehaviour = $this->post('customerbehaviour'); + // public function saveCustomerBehaviour_post() + // { + // $customerbehaviour = $this->post('customerbehaviour'); - if($customerbehaviour['customer_behaviour_id']) //Update Record - { - $where_condition_array = array('customer_behaviour_id'=>$customerbehaviour['customer_behaviour_id']); + // if($customerbehaviour['customer_behaviour_id']) //Update Record + // { + // $where_condition_array = array('customer_behaviour_id'=>$customerbehaviour['customer_behaviour_id']); - $result = $this->Common_Masters_Model->updateRecords($customerbehaviour,'m_customer_behaviour',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($customerbehaviour,'m_customer_behaviour',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($customerbehaviour,'m_customer_behaviour'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($customerbehaviour,'m_customer_behaviour'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of Customer Behaviour Master */ + // /* End Of Customer Behaviour Master */ - /* Zonal/Regional Master */ + // /* Zonal/Regional Master */ - public function getListOfRegions_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_regions'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfRegions_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_regions'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveRegion_post() - { - $region = $this->post('region'); + // public function saveRegion_post() + // { + // $region = $this->post('region'); - if($region['region_id']) //Update Record - { - $where_condition_array = array('region_id'=>$region['region_id']); + // if($region['region_id']) //Update Record + // { + // $where_condition_array = array('region_id'=>$region['region_id']); - $result = $this->Common_Masters_Model->updateRecords($region,'m_regions',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($region,'m_regions',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($region,'m_regions'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($region,'m_regions'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of Zonal/Regional Master */ + // /* End Of Zonal/Regional Master */ - /* States Master */ + // /* States Master */ - public function getListOfStates_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_states'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfStates_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_states'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveState_post() - { - $state = $this->post('state'); + // public function saveState_post() + // { + // $state = $this->post('state'); - if($state['state_id']) //Update Record - { - $where_condition_array = array('state_id'=>$state['state_id']); + // if($state['state_id']) //Update Record + // { + // $where_condition_array = array('state_id'=>$state['state_id']); - $result = $this->Common_Masters_Model->updateRecords($state,'m_states',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($state,'m_states',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($state,'m_states'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($state,'m_states'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } - /* End Of States Master */ + // /* End Of States Master */ - /* City Master */ + // /* City Master */ - public function getListOfCites_get() - { - $result = $this->Common_Masters_Model->selectRecords('m_city'); - if(count($result) > 0) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NO_CONTENT; - $this->response($data,REST_Controller::HTTP_NO_CONTENT); - } - } + // public function getListOfCites_get() + // { + // $result = $this->Common_Masters_Model->selectRecords('m_city'); + // if(count($result) > 0) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NO_CONTENT; + // $this->response($data,REST_Controller::HTTP_NO_CONTENT); + // } + // } - public function saveCity_post() - { - $city = $this->post('city'); + // public function saveCity_post() + // { + // $city = $this->post('city'); - if($city['city_id']) //Update Record - { - $where_condition_array = array('city_id'=>$city['city_id']); + // if($city['city_id']) //Update Record + // { + // $where_condition_array = array('city_id'=>$city['city_id']); - $result = $this->Common_Masters_Model->updateRecords($city,'m_city',$where_condition_array); + // $result = $this->Common_Masters_Model->updateRecords($city,'m_city',$where_condition_array); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; - $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); - } - } - else // Insert Record - { - $result = $this->Common_Masters_Model->saveRecords($city,'m_city'); + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + // $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + // } + // } + // else // Insert Record + // { + // $result = $this->Common_Masters_Model->saveRecords($city,'m_city'); - if($result) - { - $data['dataStatus'] = true; - $data['status'] = REST_Controller::HTTP_OK; - $data['records'] = $result; - $this->response($data,REST_Controller::HTTP_OK); - } - else - { - $data['dataStatus'] = false; - $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; - $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); - } - } + // if($result) + // { + // $data['dataStatus'] = true; + // $data['status'] = REST_Controller::HTTP_OK; + // $data['records'] = $result; + // $this->response($data,REST_Controller::HTTP_OK); + // } + // else + // { + // $data['dataStatus'] = false; + // $data['status'] = REST_Controller::HTTP_SERVICE_UNAVAILABLE; + // $this->response($data,REST_Controller::HTTP_SERVICE_UNAVAILABLE); + // } + // } - } + // } @@ -971,7 +971,7 @@ class Common_Masters_Controller extends REST_Controller { - /* Branch Master */ + /* For Save,Update and Retrieve all Master Tables*/ public function getListOfMaster_post() @@ -1050,7 +1050,7 @@ class Common_Masters_Controller extends REST_Controller { - /* End Of Branch Master */ + /* End Of Save,Update and Retrieve all Master Tables */ diff --git a/api/application/controllers/User_Management_Controller.php b/api/application/controllers/User_Management_Controller.php index cec489c8..a3fe66e3 100644 --- a/api/application/controllers/User_Management_Controller.php +++ b/api/application/controllers/User_Management_Controller.php @@ -24,23 +24,128 @@ class User_Management_Controller extends REST_Controller { public function listAllUsers_get() { + $result = $this->User_Management_Model->$listAllUsers(); + if($result['data_status']) + { + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $result['data']; + $this->response($data,REST_Controller::HTTP_OK); + } + else + { + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $this->response($data,REST_Controller::HTTP_NO_CONTENT); + } } public function saveNewUser_post() { - echo "saveNewUser_post"; - $data = $this->post('data'); + $roles = ""; + $lender_hierarchy = ""; - //$file = $_FILES['myfile']; - print_r($data);//print_r($file); - } + if($this->post('roles')){ $roles = $this->post('roles'); } + + if($this->post('lender_hierarchy')){ $lender_hierarchy = $this->post('lender_hierarchy'); } + + + $records = $this->post('records'); + $roles = $this->post('roles'); + + $lender_hierarchy = $this->post('lender_hierarchy'); + + if($_FILES['profilepic']['tmp_name']) + { + + + $profilepic = $_FILES['profilepic']['tmp_name']; + $profilepicname = $_FILES['profilepic']['name']; + $profilepicname = strtolower($profilepicname); + $profilepics3path = ""; + + if(array_key_exists('fk_entity_id'),$records) + { + $entity_id = $records['fk_entity_id']; + if($entity_id == 1) //1 means sine_edge Profile + { + $profilepics3path = 'sineedge/'.$profilepicname; + } + else if($entity_id == 2)//1 means lender Profile + { + $profilepics3path = 'lender/'.$profilepicname; + } + else // else or 3 means vendor Profile + { + $profilepics3path = 'vendor/'.$profilepicname; + } + } + + $bucketname = PROFILEPICTUREBUCKETNAME; + $key = $profilepics3path; + $sourcefile = $profilepic; + + $data = array('bucket_name'=>$bucketname,'key'=>$key,'sourcefile'=>$sourcefile); + $s3result= $this->aws_s3->uploadFileToS3Bucket($data); + + if(is_object($s3result) && $s3result['ObjectURL'] != '' && [$s3result'@metadata']['statusCode'] == 200) + { + $records['profilepic'] = $profilepicname; + } + else + { + $records['profilepic'] = null; + } + + + + + + } + + $user_id = $this->User_Management_Model->saveRecords($recordrs,USERPROFILE);//insert user records and get userid + + if($roles != "") + { + foreach($roles as $role) + { + $role_array = array('user_role'=>$role['user_role'],'fk_userid'=>$user_id);//insert roles againest user + $this->User_Management_Model->saveRecords($role_array,USERPROFILEROLES); + } + } + + if($lender_hierarchy != "") + { + foreach($lender_hierarchy as $hierarchy) + { + $hierarchy = array('fk_hierarchy_id'=>$hierarchy['fk_hierarchy_id'],'fk_user_id'=>$user_id,'fk_createdby'=>$records['fk_createdby'],'createdon'=>$records['createdon']);//insert hierarchy againest lender type users + $this->User_Management_Model->saveRecords($hierarchy,USERPROFILEHIERARCHY); + } + } + + if($user_id != '' || $user_id != null) + { + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['record'] = $user_id; + $this->response($data,REST_Controller::HTTP_OK); + } + else + { + $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + $this->response($data,REST_Controller::HTTP_NOT_MODIFIED); + } + + + + + + + - public function updateExistUser_post() - { - - } - + } } \ No newline at end of file diff --git a/api/application/libraries/AWS_S3.php b/api/application/libraries/AWS_S3.php index f94650fa..38f69d8b 100644 --- a/api/application/libraries/AWS_S3.php +++ b/api/application/libraries/AWS_S3.php @@ -56,16 +56,24 @@ class AWS_S3 public function uploadFileToS3Bucket($data) { + $result = ""; + try { - $result = $this->S3->putObject([ - 'Bucket' => $data['bucket_name'], - 'Key' => $data['key'], - 'SourceFile' => $data['sourcefile'], - 'ContentType' => '*/*', - 'StorageClass' => 'STANDARD', - 'ACL'=>'public-read' - ]); - return $result; + $result = $this->S3->putObject([ + 'Bucket' => $data['bucket_name'], + 'Key' => $data['key'], + 'SourceFile' => $data['sourcefile'], + 'ContentType' => '*/*', + 'StorageClass' => 'STANDARD', + 'ACL'=>'public-read' + ]); + + } catch (AwsException $e) + { + $result = false;; + } + + return $result; } public function getSingleObjectInaBucket() diff --git a/api/application/models/Branch_model.php b/api/application/models/Branch_model.php index 7780894e..84ea6b9d 100644 --- a/api/application/models/Branch_model.php +++ b/api/application/models/Branch_model.php @@ -2,6 +2,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); +require_once APPPATH . '/libraries/SPARQ_Model.php'; class Branch_model extends SPARQ_Model { public function __construct() { diff --git a/api/application/models/User_Management_Model.php b/api/application/models/User_Management_Model.php index f5966453..1bd0cc0e 100644 --- a/api/application/models/User_Management_Model.php +++ b/api/application/models/User_Management_Model.php @@ -10,6 +10,35 @@ class User_Management_Model extends SPARQ_Model { } - + public function listAllUsers() + { + $result_data = array(); + + $this->select('USERPROFILE.userid, USERPROFILE.aws_name, USERPROFILE.first_name, USERPROFILE.last_name, USERPROFILE.email, USERPROFILE.alt_email, USERPROFILE.mobile_no, USERPROFILE.alt_mobile_no, USERPROFILE.addressline1, USERPROFILE.addressline2, USERPROFILE.profilepic, USERPROFILE.createdon, USERPROFILE.fk_createdby,USERPROFILE1.first_name,USERPROFILE1.last_name, USERPROFILE.updatedon, USERPROFILE.fk_updatedby,USERPROFILE2.first_name,USERPROFILE2.last_name, USERPROFILE.fk_entity_id,ENTITY.full_name, USERPROFILE.isactive, USERPROFILE.fk_designation,DESIGNATION.name, USERPROFILE.addressline3, USERPROFILE.fk_city,CITY.name, USERPROFILE.fk_state,STATE.name, USERPROFILE.pincode'); + $this->db->from(USERPROFILE.'as USERPROFILE'); + $this->db->join(ENTITY.'as ENTITY','USERPROFILE.fk_entity_id = ENTITY.entity_id and ENTITY.isactive = 1'); + $this->db->join(DESIGNATION.'as DESIGNATION','USERPROFILE.fk_designation = DESIGNATION.designation_id and DESIGNATION.isactive = 1'); + $this->db->join(STATE.'as STATE','USERPROFILE.fk_state = STATE.state_id and STATE.isactive = 1'); + $this->db->join(CITY.'as CITY','USERPROFILE.fk_city = CITY.city_id and CITY.isactive = 1'); + $this->db->join(USERPROFILE.'as USERPROFILE1','USERPROFILE.fk_createdby = USERPROFILE1.userid and USERPROFILE1.isactive = 1'); + $this->db->join(USERPROFILE.'as USERPROFILE2','USERPROFILE.fk_updatedby = USERPROFILE2.userid and USERPROFILE2.isactive = 1'); + //$this->db->where('USERPROFILE.isactive = 1'); + $result = $this->db->get()->result_array(); + + if(count($result) > 0 ) + { + $result_data['data_status'] = true; + $result_data['data'] = $result; + return $result_data; + + } + else + { + $result_data['data_status'] = false; + $result_data['data'] = null; + return $result_data; + } + + } } \ No newline at end of file