Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

app/Controllers/Companycontroller.php

@@ -132,29 +132,31 @@ class Companycontroller extends BaseController
 		// {
 
 
+		$file=$this->request->getFile('files');
+
 		$PictureName = $this->request->getPost('Image');
 		
 		$ModifyPictureName = $this->request->getPost('ModifyImage');
 		$Picture = "";
-		$file = $this->request->getFile('ModifyImage');
+		$ProfilePicPhoto = $this->request->getFile('photo');
 		
 
 		if ($PictureName != '') {
-			if ($file !== null && $file->isValid() && !$file->hasMoved()) {
+			if ($ProfilePicPhoto !== null && $ProfilePicPhoto->isValid() && !$ProfilePicPhoto->hasMoved()) {
 				$path = ROOTPATH.'public/uploads/images/';
                 if(!is_dir($path)) { mkdir($path, 0777, true); }
-                $Picture = $file->getName();                        
-                $file->move($path,$Picture);
+                $Picture = $ProfilePicPhoto->getName();                        
+                $ProfilePicPhoto->move($path,$Picture);
 			}else{
 				$Picture = $PictureName;
 			}
 		}
 		else {
-			if ($file !== null && $file->isValid() && !$file->hasMoved()) {
+			if ($ProfilePicPhoto !== null && $ProfilePicPhoto->isValid() && !$ProfilePicPhoto->hasMoved()) {
 				$path = ROOTPATH.'public/uploads/images/';
                 if(!is_dir($path)) { mkdir($path, 0777, true); }
-                $Picture = $file->getName();                        
-                $file->move($path,$Picture);
+                $Picture = $ProfilePicPhoto->getName();                        
+                $ProfilePicPhoto->move($path,$Picture);
             }
 		}
 		
@@ -202,11 +204,21 @@ class Companycontroller extends BaseController
 		$ID = $this->request->getPost('ID');
 		//$createdDate=$this->request->getPost('createdDate');
 
-		//$Company = array('CompID'=>$CompID,'CompanyName'=>$CompanyName,'Address'=>$Address,'ContactNumber'=>$ContactNumber,'AlternateContactNumber'=>$AlternateContactNumber,'EmailAddress'=>$EmailAddress,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNO'=>$GSTNO,'GSTRange'=>$GSTRange,'UANumber'=>$UANumber,'PaymentTerms'=>$Payment ,'PaymentDays'=>$PaymentDays ,'PayableAT'=>$PayableAT ,'Createdby'=>$createdby,'ProfilePic'=>$Picture,'Exiseregistration'=>$Exiseregistration,'CollectrateAddress'=>$CollectrateAddress,'FiscalYearStartOn'=>$financialstart,'FiscalYearEndsOn'=> $financialend); 
-		$Company = array('CompID' => $CompID, 'CompanyName' => $CompanyName, 'Address' => $Address, 'ContactNumber' => $ContactNumber, 'AlternateContactNumber' => $AlternateContactNumber, 'EmailAddress' => $EmailAddress, 'TIN' => $TIN, 'PAN' => $PAN, 'GSTNO' => $GSTNO, 'GSTRange' => $GSTRange, 'UANumber' => $UANumber, 'MSME' => $MSME , 'Createdby' => $createdby, 'ProfilePic' => $Picture, 'Exiseregistration' => $Exiseregistration, 'CollectrateAddress' => $CollectrateAddress, 'FiscalYearStartOn' => $financialstart, 'FiscalYearEndsOn' => $financialend, 'paymentID' => $PaymentId, 'companyWebsite' => $companywebsite, 'UpdatedBY' => $updatedby, 'Updatedon' => $updateddt);
+		//$Company = array('CompID'=>$CompID,'CompanyName'=>$CompanyName,'Address'=>$Address,'ContactNumber'=>$ContactNumber,
+		//'AlternateContactNumber'=>$AlternateContactNumber,'EmailAddress'=>$EmailAddress,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNO'=>$GSTNO,
+		//'GSTRange'=>$GSTRange,'UANumber'=>$UANumber,'PaymentTerms'=>$Payment ,'PaymentDays'=>$PaymentDays ,'PayableAT'=>$PayableAT ,
+		//'Createdby'=>$createdby,'ProfilePic'=>$Picture,'Exiseregistration'=>$Exiseregistration,'CollectrateAddress'=>$CollectrateAddress,
+		//'FiscalYearStartOn'=>$financialstart,'FiscalYearEndsOn'=> $financialend); 
+		$Company = array('CompID' => $CompID, 'CompanyName' => $CompanyName, 'Address' => $Address, 'ContactNumber' => $ContactNumber,
+		 'AlternateContactNumber' => $AlternateContactNumber, 'EmailAddress' => $EmailAddress, 'TIN' => $TIN, 'PAN' => $PAN,
+		  'GSTNO' => $GSTNO, 'GSTRange' => $GSTRange, 'UANumber' => $UANumber, 'MSME' => $MSME , 'Createdby' => $createdby, 
+		  'ProfilePic' => $Picture, 'Exiseregistration' => $Exiseregistration, 'CollectrateAddress' => $CollectrateAddress, 
+		  'FiscalYearStartOn' => $financialstart, 'FiscalYearEndsOn' => $financialend, 'paymentID' => $PaymentId, 
+		  'companyWebsite' => $companywebsite, 'UpdatedBY' => $updatedby, 'Updatedon' => $updateddt);
 
-		if (!empty($file)) {
-			$myfile = array('CompID' => $CompID, 'filename' => $file, 'ID' => $ID, 'filedescription' => $filedescription1, 'createdDate' => $createddt);
+		if (!empty($file) && $file->getSize()){
+			$fileName = $file->getName();
+			$myfile = array('CompID' => $CompID, 'filename' => $fileName, 'uploadedby' => $ID, 'filedescription' => $filedescription1, 'createdDate' => $createddt);
 
 			$result2 = $this->companydetailsmodel->filedetails($myfile);
 		}

app/Models/Companydetails_model.php

@@ -78,9 +78,9 @@ class Companydetails_model extends Model
 	function companylisting()
 	{
 		$builder = $this->db->table('t_company_details com')
-			->select('com.*,emp.firstname,pmt.PaymentTerms')
+			->select('com.*,emp.firstname,pmt.PaymentTerms,tbl.userId')
 			->join('t_paymentterms pmt', 'com.paymentID = pmt.PaymentID', 'left')
-			->join('tbl_users as tbl', ' com.createdby = tbl.userid', 'left')
+			->join('tbl_users as tbl', ' com.Createdby = tbl.userId', 'left')
 			->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left');
 		$query = $builder->get();
 		$result = $query->getResult();