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

Issues Fixes : ps

Browse Source
This commit is contained in:
sanjeev.p 2021-08-24 13:15:15 +05:30
parent e6e14ad49d
commit 422a890e92
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/application/controllers/Dash_Board_Controller.php
View File

@ -133,7 +133,7 @@ class Dash_Board_Controller extends REST_Controller {
if($value['Allocated'] != "" && $value['Accepted'] == "") if($value['Allocated'] != "" && $value['Accepted'] == "")
{ {
$allocated_date = date_create($value['Allocated']); $allocated_date = date_create($value['Allocated']);
$accepted_date = $value['Accepted'] != "" ? date_create( $value['Accepted'] ) : date_create(date('y-m-d H:i:s')); $accepted_date = $value['Accepted'] != "" ? date_create( $value['Accepted'] ) : date_create(date('Y-m-d H:i:s'));
$diff = date_diff($allocated_date,$accepted_date); $diff = date_diff($allocated_date,$accepted_date);
$res_array[$key]['pdid'] = $value['PD']; $res_array[$key]['pdid'] = $value['PD'];

2
api/application/controllers/SMC_Credit_PD_Controller.php
View File

@ -642,7 +642,7 @@ class SMC_Credit_PD_Controller extends REST_Controller {
// { // {
$records['status'] = 'COMPLETED'; $records['status'] = 'COMPLETED';
$records['is_cus_link_disabled'] = 1; $records['is_cus_link_disabled'] = 1;
$records['completed_date'] = date('Y-m-d h:i:s'); $records['completed_date'] = date('Y-m-d H:i:s');
//echo 'final';die(); //echo 'final';die();
$id = $this->SMC_Credit_PD_Model->updateRecords($records,SMC_CREDIT_PD,array('smc_credit_pd' => $records['smc_credit_pd'])); $id = $this->SMC_Credit_PD_Model->updateRecords($records,SMC_CREDIT_PD,array('smc_credit_pd' => $records['smc_credit_pd']));

4
api/application/controllers/Sales_PD_Controller.php
View File

@ -209,7 +209,7 @@ class Sales_PD_Controller extends REST_Controller {
//$view_name = $sales_pd_data[0]['short_name'].'_'.$sales_pd_data[0]['abbr']; //$view_name = $sales_pd_data[0]['short_name'].'_'.$sales_pd_data[0]['abbr'];
$view_name = $sales_pd_data[0]['short_name'];if( $sales_pd_data[0]['abbr'] == 'MEQ'){ $view_name = $sales_pd_data[0]['abbr']; } $view_name = $sales_pd_data[0]['short_name'];if( $sales_pd_data[0]['abbr'] == 'MEQ'){ $view_name = $sales_pd_data[0]['abbr']; }
$html_content = $this->load->view('sale_pd_templates/'.$view_name,$view_data,true); $html_content = $this->load->view('sale_pd_templates/'.$view_name,$view_data,true);
// echo $html_content;die(); //echo $html_content;die();
$pdf_doc = $this->pdfgenerator->generate($html_content, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait"); $pdf_doc = $this->pdfgenerator->generate($html_content, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait");
//End of PDF Gen using DOM PDF //End of PDF Gen using DOM PDF
$output_file = $this->external_path ."/sales_pd/" . $sales_pd_id . "/temp.pdf"; $output_file = $this->external_path ."/sales_pd/" . $sales_pd_id . "/temp.pdf";
@ -661,7 +661,7 @@ class Sales_PD_Controller extends REST_Controller {
{ {
$records['status'] = 'COMPLETED'; $records['status'] = 'COMPLETED';
$records['is_cus_link_disabled'] = 1; $records['is_cus_link_disabled'] = 1;
$records['completed_date'] = date('Y-m-d h:i:s'); $records['completed_date'] = date('Y-m-d H:i:s');
//echo 'final';die(); //echo 'final';die();
$id = $this->Sales_PD_Model->updateRecords($records,SALES_PD_DATA,array('sales_pd_id' => $records['sales_pd_id'])); $id = $this->Sales_PD_Model->updateRecords($records,SALES_PD_DATA,array('sales_pd_id' => $records['sales_pd_id']));

4
api/application/hooks/waterMarkHook.php
View File

@ -9,9 +9,9 @@ class waterMarkHook
$CI =&get_instance(); $CI =&get_instance();
if($CI->router->class == 'PD_Controller' && ($CI->router->method == 'checkAfterResponse' || $CI->router->method == 'savePDPhotos')) if($CI->router->class == 'PD_Controller' && ($CI->router->method == 'checkAfterResponse' || $CI->router->method == 'savePDPhotos'))
{ {
$CI->load->helper('watermark'); // $CI->load->helper('watermark');
// $sourceFilePath = 'C:\Users\Venba\Pictures\1canvas.png'; // $sourceFilePath = 'C:\Users\Venba\Pictures\1canvas.png';
watermark::makeWatermark(); // watermark::makeWatermark();
} }