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
- Cancel
+ Back
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
- Cancel
+ Back
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 @@
= esc($stdate) ?>
= esc($eddate) ?>
= esc($d['no_of_days']) ?>
-
+
-
+
@@ -769,7 +800,7 @@
- get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Stock Handler'){?>
+ get('roleText') == 'System Administrator' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Stock Handler'){?>
+
+
+ get('roleText') == 'Auditor'){?>
+
+
diff --git a/app/Views/rawmaterialListing.php b/app/Views/rawmaterialListing.php
index d7375955..a9725090 100755
--- a/app/Views/rawmaterialListing.php
+++ b/app/Views/rawmaterialListing.php
@@ -204,8 +204,10 @@
} ?>
IsActive == 0) { ?>
-
+
+
@@ -217,11 +219,12 @@
class="fa fa-edit" style="color:#02a8b5;">
+
-
+
diff --git a/app/Views/report_sales.php b/app/Views/report_sales.php
index 04d7a270..ba7ea95e 100644
--- a/app/Views/report_sales.php
+++ b/app/Views/report_sales.php
@@ -155,21 +155,23 @@
-
+
+
- Invoice Date
- Invoice No
- Client Name
- Product
- HSN
- Quantity
- Rate
- Sub Total
- GST
- Total
+ Invoice Date
+ Invoice No
+ Client Name
+ Product
+ HSN
+ Quantity
+ Rate
+ Sub Total
+ GST
+ Total
diff --git a/app/Views/requisitionlisting.php b/app/Views/requisitionlisting.php
index d0b5beec..d0cf9670 100755
--- a/app/Views/requisitionlisting.php
+++ b/app/Views/requisitionlisting.php
@@ -114,9 +114,10 @@ if (!empty($Status)) {
Raise New Requisition
0) { ?>
- The Requisition No is in Draft
+ Raise New Requisition
+
diff --git a/app/Views/sales_invoice.php b/app/Views/sales_invoice.php
index c83a09a3..4b6c5270 100755
--- a/app/Views/sales_invoice.php
+++ b/app/Views/sales_invoice.php
@@ -359,7 +359,7 @@
- Delete
@@ -368,7 +368,7 @@
-
+
Add New File
@@ -380,7 +380,7 @@
@@ -488,6 +488,9 @@ $(document).ready(function () {
$(document).ready(function() {
+ get('roleText') == 'Auditor'){ ?>
+ $(".account-restricted").hide();
+
// Initialize the DataTable
var table = $('#datatable-buttosns').DataTable({
@@ -554,7 +557,7 @@ $(document).ready(function () {
style="font-size: 25px;">
-
+
Delete
@@ -563,6 +566,9 @@ $(document).ready(function () {
});
$('#filesContainer').html(attachmentsHtml);
$('#invoiceModal').modal('show');
+ get('roleText') == 'Auditor'){ ?>
+ $(".account-restricted").hide();
+
},
error: function() {
// Handle any errors during the AJAX request
@@ -570,6 +576,9 @@ $(document).ready(function () {
$('#invoiceModal').modal('show');
}
});
+ get('roleText') == 'Auditor'){ ?>
+ $(".account-restricted").hide();
+
}
function appendFilesFileds(data) {
diff --git a/app/Views/stock/incomingSilicaSandDetails.php b/app/Views/stock/incomingSilicaSandDetails.php
index b2b64690..ceb71fff 100644
--- a/app/Views/stock/incomingSilicaSandDetails.php
+++ b/app/Views/stock/incomingSilicaSandDetails.php
@@ -725,7 +725,7 @@
Cancel
- Save
+ Save
Download
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 @@
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 @@
-
+
+