RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-08-31 11:37:25 +00:00
commit d768a9dbcd
7 changed files with 1566 additions and 2485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/Controllers/Emergencypurchaseorder.php
View File

@ -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 "<script>alert('You Have Successfully created the Purchase order! $PONO');</script>";
// redirect('purchaseorder/PurchaseOrderList', 'refresh');

3
app/Controllers/Purchaseorder.php
View File

@ -114,7 +114,8 @@ class Purchaseorder extends BaseController
$this->purchaseorder_model->UpdateRequistionStatus();
$data['POData'] = $this->purchaseorder_model->purchaseorderListing();
// echo "<pre>";
// print_r($data['POData']);die;
$this->global['pageTitle'] = 'Purchase Orders';

7
app/Models/Purchaseorder_model.php
View File

@ -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') {

3963
app/Views/alterpurchaseorder.php
View File

File diff suppressed because it is too large Load Diff

4
app/Views/includes/new_footer.php
View File

@ -25,8 +25,8 @@
<!-- END wrapper -->
<!-- Right bar overlay-->
<div class="rightbar-overlay"></div>
<!-- Vendor js -->
<script src="<?php echo base_url(); ?>public/new_assets/js/vendor.min.js"></script>

12
app/Views/includes/new_header.php
View File

@ -88,7 +88,7 @@
top: 7px;
}
/* Select2 Height End */
/* .navbar-custom{
.navbar-custom{
height: 55px;
}
.logo-box .logo {
@ -106,13 +106,13 @@
}
.topnav .navbar-nav .nav-link{
line-height: 15px;
} */
}
.navbar-custom {
background-color: #4f7c97 !important;
}
th{
/* th{
background-color: #ddd !important;
}
} */
.btn.btn-secondary.buttons-html5 , .btn.btn-secondary.buttons-print{
border: 1px solid grey;
border-radius: 4px !important;
@ -348,10 +348,10 @@
<a href="index.html" class="logo logo-light text-center">
<span class="logo-sm">
<img src="<?php echo base_url(); ?>public/new_assets/images/RI.png" alt="" height="24">
<img src="<?php echo base_url(); ?>public/new_assets/images/RI.png" alt="" height="30">
</span>
<span class="logo-lg">
<img src="<?php echo base_url(); ?>public/new_assets/images/RESICO (2).png" alt="" height="20">
<img src="<?php echo base_url(); ?>public/new_assets/images/RESICO (2).png" alt="" height="30">
</span>
</a>
</div>

2
system/Helpers/form_helper.php
View File

@ -267,6 +267,8 @@ if (! function_exists('form_dropdown')) {
*/
function form_dropdown($data = '', $options = [], $selected = [], $extra = ''): string
{
$defaults = [];
if (is_array($data)) {
if (isset($data['selected'])) {