From 1f1a966ebd54b6d0eb1c505d671a7a8d8a3def89 Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Fri, 12 Jun 2020 23:31:01 +0530 Subject: [PATCH] TELE SALES PD REPORT --- api/application/config/constants.php | 1 + .../controllers/Sales_PD_Controller.php | 4 ++-- .../helpers/authorization_helper.php | 2 +- .../views/sale_pd_templates/MWISE.php | 17 +++++++++++++---- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/api/application/config/constants.php b/api/application/config/constants.php index d2c6a175..b88a2242 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -91,6 +91,7 @@ defined('ROUTE_LOGIN_X') OR define('ROUTE_LOGIN_X', '(getPDReportHTML/:an defined('ROUTE_LOGIN_Y') OR define('ROUTE_LOGIN_Y', '(getPDReportPDFpreview/:any/:any)'); // no errors defined('ROUTE_LOGIN_Z') OR define('ROUTE_LOGIN_Z', 'getSalesPDImgDataCusLink'); // no errors defined('ROUTE_LOGIN_W') OR define('ROUTE_LOGIN_W', 'saveSalesPDImage'); // no errors +defined('ROUTE_LOGIN_V') OR define('ROUTE_LOGIN_V', 'generateSatelliteImg'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN','getFullPDDetails'); // no errors /*********************AWS resources Constants*************************************************/ diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 2c784b42..635f8641 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -167,7 +167,7 @@ class Sales_PD_Controller extends REST_Controller { $where_condition_array = array('SALES_PD_DATA.sales_pd_id' => $sales_pd_id); $sales_pd_data = $this->Sales_PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array); - //print_r($sales_pd_data);//die(); + //print_r($sales_pd_data);die(); if($sales_pd_data) { @@ -987,7 +987,7 @@ public function filterSalesPDList_post() { //print_r($sales_pd_img_data); //sales tele pd img structure array - $imgs = array('selfie_with_person_met' => array('is_multiple' => 0,'img_name' => 'Selfie With Person Met'),'name_board_seen' => array('is_multiple' => 1,'img_name' => 'Business Name Board'),'stock_image' => array('is_multiple' => 1,'img_name' => 'Stock Images'),'workplace_interior_image' => array('is_multiple' => 1,'img_name' => 'Work Place Interior')); + $imgs = array('selfie_with_person_met' => array('is_multiple' => 0,'img_name' => 'Selfie of the person contacted'),'name_board_seen' => array('is_multiple' => 1,'img_name' => 'Business Name Board'),'stock_image' => array('is_multiple' => 1,'img_name' => 'Stock Images'),'workplace_interior_image' => array('is_multiple' => 1,'img_name' => 'Work Place Interior')); $img_data = array(); if(count($sales_pd_img_data)) diff --git a/api/application/helpers/authorization_helper.php b/api/application/helpers/authorization_helper.php index d4bf1c0e..b451339a 100644 --- a/api/application/helpers/authorization_helper.php +++ b/api/application/helpers/authorization_helper.php @@ -72,7 +72,7 @@ class AUTHORIZATION } - if( $routingName == ROUTE_LOGIN_X || $routingName == ROUTE_LOGIN_Y || $routingName == ROUTE_LOGIN_Z || $routingName == ROUTE_LOGIN_W) + if( $routingName == ROUTE_LOGIN_X || $routingName == ROUTE_LOGIN_Y || $routingName == ROUTE_LOGIN_Z || $routingName == ROUTE_LOGIN_W || $routingName == ROUTE_LOGIN_V) { return true; } diff --git a/api/application/views/sale_pd_templates/MWISE.php b/api/application/views/sale_pd_templates/MWISE.php index e25cb15e..177451b0 100644 --- a/api/application/views/sale_pd_templates/MWISE.php +++ b/api/application/views/sale_pd_templates/MWISE.php @@ -162,11 +162,11 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - Name of Person Met during visit + - Address Visited + @@ -474,12 +474,15 @@ if(isset($section6)) Final Remarks of Sales officer + + Business activity seen during visit (Yes / No) Location of workplace suits the business (Yes/No) + Overall Assessment (Positive / Negative) > @@ -496,11 +499,16 @@ if(isset($section6))

Satellite Image of PD Location

-

GPS Coordinates of location where PD Visit was done :

- PD Visted Location Satellite Image +

GPS Coordinates of location where PD Visit was done :

+ + PD Visted Location Satellite Image + Due to location access not provided by loan applicant Geo coordinates on photographs and Satellite image of PD location is not shown

';} + ?> 'Selfie with person met','approach_to_pd_location' => 'Approach to pd location','name_board_seen' => 'Name board seen', 'stock_image' => 'Stock image','workplace_interior_image' => 'Workplace interior image','satellite1' => 'satellite'); + if($master[0]['sales_pd_type'] == 2){ $photo_names['selfie_with_person_met'] = 'Selfie of the person contacted';} //echo count($section9);die(); //print_r(array_keys($section9));die(); $tot_rows = ceil(count($section9) / 3); @@ -528,6 +536,7 @@ if(isset($section6)) if(isset($section9[$i])) { + echo ' '.$section9[$i]['img_name'].'
'.$photo_names [ $section9[$i]['img_name'] ].''; }