From 422a890e92caeb934dab0103678699e7ec9a1075 Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Tue, 24 Aug 2021 13:15:15 +0530 Subject: [PATCH] Issues Fixes : ps --- api/application/controllers/Dash_Board_Controller.php | 2 +- api/application/controllers/SMC_Credit_PD_Controller.php | 2 +- api/application/controllers/Sales_PD_Controller.php | 4 ++-- api/application/hooks/waterMarkHook.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/application/controllers/Dash_Board_Controller.php b/api/application/controllers/Dash_Board_Controller.php index 6b493c5a..d400d895 100644 --- a/api/application/controllers/Dash_Board_Controller.php +++ b/api/application/controllers/Dash_Board_Controller.php @@ -133,7 +133,7 @@ class Dash_Board_Controller extends REST_Controller { if($value['Allocated'] != "" && $value['Accepted'] == "") { $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); $res_array[$key]['pdid'] = $value['PD']; diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php index acfdcdf9..532e9e15 100644 --- a/api/application/controllers/SMC_Credit_PD_Controller.php +++ b/api/application/controllers/SMC_Credit_PD_Controller.php @@ -642,7 +642,7 @@ class SMC_Credit_PD_Controller extends REST_Controller { // { $records['status'] = 'COMPLETED'; $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(); $id = $this->SMC_Credit_PD_Model->updateRecords($records,SMC_CREDIT_PD,array('smc_credit_pd' => $records['smc_credit_pd'])); diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 6a5af7d5..6b5ca6a3 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -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'];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); - // echo $html_content;die(); + //echo $html_content;die(); $pdf_doc = $this->pdfgenerator->generate($html_content, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait"); //End of PDF Gen using DOM 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['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(); $id = $this->Sales_PD_Model->updateRecords($records,SALES_PD_DATA,array('sales_pd_id' => $records['sales_pd_id'])); diff --git a/api/application/hooks/waterMarkHook.php b/api/application/hooks/waterMarkHook.php index 39c47863..ec48b301 100644 --- a/api/application/hooks/waterMarkHook.php +++ b/api/application/hooks/waterMarkHook.php @@ -9,9 +9,9 @@ class waterMarkHook $CI =&get_instance(); 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'; - watermark::makeWatermark(); + // watermark::makeWatermark(); }