Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WATTER MARK RESLOVED

Browse Source
This commit is contained in:
Velz2020 2019-07-11 21:48:32 +05:30
parent aee1a3af35
commit f9c88069ef
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/application/controllers/PD_Controller.php
View File

@ -6147,7 +6147,9 @@ class PD_Controller extends REST_Controller {
fclose( $ifp );
// ################### start img water marking with text
$imagetobewatermark=imagecreatefrompng($output_file);
$imagetobewatermark = imagecreatefromstring(file_get_contents($output_file));
$location_watermarktext="Location: ".$doc['link'];
$font=APPPATH."docs/robold.ttf"; //metion font and it's location
$fontsize="7";
@ -6160,8 +6162,8 @@ class PD_Controller extends REST_Controller {
//###########image water marking with logo
$pd_logo = imagecreatefrompng(APPPATH.'docs/icon.png');
$curret_file = imagecreatefrompng($output_file);
$pd_logo = imagecreatefromstring(file_get_contents(APPPATH.'docs/icon.png'));
$curret_file = imagecreatefromstring(file_get_contents($output_file));
$sx = imagesx($curret_file);
$sy = imagesy($curret_file);
// imagecopyresized ( resource $dst_image , resource $src_image , int $dst_x , int $dst_y , int $src_x , int $src_y , int $dst_w , int $dst_h , int $src_w , int $src_h ) : bool
@ -7089,10 +7091,14 @@ class PD_Controller extends REST_Controller {
$finance_form_photo_count = isset($pd_images[14]) ? count($pd_images[14]) : 0;
//print_r($finance_form);die();
//print_r($pd_images[14]);die();
if(! (isset($finance_form['is_financial_statements']) && strcasecmp($finance_form['is_financial_statements'],'yes') && !($finance_form_photo_count)) )
if(isset($finance_form['is_financial_statements']))
{
$incomplete_details[] = 'Financial Section - Financial Images Not captured';
if(!strcasecmp($finance_form['is_financial_statements'],'yes') && !($finance_form_photo_count))
{
$incomplete_details[] = 'Financial Section - Financial Images Not captured';
}
}
}
#####End of Finance Form Questions########

6
api/application/helpers/InlinePhotoTransform_helper.php
View File

@ -61,7 +61,7 @@ class INLINEPHOTOTRANSFORM
fclose( $ifp );
//echo mime_content_type($output_file);
// ################### start img water marking with text
$imagetobewatermark=imagecreatefromjpeg($output_file);
$imagetobewatermark=imagecreatefromstring(file_get_contents(($output_file));
$location_watermarktext="Location: ".$pd_details[0]['start_location'];
$font=APPPATH."docs/robold.ttf"; //metion font and it's location
$fontsize="7";
@ -74,8 +74,8 @@ class INLINEPHOTOTRANSFORM
//###########image water marking with logo
$pd_logo = imagecreatefrompng(APPPATH.'docs/icon.png');
$curret_file = imagecreatefrompng($output_file);
$pd_logo = imagecreatefromstring(file_get_contents(APPPATH.'docs/icon.png'));
$curret_file = imagecreatefromstring(file_get_contents($output_file));
$sx = imagesx($curret_file);
$sy = imagesy($curret_file);
// imagecopyresized ( resource $dst_image , resource $src_image , int $dst_x , int $dst_y , int $src_x , int $src_y , int $dst_w , int $dst_h , int $src_w , int $src_h ) : bool

2
api/application/helpers/pdalerts_helper.php
View File

@ -39,7 +39,7 @@ class PDALERTS
$CI->db->JOIN(PDAPPLICANTSDETAILS." as PDAPPLICANTSDETAILS","PDTRIGGER.pd_id = PDAPPLICANTSDETAILS.fk_pd_id AND PDAPPLICANTSDETAILS.applicant_type = 1",'LEFT');
$CI->db->JOIN(USERNOTIFICATIONTOKENS." as PDOFFICER","PDTRIGGER.fk_pd_allocated_to = PDOFFICER.fk_user_id",'LEFT');
$CI->db->JOIN(USERNOTIFICATIONTOKENS." as PDEXECUTIVE","PDTRIGGER.executive_id = PDEXECUTIVE.fk_user_id",'LEFT');
$CI->db->JOIN(USERNOTIFICATIONTOKENS." as CENTRALPDOFFICERTOKEN","PDTRIGGER.central_pd_officer_id = CENTRALPDOFFICERTOKEN.fk_userid",'LEFT');
$CI->db->JOIN(USERNOTIFICATIONTOKENS." as CENTRALPDOFFICERTOKEN","PDTRIGGER.central_pd_officer_id = CENTRALPDOFFICERTOKEN.fk_user_id",'LEFT');
$CI->db->WHERE("PDTRIGGER.pd_id",$pdid);
$core_details = $CI->db->GET()->result_array();
//print_r($core_details);