diff --git a/application/controllers/CostCenter.php b/application/controllers/CostCenter.php index 362d638c..b2134ba3 100644 --- a/application/controllers/CostCenter.php +++ b/application/controllers/CostCenter.php @@ -28,7 +28,8 @@ class CostCenter extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Cost Details'; + //$this->global['pageTitle'] = 'Resico : Cost Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Cost Details'; $this->loadViews("costListing", $this->global, NULL , NULL); } @@ -40,7 +41,8 @@ class CostCenter extends BaseController $data['userRecords'] = $this->costcenter_model->CostListing(); - $this->global['pageTitle'] = 'Resico : Cost List'; + //$this->global['pageTitle'] = 'Resico : Cost List'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Cost List'; $this->loadViews("costListing", $this->global, $data, NULL); } @@ -59,7 +61,8 @@ class CostCenter extends BaseController $data['FiscalYear'] = $this->costcenter_model->getFiscalYear(); - $this->global['pageTitle'] = 'Resico : Add Cost Center'; + //$this->global['pageTitle'] = 'Resico : Add Cost Center'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Cost Center'; $this->loadViews("addCostCenter", $this->global,$data, NULL); @@ -169,7 +172,8 @@ class CostCenter extends BaseController $data['BudYear'] = $this->costcenter_model->GetBudgetYear($CostCenterID); $data['FiscalYear'] = $this->costcenter_model->getFiscalYear(); - $this->global['pageTitle'] = 'Resico : Edit Cost'; + //$this->global['pageTitle'] = 'Resico : Edit Cost'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Cost'; $this->loadViews("editCostCenter", $this->global, $data,NULL); } @@ -333,7 +337,8 @@ class CostCenter extends BaseController $data['Cost'] = $this->costcenter_model->getuserinfo($CostCenterID); - $this->global['pageTitle'] = 'Resico : View Cost Details'; + //$this->global['pageTitle'] = 'Resico : View Cost Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : View Cost Details'; $this->loadViews("viewcost", $this->global, $data,NULL); @@ -470,7 +475,8 @@ class CostCenter extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/MRIRcontroller.php b/application/controllers/MRIRcontroller.php index 3ece1086..6feb5e83 100644 --- a/application/controllers/MRIRcontroller.php +++ b/application/controllers/MRIRcontroller.php @@ -31,7 +31,8 @@ class MRIRcontroller extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : View material inspection report'; + //$this->global['pageTitle'] = 'Resico : View material inspection report'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : View material inspection report'; $this->loadViews("viewmaterialinspectionreport", $this->global,NULL , NULL); } @@ -40,7 +41,8 @@ class MRIRcontroller extends BaseController */ function materialinspectionreport($mrir='',$IGRNO='') { - $this->global['pageTitle'] = 'Resico : Material Inspection Report'; + //$this->global['pageTitle'] = 'Resico : Material Inspection Report'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Material Inspection Report'; $this->load->model('mrir_model'); @@ -92,7 +94,8 @@ class MRIRcontroller extends BaseController */ public function viewmrirforbilling() { - $this->global['pageTitle'] = 'Resico : Billing '; + //$this->global['pageTitle'] = 'Resico : Billing '; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Billing '; $data['Billing'] = $this->mrir_model->view_mrir_Billing(); $this->loadViews("viewmrirforbilling", $this->global,$data , NULL); } @@ -102,7 +105,8 @@ class MRIRcontroller extends BaseController */ public function viewmMaterialDistributionList() { - $this->global['pageTitle'] = 'Resico : Distribution list '; + //$this->global['pageTitle'] = 'Resico : Distribution list '; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Distribution list '; $data['Distribution'] = $this->mrir_model->ViewDistributionList(); $data['status'] = $this->mrir_model->getStatus(); $this->loadViews("MaterialIssueList", $this->global,$data , NULL); @@ -118,8 +122,8 @@ class MRIRcontroller extends BaseController $data['IGRDetails'] = $this->mrir_model->get_IGR($IgrNo,$IgrItemno); - $this->global['pageTitle'] = 'Resico: IGR Details '; - + // $this->global['pageTitle'] = 'Resico: IGR Details '; + $this->global['pageTitle'] = $this->global['CompanyName'].' : IGR Details '; $this->loadViews("materialinspectionreport", $this->global, $data,NULL); } @@ -130,7 +134,8 @@ class MRIRcontroller extends BaseController function viewinwardgateregister() { - $this->global['pageTitle'] = 'Resico : View Inward Gate Register'; + // $this->global['pageTitle'] = 'Resico : View Inward Gate Register'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : View Inward Gate Register'; $data['IGR']= $this->mrir_model->ViewigrListing(); @@ -145,7 +150,8 @@ class MRIRcontroller extends BaseController $this->load->model('mrir_model'); $data['viewmrirdatas'] = $this->mrir_model-> view_mrir(); - $this->global['pageTitle'] = 'Resico : View Material Inspection Report'; + //$this->global['pageTitle'] = 'Resico : View Material Inspection Report'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : View Material Inspection Report'; $this->loadViews("viewmaterialinspectionreport", $this->global,$data,NULL); } @@ -160,7 +166,8 @@ class MRIRcontroller extends BaseController $data['MRIRDetails'] = $this->mrir_model->edit_mrir($MrirNo); - $this->global['pageTitle'] = 'Resico : Edit Material Inspection Report'; + //$this->global['pageTitle'] = 'Resico : Edit Material Inspection Report'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Material Inspection Report'; $this->loadViews("Editmaterialinspectionreport", $this->global,$data,NULL); @@ -404,7 +411,8 @@ class MRIRcontroller extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } } diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php index bb88f85f..1b224b0f 100644 --- a/application/controllers/amendmentpurchaseorder.php +++ b/application/controllers/amendmentpurchaseorder.php @@ -32,7 +32,8 @@ class amendmentpurchaseorder extends BaseController $this->load->library('pagination'); $forwhat='amendment'; $data['POData'] = $this->purchaseorder_model->purchaseorderListing($forwhat); - $this->global['pageTitle'] = 'Resico : Amendment Purchase Order'; + //$this->global['pageTitle'] = 'Resico : Amendment Purchase Order'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Amendment Purchase Order'; $this->loadviews('AmendPOlist',$this->global,$data,NULL); } @@ -115,7 +116,8 @@ class amendmentpurchaseorder extends BaseController $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO); $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO); $data['WorkStatus']=$this->purchaseorder_model->getStatus(7); - $this->global['pageTitle'] = 'Resico : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Edit Service Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("editServiceAmendPO", $this->global, $data, NULL); } else if($ReqType == REVENUE) @@ -124,7 +126,8 @@ class amendmentpurchaseorder extends BaseController $data['POSTATUS']=$this->purchaseorder_model->GetPOStatus($PONO); $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO); $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO); - $this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Revenue Purchase order form'; $this->loadViews("editRevenueAmendPO", $this->global, $data, NULL); } else if($ReqType == IMPORT) @@ -163,7 +166,8 @@ class amendmentpurchaseorder extends BaseController $data['unicode']=$unicode; $data['currencycode']=$currencycode; - $this->global['pageTitle'] = 'Resico : Edit Import Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Edit Import Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Import Purchase order form'; $this->loadViews("editImportAmendPO", $this->global, $data, NULL); } else if($ReqType == CAPITAL) @@ -210,7 +214,8 @@ class amendmentpurchaseorder extends BaseController $data['Currency']=$this->purchaseorder_model->GetCurrencytype(); } - $this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Capital Purchase order form'; $this->loadViews("editCapitalAmendPO", $this->global, $data, NULL); } diff --git a/application/controllers/assetdetails.php b/application/controllers/assetdetails.php index 16f0db55..34e0c1bf 100644 --- a/application/controllers/assetdetails.php +++ b/application/controllers/assetdetails.php @@ -28,7 +28,8 @@ class assetdetails extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Asset Details'; + $this->global['pageTitle'] = 'Resico : Asset Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("assetListing", $this->global, NULL , NULL); } @@ -41,6 +42,7 @@ class assetdetails extends BaseController $this->load->model('assetdetails_model'); $data['userRecords'] = $this->assetdetails_model->assetListing(); $this->global['pageTitle'] = 'Resico : Asset List'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("assetListing", $this->global, $data, NULL); } @@ -53,7 +55,8 @@ class assetdetails extends BaseController $data['AssetStatus'] = $this->assetdetails_model->getConfigValue('C015'); $data['po'] = $this->assetdetails_model->getPO(); - $this->global['pageTitle'] = 'Resico : Add Asset'; + $this->global['pageTitle'] = 'Resico : Add Asset'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("addasset", $this->global, $data, NULL); } @@ -272,7 +275,8 @@ class assetdetails extends BaseController $data['assetList'] = $this->assetdetails_model->getAssetDetails($AssetID); $data['AssetStatusList'] = $this->assetdetails_model->getConfigValue('C015'); $data['PO'] = $this->assetdetails_model->getPO($PO); - $this->global['pageTitle'] = 'Resico : Edit Asset'; + $this->global['pageTitle'] = 'Resico : Edit Asset'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("editasset", $this->global, $data,NULL); } @@ -531,6 +535,7 @@ class assetdetails extends BaseController function pageNotFound() { $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php index bf61f154..4df68dcb 100755 --- a/application/controllers/cashbook.php +++ b/application/controllers/cashbook.php @@ -59,7 +59,8 @@ class cashbook extends BaseController $data['data'] = $this->cashbook_model->getIncomeExpenseList($aid); $data['PaymentDetails'] = $this->cashbook_model->viewpaymentdetails($aid); - $this->global['pageTitle'] = 'Resico : Cash Book: View Income Expense '; + //$this->global['pageTitle'] = 'Resico : Cash Book: View Income Expense '; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Cash Book - View Income Expense '; $this->loadViews("viewIndIncomeExpense", $this->global, $data , NULL); } @@ -68,7 +69,8 @@ class cashbook extends BaseController else{ //$data['list'] = $this->cashbook_model->getIncomeExpenseList(); $data['list'] = $this->cashbook_model->getreceiptpaymentlist(); - $this->global['pageTitle'] = 'Resico : Cash Book: Listing'; + //$this->global['pageTitle'] = 'Resico : Cash Book: Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].': Cash Book: Listing'; $this->loadViews("income_expense_list", $this->global, $data , NULL); } @@ -81,7 +83,8 @@ class cashbook extends BaseController { $data['dropdownvalues'] = $this->cashbook_model->getAccounTypes(); - $this->global['pageTitle'] = 'Resico : Cash Book: Add New Income Expense '; + //$this->global['pageTitle'] = 'Resico : Cash Book: Add New Income Expense '; + $this->global['pageTitle'] = $this->global['CompanyName'].': Cash Book: Add New Income Expense '; $this->loadViews("addnewIncomeExpense", $this->global, $data , NULL); } @@ -347,7 +350,8 @@ class cashbook extends BaseController $aid = $this->uri->segment(3); $data['data'] = $this->cashbook_model->getAccounutInfo(); - $this->global['pageTitle'] = 'Resico : Cash Book: View Income Expense '; + //$this->global['pageTitle'] = 'Resico : Cash Book: View Income Expense '; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Cash Book: View Income Expense '; $this->loadViews("viewIndIncomeExpense", $this->global, $data , NULL); } @@ -357,7 +361,8 @@ class cashbook extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Cashbook Details'; + //$this->global['pageTitle'] = 'Resico : Cashbook Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Cashbook Details'; $this->loadViews("cashbooklisting", $this->global, NULL , NULL); } @@ -370,8 +375,8 @@ class cashbook extends BaseController $data['cashbook'] = $this->cashbook_model->Selectcash(); - $this->global['pageTitle'] = 'Resico : Cashbook Listing'; - + //$this->global['pageTitle'] = 'Resico : Cashbook Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Cashbook Listing'; $this->loadViews("cashbooklisting", $this->global, $data, NULL); } @@ -436,7 +441,8 @@ class cashbook extends BaseController $data['PaymentDetails'] = $this->cashbook_model->viewpaymentdetails($cash); /** this array for dropdown value(account name)*/ $data['dropdownvalues'] = $this->cashbook_model->getAccounTypes(); - $this->global['pageTitle'] = 'Resico : Edit Cashbook'; + //$this->global['pageTitle'] = 'Resico : Edit Cashbook'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Cashbook'; $this->loadViews("editincomeexpenses", $this->global,$data, NULL); } diff --git a/application/controllers/companycontroller.php b/application/controllers/companycontroller.php index 1c051f9e..d932f96d 100644 --- a/application/controllers/companycontroller.php +++ b/application/controllers/companycontroller.php @@ -18,7 +18,7 @@ class companycontroller extends BaseController { parent::__construct(); $this->load->model('companydetailsmodel'); - $this->isLoggedIn(); + $this->isLoggedIn(); } /** @@ -26,7 +26,7 @@ class companycontroller extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Company Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Company Details'; //$this->loadViews("companyadd", $this->global, NULL , NULL); //$this->loadViews("Updatecompany", $this->global,NULL,NULL); } @@ -36,7 +36,8 @@ class companycontroller extends BaseController */ public function companyview() { - $this->global['pageTitle'] = 'Resico : Company Details'; + //$this->global['pageTitle'] = 'Resico : Company Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Company Details' ; $data['userRecords'] = $this->companydetailsmodel->companylisting(); $data['payment'] = $this->companydetailsmodel->getPaymentTerms(); @@ -84,7 +85,7 @@ class companycontroller extends BaseController */ function companyadd(){ - $this->global['pageTitle'] = 'Resico : Company Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Company Details'; $this->loadViews("companyadd", $this->global, NULL); } @@ -232,12 +233,12 @@ class companycontroller extends BaseController */ function UpdateCompany() { - if($this->isAdmin() == TRUE) - { - $this->loadThis(); - } - else - { + // if($this->isAdmin() == TRUE) + // { + // $this->loadThis(); + // } + // else + // {} $PictureName = $this->input->post('Image'); @@ -298,7 +299,9 @@ class companycontroller extends BaseController $result2 = $this->companydetailsmodel->filedetails($myfile); } - $result = $this->companydetailsmodel->Updatecompany($Company,$CompID); + $result = $this->companydetailsmodel->Updatecompany($Company,$CompID); + // print_r($result); + // die(); if($result > 0) { @@ -308,8 +311,6 @@ class companycontroller extends BaseController redirect('companyview','refresh'); } - - } } diff --git a/application/controllers/configurationctrl.php b/application/controllers/configurationctrl.php index 3d02ec4d..45454ac3 100644 --- a/application/controllers/configurationctrl.php +++ b/application/controllers/configurationctrl.php @@ -28,7 +28,8 @@ class configurationctrl extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Config Details'; + //$this->global['pageTitle'] = 'Resico : Config Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Config Details'; $this->loadViews("configlisting", $this->global, NULL , NULL); } @@ -42,7 +43,8 @@ class configurationctrl extends BaseController $data['userRecords'] = $this->configmodel->configlisting(); - $this->global['pageTitle'] = 'Resico : Config Listing'; + //$this->global['pageTitle'] = 'Resico : Config Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Config Listing'; $this->loadViews("configlisting", $this->global, $data, NULL); @@ -53,7 +55,8 @@ class configurationctrl extends BaseController */ function addconfig() { - $this->global['pageTitle'] = 'Resico : Add New Config'; + //$this->global['pageTitle'] = 'Resico : Add New Config'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New Config'; $data['userRecords'] = $this->configmodel->configlisting(); $this->loadViews("addconfig", $this->global,NULL, NULL); @@ -117,7 +120,8 @@ class configurationctrl extends BaseController $data['child'] = $this->configmodel->GetConfigCenterDetails($ConfigID); $index = 1; - $this->global['pageTitle'] = 'Resico : Edit Config'; + //$this->global['pageTitle'] = 'Resico : Edit Config'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Config'; $this->loadViews("editconfig", $this->global, $data,NULL); } diff --git a/application/controllers/department.php b/application/controllers/department.php index 76402e38..67a7a32e 100644 --- a/application/controllers/department.php +++ b/application/controllers/department.php @@ -28,7 +28,8 @@ class department extends BaseController public function index() { - $this->global['pageTitle'] = 'Resico : Department Details'; + //$this->global['pageTitle'] = 'Resico : Department Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Department Details'; $this->loadViews("departmentListing", $this->global, NULL , NULL); } @@ -45,7 +46,8 @@ class department extends BaseController { $this->load->model('department_model'); $data['userRecords'] = $this->department_model->departmentListing(); - $this->global['pageTitle'] = 'Resico : Department Listing'; + //$this->global['pageTitle'] = 'Resico : Department Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Department Listing'; $this->loadViews("departmentListing", $this->global, $data, NULL); } } @@ -56,7 +58,8 @@ class department extends BaseController function adddepartment() { $data['depcode'] = $this->department_model->getdepcode(); - $this->global['pageTitle'] = 'Resico : Add New Department'; + //$this->global['pageTitle'] = 'Resico : Add New Department'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New Department'; $this->loadViews("adddepartment", $this->global,$data, NULL); } @@ -167,7 +170,8 @@ class department extends BaseController $data['department'] = $this->department_model->getDeptInfo($DepartmentID); $data['depcode'] = $this->department_model->getdepcode(); - $this->global['pageTitle'] = 'Resico : Edit Department'; + //$this->global['pageTitle'] = 'Resico : Edit Department'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Department'; $this->loadViews("editdepartment", $this->global,$data, NULL); } @@ -244,7 +248,8 @@ class department extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php index 92248ad7..8d49cf11 100644 --- a/application/controllers/emergencypurchaseorder.php +++ b/application/controllers/emergencypurchaseorder.php @@ -31,7 +31,8 @@ class emergencypurchaseorder extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : AddPO'; + //$this->global['pageTitle'] = 'Resico : AddPO'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : AddPO'; $this->loadViews("addPO", $this->global, NULL , NULL); } @@ -40,7 +41,8 @@ class emergencypurchaseorder extends BaseController $data['DeptList'] = $this->purchaseorder_model->getDepartmentListForAllReq(); $data['stList'] = $this->purchaseorder_model->getStatusListforAllReq(); $data['ReqList'] = $this->purchaseorder_model->getRequistionListbySearch(); - $this->global['pageTitle'] = 'Resico : Create PO from Requisition List'; + //$this->global['pageTitle'] = 'Resico : Create PO from Requisition List'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Create PO from Requisition List'; $this->loadViews("createPOfromRequistion", $this->global, $data,Null); } @@ -51,7 +53,8 @@ class emergencypurchaseorder extends BaseController { $RequestedBy = $this->session->userdata ('EmpID'); - $this->global['pageTitle'] = 'Resico : Create Emergency Purchase Order'; + //$this->global['pageTitle'] = 'Resico : Create Emergency Purchase Order'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Create Emergency Purchase Order'; $data['RequestType'] = $this->requistion_model->getConfigValue('C004'); $data['Suplist'] = $this->purchaseorder_model->getSupplierName(); @@ -672,7 +675,8 @@ class emergencypurchaseorder extends BaseController $returns = $this->paginationCompress ( "purchaseorderListing/", $count, 5 ); $this->purchaseorder_model->UpdateRequistionStatus(); $data['POData'] = $this->purchaseorder_model->purchaseorderListing(); - $this->global['pageTitle'] = 'Resico : Purchase Orders'; + //$this->global['pageTitle'] = 'Resico : Purchase Orders'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase Orders'; $this->loadViews("POlist", $this->global, $data, NULL); @@ -716,7 +720,8 @@ class emergencypurchaseorder extends BaseController else { - $this->global['pageTitle'] = 'Resico : Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase order form'; $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); $data['Suplist'] = $this->purchaseorder_model->getSupplierName(); @@ -804,13 +809,15 @@ class emergencypurchaseorder extends BaseController if($ReqType == SERVICE) { $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO); - $this->global['pageTitle'] = 'Resico : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Edit Service Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("EditservicePurchaseorder", $this->global, $data, NULL); } else if($ReqType == REVENUE) { $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO); - $this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Revenue Purchase order form'; $this->loadViews("editRevenuepurchaseorder", $this->global, $data, NULL); } @@ -1260,7 +1267,8 @@ class emergencypurchaseorder extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].': 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index 9577c3b2..97394b78 100644 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -27,7 +27,8 @@ class employeedetails extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Employee Details'; + //$this->global['pageTitle'] = 'Resico : Employee Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Employee Details'; //Load the view supplierListing.php $this->loadViews("employeeListing", $this->global, NULL , NULL); } @@ -41,7 +42,8 @@ class employeedetails extends BaseController $this->load->model('employeedetails_model'); $data['userRecords'] = $this->employeedetails_model->employeeListing(); - $this->global['pageTitle'] = 'Resico : Employee Listing'; + //$this->global['pageTitle'] = 'Resico : Employee Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Employee Listing'; $this->loadViews("employeeListing", $this->global, $data, NULL); } @@ -389,7 +391,8 @@ class employeedetails extends BaseController $data['BloodGroup'] = $this->employeedetails_model->getConfigValue($BloodGroupConfigID); $data['Department'] = $this->employeedetails_model->getDepartment(); - $this->global['pageTitle'] = 'Resico : Add New Employee'; + // $this->global['pageTitle'] = 'Resico : Add New Employee'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New Employee'; $this->loadViews("addemployee", $this->global, $data, NULL); } @@ -616,7 +619,8 @@ class employeedetails extends BaseController $data['bankdetails']=$this->employeedetails_model->getBankDetails(); $data['DepartmentList'] = $this->employeedetails_model->getDepartment(); $data['EmpDetails'] = $this->employeedetails_model->viewemployee($EmpID); - $this->global['pageTitle'] = 'Resico : View Employee'; + //$this->global['pageTitle'] = 'Resico : View Employee'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : View Employee'; $this->loadViews("editEmployee", $this->global, $data, NULL); @@ -839,7 +843,8 @@ class employeedetails extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/emppaydate.php b/application/controllers/emppaydate.php index 1379ad46..b20da0db 100644 --- a/application/controllers/emppaydate.php +++ b/application/controllers/emppaydate.php @@ -28,7 +28,8 @@ class emppaydate extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Employee Pay Details'; + //$this->global['pageTitle'] = 'Resico : Employee Pay Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Employee Pay Details'; $this->loadViews("emppayListing", $this->global); } @@ -43,7 +44,8 @@ class emppaydate extends BaseController $data['userRecords'] = $this->emppaydate_model->emppayListing(); - $this->global['pageTitle'] = 'Resico : Employee Pay List'; + //$this->global['pageTitle'] = 'Resico : Employee Pay List'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Employee Pay List'; $this->loadViews("emppayListing", $this->global, $data, NULL); } @@ -56,7 +58,8 @@ class emppaydate extends BaseController $q="addemppaydate"; $this->load->model('payroll_model'); $result['empdetails'] = $this->payroll_model->getEmpID($q); - $this->global['pageTitle'] = 'Resico : Add Employee Pay'; + //$this->global['pageTitle'] = 'Resico : Add Employee Pay'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Employee Pay'; $this->loadViews("addemppaydate", $this->global,$result); } @@ -165,7 +168,8 @@ class emppaydate extends BaseController $data['emppay'] = $this->emppaydate_model->getUserInfo($paydataid); - $this->global['pageTitle'] = 'Resico : Edit Employee Pay Monthly Details '; + //$this->global['pageTitle'] = 'Resico : Edit Employee Pay Monthly Details '; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Employee Pay Monthly Details '; $this->loadViews("editOldemppay", $this->global, $data,NULL); @@ -318,7 +322,8 @@ class emppaydate extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/inwardgateregister.php b/application/controllers/inwardgateregister.php index 0a5234b1..8c4c6775 100644 --- a/application/controllers/inwardgateregister.php +++ b/application/controllers/inwardgateregister.php @@ -28,7 +28,8 @@ class inwardgateregister extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Inward Gate Register'; + //$this->global['pageTitle'] = 'Resico : Inward Gate Register'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Inward Gate Register'; $this->loadViews("viewinwardgateregister", $this->global,NULL , NULL); } @@ -39,7 +40,8 @@ class inwardgateregister extends BaseController function viewIGRDetails() { $this->load->model('inwardgateregister_model'); - $this->global['pageTitle'] = 'Resico : Inward Gate Register Details'; + //$this->global['pageTitle'] = 'Resico : Inward Gate Register Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Inward Gate Register Details'; $data['IGR']= $this->inwardgateregister_model->igrListing(); $this->loadViews("viewIGRDetails",$this->global,$data,NULL); } @@ -51,7 +53,8 @@ class inwardgateregister extends BaseController { $this->load->model('inwardgateregister_model'); - $this->global['pageTitle'] = 'Resico : Add Inward Gate Register'; + //$this->global['pageTitle'] = 'Resico : Add Inward Gate Register'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Inward Gate Register'; $data['PO_NO'] = $this->inwardgateregister_model->getpurchaseorder(); $this->loadViews("inwardgateregister", $this->global, $data, NULL); } @@ -242,7 +245,8 @@ class inwardgateregister extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } } diff --git a/application/controllers/login.php b/application/controllers/login.php index f60afb12..706c76ec 100644 --- a/application/controllers/login.php +++ b/application/controllers/login.php @@ -68,7 +68,7 @@ class Login extends CI_Controller $password = $this->input->post('password'); $result = $this->login_model->loginMe($email, $password); - print_r($result); + //print_r($result); if(count($result) > 0) { foreach ($result as $res) @@ -84,6 +84,7 @@ class Login extends CI_Controller 'DepartmentName'=>$res->DepartmentName, 'EmpID' => $res->EmpID, 'ProfilePic' =>$res->ProfilePic, + 'CompanyName' =>$res->CompanyName, 'isLoggedIn' => TRUE ); diff --git a/application/controllers/monthlypay.php b/application/controllers/monthlypay.php index 311bfd5c..8b97cf57 100755 --- a/application/controllers/monthlypay.php +++ b/application/controllers/monthlypay.php @@ -28,7 +28,8 @@ class monthlypay extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Monthly Pay Details'; + //$this->global['pageTitle'] = 'Resico : Monthly Pay Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Monthly Pay Details'; $this->loadviews('monthlyListing',$this->global); } @@ -39,7 +40,8 @@ class monthlypay extends BaseController function loadPublicholidays() { $data['days'] = $this-> monthlypay_model->getPublicHoldays(); - $this->global['pageTitle'] = 'Resico : Public Holidays'; + //$this->global['pageTitle'] = 'Resico : Public Holidays'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Public Holidays'; $this->loadviews('publicholidays',$this->global,$data,NULL); } @@ -151,7 +153,8 @@ class monthlypay extends BaseController $data['datefordropdown'] = $current; $data['attendance'] = $this-> monthlypay_model->monthlyAttendance($current); $data['emppay'] = $this-> monthlypay_model->getEmpPayDetails($current,$string); - $this->global['pageTitle'] = 'Resico : Monthly Attendance'; + //$this->global['pageTitle'] = 'Resico : Monthly Attendance'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Monthly Attendance'; $this->loadViews("attendance", $this->global, $data, NULL); } @@ -217,7 +220,8 @@ class monthlypay extends BaseController $data['userRecords'] = $this->monthlypay_model->monthlyListing(); - $this->global['pageTitle'] = 'Resico : Monthly Pay List'; + //$this->global['pageTitle'] = 'Resico : Monthly Pay List'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Monthly Pay List'; $this->loadViews("monthlyListing", $this->global, $data, NULL); } @@ -228,7 +232,8 @@ class monthlypay extends BaseController */ function addmonthly() { - $this->global['pageTitle'] = 'Resico : Add Monthly Pay'; + //$this->global['pageTitle'] = 'Resico : Add Monthly Pay'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Monthly Pay'; $this->loadviews('addMontly',$this->global, NULL); } @@ -295,7 +300,8 @@ class monthlypay extends BaseController $data['monthly'] = $this->monthlypay_model->getUserInfo($EmpID,$month_year); - $this->global['pageTitle'] = 'Resico : Edit Monthly Listing'; + //$this->global['pageTitle'] = 'Resico : Edit Monthly Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Monthly Listing'; $this->loadViews("editOldmonthly", $this->global, $data,NULL); @@ -378,7 +384,8 @@ class monthlypay extends BaseController **/ function permissionslip() { - $this->global['pageTitle'] = 'Resico : Permission Slip'; + //$this->global['pageTitle'] = 'Resico : Permission Slip'; + //$this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $data['emplists']=$this->monthlypay_model->emplist(); @@ -427,9 +434,10 @@ class monthlypay extends BaseController */ function permissionlist(){ - $this->global['pageTitle'] = 'Resico : Permission Listing'; - $data['permissionlist']=$this->monthlypay_model->perlist(); - $this->loadviews('permissionlist',$this->global,$data,NULL); + // $this->global['pageTitle'] = 'Resico : Permission Listing'; + // $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + // $data['permissionlist']=$this->monthlypay_model->perlist(); + // $this->loadviews('permissionlist',$this->global,$data,NULL); } /** @@ -474,6 +482,7 @@ class monthlypay extends BaseController function pageNotFound() { $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/pages.php b/application/controllers/pages.php index 1d01e7b1..c454fc7e 100644 --- a/application/controllers/pages.php +++ b/application/controllers/pages.php @@ -70,7 +70,8 @@ class pages extends BaseController { //$data['SupplierName'] = $this->Grocery_crud_model->getSupplierName(); //$data['users'] = $this->purchaseorder_model->getusers(); - $this->global['pageTitle'] = 'Resico : Add New PO'; + //$this->global['pageTitle'] = 'Resico : Add New PO'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New PO'; $this->loadViews("Mainpage", $this->global, $data, NULL); } @@ -107,7 +108,8 @@ class pages extends BaseController { //$data['SupplierName'] = $this->Grocery_crud_model->getSupplierName(); //$data['users'] = $this->purchaseorder_model->getusers(); - $this->global['pageTitle'] = 'Resico : Add New PO'; + //$this->global['pageTitle'] = 'Resico : Add New PO'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New PO'; $this->loadViews("Mainpage", $this->global, NULL); } diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php index a84f41e2..a22112f1 100755 --- a/application/controllers/payslip.php +++ b/application/controllers/payslip.php @@ -52,7 +52,8 @@ class payslip extends BaseController $Data['Payon'] = $this->payroll_model->getPayOn(); $Data['Bank'] = $this->payroll_model->getBankInfo(); - $this->global['pageTitle'] = 'Resico : Bank Report Screen'; + //$this->global['pageTitle'] = 'Resico : Bank Report Screen'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Bank Report Screen'; $this->loadViews("bankreport", $this->global,$Data,NULL); } @@ -441,7 +442,8 @@ class payslip extends BaseController } $data['loanemployees'] = $this->payroll_model->getEmpDetailsforLoan(); - $this->global['pageTitle'] = 'Resico : Loan Reports'; + //$this->global['pageTitle'] = 'Resico : Loan Reports'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Loan Reports'; $this->loadViews("loanreports", $this->global,$data, NULL); } @@ -452,7 +454,8 @@ class payslip extends BaseController public function viewUpload2() { - $this->global['pageTitle'] = 'Resico : Payroll Data Upload2'; + //$this->global['pageTitle'] = 'Resico : Payroll Data Upload2'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Payroll Data Upload2'; $this->loadViews("payslipupload2", $this->global, NULL); } @@ -465,7 +468,8 @@ class payslip extends BaseController $data['month'] = $this-> monthlypay_model->monthlyListing($current); $data['fresh'] = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current); $data['dropdownvalue'] = $current; - $this->global['pageTitle'] = 'Resico : Payroll Monthly Inputs'; + //$this->global['pageTitle'] = 'Resico : Payroll Monthly Inputs'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Payroll Monthly Inputs'; $this->loadViews("monthlypayinputs", $this->global,$data,NULL); @@ -486,7 +490,8 @@ class payslip extends BaseController $data['month'] = $this-> monthlypay_model->monthlyListing($current); $data['fresh'] = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current); $data['dropdownvalue'] = $current; - $this->global['pageTitle'] = 'Resico : Payroll Monthly Inputs'; + //$this->global['pageTitle'] = 'Resico : Payroll Monthly Inputs'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Payroll Monthly Inputs'; $this->loadViews("monthlypayinputs", $this->global,$data,NULL); @@ -652,7 +657,8 @@ class payslip extends BaseController $curr_year = date('Y'); $curr_month =date('m'); $curr_monthyear = $curr_month.'-'.$curr_year; - $this->global['pageTitle'] = 'Resico : Payslip Listing'; + //$this->global['pageTitle'] = 'Resico : Payslip Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Payslip Listing'; $data['PayInfo'] = $this->payroll_model->GetPayslipdata(); $data['dropdownvalue'] = $curr_monthyear; $this->loadViews("paysliplist", $this->global, $data , NULL); @@ -662,7 +668,8 @@ class payslip extends BaseController { $pre_monthyear = $this->input->post('month'); - $this->global['pageTitle'] = 'Resico : Payslip Listing'; + //$this->global['pageTitle'] = 'Resico : Payslip Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Payslip Listing'; $data['PayInfo'] = $this->payroll_model->GetPayslipdata($pre_monthyear); $data['dropdownvalue'] = $pre_monthyear; @@ -674,7 +681,8 @@ class payslip extends BaseController function editPayslip($EmpID,$PayOn) { - $this->global['pageTitle'] = 'Resico : Edit Employee Payslip'; + //$this->global['pageTitle'] = 'Resico : Edit Employee Payslip'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Employee Payslip'; $data['PayInfo'] = $this->payroll_model->GetPayslipdata($PayOn,$EmpID); $this->loadViews("editPayslip", $this->global, $data , NULL); } @@ -687,8 +695,8 @@ class payslip extends BaseController $Data['Payon'] = $this->payroll_model->getPayOn(); - $this->global['pageTitle'] = 'Resico : Payroll Generater'; - + //$this->global['pageTitle'] = 'Resico : Payroll Generater'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Payroll Generater'; $this->loadViews("payslipgenerate", $this->global, $Data , NULL); } @@ -1080,7 +1088,8 @@ class payslip extends BaseController function Bonusreport() { - $this->global['pageTitle'] = 'Resico : Incentive and Bonus Reports'; + //$this->global['pageTitle'] = 'Resico : Incentive and Bonus Reports'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Incentive and Bonus Reports'; $fin_year = $this->input->post('finyear'); $data['finyear'] = $fin_year; $data['Reportvalue'] = $this->monthlypay_model->reportvalue($fin_year); @@ -1093,7 +1102,8 @@ class payslip extends BaseController $EmployeeID = $_GET['EID']; $Fin_year = $_GET['Finyear']; $data['finyear'] = $Fin_year; - $this->global['pageTitle'] = 'Resico : Monthwise Incentive and Bonus Reports'; + //$this->global['pageTitle'] = 'Resico : Monthwise Incentive and Bonus Reports'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Monthwise Incentive and Bonus Reports'; $data['MonthwiseReport'] = $this->monthlypay_model->Monthwisereportvalue($Fin_year,$EmployeeID); $this->loadViews("Bonusreportmonthwise", $this->global,$data,NULL); } @@ -1103,7 +1113,8 @@ class payslip extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index efa32b32..717b4d42 100644 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -31,13 +31,15 @@ class purchaseorder extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : AddPO'; + //$this->global['pageTitle'] = 'Resico : AddPO'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : AddPO'; $this->loadViews("addPO", $this->global, NULL , NULL); } function viewfullpurchaseorder() { - $this->global['pageTitle'] = 'Resico : View Purchase Order'; + //$this->global['pageTitle'] = 'Resico : View Purchase Order'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : View Purchase Order'; $this->loadViews("viewfullpurchaseorder", $this->global,Null); } @@ -47,7 +49,8 @@ class purchaseorder extends BaseController */ function advancerequest() { - $this->global['pageTitle'] = 'Resico : Advance Request'; + //$this->global['pageTitle'] = 'Resico : Advance Request'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Advance Request'; $data['PONO']=$this->purchaseorder_model->getadvancePONO('ST026'); $this->loadViews("advancerequest", $this->global, $data, NULL); } @@ -65,7 +68,8 @@ class purchaseorder extends BaseController $data['ReqList'] = $this->purchaseorder_model->getAllRequistionListToCreatePO(); /* End Here */ - $this->global['pageTitle'] = 'Resico : Create PO from Requisition List'; + //$this->global['pageTitle'] = 'Resico : Create PO from Requisition List'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Create PO from Requisition List'; $this->loadViews("createPOfromRequistion", $this->global, $data,Null); } @@ -81,7 +85,8 @@ class purchaseorder extends BaseController $data['POData'] = $this->purchaseorder_model->purchaseorderListing(); - $this->global['pageTitle'] = 'Resico : Purchase Orders'; + //$this->global['pageTitle'] = 'Resico : Purchase Orders'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase Orders'; $this->loadViews("POlist", $this->global, $data, NULL); } @@ -118,7 +123,8 @@ class purchaseorder extends BaseController else { - $this->global['pageTitle'] = 'Resico : Purchase order' ; + //$this->global['pageTitle'] = 'Resico : Purchase order' ; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase order' ; $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); $data['Suplist'] = $this->purchaseorder_model->getSupplierName(); @@ -404,7 +410,8 @@ class purchaseorder extends BaseController $data['getdata'] = $this->purchaseorder_model->getfunction($PONO); $data['WorkStatus']=$this->purchaseorder_model->getStatus(7); - $this->global['pageTitle'] = 'Resico : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Edit Service Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("EditservicePurchaseorder", $this->global, $data, NULL); } else if($ReqType == REVENUE) @@ -413,7 +420,8 @@ class purchaseorder extends BaseController $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO); $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO); $data['WorkStatus']=$this->purchaseorder_model->getStatus(7); - $this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Revenue Purchase order form'; $this->loadViews("editRevenuepurchaseorder", $this->global, $data, NULL); } @@ -452,7 +460,8 @@ class purchaseorder extends BaseController $data['unicode']=$unicode; $data['currencycode']=$currencycode; - $this->global['pageTitle'] = 'Resico : Edit Import Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Edit Import Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Import Purchase order form'; $this->loadViews("editimportpo", $this->global, $data, NULL); } else if($ReqType == CAPITAL) @@ -502,7 +511,8 @@ class purchaseorder extends BaseController } - $this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form'; + // $this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Capital Purchase order form'; $this->loadViews("editCapitalPo", $this->global, $data, NULL); } @@ -635,7 +645,8 @@ class purchaseorder extends BaseController $data['unicode']=$unicode; $data['currencycode']=$currencycode; - $this->global['pageTitle'] = 'Resico : Edit Import Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Edit Import Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Import Purchase order form'; $this->loadViews("editimportpo", $this->global, $data, NULL); } @@ -690,7 +701,8 @@ class purchaseorder extends BaseController } - $this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form'; + // $this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Capital Purchase order form'; $this->loadViews("editCapitalPo", $this->global, $data, NULL); } @@ -1220,7 +1232,8 @@ class purchaseorder extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } @@ -2040,7 +2053,8 @@ function addNewImportPurchaseOrder() **/ function poapproval(){ $q="APPROVAL"; - $this->global['pageTitle'] = 'Resico : Purchase Order Approval'; + //$this->global['pageTitle'] = 'Resico : Purchase Order Approval'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase Order Approval'; $userID = $this->session->userdata ( 'userId' ); @@ -2111,7 +2125,8 @@ function addNewImportPurchaseOrder() function porelease(){ $q="RELEASE"; - $this->global['pageTitle'] = 'Resico: Purchase Order Release'; + //$this->global['pageTitle'] = 'Resico: Purchase Order Release'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase Order Release'; $userID = $this->session->userdata ( 'userId' ); diff --git a/application/controllers/quality.php b/application/controllers/quality.php index 2d4426cb..de51d053 100644 --- a/application/controllers/quality.php +++ b/application/controllers/quality.php @@ -31,7 +31,8 @@ class quality extends BaseController $data['customers'] = $this->quality_model->getAllcustomers(); $data['existspec'] = $this->quality_model->getAllspec(); $data['existspecinward'] = $this->quality_model->getAllspecInward(); - $this->global['pageTitle'] = 'Resico : Quality Master'; + $this->global['pageTitle'] = 'Resico : Quality Master'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("qualitymasterlistview", $this->global, $data , NULL); } @@ -42,6 +43,7 @@ class quality extends BaseController { $data['records'] = $this->quality_model->getTestMasterforList(); $this->global['pageTitle'] = 'Resico : Prodcut Report List '; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("reportmasterlist", $this->global, $data , NULL); } @@ -53,6 +55,7 @@ class quality extends BaseController $data['records'] = $this->quality_model->getTestMasterforListInward(); $this->global['pageTitle'] = 'Resico : Report List Inward'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("reportmasterlist_inward", $this->global, $data , NULL); } @@ -66,7 +69,8 @@ class quality extends BaseController $data['productsinward'] = $this->quality_model->getAllprodcutsInward(); $data['customersinward'] = $this->quality_model->getAllcustomersInward(); - $this->global['pageTitle'] = 'Resico : Quality Master'; + $this->global['pageTitle'] = 'Resico : Quality Master'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("qualitymaster", $this->global, $data , NULL); } @@ -144,6 +148,7 @@ class quality extends BaseController $data['records'] = $this->quality_model->getDataforReport(); $data['emplist'] = $this->quality_model->getEmplistforReport(); $this->global['pageTitle'] = 'Resico : Inspection Report Screen'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("qualityreport", $this->global, $data, NULL); } @@ -156,6 +161,7 @@ class quality extends BaseController $customerid =$this->uri->segment(4); $data['specifications'] = $this->quality_model->getIndividualSpec($prodcutid,$customerid); $this->global['pageTitle'] = 'Resico : View reports Lists'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("viewIndSpec", $this->global, $data, NULL); } @@ -168,6 +174,7 @@ class quality extends BaseController $reportid = $this->uri->segment(3); $data['reportdata'] = $this->quality_model->getIndividualReportData($reportid); $this->global['pageTitle'] = 'Resico : View Individual Report'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("viewindreport", $this->global, $data, NULL); } @@ -178,6 +185,7 @@ class quality extends BaseController $data['reportdata'] = $this->quality_model->getIndividualInwardReportData($reportid); $this->global['pageTitle'] = 'Resico : View Individual Report'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("viewindInwardreport", $this->global, $data, NULL); } @@ -422,7 +430,8 @@ class quality extends BaseController $data['records'] = $this->quality_model->getIGRNOforReport(); $data['reports'] = $this->quality_model->getIGRNOReport(); $data['emplist'] = $this->quality_model->getEmplistforReport(); - $this->global['pageTitle'] = 'Resico : Inward Inspection'; + $this->global['pageTitle'] = 'Resico : Inward Inspection'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("inward_report_create", $this->global,$data,NULL); } @@ -450,7 +459,8 @@ class quality extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php index 624c8865..c9eafed9 100644 --- a/application/controllers/rawmaterialdetails.php +++ b/application/controllers/rawmaterialdetails.php @@ -31,6 +31,7 @@ class rawmaterialdetails extends BaseController public function index() { $this->global['pageTitle'] = 'Resico : RawMaterialDetails'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : RawMaterialDetails'; $this->loadViews("rawmaterialListing", $this->global, NULL , NULL); } @@ -45,7 +46,8 @@ class rawmaterialdetails extends BaseController $data['userRecords'] = $this->rawmaterialdetails_model->rawmaterialListing(); - $this->global['pageTitle'] = 'Resico : RawMaterial Listing'; + //$this->global['pageTitle'] = 'Resico : RawMaterial Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : RawMaterial Listing'; $this->loadViews("rawmaterialListing", $this->global, $data, NULL); @@ -64,7 +66,8 @@ class rawmaterialdetails extends BaseController $data['assetcode'] = $this->rawmaterialdetails_model->getAssetcode(); $data['costcentercode'] =$this->rawmaterialdetails_model->getcostcentercode(); $data['cfUOM'] = $this->rawmaterialdetails_model->getConversionfactorUOM(); - $this->global['pageTitle'] = 'Resico : Add New RawMaterial'; + //$this->global['pageTitle'] = 'Resico : Add New RawMaterial'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New RawMaterial'; $this->loadViews("addRawMaterial", $this->global, $data, NULL); } @@ -254,7 +257,8 @@ else $data['costcentercode'] =$this->rawmaterialdetails_model->getCostCenterCode(); $data['cfUOM'] = $this->rawmaterialdetails_model->getConversionfactorUOM(); $data['assetcode'] = $this->rawmaterialdetails_model->getAssetcode(); - $this->global['pageTitle'] = 'Resico : Edit Material Master'; + //$this->global['pageTitle'] = 'Resico : Edit Material Master'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Material Master'; $this->loadViews("editRawmaterial", $this->global,$data, NULL); } @@ -524,7 +528,8 @@ function insertvalueintoconfig(){ */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/reportlistcontroller.php b/application/controllers/reportlistcontroller.php index 15029546..848063ad 100644 --- a/application/controllers/reportlistcontroller.php +++ b/application/controllers/reportlistcontroller.php @@ -27,7 +27,8 @@ class reportlistcontroller extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Reports list '; + //$this->global['pageTitle'] = 'Reports list '; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Reports list '; $this->loadViews("reportslink", $this->global , NULL); } diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php index 0db478e6..0d7f3ff2 100644 --- a/application/controllers/requisitionform.php +++ b/application/controllers/requisitionform.php @@ -27,7 +27,8 @@ class requisitionform extends BaseController */ function requisitionlisting() { - $this->global['pageTitle'] = 'Resico : Requisition Listing'; + //$this->global['pageTitle'] = 'Resico : Requisition Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Requisition Listing'; $userID = $this->session->userdata ( 'userId' ); // $data['ReqList'] = $this->requistion_model->getRequistListUserID($userID); $data['Status'] = $this->requistion_model->CheckDraftStatus($userID); @@ -40,7 +41,8 @@ class requisitionform extends BaseController */ function requisition() { - $this->global['pageTitle'] = 'Resico : Raise Requisition'; + //$this->global['pageTitle'] = 'Resico : Raise Requisition'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Raise Requisition'; $data['RequestType'] = $this->requistion_model->getConfigValue('C020'); $data['EmpList'] = $this->requistion_model->getAllEmployees(); @@ -58,7 +60,8 @@ class requisitionform extends BaseController */ function requisitionlistApproval() { - $this->global['pageTitle'] = 'Resico : Requisition Approval'; + //$this->global['pageTitle'] = 'Resico : Requisition Approval'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Requisition Approval'; $data['Status']= $this->requistion_model->getStatus(); $userID = $this->session->userdata ( 'userId' ); @@ -73,7 +76,8 @@ class requisitionform extends BaseController */ function EditRequistionForm() { - $this->global['pageTitle'] = 'Resico : Edit Requisition'; + //$this->global['pageTitle'] = 'Resico : Edit Requisition'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Requisition'; $ReqNo= $_GET['ReqNo']; $ReqType= $_GET['ReqType']; @@ -189,7 +193,8 @@ class requisitionform extends BaseController $data['AppList'] = $this->requistion_model->getApproverRequistList($userID,$Status,$FromDate, $ToDate); - $this->global['pageTitle'] = 'Resico : Requisition Approval'; + //$this->global['pageTitle'] = 'Resico : Requisition Approval'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Requisition Approval'; $data['Status']= $this->requistion_model->getStatus(); @@ -621,7 +626,8 @@ function ViewRequest() */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } } diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php index 4a787351..e40399ee 100644 --- a/application/controllers/servicepurchaseorder.php +++ b/application/controllers/servicepurchaseorder.php @@ -34,6 +34,7 @@ class servicepurchaseorder extends BaseController { $this->global['pageTitle'] = 'Resico : Service Purchase Order for Billing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $data["Billing"] = $this->purchaseorder_model->GetServicePOListforBilling(); @@ -47,6 +48,7 @@ class servicepurchaseorder extends BaseController function UpdateServicePOStatus() { $this->global['pageTitle'] = 'Resico : Update Service PO Status'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $data['PO'] = $this->purchaseorder_model->GetServicePOListforStatusUpdate(); $data['WorkStatus']=$this->purchaseorder_model->getStatus(7); $this->loadViews("statusofservicepurchaseorder", $this->global,$data,Null); @@ -489,7 +491,8 @@ class servicepurchaseorder extends BaseController } function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/storerequisition.php b/application/controllers/storerequisition.php index 6848b2a0..2dca60e1 100644 --- a/application/controllers/storerequisition.php +++ b/application/controllers/storerequisition.php @@ -37,7 +37,8 @@ class storerequisition extends BaseController */ function addstorerequisitionslip() { - $this->global['pageTitle'] = 'Resico : Add Store Requisition'; + //$this->global['pageTitle'] = 'Resico : Add Store Requisition'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Store Requisition'; $this->loadviews('addstorerequisitionslip',$this->global); } @@ -47,7 +48,8 @@ class storerequisition extends BaseController */ function storerequisitionlist() { - $this->global['pageTitle'] = 'Resico : Store Requisition List'; + //$this->global['pageTitle'] = 'Resico : Store Requisition List'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Requisition List'; $this->loadviews('storerequisitionlist',$this->global); } @@ -57,7 +59,8 @@ class storerequisition extends BaseController */ function storerequisitionlisting() { - $this->global['pageTitle'] = 'Resico : Store Requisition Listing'; + //$this->global['pageTitle'] = 'Resico : Store Requisition Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Requisition Listing'; $this->loadviews('storerequisitionlisting',$this->global); } @@ -67,7 +70,8 @@ class storerequisition extends BaseController */ function approvalstorerequisition() { - $this->global['pageTitle'] = 'Resico : Approval Store Requisition'; + //$this->global['pageTitle'] = 'Resico : Approval Store Requisition'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Approval Store Requisition'; $this->loadviews('approvalstorerequisitionslip',$this->global); } @@ -77,7 +81,8 @@ class storerequisition extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/storerequisitionlist.php b/application/controllers/storerequisitionlist.php index 25a805ed..e0348ae6 100644 --- a/application/controllers/storerequisitionlist.php +++ b/application/controllers/storerequisitionlist.php @@ -29,7 +29,8 @@ class storerequisitionlist extends BaseController **/ function addstores() { - $this->global['pageTitle'] = 'Resico : Created Store Requisition Listing'; + //$this->global['pageTitle'] = 'Resico : Created Store Requisition Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Created Store Requisition Listing'; $userId= $this->session->userdata ('userId'); @@ -47,7 +48,8 @@ class storerequisitionlist extends BaseController function addstore() { - $this->global['pageTitle'] = 'Resico : StoreRequisition Listing'; + //$this->global['pageTitle'] = 'Resico : StoreRequisition Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : StoreRequisition Listing'; $userId= $this->session->userdata ('userId'); $data['Store'] = $this->storerequistion_model->Storeall($userId); @@ -79,7 +81,8 @@ class storerequisitionlist extends BaseController { $StoreReqNo = $_GET['StoreReqNo']; - $this->global['pageTitle'] = 'Resico : Edit StoreRequisition'; + //$this->global['pageTitle'] = 'Resico : Edit StoreRequisition'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit StoreRequisition'; $this->load->model('storerequistion_model'); $data['cost'] = $this->storerequistion_model->editRequistDetails($StoreReqNo); @@ -177,7 +180,8 @@ class storerequisitionlist extends BaseController */ function addstorerequisitionlist() { - $this->global['pageTitle'] = 'Resico : Store Requisition Listing'; + //$this->global['pageTitle'] = 'Resico : Store Requisition Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Requisition Listing'; $this->load->model('storerequistion_model'); $data['Status']= $this->storerequistion_model->getStatus(); @@ -194,7 +198,8 @@ class storerequisitionlist extends BaseController function issuestorerequisition() { - $this->global['pageTitle'] = 'Resico : Issue StoreRequisition'; + //$this->global['pageTitle'] = 'Resico : Issue StoreRequisition'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Issue StoreRequisition'; $this->load->model('storerequistion_model'); $StoreReqNo= $_GET['ReqNo']; @@ -320,7 +325,8 @@ class storerequisitionlist extends BaseController { $userID = $this->session->userdata ( 'userId' ); $data['AppList'] = $this->storerequistion_model->getApproverRequistList($userID); - $this->global['pageTitle'] = 'Resico : Approval Store Requisition Listing'; + //$this->global['pageTitle'] = 'Resico : Approval Store Requisition Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Approval Store Requisition Listing'; $data['Status']= $this->storerequistion_model->getStatus(); $this->loadViews("approvalstorerequisitionslip", $this->global, $data, NULL); @@ -351,7 +357,8 @@ class storerequisitionlist extends BaseController /*to load the first screen of the Requistion List Approval Screen*/ function requisitionlistApproval() { - $this->global['pageTitle'] = 'Resico :Approvalstorerequisitionlist'; + // $this->global['pageTitle'] = 'Resico :Approvalstorerequisitionlist'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Approvalstorerequisitionlist'; $userID = $this->session->userdata ( 'userId' ); diff --git a/application/controllers/storestatus.php b/application/controllers/storestatus.php index 09ac8e65..45675b2f 100644 --- a/application/controllers/storestatus.php +++ b/application/controllers/storestatus.php @@ -34,7 +34,8 @@ class storestatus extends BaseController { - $this->global['pageTitle'] = 'Resico : Store Status'; + //$this->global['pageTitle'] = 'Resico : Store Status'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Status'; $this->loadViews("storestatus", $this->global, NULL , NULL); } @@ -46,7 +47,8 @@ class storestatus extends BaseController */ function storeavailability() { - $this->global['pageTitle'] = 'Resico : Store Status'; + //$this->global['pageTitle'] = 'Resico : Store Status'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Status'; $data['Stock'] = $this->store_model->viewStock(); $data['MaterialList'] = $this->store_model->GetAllMaterialList(); $data['StockStatus'] = $this->store_model->GetConfigValue('C021'); @@ -163,7 +165,8 @@ class storestatus extends BaseController function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php index caebf32c..b92b3f6c 100644 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -30,7 +30,8 @@ class supplier extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Supplier'; + //$this->global['pageTitle'] = 'Resico : Supplier'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Supplier'; //Load the view supplierListing.php $this->loadViews("supplierListing", $this->global, NULL , NULL); } @@ -45,7 +46,8 @@ class supplier extends BaseController $data['userRecords'] = $this->supplier_model->supplierListing(); - $this->global['pageTitle'] = 'Resico : Supplier Listing'; + //$this->global['pageTitle'] = 'Resico : Supplier Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Supplier Listing'; //Load the view supplierListing.php @@ -61,7 +63,8 @@ class supplier extends BaseController { $data['payment'] = $this->supplier_model->getPaymentTerms(); - $this->global['pageTitle'] = 'Resico : Add New Supplier'; + //$this->global['pageTitle'] = 'Resico : Add New Supplier'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New Supplier'; //Load the view addsupplier.php $this->loadViews("addsupplier", $this->global,$data, NULL); @@ -441,7 +444,8 @@ class supplier extends BaseController $data['supplier'] = $this->supplier_model->getSupplierInfo($supplierID); $data['payment'] = $this->supplier_model->getPaymentTerms($Payment); - $this->global['pageTitle'] = 'Resico : Edit Supplier'; + //$this->global['pageTitle'] = 'Resico : Edit Supplier'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Supplier'; //Load the view editSupplier.php $this->loadViews("editSupplier", $this->global,$data, NULL); @@ -623,7 +627,8 @@ class supplier extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; //Load the view 404.php $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/user.php b/application/controllers/user.php index 09d1a953..c784c2f9 100755 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -30,7 +30,8 @@ class user extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Dashboard'; + // $this->global['pageTitle'] = 'Resico : Dashboard'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Dashboard'; $this->load->model('employeedetails_model'); $this->load->model('dahsboard_Model'); @@ -964,7 +965,8 @@ function attendanceyear($empID ='') $data['userRecords'] = $this->user_model->userListing(); - $this->global['pageTitle'] = 'Resico : User Listing'; + //$this->global['pageTitle'] = 'Resico : User Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : User Listing'; $this->loadViews("users", $this->global, $data, NULL); //} @@ -988,7 +990,8 @@ function attendanceyear($empID ='') $data['Department'] = $this->costcenter_model->getDepartment(); - $this->global['pageTitle'] = 'Resico : Add New User'; + //$this->global['pageTitle'] = 'Resico : Add New User'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New User'; $this->loadViews("addNew", $this->global, $data, NULL); //} @@ -1174,7 +1177,8 @@ function attendanceyear($empID ='') $data['EmpRole'] = $this->user_model->GetRoleNameByUserID($Uid); $data['AccessDept'] = $this->costcenter_model ->getaccessDept($Empid); - $this->global['pageTitle'] = 'Resico : Edit User'; + //$this->global['pageTitle'] = 'Resico : Edit User'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit User'; $this->loadViews("editOld", $this->global, $data, NULL); @@ -1261,7 +1265,8 @@ function attendanceyear($empID ='') */ function loadChangePass() { - $this->global['pageTitle'] = 'Resico : Change Password'; + //$this->global['pageTitle'] = 'Resico : Change Password'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Change Password'; $this->loadViews("changePassword", $this->global, NULL, NULL); } @@ -1314,7 +1319,8 @@ function attendanceyear($empID ='') */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } @@ -1334,7 +1340,8 @@ function attendanceyear($empID ='') $data['finyear']=$this->user_model->finyear(); - $this->global['pageTitle'] = 'Resico : MaterialInwardRegister'; + //$this->global['pageTitle'] = 'Resico : MaterialInwardRegister'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : MaterialInwardRegister'; $this->loadViews("Report_Material_inward_Register", $this->global,$data,NULL); } diff --git a/application/libraries/BaseController.php b/application/libraries/BaseController.php index b1c72aca..970ce6a6 100644 --- a/application/libraries/BaseController.php +++ b/application/libraries/BaseController.php @@ -16,6 +16,7 @@ class BaseController extends CI_Controller { protected $HeadDept = ''; protected $DepartmentName = ''; protected $roleText = ''; + protected $CompanyName = ''; //Protected depaccess = ''; protected $global = array (); @@ -52,12 +53,14 @@ class BaseController extends CI_Controller { $this->EmpID = $this->session->userdata ( 'EmpID' ); $this->depaccess = $this->session->userdata ('depaccess'); $this->profilepic = $this->session->userdata ( 'ProfilePic' ); + $this->CompanyName = $this->session->userdata ( 'CompanyName' ); $this->global ['name'] = $this->name; $this->global ['role'] = $this->role; $this->global ['role_text'] = $this->roleText; $this->global ['DEPCode'] = $this->DEPCode; $this->global ['Designation'] = $this->Designation; $this->global ['DepAccesslist'] = $this->depaccess; + $this->global ['CompanyName'] = $this->CompanyName; } } diff --git a/application/models/login_model.php b/application/models/login_model.php index 7b560e8b..c1137320 100644 --- a/application/models/login_model.php +++ b/application/models/login_model.php @@ -5,18 +5,19 @@ class Login_model extends CI_Model /** * To check the login credentials of the user - * @param string $email : This is email of the user + * @param string $string : This is email or phonenumber of the user * @param string $password : This is encrypted password of the user */ - function loginMe($email, $password) + function loginMe($string, $password) { - $this->db->select('BaseTbl.userId, BaseTbl.password, Emp.EmpID,Emp.FirstName,Emp.Designation, BaseTbl.roleId, Roles.role,DEPT.DEPCode,DEPT.DepartmentName,DEPT.HeadDept,Emp.ProfilePic'); + $this->db->select('BaseTbl.userId, BaseTbl.password, Emp.EmpID,Emp.FirstName,Emp.Designation, BaseTbl.roleId, Roles.role,DEPT.DEPCode,DEPT.DepartmentName,DEPT.HeadDept,Emp.ProfilePic,CompTbl.CompanyName'); $this->db->from('tbl_users as BaseTbl'); - $this->db->join('tbl_roles as Roles','Roles.roleId = BaseTbl.roleId'); - $this->db->join('T_Employee_Details as Emp','BaseTbl.EmpID = Emp.EmpID'); - $this->db->join('T_DepartmentDetails as DEPT','Emp.Departmentcode = DEPT.DEPCode'); - $this->db->where('BaseTbl.email', $email); - $this->db->or_where('Emp.ContactNumber', $email); + $this->db->join('tbl_roles as Roles','Roles.roleId = BaseTbl.roleId','left'); + $this->db->join('T_Employee_Details as Emp','BaseTbl.EmpID = Emp.EmpID','left'); + $this->db->join('T_DepartmentDetails as DEPT','Emp.Departmentcode = DEPT.DEPCode','left'); + $this->db->join('T_Company_Details as CompTbl','true','cross'); + $this->db->where('BaseTbl.email', $string); + $this->db->or_where('Emp.ContactNumber', $string); $this->db->where('BaseTbl.isDeleted', 0); $query = $this->db->get(); diff --git a/application/views/addCostCenter.php b/application/views/addCostCenter.php index 6e3fe17c..2b91230a 100644 --- a/application/views/addCostCenter.php +++ b/application/views/addCostCenter.php @@ -73,7 +73,7 @@ span {

-
Resico Industries - Add Cost List
+
Add Cost List

diff --git a/application/views/addNew.php b/application/views/addNew.php index acc0ee92..5ee226c5 100644 --- a/application/views/addNew.php +++ b/application/views/addNew.php @@ -2,7 +2,7 @@

-
Resico Industries - Add New User
+

diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php index bb514b54..954cb4f4 100644 --- a/application/views/addRawMaterial.php +++ b/application/views/addRawMaterial.php @@ -11,7 +11,7 @@

-
Resico Industries - Add New Material
+

diff --git a/application/views/addasset.php b/application/views/addasset.php index 775ecb9f..4b6487ca 100644 --- a/application/views/addasset.php +++ b/application/views/addasset.php @@ -51,7 +51,7 @@ $(function() {

-
Resico Industries - Add Asset Details
+
Add Asset Details

diff --git a/application/views/addconfig.php b/application/views/addconfig.php index a82617ed..24834690 100644 --- a/application/views/addconfig.php +++ b/application/views/addconfig.php @@ -45,7 +45,8 @@ span {

-
Reisco Industries - Add Configuration List
+ +

diff --git a/application/views/adddepartment.php b/application/views/adddepartment.php index f7a20467..68a4de54 100644 --- a/application/views/adddepartment.php +++ b/application/views/adddepartment.php @@ -66,7 +66,8 @@

-
Resico Industries - New Department Details
+ +

diff --git a/application/views/addemployee.php b/application/views/addemployee.php index dcf96942..78047c2c 100644 --- a/application/views/addemployee.php +++ b/application/views/addemployee.php @@ -15,7 +15,9 @@
-

Resico Industries Employee Profile

+ +

+
diff --git a/application/views/addnewIncomeExpense.php b/application/views/addnewIncomeExpense.php index 097085cd..54a7d979 100755 --- a/application/views/addnewIncomeExpense.php +++ b/application/views/addnewIncomeExpense.php @@ -44,7 +44,7 @@

-
Resico Industries - Add New Receipt and Payment
+
Add New Receipt and Payment

diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php index 5fb7be45..50be18e3 100644 --- a/application/views/addsupplier.php +++ b/application/views/addsupplier.php @@ -26,6 +26,13 @@ function alpha(e) { return ((k > 64 && k < 91) || (k > 96 && k < 123) || k == 8 || k == 32 || (k >= 48 && k <= 57)); } +function ralpha(e) { + var j; + document.all ? j = e.keyCode : j = e.which; + return ( j == 40 || j == 41 || j == 32 ); +} + + function blockKeyPress(evt) { var charCode = (evt.which) ? evt.which : evt.keyCode; @@ -322,8 +329,9 @@ $(function() {

-
Resico Industries - New Supplier Details
- + + +

diff --git a/application/views/companyview.php b/application/views/companyview.php index 65cae248..c810cfb6 100644 --- a/application/views/companyview.php +++ b/application/views/companyview.php @@ -188,9 +188,11 @@ function onlyAlphabets(evt) { charCode = window.event.keyCode; //for IE else charCode = evt.which; //for firefox - if (charCode == 32) //for <space> symbol + if (charCode == 32 || charCode == 40 || charCode == 41) //for <space> symbol 32 for space; 40 for rounded open brackets; 41 for rounded close brackets return true; - if (charCode > 31 && charCode < 65) //for characters before 'A' in ASCII Table + if (charCode > 31 && charCode <= 39) + return false; + if (charCode >= 42 && charCode <= 65) //for characters before 'A' in ASCII Table return false; if (charCode > 90 && charCode < 97) //for characters between 'Z' and 'a' in ASCII Table return false; @@ -430,15 +432,15 @@ function ValidateUA() { .badge { color:red; background-color:#fff; - } + }

-
Resico Industries Company Profile
- +
- Company Profile
+

diff --git a/application/views/configlisting.php b/application/views/configlisting.php index 4a278fc2..0819eb72 100644 --- a/application/views/configlisting.php +++ b/application/views/configlisting.php @@ -3,7 +3,8 @@

-
Resico Industries - Configuration Details
+ +

diff --git a/application/views/create_pdf.php b/application/views/create_pdf.php index fbf23b1c..879b1e0b 100644 --- a/application/views/create_pdf.php +++ b/application/views/create_pdf.php @@ -62,7 +62,7 @@ if(!empty($PODetail))

-

Resico Industries


+

Resico (India) Pvt Ltd


Factory: 196/4 B,
126, Mettupalayam Village,
Sriperumbudur Taluk, diff --git a/application/views/departmentListing.php b/application/views/departmentListing.php index e5af6dd6..dedd6f00 100644 --- a/application/views/departmentListing.php +++ b/application/views/departmentListing.php @@ -10,7 +10,8 @@
-

Resico Industries -Department Details

+ +

diff --git a/application/views/editEmployee.php b/application/views/editEmployee.php index cb4398c8..b31d94c4 100644 --- a/application/views/editEmployee.php +++ b/application/views/editEmployee.php @@ -161,7 +161,8 @@ if(!empty($EmpDetails))

-
Resico Industries Employee Profile
+ +
Details

diff --git a/application/views/editOld.php b/application/views/editOld.php index 30931994..ba2b0ad7 100644 --- a/application/views/editOld.php +++ b/application/views/editOld.php @@ -39,7 +39,8 @@ if(!empty($EmpList))

-
Resico Industries - Edit User
+ +
Details

diff --git a/application/views/editRawmaterial.php b/application/views/editRawmaterial.php index 7df878cc..051e5045 100644 --- a/application/views/editRawmaterial.php +++ b/application/views/editRawmaterial.php @@ -60,7 +60,8 @@ if(!empty($materialDetails))

-
Resico Industries - Edit Material -
+ +
Details

diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php index 3ecaae42..3708eddf 100644 --- a/application/views/editSupplier.php +++ b/application/views/editSupplier.php @@ -413,8 +413,9 @@ function onlyAlphabets(evt) {

-
Resico Industries - Edit DETAILS
- + + +
Details

diff --git a/application/views/editconfig.php b/application/views/editconfig.php index d555975c..ca5e86e0 100644 --- a/application/views/editconfig.php +++ b/application/views/editconfig.php @@ -60,8 +60,9 @@ span {

-
Resico Industries - Edit Config Details
- + +
Details

+
diff --git a/application/views/editdepartment.php b/application/views/editdepartment.php index bccc39a9..4215438d 100644 --- a/application/views/editdepartment.php +++ b/application/views/editdepartment.php @@ -96,7 +96,8 @@ if(!empty($department))

-
Resico Industries - Department Details
+ +
Details

diff --git a/application/views/employeeListing.php b/application/views/employeeListing.php index cf5fc390..ef41df9d 100644 --- a/application/views/employeeListing.php +++ b/application/views/employeeListing.php @@ -4,7 +4,8 @@
-

Resico Industries - Employee Details

+ +

diff --git a/application/views/includes/footer.php b/application/views/includes/footer.php index b54bd76b..9703001a 100644 --- a/application/views/includes/footer.php +++ b/application/views/includes/footer.php @@ -2,9 +2,9 @@
- Copyright © 2017 Resico Industries. All rights reserved. + Copyright © 2017 Resico (India) Pvt Ltd. All rights reserved.
diff --git a/application/views/includes/header.php b/application/views/includes/header.php index dcd375b4..4b78eeec 100644 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -150,7 +150,7 @@ .li .active { background:blue } - Resico Industries + Resico (India) Pvt Ltd diff --git a/application/views/includes/pdffooter.php b/application/views/includes/pdffooter.php index 818d6da3..768f3131 100644 --- a/application/views/includes/pdffooter.php +++ b/application/views/includes/pdffooter.php @@ -26,7 +26,7 @@ -

For RESICO INDUSTRIES

+

For RESICO (INDIA) PVT LTD

 

 

 

diff --git a/application/views/login.php b/application/views/login.php index 1a12753b..cc79c738 100644 --- a/application/views/login.php +++ b/application/views/login.php @@ -2,7 +2,7 @@ - Resico Industries | Admin System Log in + Resico (India) Pvt Ltd | Admin System Log in @@ -23,7 +23,7 @@