diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php index df4d8f5c..dd02756e 100644 --- a/app/Controllers/Emergencypurchaseorder.php +++ b/app/Controllers/Emergencypurchaseorder.php @@ -122,7 +122,7 @@ class Emergencypurchaseorder extends BaseController //This used to Create Service Purchase Order function addNewServicePurchaseOrder() { - + // print_r($this->request->getPost());die; $txtRowCount = $this->request->getPost('txtRowCount'); $POdt = $this->request->getPost('PODate'); $PODate = get_date_time_format($POdt); @@ -130,7 +130,7 @@ class Emergencypurchaseorder extends BaseController $DeliveryAddr = $this->request->getPost('DeliveryAddr'); $CostCenterName = $this->request->getPost('CostCenterName'); $DeliveryOption = $this->request->getPost('DateRange'); - $DeliverySchedule = ''; + $DeliverySchedule = $this->request->getPost('Scheduleby'); $Deliverydt = get_date_time_format($POdt); $txtsplservice = $this->request->getPost('txtSpecialservice'); @@ -141,9 +141,9 @@ class Emergencypurchaseorder extends BaseController $SpcialInstruction = $this->request->getPost('ScopeOfWork'); $RequistionComments = "Created Emergency Service PO"; - // $TotalOrderValueSummary = $this->request->getPost('TextTotalOrderValueSummaryService'); + $TotalOrderValueSummary = $this->request->getPost('TextTotalOrderValueSummaryService'); - $TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummaryService'); + // $TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummaryService'); //$POStatus = $this->request->getPost('TextStatus'); $CreateBy = $this->session->get('userId'); @@ -161,7 +161,7 @@ class Emergencypurchaseorder extends BaseController $comma_separated = explode(':', (string)$DeletedRow); - $BudgetType = $this->request->getPost('Budget'); + $BudgetType = $this->request->getPost('BudgetType'); $createddt = get_current_date_time(); //$PaymentTerms=$this->request->getPost('PaymentMethod'); @@ -209,6 +209,7 @@ class Emergencypurchaseorder extends BaseController // PO Master $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'ServiceWorkStatus' => $ServiceWorkStatus, 'POType' => $POType, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder); $file = $this->request->getFile('POFile'); + if($file !== null){ $requestfilename = $file->getName(); if (!empty($requestfilename)) { @@ -228,7 +229,7 @@ class Emergencypurchaseorder extends BaseController } - + } $POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $ServiceTypeOptions); $PONO = $POMaster ? $newPONO : ""; // if (count($POMaster) > 0) { @@ -376,7 +377,8 @@ class Emergencypurchaseorder extends BaseController } else { $this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO); } - return redirect()->route('purchaseorderListing'); + return true; + // return redirect()->route('purchaseorderListing'); } @@ -385,7 +387,7 @@ class Emergencypurchaseorder extends BaseController function addNewRevenuePurchaseOrder() { - + // print_r($this->request->getPost());die; $txtspl = $this->request->getPost('txtSpecial'); @@ -421,7 +423,7 @@ class Emergencypurchaseorder extends BaseController $SpcialInstruction = $this->request->getPost('txtSpcialInstruction'); $RequistionComments = "Created Emergency Revenue PO"; - $TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummary'); + $TotalOrderValueSummary = $this->request->getPost('TextTotalOrderValueSummaryService'); if ($txtspl == 0) { $POStatus = REQITEM_Emergency_PO_CREATED; @@ -436,7 +438,7 @@ class Emergencypurchaseorder extends BaseController $RowCount = $this->request->getPost('txtRowCount1'); - $BudgetType = $this->request->getPost('Budget'); + $BudgetType = $this->request->getPost('BudgetType'); //echo $RowCount; // $DeletedRow = $this->request->getPost('TextDeletedRowCount'); @@ -483,24 +485,29 @@ class Emergencypurchaseorder extends BaseController $newPONO = generate_po_number($lastPONO); $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'PORange' => $Local_Interstate, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'CapitalRange' => $Local_Interstate, 'PaymentOtherDescription' => $OtherPayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Offer_No' => $supplieroffno, 'Supplier_Reference' => $supplierreference, 'Other_Reference' => $otherreference, 'InsuranceNumber' => $InsuranceNumber, 'InsuranceStatus' => $insurancestatus, 'Fincap' => $fincap, 'POSubType' => $revenuetype, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder); $file = $this->request->getFile('POFiles'); - $requestfilename = $file->getName(); - if (!empty($requestfilename)) { - - if ($file->isValid() && !$file->hasMoved()) { - $path = ROOTPATH.'public/uploads/POfiles/'; - if(!is_dir($path)) { mkdir($path, 0777, true); } - if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) { - log_message('error', 'File already exists in the database'.$requestfilename); - $POList['POFile'] = NULL; + if($file !== null){ + $requestfilename = $file->getName(); + if (!empty($requestfilename)) { + + if ($file->isValid() && !$file->hasMoved()) { + $path = ROOTPATH.'public/uploads/POfiles/'; + if(!is_dir($path)) { mkdir($path, 0777, true); } + if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) { + log_message('error', 'File already exists in the database'.$requestfilename); + $POList['POFile'] = NULL; + }else{ + $file->move($path, $requestfilename); + $POList['POFile'] = $requestfilename; + } }else{ - $file->move($path, $requestfilename); - $POList['POFile'] = $requestfilename; + $POList['POFile'] = NULL; } - }else{ - $POList['POFile'] = NULL; + } - - } + }else{ + + } + // print_r($POList);die; $POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $revenuetype); $PONO = $POMaster ? $newPONO : ""; // $PONO = ''; @@ -862,7 +869,8 @@ class Emergencypurchaseorder extends BaseController $this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO); - return redirect()->route('purchaseorderListing'); + // return redirect()->route('purchaseorderListing'); + return true; // echo ""; // redirect('purchaseorder/PurchaseOrderList', 'refresh'); diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index d42d2092..d25e7e54 100644 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -114,7 +114,8 @@ class Purchaseorder extends BaseController $this->purchaseorder_model->UpdateRequistionStatus(); $data['POData'] = $this->purchaseorder_model->purchaseorderListing(); - + // echo "
";
+    // print_r($data['POData']);die;
     $this->global['pageTitle'] = 'Purchase Orders';
 
 
diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php
index a0f828cf..ccc6603f 100644
--- a/app/Models/Purchaseorder_model.php
+++ b/app/Models/Purchaseorder_model.php
@@ -788,6 +788,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	 */
 	function addPOMaster($POMaster, $POType, $revenuetype)
 		{
+			// print_r($POMaster);die;
 			try {
 				$this->db->transStart();
 				$builder = $this->db->table('t_purchaseorder_master');
@@ -1588,9 +1589,9 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
 			->join('t_requestion_master rmast', 'rmast.ReqNo=req.ReqNo')
 			//->join('t_costcenter_budget bud','bud.CostCenterCode = req.CostCenterCode and bud.BudgetType = rmast.ReqType')
 			->join('t_costcenter_master ccm', 'ccm.CostCenterCode = req.CostCenterCode', 'left')
-			->join('tbl_users tbl', 'rmast.createdby=tbl.userid')
-			->join('t_employee_details as emp', 'emp.empid=tbl.empid')
-			->join('t_departmentdetails as Dep', 'Dep.DEPCode=emp.Departmentcode');
+			->join('tbl_users tbl', 'rmast.createdby=tbl.userid', 'left')
+			->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left')
+			->join('t_departmentdetails as Dep', 'Dep.DEPCode=emp.Departmentcode', 'left');
 
 		// old Status Don't Deleted it.
 		// if ($type == 'APPROVAL') {
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index c6f6634b..799df48e 100644
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -32,6 +32,7 @@ if (!empty($INRSYMBOL)) {
 
 
 ?>
+
 
 
 
-
-
-

-    

-        
-        

-            
-            

-                

-                    

-                        

-                    

-                

-            

-            
-            
-            

-                

-                    

-                        

-                             'form-label-left CreatealterPO ', 'name'  => 'CreatealterPO', 'id'  => 'CreatealterPO');
-                            echo form_open(base_url() . '/purchaseorder/addalterPO/', $attributes);
-                            ?>
-
-                            

-                                

-                                    
-                                     'Select Request Type');
-
-                                    if (!empty($RequestType)) {
-
-                                        foreach ($RequestType as $RID) :
-                                            if ($RID->ConfigValue == "SERVICE" || $RID->ConfigValue == "REVENUE") {
-                                                $options[$RID->ConfigValue] =  $RID->ConfigValue;
-                                            }
-                                        endforeach;
-                                    }
-
-                                    echo form_dropdown('RequestType', $options, set_value('ConfigValue'), 'id="purpose"', 'class = "form-control select2"', 'required="true"');
-
-                                    ?>
-
-                                

-                                

-                                    
-                                     'POType', 'value' => set_value('POType', $ReqType), 'id' => 'POType',  'class' => 'form-control', 'readonly' => 'true');
-                                    echo form_input($data);
-                                    ?>
-                                

-                                

-                                    
-                                    

-                                         'Select Supplier');
-                                        //print_r(  $options);
-
-                                        if (!empty($Suplist)) {
-                                            foreach ($Suplist as $SID) :
-                                                $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
-                                            endforeach;
-                                        }
-
-                                        echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSupplier"', 'required="true"', 'class="form-control select2"');
-
-                                        ?>
-                                    

-                                

-                                

-                                    
-                                     'SupAddress', 'value' => set_value('SupAddress'), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
-                                    echo Form_textarea($data);
-                                    ?>
-                                

-                            

-                            

-