diff --git a/application/config/routes.php b/application/config/routes.php
index a93eabe7..6d73eb5e 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -42,7 +42,7 @@ $route['default_controller'] = "login";
$route['404_override'] = 'error';
-/*********** Siddharth DEFINED ROUTES *******************/
+/*********** Resico DEFINED ROUTES *******************/
$route['loginMe'] = 'login/loginMe';
$route['dashboard'] = 'user';
diff --git a/application/controllers/companycontroller.php b/application/controllers/companycontroller.php
index 45947063..d8d33452 100644
--- a/application/controllers/companycontroller.php
+++ b/application/controllers/companycontroller.php
@@ -25,7 +25,7 @@ class companycontroller extends BaseController
*/
public function index()
{
- $this->global['pageTitle'] = 'Siddharth : Company Details';
+ $this->global['pageTitle'] = 'Resico : Company Details';
//$this->loadViews("companyadd", $this->global, NULL , NULL);
@@ -34,7 +34,7 @@ class companycontroller extends BaseController
public function companyview()
{
- $this->global['pageTitle'] = 'Siddharth : Company Details';
+ $this->global['pageTitle'] = 'Resico : Company Details';
$data['userRecords'] = $this->companydetailsmodel->companylisting();
$data['payment'] = $this->companydetailsmodel->getPaymentTerms();
@@ -85,7 +85,7 @@ class companycontroller extends BaseController
function companyadd(){
- $this->global['pageTitle'] = 'Siddharth : Company Details';
+ $this->global['pageTitle'] = 'Resico : Company Details';
$this->loadViews("companyadd", $this->global, NULL);
}
@@ -210,8 +210,7 @@ class companycontroller extends BaseController
echo 'Succssfully change the user status to InActive';
}
-
-
+
function UpdateCompany()
diff --git a/application/controllers/configurationctrl.php b/application/controllers/configurationctrl.php
index 7b06725f..f683bac6 100644
--- a/application/controllers/configurationctrl.php
+++ b/application/controllers/configurationctrl.php
@@ -27,7 +27,7 @@ class configurationctrl extends BaseController
public function index()
{
- $this->global['pageTitle'] = 'Siddharth : Supplier';
+ $this->global['pageTitle'] = 'Resico : Supplier';
$this->loadViews("configlisting", $this->global, NULL , NULL);
}
@@ -48,14 +48,14 @@ public function index()
$data['userRecords'] = $this->configmodel->configlisting();
- $this->global['pageTitle'] = 'Siddharth Industries : config Listing';
+ $this->global['pageTitle'] = 'Resico : Config Listing';
$this->loadViews("configlisting", $this->global, $data, NULL);
}
function addconfig()
{
- $this->global['pageTitle'] = 'siddharth : AddNew Department';
+ $this->global['pageTitle'] = 'Resico : Add New Config';
$this->loadViews("addconfig", $this->global,NULL, NULL);
}
@@ -102,13 +102,13 @@ public function index()
if($result > 0)
{
redirect('configurationctrl/configlisting','refresh');
- echo "";
+ echo "";
}
else
{
redirect('configurationctrl/configlisting','refresh');
- echo "";
+ echo "";
}
}
@@ -120,7 +120,7 @@ public function index()
$index = 1;
// $index = $index + 1;
- $this->global['pageTitle'] = 'Siddharth : Edit Cost';
+ $this->global['pageTitle'] = 'Resico : Edit Config';
$this->loadViews("editconfig", $this->global, $data,NULL);
//}
}
@@ -160,13 +160,13 @@ public function index()
if($result == True)
{
redirect('configlisting','refresh');
- echo "";
+ echo "";
}
else
{
redirect('configlisting','refresh');
- echo "";
+ echo "";
}
}
}
diff --git a/application/controllers/department.php b/application/controllers/department.php
index 897c8657..b56e7ba0 100644
--- a/application/controllers/department.php
+++ b/application/controllers/department.php
@@ -29,7 +29,7 @@ class department extends BaseController
public function index()
{
- $this->global['pageTitle'] = 'Siddharth : Department Details';
+ $this->global['pageTitle'] = 'Resico : Department Details';
$this->loadViews("departmentListing", $this->global, NULL , NULL);
}
@@ -54,7 +54,7 @@ class department extends BaseController
$data['userRecords'] = $this->department_model->departmentListing();//$searchText, $returns["page"], $returns["segment"]);
- $this->global['pageTitle'] = 'Siddharth Industries : Department Listing';
+ $this->global['pageTitle'] = 'Resico : Department Listing';
$this->loadViews("departmentListing", $this->global, $data, NULL);
}
@@ -68,7 +68,7 @@ class department extends BaseController
//$data['depcode'] = $this->department_model->getdepcode();
$data['depcode'] = $this->department_model->getdepcode();
- $this->global['pageTitle'] = 'siddharth : AddNew Department';
+ $this->global['pageTitle'] = 'Resico : Add New Department';
$this->loadViews("adddepartment", $this->global,$data, NULL);
@@ -99,7 +99,7 @@ class department extends BaseController
if($result > 0)
{
- echo "";
+ echo "";
redirect('departmentListing','refresh');
}
@@ -180,7 +180,7 @@ class department extends BaseController
$data['department'] = $this->department_model->getDeptInfo($DepartmentID);
$data['depcode'] = $this->department_model->getdepcode();
- $this->global['pageTitle'] = 'Siddharth : Edit Department';
+ $this->global['pageTitle'] = 'Resico : Edit Department';
$this->loadViews("editdepartment", $this->global,$data, NULL);
}
@@ -251,7 +251,7 @@ class department extends BaseController
function pageNotFound()
{
- $this->global['pageTitle'] = 'Siddharth : 404 - Page Not Found';
+ $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
$this->loadViews("404", $this->global, NULL, NULL);
}
diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php
index 8cdaf9f3..81d7b6b5 100644
--- a/application/controllers/employeedetails.php
+++ b/application/controllers/employeedetails.php
@@ -25,7 +25,7 @@ class employeedetails extends BaseController
*/
public function index()
{
- $this->global['pageTitle'] = 'Siddharth : Employee Details';
+ $this->global['pageTitle'] = 'Resico : Employee Details';
$this->loadViews("employeeListing", $this->global, NULL , NULL);
}
@@ -42,7 +42,7 @@ class employeedetails extends BaseController
$data['userRecords'] = $this->employeedetails_model->employeeListing();
- $this->global['pageTitle'] = 'Siddharth : Employee Listing';
+ $this->global['pageTitle'] = 'Resico : Employee Listing';
$this->loadViews("employeeListing", $this->global, $data, NULL);
@@ -384,7 +384,7 @@ echo "";redirect('employeeListing','
$data['BloodGroup'] = $this->employeedetails_model->getConfigValue($BloodGroupConfigID);
$data['Department'] = $this->employeedetails_model->getDepartment();
- $this->global['pageTitle'] = 'Siddharth : Add New Employee';
+ $this->global['pageTitle'] = 'Resico : Add New Employee';
$this->loadViews("addemployee", $this->global, $data, NULL);
}
@@ -465,7 +465,7 @@ echo "";redirect('employeeListing','
function pageNotFound()
{
- $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
+ $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
$this->loadViews("404", $this->global, NULL, NULL);
}
@@ -529,7 +529,7 @@ echo "";redirect('employeeListing','
$data['bankdetails']=$this->employeedetails_model->getBankDetails();
$data['DepartmentList'] = $this->employeedetails_model->getDepartment();
$data['EmpDetails'] = $this->employeedetails_model->viewemployee($EmpID);
- $this->global['pageTitle'] = 'Siddharth : View Employee';
+ $this->global['pageTitle'] = 'Resico : View Employee';
$this->loadViews("editEmployee", $this->global, $data, NULL);
@@ -749,7 +749,7 @@ echo ""; redirect('employeeListin
$this->excel->getActiveSheet()->setTitle('Employee details');
- $this->excel->getActiveSheet()->setCellValue('L3', 'SIDDHARTH INDUSTRIES Employee Details');
+ $this->excel->getActiveSheet()->setCellValue('L3', 'RESICO INDUSTRIES Employee Details');
$this->excel->getActiveSheet()->setCellValue('A5', 'EmpID');
$this->excel->getActiveSheet()->setCellValue('B5', 'FirstName-LastName');
diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php
index 89f03a42..d4cc43d0 100644
--- a/application/controllers/rawmaterialdetails.php
+++ b/application/controllers/rawmaterialdetails.php
@@ -29,7 +29,7 @@ class rawmaterialdetails extends BaseController
*/
public function index()
{
- $this->global['pageTitle'] = 'Siddharth : RawMaterialDetails';
+ $this->global['pageTitle'] = 'Resico : RawMaterialDetails';
$this->loadViews("rawmaterialListing", $this->global, NULL , NULL);
}
@@ -44,7 +44,7 @@ class rawmaterialdetails extends BaseController
$data['userRecords'] = $this->rawmaterialdetails_model->rawmaterialListing();
- $this->global['pageTitle'] = 'Siddharth : RawMaterial Listing';
+ $this->global['pageTitle'] = 'Resico : RawMaterial Listing';
$this->loadViews("rawmaterialListing", $this->global, $data, NULL);
@@ -61,7 +61,7 @@ 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'] = 'siddharth : AddNew RawMaterial';
+ $this->global['pageTitle'] = 'Resico : Add New RawMaterial';
$this->loadViews("addRawMaterial", $this->global, $data, NULL);
}
@@ -231,7 +231,7 @@ class rawmaterialdetails extends BaseController
$data['costcentercode'] =$this->rawmaterialdetails_model->getCostCenterCode();
$data['cfUOM'] = $this->rawmaterialdetails_model->getConversionfactorUOM();
$data['assetcode'] = $this->rawmaterialdetails_model->getAssetcode();
- $this->global['pageTitle'] = 'Siddharth : Edit Material Master';
+ $this->global['pageTitle'] = 'Resico : Edit Material Master';
$this->loadViews("editOldRawmaterial", $this->global,$data, NULL);
}
@@ -349,7 +349,7 @@ class rawmaterialdetails extends BaseController
$this->excel->getActiveSheet()->setTitle('Material Master');
- $this->excel->getActiveSheet()->setCellValue('F3', 'SIDDHARTH INDUSTRIES Material Master');
+ $this->excel->getActiveSheet()->setCellValue('F3', 'RESICO INDUSTRIES Material Master');
$this->excel->getActiveSheet()->setCellValue('C5', 'MaterialCode');
$this->excel->getActiveSheet()->setCellValue('D5', 'MaterialName');
$this->excel->getActiveSheet()->setCellValue('E5', 'MaterialType');
@@ -446,7 +446,7 @@ class rawmaterialdetails extends BaseController
function pageNotFound()
{
- $this->global['pageTitle'] = 'Siddharth : 404 - Page Not Found';
+ $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
$this->loadViews("404", $this->global, NULL, NULL);
}
diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php
index 6713c535..e513dcfe 100644
--- a/application/controllers/supplier.php
+++ b/application/controllers/supplier.php
@@ -28,7 +28,7 @@ class supplier extends BaseController
*/
public function index()
{
- $this->global['pageTitle'] = 'Siddharth : Supplier';
+ $this->global['pageTitle'] = 'Resico : Supplier';
$this->loadViews("supplierListing", $this->global, NULL , NULL);
}
@@ -43,7 +43,7 @@ class supplier extends BaseController
$data['userRecords'] = $this->supplier_model->supplierListing();
- $this->global['pageTitle'] = 'Siddharth Industries : Supplier Listing';
+ $this->global['pageTitle'] = 'Resico Industries : Supplier Listing';
$this->loadViews("supplierListing", $this->global, $data, NULL);
@@ -57,7 +57,7 @@ class supplier extends BaseController
$data['payment'] = $this->supplier_model->getPaymentTerms();
//$data['users'] = $this->purchaseorder_model->getusers();
- $this->global['pageTitle'] = 'siddharth : Add New Supplier';
+ $this->global['pageTitle'] = 'Resico : Add New Supplier';
$this->loadViews("addsupplier", $this->global,$data, NULL);
@@ -431,7 +431,7 @@ class supplier extends BaseController
$this->excel->getActiveSheet()->setTitle('Supplier details');
- $this->excel->getActiveSheet()->setCellValue('J3', 'SIDDHARTH INDUSTRIES Supplier Details');
+ $this->excel->getActiveSheet()->setCellValue('J3', 'RESICO INDUSTRIES Supplier Details');
$this->excel->getActiveSheet()->setCellValue('A5', 'SupplierID');
$this->excel->getActiveSheet()->setCellValue('B5', 'SupplierName');
@@ -582,7 +582,7 @@ class supplier extends BaseController
function pageNotFound()
{
- $this->global['pageTitle'] = 'Siddharth : 404 - Page Not Found';
+ $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
$this->loadViews("404", $this->global, NULL, NULL);
}
diff --git a/application/controllers/user.php b/application/controllers/user.php
index 3c0726c4..d1c796e0 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -28,7 +28,7 @@ class user extends BaseController
*/
public function index()
{
- $this->global['pageTitle'] = 'Siddharth : Dashboard';
+ $this->global['pageTitle'] = 'Resico : Dashboard';
$this->load->model('employeedetails_model');
@@ -86,7 +86,7 @@ class user extends BaseController
$data['userRecords'] = $this->user_model->userListing();
- $this->global['pageTitle'] = 'Siddharth : User Listing';
+ $this->global['pageTitle'] = 'Resico : User Listing';
$this->loadViews("users", $this->global, $data, NULL);
}
@@ -108,7 +108,7 @@ class user extends BaseController
$data['roles'] = $this->user_model->getUserRoles();
- $this->global['pageTitle'] = 'Siddharth : Add New User';
+ $this->global['pageTitle'] = 'Resico : Add New User';
$this->loadViews("addNew", $this->global, $data, NULL);
}
@@ -250,7 +250,7 @@ class user extends BaseController
// $data['userInfo'] = $this->user_model->getUserInfo($userId);
- $this->global['pageTitle'] = 'Siddharth : Edit User';
+ $this->global['pageTitle'] = 'Resico : Edit User';
$this->loadViews("editOld", $this->global, $data, NULL);
}
@@ -338,7 +338,7 @@ class user extends BaseController
*/
function loadChangePass()
{
- $this->global['pageTitle'] = 'Siddharth : Change Password';
+ $this->global['pageTitle'] = 'Resico : Change Password';
$this->loadViews("changePassword", $this->global, NULL, NULL);
}
@@ -388,7 +388,7 @@ class user extends BaseController
function pageNotFound()
{
- $this->global['pageTitle'] = 'Siddharth : 404 - Page Not Found';
+ $this->global['pageTitle'] = 'Resico Industries : 404 - Page Not Found';
$this->loadViews("404", $this->global, NULL, NULL);
}
diff --git a/application/libraries/BaseController.php b/application/libraries/BaseController.php
index cff31c77..f9abafd6 100644
--- a/application/libraries/BaseController.php
+++ b/application/libraries/BaseController.php
@@ -3,7 +3,7 @@
/**
* Class : BaseController
* Base Class to control over all the classes
- * @author : Kishor Mali
+ * @author :
* @version : 1.1
* @since : 15 November 2016
*/
@@ -83,7 +83,7 @@ class BaseController extends CI_Controller {
* This function is used to load the set of views
*/
function loadThis() {
- $this->global ['pageTitle'] = 'CodeInsect : Access Denied';
+ $this->global ['pageTitle'] = 'Resico Industries : Access Denied';
$this->load->view ( 'includes/header', $this->global );
$this->load->view ( 'access' );
@@ -118,7 +118,8 @@ class BaseController extends CI_Controller {
* This function used provide the pagination resources
* @param {string} $link : This is page link
* @param {number} $count : This is page count
- * @param {number} $perPage : This is records per page limit
+ * @param {number} $perPage : This is
+ * records per page limit
* @return {mixed} $result : This is array of records and pagination data
*/
function paginationCompress($link, $count, $perPage = 10) {
diff --git a/application/views/addNew.php b/application/views/addNew.php
index 74803ae3..9cb9bb1a 100644
--- a/application/views/addNew.php
+++ b/application/views/addNew.php
@@ -2,7 +2,7 @@