diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 56ca9f5a..fe8150a7 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -316,6 +316,7 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'EditStoreRequisition', 'Storer $routes->get( 'AddIGR', 'Inwardgateregister::addIGR'); // ADD IGR page - working $routes->get( 'ViewIGR', 'Inwardgateregister::viewIGR'); // View IGR PAGE - Working $routes->post('ViewIGR', 'Inwardgateregister::viewIGR');//for filter purpose +$routes->post('cancellationIGR', 'Inwardgateregister::cancellationIGR'); $routes->get( 'accountsDashboard', 'Inwardgateregister::accountsDashboard'); // View IGR PAGE - Working $routes->post('ViewIGRDetails', 'Inwardgateregister::viewIGRDetails'); $routes->post('GetIGRLineItemDetails', 'Inwardgateregister::getIGRLineItemDetails'); diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 3b080fbe..a75ecd90 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1715,7 +1715,7 @@ if (!empty($getlogpodtl)) {   Submit   Approve -   OK +   OK   Submit   Reset diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php index b46cc7f0..913a9c29 100755 --- a/app/Views/Report_pending_purchase.php +++ b/app/Views/Report_pending_purchase.php @@ -159,6 +159,7 @@

+
diff --git a/app/Views/assetListing.php b/app/Views/assetListing.php index fe17cfe4..287f3f69 100755 --- a/app/Views/assetListing.php +++ b/app/Views/assetListing.php @@ -153,7 +153,7 @@ IsActive == 0) { ?> - @@ -168,7 +168,7 @@    - IsActive == 0) { ?> -     diff --git a/app/Views/editOldemppay.php b/app/Views/editOldemppay.php index 7e92e7b8..790852dd 100755 --- a/app/Views/editOldemppay.php +++ b/app/Views/editOldemppay.php @@ -343,8 +343,8 @@ if (!empty($emppay)) {
- - + +
diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php index 48b5e391..c298dcbb 100755 --- a/app/Views/editRawmaterial.php +++ b/app/Views/editRawmaterial.php @@ -114,7 +114,7 @@ if ($total <= $reorder) {

Edit Material - Details

diff --git a/app/Views/editSupplier.php b/app/Views/editSupplier.php index 5e90c047..ea05467d 100755 --- a/app/Views/editSupplier.php +++ b/app/Views/editSupplier.php @@ -287,7 +287,7 @@ if (!empty($supplier)) {

Edit Supplier Details

diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index f75f9938..fe03f7d6 100755 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -1409,10 +1409,12 @@ if (!empty($getlogpodtl)) {   Submit   Approve - OK + + OK   Submit - OK + OK + diff --git a/app/Views/employeeLeaveApplicationForm.php b/app/Views/employeeLeaveApplicationForm.php index b7bcc8d6..594a4fa5 100755 --- a/app/Views/employeeLeaveApplicationForm.php +++ b/app/Views/employeeLeaveApplicationForm.php @@ -82,7 +82,7 @@ From Date To Date Number Of Days - Status + Status Action @@ -105,7 +105,7 @@ - + - + diff --git a/app/Views/supplierListing.php b/app/Views/supplierListing.php index 3cdaa8cb..7500691f 100755 --- a/app/Views/supplierListing.php +++ b/app/Views/supplierListing.php @@ -61,7 +61,7 @@

Supplier Listing

- Add New Supplier + Add New Supplier
diff --git a/app/Views/transporterListing.php b/app/Views/transporterListing.php index ecc666ee..d9f66eb9 100755 --- a/app/Views/transporterListing.php +++ b/app/Views/transporterListing.php @@ -93,7 +93,7 @@ Add New Transporter + class="btn btn-success auditor-restricted-btn">Add New Transporter @@ -170,7 +170,7 @@ isactive == 1) {echo"Active";}else{echo "InActive";}?> isactive == 0) { ?> -     @@ -180,7 +180,7 @@ class="fa fa-edit">       + class="fa fa-trash auditor-restricted-btn">    @@ -230,7 +230,7 @@ diff --git a/app/Views/userListing.php b/app/Views/userListing.php index 4dcfb81f..1150bddd 100755 --- a/app/Views/userListing.php +++ b/app/Views/userListing.php @@ -150,12 +150,12 @@ isDeleted == 0) {echo"Active";}else{echo"InActive";} ?> isDeleted == 1) { ?> - - + + @@ -165,12 +165,13 @@    - + +