diff --git a/app/Controllers/Department.php b/app/Controllers/Department.php index 185376e0..b731caeb 100755 --- a/app/Controllers/Department.php +++ b/app/Controllers/Department.php @@ -145,11 +145,21 @@ class Department extends BaseController function reActivateDepartment(){ + $depCode = $this->request->getGet('SID'); + $updateInfo = ['IsActive' => 1]; + $result = $this->department_model->reActivateDepartment($depCode , $updateInfo); + + return redirect()->route('departmentListing'); + } function deleteDepartment(){ + $depCode = $this->request->getGet('SID'); + $updateInfo = ['IsActive' => 0]; + $result = $this->department_model->reActivateDepartment($depCode , $updateInfo); + return redirect()->route('departmentListing'); } diff --git a/app/Models/Department_model.php b/app/Models/Department_model.php index 339da784..d5428328 100755 --- a/app/Models/Department_model.php +++ b/app/Models/Department_model.php @@ -132,13 +132,21 @@ function getdepcode() } - function reActivateDepartment(){ - + function reActivateDepartment($depCode , $updateInfo){ + $this->db->table('t_departmentdetails') + ->where('DEPCode', $depCode) + ->update($updateInfo); + $res = $this->db->affectedRows(); + return $res; } - function deleteDepartment(){ - + function deleteDepartment($depCode , $updateInfo){ + $this->db->table('t_departmentdetails') + ->where('DEPCode', $depCode) + ->update($updateInfo); + $res = $this->db->affectedRows(); + return $res; } diff --git a/app/Views/MaterialIssueList.php b/app/Views/MaterialIssueList.php index 200965dc..ac484748 100755 --- a/app/Views/MaterialIssueList.php +++ b/app/Views/MaterialIssueList.php @@ -92,6 +92,7 @@ ?> +

( Note :The entries count includes archived data... )


diff --git a/app/Views/assetListing.php b/app/Views/assetListing.php index 0f215235..ec575ecf 100755 --- a/app/Views/assetListing.php +++ b/app/Views/assetListing.php @@ -41,151 +41,160 @@
- -
-
-
-
-
    -
  1. Master Details
    2. -
  2. -

    Asset Details

    -
    3. -
-
- Add New - Asset + +
+
+
+
+
    +
  1. Master Details
    2. +
  2. +

    Asset Details

    +
    3. +
+ Add New + Asset
- -
-
-
-
- - - +
- - +
+
+
+ + + + - - - -
-
- - -
+ + -
- - -
- -
+ + - - - - - - - - - - - - - - - +
+
+ + +
+ +
- - - - - " - style="IsActive == 0){echo"display:none";}?>" - > +
+ +
- CreatedDt)) == "30-11--0001") { - $cdate = '00-00-0000'; - } else { - $cdate = date('d-m-Y', strtotime($record->CreatedDt)); - } ?> -
- - - - - - - - - - - +
Created DateAsset CodeAsset NameAsset DescriptionDepartment NameLocationAsset UserSupplier NameReceived DateAsset ValueAsset StatusAction
AssetCode ?>AssetName ?>Description ?>DepartmentName ?>Location ?>UserName ?>SupplierName ?>DateOfPurchase); - $DOPurchase = $dtpurchase->format('d-m-Y'); - echo $DOPurchase ?>AssetValue, 2); ?>AssetStatus ?> + + + + + + + + + + + + + + + + + + + + + + " + style="IsActive == 0) { + echo "display:none"; + } ?>"> + + CreatedDt)) == "30-11--0001") { + $cdate = '00-00-0000'; + } else { + $cdate = date('d-m-Y', strtotime($record->CreatedDt)); + } ?> + + + + + + + + + + + + - + - - + - -
Created DateAsset CodeAsset NameAsset DescriptionDepartment NameLocationAsset UserSupplier NameReceived DateAsset ValueAsset StatusAction
AssetCode ?>AssetName ?>Description ?>DepartmentName ?>Location ?>UserName ?>SupplierName ?>DateOfPurchase); + $DOPurchase = $dtpurchase->format('d-m-Y'); + echo $DOPurchase ?>AssetValue, 2); ?>AssetStatus ?> IsActive == 0) { ?> - - - + + + - + - - + +    - - + + -
- -

( Note :The entries count includes archived data... )

- -
- - - - + } + ?> +
+ +

( Note :The entries count includes archived data... )

+
+
+ +
+
-
-
+
+
+
@@ -194,20 +203,20 @@ \ No newline at end of file diff --git a/app/Views/costListing.php b/app/Views/costListing.php index f28a0ad6..85301c8c 100755 --- a/app/Views/costListing.php +++ b/app/Views/costListing.php @@ -146,6 +146,7 @@ ?> +

( Note :The entries count includes archived data... )

@@ -416,6 +417,13 @@ } $(document).ready(function () { + let table = $('#cost_listing').DataTable(); + + showArchiveList(); + + table.on('draw', function () { showArchiveList(); }); + + }); \ No newline at end of file diff --git a/app/Views/departmentListing.php b/app/Views/departmentListing.php index 8f26a600..632771e9 100755 --- a/app/Views/departmentListing.php +++ b/app/Views/departmentListing.php @@ -50,19 +50,19 @@
- +
-
-
    -
  1. Master Details
    2. -
  2. -

    Department Details

    -
    3. -
-
- Add New department - - +
+
    +
  1. Master Details
    2. +
  2. +

    Department Details

    +
    3. +
+
+ Add New department + +
@@ -71,7 +71,7 @@ helper('form'); $error = session()->getFlashdata('error'); if ($error) { - ?> + ?>
getFlashdata('error'); ?> @@ -80,7 +80,7 @@ getFlashdata('success'); if ($success) { - ?> + ?>
getFlashdata('success'); ?> @@ -90,16 +90,35 @@
-
+ - + - + + + + + + +
+
+ + +
+ +
+ - -
@@ -118,34 +137,56 @@ - + ?> + " style="IsActive == 0) { + echo "display:none"; + } ?>"> CreatedDt)) == "30-11--0001") { - $cdate = '00-00-0000'; + $cdate = '00-00-0000'; } else { - $cdate = date('d-m-Y', strtotime($record->CreatedDt)); + $cdate = date('d-m-Y', strtotime($record->CreatedDt)); } ?> - DEPCode;?> + DEPCode; ?> DepartmentName ?> HeadDept ?> - IsActive == 0) { ?> - - - -    - - + + IsActive == 0) { ?> + + + + + + + +    + + + + + - +

( Note :The entries count includes archived data... )

@@ -158,25 +199,25 @@ + + \ No newline at end of file diff --git a/app/Views/rawmaterialListing.php b/app/Views/rawmaterialListing.php index 57686b6e..e0eede4f 100755 --- a/app/Views/rawmaterialListing.php +++ b/app/Views/rawmaterialListing.php @@ -162,6 +162,7 @@ +

( Note :The entries count includes archived data... )

@@ -277,10 +278,17 @@ }); } - $(document).ready(function() { + $(document).ready(function () { + let table = $('#raw_material_list_table').DataTable(); + + showArchiveList(); + + table.on('draw', function () { showArchiveList(); }); + }); + function deleteMaterial(mid) { diff --git a/app/Views/supplierListing.php b/app/Views/supplierListing.php index 398f35a4..ecbc994b 100755 --- a/app/Views/supplierListing.php +++ b/app/Views/supplierListing.php @@ -1,203 +1,218 @@ - + .icon-button:hover { + color: #0056b3; + } + -
-
- getFlashdata('error'); - if ($error) { - $type = "error"; - echo show_alert($type, $error); - } - $success = session()->getFlashdata('success'); - if ($success) { - $type = "success"; - echo show_alert($type, $success); - } - ?> +
+
+ getFlashdata('error'); + if ($error) { + $type = "error"; + echo show_alert($type, $error); + } + $success = session()->getFlashdata('success'); + if ($success) { + $type = "success"; + echo show_alert($type, $success); + } + ?> - -
- -
-
-
-
-

Supplier Listing

- Add New Supplier -
-
-
-
-
-
-
- - - + +
+ +
+
+
+
+

Supplier Listing

+ Add New Supplier +
+
+
+
+
+
+ + + + - - - - - - -
+ + + + + + +
- -
-
- +
-
- -
- - - - - - - - - - - - - - - - - +
- " - style="IsActive == 0){echo"display:none";}?>" - > + +
+
Created DateSupplier IDSupplier NameAddressContact NumberEmail AddressPANGST NumberPayment TermsAction
+ + + + + + + + + + + + + + + + - CreatedOn)) == "30-11--0001") { - $cdate = '00-00-0000'; - } else { - $cdate = date('d-m-Y', strtotime($record->CreatedOn)); - } ?> - + " + style="IsActive == 0) { + echo "display:none"; + } ?>"> - - - - - - - - - - SupplierID ?> + + + + + + + + - - + + + - -
Created DateSupplier IDSupplier NameAddressContact NumberEmail AddressPANGST NumberPayment TermsAction
SupplierID ?>SupplierName ?>Address ?>ContactNumber ?>EmailAddress ?>PAN ?>GSTNO ?>PaymentTerms ?>IsActive == 0) { ?> - -     - - + CreatedOn)) == "30-11--0001") { + $cdate = '00-00-0000'; + } else { + $cdate = date('d-m-Y', strtotime($record->CreatedOn)); + } ?> + SupplierName ?>Address ?>ContactNumber ?>EmailAddress ?>PAN ?>GSTNO ?>PaymentTerms ?>IsActive == 0) { ?> + +     + + + +     + data-toggle="tooltip" + title="SupplierID ?> - Click here to edit Supplier details">    -     +     - -
-
-
-
-
-
-
-
-
+ } + ?> + + +

( Note :The entries count includes archived data... )

+
+
+
+
+
+
+
+
- - + - + - + \ No newline at end of file diff --git a/app/Views/transporterListing.php b/app/Views/transporterListing.php index c1706ffd..a66b6a31 100755 --- a/app/Views/transporterListing.php +++ b/app/Views/transporterListing.php @@ -186,7 +186,7 @@ - +

( Note :The entries count includes archived data... )

@@ -435,7 +435,14 @@ } $(document).ready(function () { + let table = $('#transporter_list').DataTable(); + + showArchiveList(); + + table.on('draw', function () { showArchiveList(); }); + }); + \ No newline at end of file