hr login changes
This commit is contained in:
venbatechnologies@gmail.com
parent
85efd2da75
commit
f74ffbaf82
@ -35,12 +35,7 @@ class employeedetails extends BaseController
|
||||
*/
|
||||
function employeeListing()
|
||||
{
|
||||
if($this->isAdmin() == TRUE)
|
||||
{
|
||||
$this->loadThis();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
|
||||
$this->load->model('employeedetails_model');
|
||||
|
||||
@ -50,7 +45,7 @@ class employeedetails extends BaseController
|
||||
$this->global['pageTitle'] = 'Siddharth : Employee Listing';
|
||||
|
||||
$this->loadViews("employeeListing", $this->global, $data, NULL);
|
||||
}
|
||||
|
||||
}
|
||||
/*
|
||||
Validation for Gender status Dropdown
|
||||
|
||||
14
application/logs/log-2017-10-30.php
Normal file
14
application/logs/log-2017-10-30.php
Normal file
@ -0,0 +1,14 @@
|
||||
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
|
||||
|
||||
ERROR - 2017-10-30 11:24:56 --> Severity: Warning --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: Temporary failure in name resolution /opt/lampp/htdocs/30oct/siddharth_application/system/database/drivers/mysqli/mysqli_driver.php 77
|
||||
ERROR - 2017-10-30 11:24:56 --> Severity: Warning --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: Temporary failure in name resolution /opt/lampp/htdocs/30oct/siddharth_application/system/database/drivers/mysqli/mysqli_driver.php 77
|
||||
ERROR - 2017-10-30 11:24:56 --> Unable to connect to the database
|
||||
ERROR - 2017-10-30 11:25:30 --> Severity: Warning --> mysqli_connect(): php_network_getaddresses: getaddrinfo failed: Temporary failure in name resolution /opt/lampp/htdocs/30oct/siddharth_application/system/database/drivers/mysqli/mysqli_driver.php 77
|
||||
ERROR - 2017-10-30 11:25:30 --> Severity: Warning --> mysqli_connect(): (HY000/2002): php_network_getaddresses: getaddrinfo failed: Temporary failure in name resolution /opt/lampp/htdocs/30oct/siddharth_application/system/database/drivers/mysqli/mysqli_driver.php 77
|
||||
ERROR - 2017-10-30 11:25:30 --> Unable to connect to the database
|
||||
ERROR - 2017-10-30 11:40:00 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/30oct/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
|
||||
ERROR - 2017-10-30 11:40:15 --> Severity: Warning --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/30oct/siddharth_application/application/third_party/dompdf/include/stylesheet.cls.php 697
|
||||
ERROR - 2017-10-30 11:40:15 --> Severity: Warning --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/30oct/siddharth_application/application/third_party/dompdf/include/stylesheet.cls.php 697
|
||||
ERROR - 2017-10-30 11:41:38 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/30oct/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
|
||||
ERROR - 2017-10-30 11:42:10 --> Severity: Warning --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/30oct/siddharth_application/application/third_party/dompdf/include/stylesheet.cls.php 697
|
||||
ERROR - 2017-10-30 11:42:10 --> Severity: Warning --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/30oct/siddharth_application/application/third_party/dompdf/include/stylesheet.cls.php 697
|
||||
@ -1 +1 @@
|
||||
<span style='color: #900'>14,080 KB</span> <span style='color: #090'>1,982.8620 ms</span><br />
|
||||
<span style='color: #900'>20,480 KB</span> <span style='color: #090'>1,034.0412 ms</span><br />
|
||||
46
application/views/editRevenueAmendPO.php
Executable file → Normal file
46
application/views/editRevenueAmendPO.php
Executable file → Normal file
@ -250,6 +250,7 @@ if(insurancestatus == 1)
|
||||
var PercentageType = '<?php echo PERCENTAGE;?>';
|
||||
var POMaxDate = '<?php echo $MaxPoDate;?>';
|
||||
var PackagingCalculation = '';
|
||||
var FreightCalculation = '';
|
||||
var ExciseCalculation = '';
|
||||
var StateTaxCheck = '';
|
||||
var VatCalculation = ''; //FOR SGST
|
||||
@ -471,6 +472,7 @@ function calculateDiscount()
|
||||
}
|
||||
/*
|
||||
* To calcuate the Packaging */
|
||||
|
||||
function calculatePackaging()
|
||||
{
|
||||
|
||||
@ -597,7 +599,7 @@ function calculatePackaging()
|
||||
basicValue=parseFloat(basicValue1+packfreight);
|
||||
//alert(vatValue);
|
||||
$('#txtEditGST').val(vatValue);
|
||||
$('#txtEditOtherTax').val(0.00);
|
||||
//$('#txtEditOtherTax').val(0.00);
|
||||
AfterVat = <?php echo VAT_ONBASICVALUE; ?>;
|
||||
Vatval = parseFloat(AfterVat).toFixed(2);
|
||||
|
||||
@ -667,23 +669,26 @@ function calculatePackaging()
|
||||
else
|
||||
{
|
||||
var basicValue = parseFloat($('#txtEditBasicValue').val());
|
||||
|
||||
//alert("basic only "+basicValue);
|
||||
var discount=parseFloat($('#txtEditAfterDiscount').val());
|
||||
basicValue=basicValue-discount;
|
||||
basicValue=basicValue-discount;
|
||||
//alert("with discount "+basicValue);
|
||||
var packaging=parseFloat($('#txtEditAfterPackaging').val());
|
||||
var freight=parseFloat($('#txtEditAfterFreight').val());
|
||||
var packfreight =parseFloat(packaging)+parseFloat(freight);
|
||||
basicValue=parseFloat(basicValue+packfreight);
|
||||
//alert("with packfreight "+basicValue);
|
||||
|
||||
if($('#txtEditOtherTax').val() != "0" && $('#txtEditOtherTax').val() != '')
|
||||
{
|
||||
$('#txtEditGST').val(0.00);
|
||||
$('#txtEditVat').val(0.00);
|
||||
$('#txtEditAfterVat').val(0.00);
|
||||
|
||||
$('#txtEditAfterGST').val(0.00);
|
||||
// $('#txtEditGST').val(0.00);
|
||||
// $('#txtEditVat').val(0.00);
|
||||
// $('#txtEditAfterVat').val(0.00);
|
||||
// $('#txtEditAfterGST').val(0.00);
|
||||
|
||||
var OtherTaxValue = parseFloat($('#txtEditOtherTax').val());
|
||||
|
||||
|
||||
var AfterOtherTaxes = 0.0;
|
||||
AfterOtherTaxes = <?php echo OTHERTAX; ?>;
|
||||
|
||||
var Otherval = parseFloat(AfterOtherTaxes).toFixed(2);
|
||||
|
||||
$('#txtEditAfterOtherTax').val(Otherval);
|
||||
@ -714,6 +719,7 @@ function calculatePackaging()
|
||||
{
|
||||
var basicValue = parseFloat($('#txtEditBasicValue').val());
|
||||
var FreightType =$("#drpEditFreight").val();
|
||||
|
||||
if(FreightType == "0")
|
||||
{
|
||||
alert('Please select Freight Type');
|
||||
@ -725,12 +731,13 @@ function calculatePackaging()
|
||||
var FreightValue = parseFloat($('#txtEditFreight').val());
|
||||
var UOM = parseFloat($('#EditUOM').val());
|
||||
var Quantity = parseFloat($('#EditQuantity').val());
|
||||
//alert(FreightType);
|
||||
|
||||
var AfterFreight = 0.0;
|
||||
if(FreightType == PercentageType)
|
||||
{
|
||||
if(FreightCalculation != 0 &&$('#txtEditAfterDiscount').val() == '')
|
||||
{
|
||||
alert(FreightType);
|
||||
alert('Please Enter the Discount value');
|
||||
$('#EditDiscountType').focus();
|
||||
$('#txtEditFreight').val('');
|
||||
@ -823,7 +830,7 @@ function calculatePackaging()
|
||||
function SetFreightOption()
|
||||
{
|
||||
FreightCalculation = $("input:radio[name='optfreight']:checked").val();
|
||||
//alert(FreightCalculation);
|
||||
alert("this is value taken as before after radio value"+FreightCalculation);
|
||||
$('#freightmodel').modal('hide');
|
||||
calculateFreight();
|
||||
}
|
||||
@ -849,12 +856,13 @@ function calculatePackaging()
|
||||
$('#txtEditBasicValue').val(Tot);
|
||||
calculateDiscount();
|
||||
calculatePackaging();
|
||||
calculateFreight();
|
||||
// calculateExcise();
|
||||
calculateVat();
|
||||
// calculateCST();
|
||||
calculateGST();
|
||||
calculateOtherTaxes();
|
||||
calculateFreight();
|
||||
calculateOtherTaxes();//this is for igst
|
||||
|
||||
calculateEditTotalValue($('#isEdit').val());
|
||||
|
||||
}
|
||||
@ -1784,7 +1792,7 @@ function calculateEditTaxValue()
|
||||
<label>Freight Rate </label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'txtEditFreight','value' => set_value('txtEditFreight'),'id'=>'txtEditFreight', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight();','style'=>'text-align:right;');
|
||||
$data = array('name' => 'txtEditFreight','value' => set_value('txtEditFreight'),'id'=>'txtEditFreight', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight();','style'=>'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -1879,6 +1887,7 @@ function calculateEditTaxValue()
|
||||
|
||||
foreach($POItem as $record)
|
||||
{
|
||||
//print_r($POItem);
|
||||
$index = $index + 1;
|
||||
?>
|
||||
<tr id="<?php echo $index ; ?>">
|
||||
@ -1933,12 +1942,13 @@ function calculateEditTaxValue()
|
||||
<input type="hidden" name="<?php echo 'beforeOtherTaxVal'.$index ?>" id="<?php echo 'beforeOtherTaxVal'.$index ?>" value="<?php echo $record->IGST ; ?>" /><!-- IGST-->
|
||||
<input type="hidden" name="<?php echo 'AfterOtherTaxVal'.$index ?>" id="<?php echo 'AfterOtherTaxVal'.$index ?>" value="<?php echo $record->AfterIGST ; ?>" /><!-- IGST-->
|
||||
<input type="hidden" name="<?php echo 'beforeAfterOtherTaxVal'.$index ?>" id="<?php echo 'beforeAfterOtherTaxVal'.$index ?>" value="<?php echo $record->AfterIGST ; ?>" /><!-- IGST-->
|
||||
<!-- <input type="hidden" name="<?php echo 'FreightOption'.$index ?>" id="<?php echo 'FreightOption'.$index ?>" value="<?php echo $record->FreightCalulatedOn ; ?>" /> -->
|
||||
<input type="hidden" name="<?php echo 'FreightType'.$index ?>" id="<?php echo 'FreightType'.$index ?>" value="<?php echo $record->FreightType ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'beforeFreightType'.$index ?>" id="<?php echo 'beforeFreightType'.$index ?>" value="<?php echo $record->FreightType ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'FreightVal'.$index ?>" id="<?php echo 'FreightVal'.$index ?>" value="<?php echo $record->FreightValue ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'beforeFreightVal'.$index ?>" id="<?php echo 'beforeFreightVal'.$index ?>" value="<?php echo $record->FreightValue ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'AfterFreightVal'.$index ?>" id="<?php echo 'AfterFreightVal'.$index ?>" value="<?php echo $record->AfterFreightValue ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'beforeAfterFreightVal'.$index ?>" id="<?php echo 'before-AfterFreightVal'.$index ?>" value="<?php echo $record->AfterFreightValue ; ?>" />
|
||||
<input type="hidden"name="<?php echo 'beforeAfterFreightVal'.$index ?>" id="<?php echo 'before-AfterFreightVal'.$index ?>" value="<?php echo $record->AfterFreightValue ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'Nooftrips'.$index ?>" id="<?php echo 'Nooftrips'.$index ?>" value="<?php echo $record->NoOfTrip ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'beforeNooftrips'.$index ?>" id="<?php echo 'beforeNooftrips'.$index ?>" value="<?php echo $record->NoOfTrip ; ?>" />
|
||||
<input type="hidden" name="<?php echo 'basicval'.$index ?>" id="<?php echo 'basicval'.$index ?>" value="<?php echo $record->BasicValue ; ?>"/>
|
||||
@ -2308,6 +2318,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
|
||||
var AfterOtherTaxVal = $("#txtEditAfterOtherTax").val();
|
||||
var Trips = $('#EditNOOfTrips').val();
|
||||
|
||||
// var FreightOption = FreightCalculation ;
|
||||
var FreightType = $("#drpEditFreight").val();
|
||||
var FreightVal = $("#txtEditFreight").val();
|
||||
var AfterFreightVal = $("#txtEditAfterFreight").val();
|
||||
@ -2359,6 +2370,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
|
||||
$('#AfterGSTVal'+userid).val(AfterGSTVal);
|
||||
$('#OtherTaxVal'+userid).val(OtherTaxVal);
|
||||
$('#AfterOtherTaxVal'+userid).val(AfterOtherTaxVal);
|
||||
//$('#FreightOption'+userid).val(FreightOption);
|
||||
$('#FreightType'+userid).val(FreightType);
|
||||
$('#Nooftrips'+userid).val(Trips);
|
||||
//alert($('#Nooftrips'+userid).val());
|
||||
|
||||
Loading…
Reference in New Issue
Block a user