RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
vadivelJ96 2025-04-22 18:15:12 +05:30
commit c249f9d69d
20 changed files with 113 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Config/Routes.php
View File

@ -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');

2
app/Views/EditservicePurchaseorder.php
View File

@ -1715,7 +1715,7 @@ if (!empty($getlogpodtl)) {
<a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success auditor-restricted-btn" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<?php } else if($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-danger auditor-restricted-btn Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>

1
app/Views/Report_pending_purchase.php
View File

@ -159,6 +159,7 @@
</div>
<div class="col-md-2"></div>
<div class="col-md-2 text-right"><br>
<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_pending_purchase') ?>';">
<input type="submit" class="btn btn-success" name="btn_submit"
value="View Report">
</div>

4
app/Views/assetListing.php
View File

@ -153,7 +153,7 @@
<td>
<?php if ($record->IsActive == 0) { ?>
<a onclick="confirmReActivatingAsset(event)"
<a class="auditor-restricted-btn" onclick="confirmReActivatingAsset(event)"
href="<?php echo base_url() . 'assetdetails/reActivateAsset/?AssetID=' . $record->AssetCode ?>"
data-toggle="tooltip"
title="<?php echo $record->AssetCode; ?> - Click here to Re-Activate Asset Details">
@ -168,7 +168,7 @@
<i class="fa fa-edit"></i>
</a>
&nbsp;&nbsp;
<a onclick="confirmDeleteAsset(event)"
<a class="auditor-restricted-btn" onclick="confirmDeleteAsset(event)"
href="<?php echo base_url() . 'assetdetails/deleteAsset/?AssetID=' . $record->AssetCode ?>"
data-toggle="tooltip"
class="auditor-restricted-btn"

2
app/Views/costListing.php
View File

@ -129,7 +129,7 @@
<?php
if ($record->IsActive == 0) {
?>
<a onclick="confirmReActivate(event)" style="cursor:pointer;"
<a class="auditor-restricted-btn" onclick="confirmReActivate(event)" style="cursor:pointer;"
href="<?php echo base_url() . 'reActivateCostCenter?CostCenterCode=' . $record->code; ?>">
<i class="fa fa-key" style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;
</a>

4
app/Views/editOldemppay.php
View File

@ -343,8 +343,8 @@ if (!empty($emppay)) {
</div>
</div>
<div class="col-md-12 text-right">
<input type="button" class="btn btn-secondary" value="Delete" id="deleteemp" style="margin-right:15px;width:80px;border:none;" />
<input type="submit" onclick="return finalCheck();" value="Submit" class="btn btn-success">
<input type="button" class="btn btn-secondary auditor-restricted-btn" value="Delete" id="deleteemp" style="margin-right:15px;width:80px;border:none;" />
<input type="submit" onclick="return finalCheck();" value="Submit" class="btn btn-success auditor-restricted-btn">
<!-- <input type="submit" onmouseover="finalCheck();" value="Submit" class="btn btn-success"> -->
</div>
</div>

2
app/Views/editRawmaterial.php
View File

@ -114,7 +114,7 @@ if ($total <= $reorder) {
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Material - <?php echo $MaterialCode; ?> Details</h4>
<button type="button" class="btn btn-secondary" onclick="window.location.href='<?= base_url() ?>rawmaterialListing?materialListPage=<?= $materialListPage ?>'">
<span class="bold">Cancel</span>
<span class="bold">Back</span>
</button>
</div>
</div>

2
app/Views/editSupplier.php
View File

@ -287,7 +287,7 @@ if (!empty($supplier)) {
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Supplier Details <?php echo $SupplierID; ?></h4>
<button type="button" class="btn btn-secondary" onclick="history.back()">
<span class="bold">Cancel</span>
<span class="bold">Back</span>
</button>
</div>
</div>

6
app/Views/editimportpo.php
View File

@ -1409,10 +1409,12 @@ if (!empty($getlogpodtl)) {
<a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light auditor-restricted-btn Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<!-- <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a> -->
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>"><span class="bold">OK</span></a>
<a class="btn btn-success auditor-restricted-btn Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<?php } else { ?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>"><span class="bold">OK</span></a>
<!-- <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a> -->
<?php } ?>
</div>
</div>

4
app/Views/employeeLeaveApplicationForm.php
View File

@ -82,7 +82,7 @@
<th>From Date</th>
<th>To Date</th>
<th>Number Of Days</th>
<th class="security-restricted labstaff-restricted stock-restricted">Status</th>
<th class="auditor-restricted security-restricted labstaff-restricted stock-restricted">Status</th>
<th>Action</th>
</tr>
</thead>
@ -105,7 +105,7 @@
<td><?= esc($stdate) ?></td>
<td><?= esc($eddate) ?></td>
<td><?= esc($d['no_of_days']) ?></td>
<td class="security-restricted labstaff-restricted stock-restricted"><?php if($d['status'] !== "Approved"){ ?>
<td class="auditor-restricted security-restricted labstaff-restricted stock-restricted"><?php if($d['status'] !== "Approved"){ ?>
<select
class="form-control"
name="drpStatus"

2
app/Views/factoryMachineMasterDetails.php
View File

@ -159,7 +159,7 @@
<?php if ($record['is_active'] == 0) { ?>
<a data-toggle="tooltip"
<a data-toggle="tooltip" class="auditor-restricted-btn"
onclick="confirmReActivateMachineDetail(event)"
href="<?php echo base_url(); ?>reActivateFactoryMachineMasterDetails?id=<?php echo $record['id'] ?>">
<i class="fa fa-key" data-toggle="tooltip"

53
app/Views/includes/new_header.php
View File

@ -504,7 +504,38 @@
</head>
<script>
$(function () {
<?php if(session()->get('roleText') == 'Auditor'){ ?>
$(".auditor-restricted").hide();
$(".auditor-restricted-btn").hide();
$(".auditor-restricted-field").attr("readonly", true);
$(".auditor-restricted-dropdown").prop("disabled", true);
<?php } ?>
<?php if(session()->get('roleText') == 'Lab Staff'){ ?>
$(".labstaff-restricted").hide();
$(".labstaff-restricted-btn").hide();
$(".labstaff-restricted-field").attr("readonly", true);
$(".labstaff-restricted-dropdown").prop("disabled", true);
<?php } ?>
<?php if(session()->get('roleText') == 'Security'){ ?>
$(".security-restricted").hide();
$(".security-restricted-btn").hide();
$(".security-restricted-field").attr("readonly", true);
$(".security-restricted-dropdown").prop("disabled", true);
<?php } ?>
<?php if(session()->get('roleText') == 'Stock Handler'){ ?>
$(".stock-restricted").hide();
$(".stock-restricted-btn").hide();
$(".stock-restricted-field").attr("readonly", true);
$(".stock-restricted-dropdown").prop("disabled", true);
<?php } ?>
});
</script>
<body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
<!-- Begin page -->
<div id="wrapper">
@ -769,7 +800,7 @@
<?php } ?>
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Stock Handler'){?>
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Stock Handler'){?>
<div class="dropdown" >
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-po"
@ -874,7 +905,7 @@
<!-- master detail module -->
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor'){ ?>
<?php if(session()->get('roleText') == 'System Administrator'){ ?>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-others" role="button"
@ -945,6 +976,24 @@
<a href="<?php echo base_url(); ?>trpProductionDetails" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i>TRP Production Details</a>
</div>
<!-- whatsapp voice message -> ask gowtham -> date 22th april 2025-->
<?php if(session()->get('roleText') == 'Auditor'){?>
<div class="dropdown" >
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-po"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-arrow-down mr-1"></i> Gas Shortage <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-po" >
<a href="<?php echo base_url(); ?>gasCylinderEntered" class="dropdown-item"><i class="fa fa-truck mr-1"></i>Gas Cylinder Entered</a>
<a href="<?php echo base_url(); ?>gasCylinderPending" class="dropdown-item"><i class="fa fa fa-hourglass-half mr-1"></i>Gas Cylinder Pending </a>
<a href="<?php echo base_url(); ?>gasCylinderReturned" class="dropdown-item"><i class="fa fa-check mr-1"></i>Gas Cylinder Completed</a>
</div>
</div>
<?php } ?>
</div>
</li>

7
app/Views/rawmaterialListing.php
View File

@ -204,8 +204,10 @@
} ?></td>
<td><?php if ($record->IsActive == 0) { ?>
<a style="cursor:pointer;" onclick="reActivateMaterial('<?php echo $record->MaterialCode; ?>')"><i
<span class="auditor-restricted">
<a class="auditor-restricted-btn" style="cursor:pointer;" onclick="reActivateMaterial('<?php echo $record->MaterialCode; ?>')"><i
class="fa fa-key" style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;</a>
</span>
<?php } else { ?>
@ -217,11 +219,12 @@
class="fa fa-edit" style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;
</a>
<span class="auditor-restricted">
<a class="auditor-restricted-btn" style="cursor:pointer;" data-toggle="tooltip"
title="<?= $record->MaterialCode ?> - Click here to delete material details"
onclick="deleteMaterial('<?php echo $record->MaterialCode; ?>')"><i class="fa fa-trash"
style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;
</a>
</a></span>
<?php } ?>
</td>
</tr>

24
app/Views/report_sales.php
View File

@ -155,21 +155,23 @@
</form>
<table id="cc" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
<table id="cc" class="table table-bordered table-hover mb-0 nowrap w-100"
style="background-color:#fff; font-size:12px;">
<thead>
<tr>
<th>Invoice Date</th>
<th>Invoice No</th>
<th>Client Name</th>
<th>Product</th>
<th>HSN</th>
<th>Quantity</th>
<th>Rate</th>
<th>Sub Total</th>
<th>GST</th>
<th>Total</th>
<th style="white-space: nowrap !important;">Invoice Date</th>
<th style="white-space: nowrap !important;">Invoice No</th>
<th style="white-space: nowrap !important;">Client Name</th>
<th style="white-space: nowrap !important;">Product</th>
<th style="white-space: nowrap !important;">HSN</th>
<th style="white-space: nowrap !important;">Quantity</th>
<th style="white-space: nowrap !important;">Rate</th>
<th style="white-space: nowrap !important;">Sub Total</th>
<th style="white-space: nowrap !important;">GST</th>
<th style="white-space: nowrap !important;">Total</th>
</tr>
</thead>

5
app/Views/requisitionlisting.php
View File

@ -114,9 +114,10 @@ if (!empty($Status)) {
<a class="btn btn-success auditor-restricted-btn" href="<?php echo base_url(); ?>RequisitionForm">Raise New Requisition</a>
<?php } ?>
<?php if ($DraftCount > 0) { ?>
<p><span class="highlight auditor-restricted-btn">The Requisition No <b><?php echo $ReqNo; ?></b> is in Draft
<a class="btn btn-success auditor-restricted-btn" href="<?php echo base_url(); ?>RequisitionForm">Raise New Requisition</a>
<!-- <p><span class="highlight auditor-restricted-btn">The Requisition No <b><?php echo $ReqNo; ?></b> is in Draft
status.</span> Please act on the requisition.<span class="highlight">Then only you can raise
New Requisition. </span></p>
New Requisition. </span></p> -->
<?php } ?>
</div>
</div>

17
app/Views/sales_invoice.php
View File

@ -359,7 +359,7 @@
</a>
</div>
<div class="col-md-5" style="margin-top: 23px;">
<button type="button" class="btn btn-danger btn-sm"
<button type="button" class="btn btn-danger btn-sm account-restricted"
id="<?= $value['id']; ?>"
onclick="removeContact(this)">Delete</button>
</div>
@ -368,7 +368,7 @@
<?php }
} ?>
<div class="col-md-4">
<button type="button" class="btn btn-primary btn-sm a1" onclick="appendFilesFileds()" id="day">
<button type="button" class="btn btn-primary btn-sm a1 account-restricted" onclick="appendFilesFileds()" id="day">
Add New File
</button>
</div>
@ -380,7 +380,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" onclick="saveAttachment()" class="btn btn-primary">Save changes</button>
<button type="button" onclick="saveAttachment()" class="btn btn-primary account-restricted">Save changes</button>
</div>
</div>
</div>
@ -488,6 +488,9 @@ $(document).ready(function () {
$(document).ready(function() {
<?php if(session()->get('roleText') == 'Auditor'){ ?>
$(".account-restricted").hide();
<?php } ?>
// Initialize the DataTable
var table = $('#datatable-buttosns').DataTable({
@ -554,7 +557,7 @@ $(document).ready(function () {
style="font-size: 25px;"></i>
</a>
</div>
<div class="col-md-5" style="margin-top: 23px;">
<div class="col-md-5 account-restricted" style="margin-top: 23px;">
<button type="button" class="btn btn-danger btn-sm"
id="${element.invoice_attachment_id}"
onclick="removeContact(this)">Delete</button>
@ -563,6 +566,9 @@ $(document).ready(function () {
});
$('#filesContainer').html(attachmentsHtml);
$('#invoiceModal').modal('show');
<?php if(session()->get('roleText') == 'Auditor'){ ?>
$(".account-restricted").hide();
<?php } ?>
},
error: function() {
// Handle any errors during the AJAX request
@ -570,6 +576,9 @@ $(document).ready(function () {
$('#invoiceModal').modal('show');
}
});
<?php if(session()->get('roleText') == 'Auditor'){ ?>
$(".account-restricted").hide();
<?php } ?>
}
function appendFilesFileds(data) {

2
app/Views/stock/incomingSilicaSandDetails.php
View File

@ -725,7 +725,7 @@
</select>
</span>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="button" id="labReportSubmitId" class="btn btn-success">Save</button>
<button type="button" id="labReportSubmitId" class="btn btn-success auditor-restricted-btn">Save</button>
<button type="button" id="pdfGenerateId" class="btn btn-primary">Download</button>
</div>
</form>

2
app/Views/supplierListing.php
View File

@ -61,7 +61,7 @@
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Supplier Listing</h4>
<a class="btn btn-success" href="<?php echo base_url(); ?>addsupplier">Add New Supplier</a>
<a class="btn btn-success auditor-restricted" href="<?php echo base_url(); ?>addsupplier">Add New Supplier</a>
</div>
</div>
</div>

8
app/Views/transporterListing.php
View File

@ -93,7 +93,7 @@
</div>
<a data-toggle="modal" href="#transporterwizard" data-id="0" data-name=""
class="btn btn-success">Add New Transporter</a>
class="btn btn-success auditor-restricted-btn">Add New Transporter</a>
</div>
</div>
</div>
@ -170,7 +170,7 @@
<td><?php if ($record->isactive == 1) {echo"Active";}else{echo "InActive";}?></td>
<td>
<?php if ($record->isactive == 0) { ?>
<a onclick="confirmReActivate(event)" style="cursor:pointer;"
<a class="auditor-restricted-btn" onclick="confirmReActivate(event)" style="cursor:pointer;"
href="<?php echo base_url() . 'reActivateTransporter?id=' . $record->id; ?>"><i
class="fa fa-key" style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;</a>
<?php } else { ?>
@ -180,7 +180,7 @@
class="fa fa-edit"></i>&nbsp;&nbsp;</a>
<a onclick="confirmDelete(event)"
href="<?php echo base_url() . 'deleteTransporter?id=' . $record->id; ?>"><i
class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>
class="fa fa-trash auditor-restricted-btn"></i>&nbsp;&nbsp;&nbsp;</a>
<?php } ?>
</td>
</tr>
@ -230,7 +230,7 @@
<div class="modal-footer">
<button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal"
value="Cancel">Cancel</button>
<button type="button" class="btn btn-info waves-effect waves-light tempClick"
<button type="button" class="btn btn-info waves-effect waves-light tempClick auditor-restricted-btn"
id="tempClick">Submit</button>
</div>
</div>

9
app/Views/userListing.php
View File

@ -150,12 +150,12 @@
<td><?php if($record->isDeleted == 0) {echo"Active";}else{echo"InActive";} ?></td>
<td>
<?php if ($record->isDeleted == 1) { ?>
<a onclick="confirmReActivateUser(event)"
class="auditor-restricted-btn"
<span class="auditor-restricted">
<a class="auditor-restricted-btn" onclick="confirmReActivateUser(event)"
href="<?php echo base_url() . 'user/reActivateUser?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
<i class="fas fa-key"></i>
</a>
</span>
<?php } else { ?>
@ -165,12 +165,13 @@
</a>
&nbsp;&nbsp;
<span class="auditor-restricted">
<a class="auditor-restricted-btn"
onclick="confirmDeleteUser(event)"
href="<?php echo base_url() . 'user/deleteUser?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
<i class="fas fa-trash"></i>
</a>
</span>
<?php } ?>