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

Compare commits

base: RIA:9d7d72cd84f4a93a9145c5110cc4eb922f443718
Branches Tags
RIA:master
RIA:new_theme
RIA:CI4-Application
..
compare: RIA:361150a09b058848b240bd2621c1a4a791c27e02
Branches Tags
RIA:new_theme
RIA:CI4-Application
RIA:master

No commits in common. "9d7d72cd84f4a93a9145c5110cc4eb922f443718" and "361150a09b058848b240bd2621c1a4a791c27e02" have entirely different histories.
9d7d72cd84 ... 361150a09b

15 changed files with 112 additions and 289 deletions
Show Stats Expand all files Collapse all files

4
app/Controllers/Amendmentpurchaseorder.php
View File

@ -320,7 +320,7 @@ class Amendmentpurchaseorder extends BaseController
$AmendmentNewPoNo = generate_amendment_po_number($PONO);
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $Local_Interstate, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $changeStatus , 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult,'CapitalRange' => $Local_Interstate,'BudgetType' => $BudgetType, 'IsOpenOrder'=>$IsOpenOrder); // not
$file = $this->request->getFile('POFile');
$requestfilename = $file ? $file->getName() : null;
$requestfilename = $file->getName();
$PrePOFile = $this->request->getPost('PrePOFile');
if (!empty($requestfilename)) {
if ($file && $file->isValid() && !$file->hasMoved()) {
@ -1415,7 +1415,7 @@ class Amendmentpurchaseorder extends BaseController
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $changeStatus , 'PORange' => $PoRange, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'Import_DispatchDetails' => $Dispatch, 'CreatedDate' => $createddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ExchangeRate' => $Exchangerate, 'ExchangeRateCalculatedon' => $ExchangeRateCalculatedon, 'CurrencyType' => $CurrencyType, 'PaymentTerms' => $PaymentTerms, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Mode_Of_Shipment' => $Shipmentmode, 'Supplier_Reference' => $SupplierRef, 'Supplier_Offer_No' => $SupplierOffer, 'Other_Reference' => $otherRef, 'Fincap' => $finCap, 'AmendedDetails' => $MAD, 'PaymentOtherDescription' => $OtherPayment, 'InsuranceStatus' => $insurestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $importoption, 'IsQualityChkReqired' => $qtycheckresult);
$file = $this->request->getFile('POFile');
$requestfilename = $file ? $file->getName() : null;
$requestfilename = $file->getName();
$PrePOFile = $this->request->getPost('PrePOFile');
if (!empty($requestfilename)) {

153
app/Controllers/Inwardgateregister.php
View File

@ -423,9 +423,9 @@ class Inwardgateregister extends BaseController
$MasterRemarks = $this->request->getPost('MasterRemarks');
$createddt = get_current_date_time();
//$IGRStatus = IGR_CREATED;//old
$changedIgrStatus = (int)$this->request->getPost('hideIGRStatus') == 1 ? IGR_CREATED : IGR_DRAFT;
// $IGRStatus = ((int)$IsThisOpenOrderPO == 1) ? IGR_DRAFT : $changedIgrStatus;
$IGRStatus = $changedIgrStatus;
$PreIGRStatus = (int)$this->request->getPost('hideIGRStatus') == 1 ? IGR_CREATED : IGR_DRAFT;
// $IGRStatus = ((int)$IsThisOpenOrderPO == 1) ? IGR_DRAFT : $PreIGRStatus;
$IGRStatus = $PreIGRStatus;
$igr = array(); // For IGR Master
$paymentstatus = NO_PAIDIGR;
@ -612,23 +612,19 @@ class Inwardgateregister extends BaseController
$totalReceivedqty = 0 ;
if(!$IsThisOpenOrderPO && $changedIgrStatus == "ST027"){
if(!$IsThisOpenOrderPO && $PreIGRStatus == "ST027"){
log_message('info','Inside Updation of POLineItem in SaveIgr ');
// $quantitiesReceived = $this->inwardgateregister_model->getOldIgrReceivedQty($MaterialCode,$PONO_array);
$currentPoRecievedQuantity = $this->inwardgateregister_model->getCurrentPOreceivedQty($MaterialCode,$PONO);
$oldQuantityReceived = 0 ;
$currentIgrPreviousQty = 0 ;
$newQuantitiesReceived = $QuantityAsPerInvoice;
$currentIgrCurrentQty = $QuantityAsPerInvoice;
$changeInQuantities = $newQuantitiesReceived - $oldQuantityReceived;
$changeInQty = $currentIgrCurrentQty - $currentIgrPreviousQty;
$quantityToBeUpdated = $changeInQty;
$quantityToBeUpdated = $changeInQuantities;
$totalReceivedqty = $currentPoRecievedQuantity + $quantityToBeUpdated;
$totalReceivedqty = $oldQuantityReceived + $quantityToBeUpdated;
$POLineItem = array('ReceivedQuantity' => $totalReceivedqty, 'Status' => $ItemStatus, 'UpdateBY' => $CreatedBy, 'UpdatedOn' => $createddt);
@ -640,23 +636,17 @@ class Inwardgateregister extends BaseController
}
}
$this->inwardgateregister_model->UpdatePOMaster($PONO, $CreatedBy,$IGRStatus);
// $this->inwardgateregister_model->UpdatePOMaster($PONO, $CreatedBy,$IGRStatus);
// #Step 9 Updating Pending Quantity IN PO Master amd Line Item Details.
// if ((int)$IsThisOpenOrderPO != 1) {
// if ($TotalPendingQty == 0.00) {
// $Newstatus = array('Status' => $IGRStatus);
// $this->inwardgateregister_model->POLineItemsupdatestatus($PONO, $Newstatus);
// $this->inwardgateregister_model->pomasterupdatestatus($PONO, $Newstatus);
// }
// }
#Step 9 Updating Pending Quantity IN PO Master amd Line Item Details.
if ((int)$IsThisOpenOrderPO != 1) {
if ($TotalPendingQty == 0.00) {
$Newstatus = array('Status' => $IGRStatus);
$this->inwardgateregister_model->POLineItemsupdatestatus($PONO, $Newstatus);
$this->inwardgateregister_model->pomasterupdatestatus($PONO, $Newstatus);
}
}
#finally
$finalstatement = "Successfully Created IGR Number: $IGRNO \n";
@ -842,13 +832,10 @@ function viewIGRDetails()
$DriverName = $this->request->getPost('driver');
$DriverMobileNumber = $this->request->getPost('driver_mobile');
$changedIgrStatus = (int)$this->request->getPost('status') == 1 ? IGR_CREATED : IGR_DRAFT;
$PreIGRStatus = (int)$this->request->getPost('status') == 1 ? IGR_CREATED : IGR_DRAFT;
$IsThisOpenOrderPO = $this->request->getPost('isOpenOrder');
// $IGRStatus = ((int)$IsThisOpenOrderPO == 1) ? IGR_DRAFT : $changedIgrStatus;
$IGRStatus = $changedIgrStatus;
$getigrstatus = $this->inwardgateregister_model->getigrstatus($IGRNo);
$previousIgrStatus = $getigrstatus->IGRStatus;
// $IGRStatus = ((int)$IsThisOpenOrderPO == 1) ? IGR_DRAFT : $PreIGRStatus;
$IGRStatus = $PreIGRStatus;
# Here decode the tableData for IGRLineitem
$tableData = $this->request->getPost('tableData');
@ -980,25 +967,22 @@ function viewIGRDetails()
# Step 4.3 : IGRlineitem affectedRow have value and MaterialCode have value means
# : updated the polineitem Qty
if(!$IsThisOpenOrderPO && $changedIgrStatus == "ST027"){
if(!$IsThisOpenOrderPO && $PreIGRStatus == "ST027"){
log_message('info','Inside Updation of POLineItem in UpdateIGR ');
$currentPoRecievedQuantity = $this->inwardgateregister_model->getCurrentPOreceivedQty($MaterialCode,$PONo);
// $quantitiesReceived = $this->inwardgateregister_model->getOldIgrReceivedQty($MaterialCode,$PONO_array);d
$currentIgrPreviousQty = $previousIgrStatus == "ST074"
? 0
: $this->inwardgateregister_model->currentIgrPreviousQty($IGRNo , $MaterialCode);
$oldQuantityReceived = $this->inwardgateregister_model->getOldIgrReceivedIndividualQty($IGRNo , $MaterialCode );
$currentIgrCurrentQty = $quantityAsPerInvoice;
$newQuantitiesReceived = $quantityAsPerInvoice;
$changeInQty = $currentIgrCurrentQty - $currentIgrPreviousQty;
$changeInQuantities = $newQuantitiesReceived - $oldQuantityReceived;
$quantityToBeUpdated = $changeInQty;
$quantityToBeUpdated = $oldQuantityReceived + $changeInQuantities;
$totalReceivedqty = $currentPoRecievedQuantity + $quantityToBeUpdated;
$totalReceivedqty = $quantityToBeUpdated;
$POLineItem = array('ReceivedQuantity' => $totalReceivedqty);
$POLineItem = array('ReceivedQuantity' => $totalReceivedqty);
$this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONo, $MaterialCode);
@ -1195,16 +1179,19 @@ function viewIGRDetails()
$updateby = $this->session->get('userId');
$igrarr = array('IGRStatus' => $IGRStatus,'UpdateBY' => $updateby);
$getigrstatus = $this->inwardgateregister_model->getigrstatus($IGRNo);
$previousIgrStatus = $getigrstatus->IGRStatus;
# Step 2 : Here decode the tableData for IGRLineitem
$tableData = $this->request->getPost('tableData');
if (is_string($tableData)) {
$tableData = json_decode($tableData, true);
}
# Step 3 : loop starts here for IGRlineitem to save
# Step 3 : inserting IGR History
$this->saveIGRMasterHistory(array('IGRStatus' => $IGRStatus),$IGRNo);
# Step 4 : Updating IGR master
$updateigrmaster = $this->inwardgateregister_model->updateigr($igrarr, $IGRNo);
# Step 5 : loop starts here for IGRlineitem to save
if(!empty($tableData )){
foreach ($tableData as $row) {
@ -1212,43 +1199,37 @@ function viewIGRDetails()
$quantityAsPerInvoice = $row['QuantityAsPerInvoice']; // is also known as inward quantity
$igrItemNo = $row['IGRItemNo'];
# Step 3.0 : IGRlineitem affectedRow have value and MaterialCode have value means
# : updated the polineitem Qty
if ($MaterialCode != '' && $previousIgrStatus == "ST027" ) {
log_message('info','Inside Updation of POLineItem in CancelIGR ');
$currentPoRecievedQuantity = $this->inwardgateregister_model->getCurrentPOreceivedQty($MaterialCode,$PONo);
$currentIgrPreviousQty = $this->inwardgateregister_model->currentIgrPreviousQty($IGRNo , $MaterialCode);
$currentIgrCurrentQty = 0 ;
$changeInQty = $currentIgrCurrentQty - $currentIgrPreviousQty;
$quantityToBeUpdated = $changeInQty;
$totalReceivedqty = $currentPoRecievedQuantity + $quantityToBeUpdated ;
$POLineItem = array('ReceivedQuantity' => $totalReceivedqty );
$this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONo, $MaterialCode);
}
# Step 3.1 : IGR Lineitem And History Array Formation
# Step 5.0 : IGR Lineitem And History Array Formation
$igrline = array(
'QuantityAsPerInvoice' => 0,
'UpdateBY' => $updateby,
'mIGRStatus' => IGR_CANCELLED
);
'QuantityAsPerInvoice' => 0,
'UpdateBY' => $updateby,
'mIGRStatus' => IGR_CANCELLED
);
# Step 3.2 : Save IGRlineitem History
# Step 5.1 : Save IGRlineitem History
$this->saveIGRLineitemHistory(array('QuantityAsPerInvoice'=>0,'mIGRStatus' => $IGRStatus), $IGRNo,$igrItemNo);
# Step 5.2 : IGRlineitem affectedRow have value and MaterialCode have value means
# : updated the polineitem Qty
# Step 3.3 : Updating IGRlineitem
if ($MaterialCode != '') {
$PolineitemQty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONo, $MaterialCode);
$ReceivedQuantity = 0.00;
if (count($PolineitemQty) > 0) {
foreach ($PolineitemQty as $key) {
$ReceivedQuantity = $key->ReceivedQuantity;
}
}
$totalReceivedqty = ($ReceivedQuantity-$quantityAsPerInvoice);
$POLineItem = array('ReceivedQuantity' => ($totalReceivedqty > 0) ? $totalReceivedqty : 0 );
$this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONo, $MaterialCode);
$POMasterStatus = array('Status' => PO_RELEASED);
$this->inwardgateregister_model->UpdatePOMasterStatus($PONo, $POMasterStatus);
}
# Step 5.3 : Updating IGRlineitem
$updateigrlineitem = $this->inwardgateregister_model->updateIGRLineItem($igrline, $igrItemNo);
log_message('error', "lineitem updated successfully: " . $updateigrlineitem);
log_message('error', 'UpdateIGR updateigrlineitem: ' . json_encode($igrline));
@ -1257,13 +1238,7 @@ function viewIGRDetails()
}
# Step 4 : inserting IGR History
$this->saveIGRMasterHistory(array('IGRStatus' => $IGRStatus),$IGRNo);
# Step 5 : Updating IGR master
$this->inwardgateregister_model->updateigr($igrarr, $IGRNo);
echo "Successfully Cancelled IGR Number: $IGRNo \n";
echo "Successfully Cancelled IGR Number: $IGRNo \n";
}

26
app/Controllers/Supplier.php
View File

@ -291,8 +291,15 @@ class Supplier extends BaseController
if($PAN){ $supplier['PAN'] = $PAN;}
if($GSTNo){ $supplier['GSTNO'] = $GSTNo;}
/********************** File Insertion - MSME **************************/
if ($file2 && $file2->isValid() && !$file2->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$GST_DOC = $file2->getName();
$file2->move($path,$GST_DOC);
$supplier['Cert_GST'] = $GST_DOC;
}
else{
$supplier['Cert_GST'] = $this->request->getPost('hidden_Cert_GST') ? $this->request->getPost('hidden_Cert_GST') : NULL;
}
if ($file1 && $file1->isValid() && !$file1->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
@ -304,18 +311,6 @@ class Supplier extends BaseController
$supplier['Cert_MSME'] = $this->request->getPost('hidden_Cert_MSME') ? $this->request->getPost('hidden_Cert_MSME') : NULL;
}
/********************** GST *******************************************/
if ($file2 && $file2->isValid() && !$file2->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$GST_DOC = $file2->getName();
$file2->move($path,$GST_DOC);
$supplier['Cert_GST'] = $GST_DOC;
}
else{
$supplier['Cert_GST'] = $this->request->getPost('hidden_Cert_GST') ? $this->request->getPost('hidden_Cert_GST') : NULL;
}
/********************** BANK *******************************************/
if ($file3 && $file3->isValid() && !$file3->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$BANK_DOC = $file3->getName();
@ -326,7 +321,6 @@ class Supplier extends BaseController
$supplier['Cert_BANK'] = $this->request->getPost('hidden_Cert_BANK') ? $this->request->getPost('hidden_Cert_BANK') : NULL;
}
/********************** PAN *******************************************/
if ($file4 && $file4->isValid() && !$file4->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$PAN_DOC = $file4->getName();
@ -337,8 +331,6 @@ class Supplier extends BaseController
$supplier['Cert_PAN'] = $this->request->getPost('hidden_Cert_PAN') ? $this->request->getPost('hidden_Cert_PAN') : NULL;
}
/********************** End Of File Insertion *************************/
$result = $this->supplier_model->UpdateSupplier($supplier, $SupplierID);
if ($result == True) {

2
app/Models/Dashboard_model.php
View File

@ -3285,7 +3285,7 @@ function daybeforetotal($yesterday){
SUM(CASE WHEN date = '$startDate' THEN opening ELSE 0 END) + SUM(receipt) as total,
SUM(used) as used,
SUM(CASE WHEN date = '$startDate' THEN opening ELSE 0 END) + SUM(receipt) - SUM(used) as closing
FROM t_resinstockdetails tbg
FROM t_resinStockDetails tbg
INNER JOIN t_materialmaster tmm ON tmm.MaterialCode = tbg.materialCode
INNER JOIN t_igr_details tigrd ON tigrd.MaterialCode = tbg.materialCode AND Date(tigrd.CreatedDate) >= '$startDate' AND Date(tigrd.CreatedDate) <= '$endDate'
INNER JOIN t_igr_master tigrm ON tigrd.IGRNO = tigrm.IGRNO

22
app/Models/Inwardgateregister_model.php
View File

@ -754,24 +754,26 @@ class Inwardgateregister_model extends Model
}
function getCurrentPOreceivedQty( $MaterialCode, $PONO) {
function getOldIgrReceivedQty( $MaterialCode, $PONO_array) {
$builder = $this->db->table('t_purchaseorder_lineitem tpol')
->selectSum('tpol.ReceivedQuantity')
->where('tpol.PONO',$PONO)
->where('tpol.MaterialCode', $MaterialCode)
->groupBy('PONO,MaterialCode');
$builder = $this->db->table('t_igr_details tigrd')
->selectSum('tigrd.QuantityAsPerInvoice')
->join('t_igr_master tigrm', 'tigrm.IGRNO = tigrd.IGRNO', 'inner')
->whereIn('tigrm.PONO', $PONO_array)
->where('tigrm.IGRStatus', 'ST027')
->where('tigrd.MaterialCode', $MaterialCode)
->groupBy('tigrd.MaterialCode');
$result = $builder->get()->getRow();
log_message('info', 'getCurrentPOreceivedQty Query: ' . $this->db->getLastQuery()->getQuery());
log_message('info', 'getOldIgrReceivedQty Second Query: ' . $this->db->getLastQuery()->getQuery());
// Return the sum or 0 if no result from the second query
return $result ? $result->ReceivedQuantity : 0;
return $result ? $result->QuantityAsPerInvoice : 0;
}
function currentIgrPreviousQty($IGRNo , $MaterialCode){
function getOldIgrReceivedIndividualQty($IGRNo , $MaterialCode){
$builder = $this->db->table('t_igr_details tigrd')
->selectSum('tigrd.QuantityAsPerInvoice')
@ -782,7 +784,7 @@ class Inwardgateregister_model extends Model
$result = $builder->get()->getRow();
log_message('info', 'currentIgrPreviousQty Query: ' . $this->db->getLastQuery()->getQuery());
log_message('info', 'getOldIgrReceivedIndividualQty Query: ' . $this->db->getLastQuery()->getQuery());
// Return the sum or 0 if no result from the second query
return $result ? $result->QuantityAsPerInvoice : 0;

4
app/Models/Ipinvoice_model.php
View File

@ -645,7 +645,7 @@ class Ipinvoice_model extends Model
/************************************************************* Resin ****************************************************************/
case "resin":
$builder = $this->db->table('t_resinstockdetails trd')
$builder = $this->db->table('t_resinStockDetails trd')
->select('trd.balanceStock, tmm.MaterialName ,tmm.MaterialCode ,tmm.UOM')
->join('t_materialmaster tmm', 'tmm.MaterialCode = trd.materialCode')
->where('trd.date', $lastDateOfCurrentMonth)
@ -679,7 +679,7 @@ class Ipinvoice_model extends Model
default:
$builder = $this->db->table('t_resinstockdetails trd')
$builder = $this->db->table('t_resinStockDetails trd')
->select('trd.balanceStock, tmm.MaterialName ,tmm.MaterialCode , tmm.UOM')
->join('t_materialmaster tmm', 'tmm.MaterialCode = trd.materialCode')
->where('trd.date', $lastDateOfCurrentMonth)

2
app/Models/ResinStockModel.php
View File

@ -6,7 +6,7 @@ use CodeIgniter\Model;
class ResinStockModel extends Model
{
protected $table = 't_resinstockdetails';
protected $table = 't_resinStockDetails';
protected $primaryKey = 'id';
protected $useAutoIncrement = true;
protected $returnType = 'array';

2
app/Models/Supplier_model.php
View File

@ -209,7 +209,7 @@ class Supplier_model extends Model
$builder = $builder->select('SupplierID, SupplierName, Address, IsActive');
if(!empty($supp_id)){
$builder = $builder->where('SupplierID <>' , $supp_id);
$builder = $builder->where('SupplierID !=' , $supp_id);
}
$builder = $builder->where('REPLACE(SupplierName, " ", "") ',$supp_name);

14
app/Views/capitalpurchaseorder.php
View File

@ -3340,11 +3340,10 @@ if (!empty($INRSYMBOL)) {
/* This is used add capital po line item */
$('.AddCapital').click(function() {
let CPRate = $('#CPRate').val().trim();
let CPRate = $('#CPRate').val();
if (CPRate === "" || CPRate === "0" || CPRate === "0.00" || parseFloat(CPRate) === 0) {
if (parseFloat(CPRate) === 0 || CPRate.trim() === "") {
alert("Rate Cannot be Empty Or Zero ..!!")
return false;
}
@ -4775,15 +4774,6 @@ if (!empty($INRSYMBOL)) {
* This function is used for Edit Capital
*/
$('.EditCapital').click(function() {
let rate = $('#EditCPRate').val().trim();
if (rate === "" || rate === "0" || rate === "0.00" || parseFloat(rate) === 0) {
alert("Rate cannot be empty or zero..!!");
return false;
}
tinyMCE.triggerSave();
if (validateEditCapitalTax() && EditExceedQuantityCheck() && validateEditExceedLimit()) {

15
app/Views/importpo.php
View File

@ -3440,13 +3440,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
$('.AddImport').click(function() {
let rate = $('#Rate').val().trim();
if (rate === "" || rate === "0" || rate === "0.00" || parseFloat(rate) === 0) {
alert("Rate cannot be empty or zero..!!");
return false;
}
// alert('out');
if (validateImport() && ExceedQuantityCheck() && validateExceedLimit() && QtyZerocheck()) {
//alert('in');
@ -3851,14 +3844,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
}
$('.EditImport').click(function() {
let rate = $('#EditRate').val().trim();
if (rate === "" || rate === "0" || rate === "0.00" || parseFloat(rate) === 0) {
alert("Rate cannot be empty or zero..!!");
return false;
}
if (validateEditExceedLimit() && ExceedEditQuantityCheck() && EditQtyZerocheck()) {
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();

9
app/Views/po_pdf.php
View File

@ -612,13 +612,8 @@
echo "xxx";
} ?>
</td>
<td class="text-right no-border"><?php
if ($POType == 'IMPORT') {
echo $item->Rate;
} else {
echo number_alignment($item->Rate);
}
?></td> <td class="text-right no-border"><?php echo number_alignment(abs($item->BasicValue)); ?></td>
<td class="text-right no-border"><?php echo number_alignment($item->Rate); ?></td>
<td class="text-right no-border"><?php echo number_alignment(abs($item->BasicValue)); ?></td>
<td class="text-right no-border"><?php if(isset($item->CGST) && $item->CGST != '' ){ _htmlsc($item->CGST); }else{ echo 0; } ?></td>
<td class="text-right no-border"><?php if (isset($item->AfterCGST) && $item->AfterCGST != '') {
echo number_alignment(abs($item->AfterCGST));

16
app/Views/purchaseorder.php
View File

@ -3408,14 +3408,6 @@ if (!empty($INRSYMBOL)) {
});
});
$('.AddRevenue').click(function() {
let rate = $('#Rate').val().trim();
if (rate === "" || rate === "0" || rate === "0.00" || parseFloat(rate) === 0) {
alert("Rate cannot be empty or zero..!!");
return false;
}
tinyMCE.triggerSave();
if (validateRevenueTax() && ExceedQuantityCheck()) {
// console.log(index);
@ -3588,14 +3580,6 @@ if (!empty($INRSYMBOL)) {
});
$('.EditRevenue').click(function() {
let rate = $('#EditRate').val().trim();
if (rate === "" || rate === "0" || rate === "0.00" || parseFloat(rate) === 0) {
alert("Rate cannot be empty or zero..!!");
return false;
}
tinyMCE.triggerSave();
if (validateEditRevenueTax() && validateEditExceedLimit() && ExceedEditQuantityCheck()) {
var CostCode = $("#EditCostCenter").val();

27
app/Views/requisitionform.php
View File

@ -210,31 +210,20 @@ if (!empty($Emp)) {
<div class="modal-body p-4">
<div class="row">
<div class="col-md-12">
<div class="form-group">
<label for="MaterialCode" class="control-label">Material Code</label>
<?php
$options = array("0" => 'Material Code');
$options = array("0" => 'Material Code');
//print_r( $options);
if (!empty($MaterialList)) {
foreach ($MaterialList as $MID) :
$options[$MID->MaterialCode] = $MID->HSNCODE . ' ' . ' - ' . ' ' . $MID->MaterialName.' ( '.$MID->MaterialCode.' )';
endforeach;
}
echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode" class="form-control searchabledropdown" ');
if (!empty($MaterialList)) {
foreach ($MaterialList as $MID) :
$hsn = isset($MID->HSNCODE) ? $MID->HSNCODE : '';
$label = esc($hsn . ' - ' . $MID->MaterialName . ' ( ' . $MID->MaterialCode . ' )');
$options[$MID->MaterialCode] = $label;
endforeach;
}
echo form_dropdown(
'MaterialCode',
$options,
set_value('MaterialCode'),
'id="MaterialCode" class="form-control searchabledropdown"'
);
?>
</div>
</div>
</div>

88
app/Views/sales_dashboard.php
View File

@ -112,12 +112,12 @@
<div class="row">
<div class="col-xl-6 col-md-6">
<div class="col-xl-12 col-md-12">
<div class="card">
<div class="card-body" style="min-height: 460px;">
<div class="card-body">
<h4 class="header-title">This Month Stock Closing</h4>
<div class="d-flex justify-content-between align-items-center ">
<div class="d-flex justify-content-between align-items-center w-50">
<div>
<a class="btn btn-primary btn-sm px-2" href="<?php echo base_url(); ?>sales_dashboard?stock=resin">Resin</a>
<a class="btn btn-secondary btn-sm px-2" href="<?php echo base_url(); ?>sales_dashboard?stock=bag">Bag</a>
@ -152,7 +152,7 @@
}
}?>
<table align="left" id="stockClosing" class="table dt-responsive nowrap ">
<table align="left" id="stockClosing" class="table dt-responsive nowrap w-50">
<thead>
<?php if (is_array($stock[0]['header'])) { ?>
@ -224,19 +224,7 @@
</div>
</div>
<div class="col-xl-6 col-md-6">
<div class="card" style="min-height: 460px;">
<div class="card-body">
<h4 class="header-title">This Month Stock Chart</h4>
<canvas id="stockChart" height="170"></canvas>
</div>
</div>
</div>
</div>
</div>
<div class="row">
@ -426,72 +414,6 @@
});
</script>
<script>
const stockLabels = <?php echo json_encode(is_array($stock[0]['header']) ? $stock[0]['header'] : [$stock[0]['header']]); ?>;
const stockData = <?php echo json_encode(is_array($stock[0]['header']) ? $stock[2]['body'] : [$stock[1]['body']]); ?>;
</script>
<script>
const stockCtx = document.getElementById('stockChart').getContext('2d');
const stockChart = new Chart(stockCtx, {
type: 'bar', // or 'line', 'doughnut', etc.
data: {
labels: stockLabels,
datasets: [{
label: 'Closing Stock',
data: stockData,
backgroundColor: 'rgba(54, 162, 235, 0.5)',
borderColor: 'rgba(54, 162, 235, 1)',
borderWidth: 1
}]
},
options: {
responsive: true,
plugins: {
legend: {
position: 'top',
},
tooltip: {
callbacks: {
label: function(context) {
return ` ${context.parsed.y} units`;
}
}
}
},
scales: {
y: {
beginAtZero: true,
title: {
display: true,
text: 'Stock Quantity'
}
},
x: {
title: {
display: true,
text: 'Material'
},
ticks: {
callback: function(value, index, ticks) {
const label = this.getLabelForValue(value);
return label.length > 12 ? label.substr(0, 12) + '...' : label;
},
font: {
size: 10
},
maxRotation: 45,
minRotation: 0
}
}
}
}
});
</script>
<script>
$(document).ready(function() {

17
app/Views/servicePurchaseorder.php
View File

@ -677,14 +677,10 @@ if (!empty($INRSYMBOL)) {
clearTotalItemValues();
$('.EditService').click(function(){
console.log("1111111111111111111");
let rate = $('#Edit').val().trim();
if (rate === "" || rate === "0" || rate === "0.00" || parseFloat(rate) === 0) {
alert("Rate cannot be empty or zero..!!");
return false;
}
// tinyMCE.triggerSave();
console.log("2222222222222222");
if (validateEditServiceTax()) {
var CostCode = $("#EditCostCenter").val();
@ -1929,13 +1925,6 @@ console.log($('#ItemDescription' + userid).val());
$('.AddService').click(function() {
let rate = $('#Rate').val().trim();
if (rate === "" || rate === "0" || rate === "0.00" || parseFloat(rate) === 0) {
alert("Rate cannot be empty or zero..!!");
return false;
}
tinyMCE.triggerSave();
if (validateServiceTax()) {
var temp = index;