diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index 91157ab2..01d73cf6 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -1870,6 +1870,7 @@ public function assignPDTempalate($data)
public function listLessPDDetails_get()
{
+ //print_r($_GET);die();
//check empty query params
$this->checkEmptyQueryParams($_GET);
$page = 0;$limit = 1000;$sort = 'DESC';$pdofficerid = "";$datetype = "";$fdate ="";$tdate ="";
@@ -2220,7 +2221,7 @@ public function assignPDTempalate($data)
for ($i = 0; $i < 5; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)];
}
- $temp_file_name = $randomString.date('Y-m-d-H:i:s').'.jpeg';
+ $temp_file_name = $randomString.date('Y-m-d-H-i-s').'.jpeg';
$ifp = fopen( $output_file, 'wb' );
@@ -2319,7 +2320,7 @@ public function assignPDTempalate($data)
for ($i = 0; $i < 5; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)];
}
- $temp_file_name = $randomString.date('Y-m-d-H:i:s').'.jpeg';
+ $temp_file_name = $randomString.date('Y-m-d-H-i-s').'.jpeg';
$ifp = fopen( $output_file, 'wb' );
@@ -4785,8 +4786,9 @@ public function getPDFormDetailsJSON_post()
foreach($all_pd_images as $image)
{
$temp_dir_name = isset($form_name[ $image['fk_form_id'] ]) ? $form_name[ $image['fk_form_id'] ] : 'Common';
-
- $this->zip->add_data('pdimages/'.$image['pd_document_name'],file_get_contents($image['doc_url']));
+ //replace colon with hyphen in doc name
+ $doc_name = str_replace(':', '-', $image['pd_document_name']);
+ $this->zip->add_data('pdimages/'.$doc_name,file_get_contents($image['doc_url']));
}
$temp_path = $main_applicant_name.'_'.$pdid.'_'.'pd_images.zip';
@@ -6986,7 +6988,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
for ($i = 0; $i < 5; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)];
}
- $temp_file_name = $randomString.date('Y-m-d-H:i:s').'.jpeg';
+ $temp_file_name = $randomString.date('Y-m-d-H-i-s').'.jpeg';
$ifp = fopen( $output_file, 'wb' );
@@ -7092,7 +7094,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
for ($i = 0; $i < 5; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)];
}
- $temp_file_name = $randomString.date('Y-m-d-H:i:s').'.jpeg';
+ $temp_file_name = $randomString.date('Y-m-d-H-i-s').'.jpeg';
$ifp = fopen( $output_file, 'wb' );
diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php
index 923f61a5..d956ec97 100644
--- a/api/application/controllers/Sales_PD_Controller.php
+++ b/api/application/controllers/Sales_PD_Controller.php
@@ -191,6 +191,7 @@ class Sales_PD_Controller extends REST_Controller {
$view_data['section9'] = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name !=' => 'satellite'),SALEPD_DOCS);
$view_data['satellite_image'] = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name' => 'satellite'),SALEPD_DOCS);
$view_data['product_id'] = $sales_pd_data[0]['product_id'];
+ $view_data['geo_location'] = $sales_pd_data[0]['geo_location'];
//print_r($this->db->last_query());die();
//$view_name = $sales_pd_data[0]['short_name'].'_'.$sales_pd_data[0]['abbr'];
$view_name = $sales_pd_data[0]['short_name'];
diff --git a/api/application/views/sale_pd_templates/MWISE.php b/api/application/views/sale_pd_templates/MWISE.php
index 99820d0a..d1333e47 100644
--- a/api/application/views/sale_pd_templates/MWISE.php
+++ b/api/application/views/sale_pd_templates/MWISE.php
@@ -98,7 +98,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');