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:
aadhavan valli 2024-09-26 11:38:37 +05:30
commit 6b418033b7
3 changed files with 72 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/Controllers/Servicepurchaseorder.php
View File

@ -341,6 +341,7 @@ class Servicepurchaseorder extends BaseController
//update service po //update service po
function UpdateServicePurchaseOrder() function UpdateServicePurchaseOrder()
{ {
// print_r($this->request->getPost());die;
$PONO = $this->request->getPost('txtPONO'); $PONO = $this->request->getPost('txtPONO');
$newsup = $this->request->getPost('newsup'); $newsup = $this->request->getPost('newsup');
// $newSupId = split("[ - ]+", $newsup); // $newSupId = split("[ - ]+", $newsup);
@ -408,23 +409,30 @@ class Servicepurchaseorder extends BaseController
$POList['ReleasedOn'] = get_current_date_time(); $POList['ReleasedOn'] = get_current_date_time();
$POList['ReleasedBy'] = $this->session->get('userId'); $POList['ReleasedBy'] = $this->session->get('userId');
} }
$file = $this->request->getFile('POFile'); $file = $this->request->getFile('POFile');
$requestfilename = $file->getName(); if ($file !== null) {
if (!empty($requestfilename)) { $requestfilename = $file->getName();
if ($file && $file->isValid() && !$file->hasMoved()) { if (!empty($requestfilename)) {
$path = ROOTPATH . 'public/uploads/POfiles/'; if ($file->isValid() && !$file->hasMoved()) {
if (!is_dir($path)) { $path = ROOTPATH . 'public/uploads/POfiles/';
mkdir($path, 0777, true); if (!is_dir($path)) {
} mkdir($path, 0777, true);
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) { }
log_message('error', 'File already exists in the database' . $requestfilename); if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
} else { log_message('error', 'File already exists in the database: ' . $requestfilename);
$file->move($path, $requestfilename); } else {
$POList['POFile'] = $requestfilename; $file->move($path, $requestfilename);
$POList['POFile'] = $requestfilename;
}
} }
} }
} else {
log_message('error', 'No file was uploaded');
} }
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO, $POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO, $POList);

21
app/Views/EditservicePurchaseorder.php
View File

@ -2995,16 +2995,16 @@ if (!empty($getlogpodtl)) {
var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val(); var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
if (validate()) { if (validate()) {
if (document.getElementById('ServiceTable').rows.length < 2) { if (document.getElementById('ServiceTable').rows.length < 2)
{
alert('Please Select Line item to Create PO'); alert('Please Select Line item to Create PO');
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} }
// else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) { // else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
// alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
// return false; // return false;
// } // }
else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
alert('Please Enter Payable Terms'); alert('Please Enter Payable Terms');
$('#Otherpayment').focus(); $('#Otherpayment').focus();
@ -3025,7 +3025,16 @@ if (!empty($getlogpodtl)) {
processData: false, processData: false,
contentType: false, contentType: false,
success: function(data) { success: function(data) {
// console.log(data);
// var newWindow = window.open("", "_blank", "toolbar=yes,scrollbars=yes,resizable=yes,width=1024,height=768");
// newWindow.document.write("<html><head><title>Response</title></head><body>");
// newWindow.document.write("<pre>" + data + "</pre>"); // Using <pre> to preserve formatting
// newWindow.document.write("</body></html>");
// newWindow.document.close();
// newWindow.moveTo(0, 0);
// newWindow.resizeTo(screen.width, screen.height);
if (data) { if (data) {
$('#loader').hide(); $('#loader').hide();
alert(data); alert(data);

57
app/Views/editRevenuepurchaseorder.php
View File

@ -2219,20 +2219,20 @@ if (!empty($getlogpodtl)) {
<thead> <thead>
<tr> <tr>
<th>SNo</th> <th style="text-align:center !important">SNo</th>
<th>Requisition No</th> <th style="text-align:center !important">Requisition No</th>
<th>Item Code</th> <th style="text-align:center !important">Item Code</th>
<th>Item Description</th> <th style="text-align:center !important">Item Description</th>
<th>Quantity</th> <th style="text-align:center !important">Quantity</th>
<th>UOM</th> <th style="text-align:center !important">UOM</th>
<th>Rate <?php echo "($INRSYM)" ?></th> <th style="text-align:center !important">Rate <?php echo "($INRSYM)" ?></th>
<th>Basic Amount <?php echo "($INRSYM)" ?></th> <th style="text-align:center !important">Basic Amount <?php echo "($INRSYM)" ?></th>
<th>Tax Amount <?php echo "($INRSYM)" ?></th> <th style="text-align:center !important">Tax Amount <?php echo "($INRSYM)" ?></th>
<th>Total Order Amount <?php echo "($INRSYM)" ?></th> <th style="text-align:center !important">Total Order Amount <?php echo "($INRSYM)" ?></th>
<!-- <th>Actual Quantity</th> <!-- <th>Actual Quantity</th>
<th>Received Quantity</th> <th>Received Quantity</th>
<th>Pending Quantity</th> --> <th>Pending Quantity</th> -->
<th>Action</th> <th style="text-align:center !important">Action</th>
</tr> </tr>
</thead> </thead>
<tbody id='RevenueAppend'> <tbody id='RevenueAppend'>
@ -2244,12 +2244,12 @@ if (!empty($getlogpodtl)) {
$index = $index + 1; $index = $index + 1;
?> ?>
<tr id="<?php echo $index; ?>"> <tr id="<?php echo $index; ?>">
<td align="left"><?php echo $index; ?></td> <td align="center"><?php echo $index; ?></td>
<td><?php echo $record->ReqNo ?></td> <td align="center"><?php echo $record->ReqNo ?></td>
<td><?php echo $record->MaterialCode ?></td> <td align="center"><?php echo $record->MaterialCode ?></td>
<td><?php echo $record->MaterialName ?></td> <td align="center"><?php echo $record->MaterialName ?></td>
<td align="left"><?php echo $record->Quantity ?></td> <td align="center"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td> <td align="center"><?php echo $record->UOM ?></td>
<td align="right"><?php echo $record->Rate ?></td> <td align="right"><?php echo $record->Rate ?></td>
<td align="right"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td> <td align="right"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td>
@ -2297,12 +2297,14 @@ if (!empty($getlogpodtl)) {
<?php <?php
if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?> if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill"></i></a> <td align="center"> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill"></i></a>
<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
</td>
<?php <?php
} else { ?> } else { ?>
<td> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" title="Click here to view the <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td> <td align="center"> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" title="Click here to view the <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>
</td>
<?php <?php
} ?> } ?>
@ -2330,6 +2332,9 @@ if (!empty($getlogpodtl)) {
</table> </table>
</div> </div>
</div> </div>
<br>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Basic Amount <?php echo "($INRSYM)" ?></label> <label>Basic Amount <?php echo "($INRSYM)" ?></label>
@ -2378,6 +2383,9 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<br>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Total Packaging Amount <?php echo "($INRSYM)" ?></label> <label>Total Packaging Amount <?php echo "($INRSYM)" ?></label>
@ -2415,6 +2423,10 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<br>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Special Instructions </label> <?php <label>Special Instructions </label> <?php
@ -2424,6 +2436,10 @@ if (!empty($getlogpodtl)) {
<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value=""> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
</div> </div>
</div> </div>
<br>
<div class="form-row" id="splpodiv" style="display:none;"> <div class="form-row" id="splpodiv" style="display:none;">
<div class="form-group col-md-12"><label>Special po Table List</label> <div class="form-group col-md-12"><label>Special po Table List</label>
@ -2610,8 +2626,9 @@ if (!empty($getlogpodtl)) {
<?php } else { <?php } else {
} ?> } ?>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12" align="right"><br /> <div class="form-group col-md-12" align="left"><br />
<div> <div>
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile"> <input type="file" name="POFile" id="POFile">
<?php if ($PrePOFile) { ?> <?php if ($PrePOFile) { ?>
<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label> <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>