diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php
index 346571a8..8cdaf9f3 100755
--- a/application/controllers/employeedetails.php
+++ b/application/controllers/employeedetails.php
@@ -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
diff --git a/application/logs/log-2017-10-30.php b/application/logs/log-2017-10-30.php
new file mode 100644
index 00000000..11b8ceb0
--- /dev/null
+++ b/application/logs/log-2017-10-30.php
@@ -0,0 +1,14 @@
+
+
+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
diff --git a/application/third_party/dompdf/lib/fonts/log.htm b/application/third_party/dompdf/lib/fonts/log.htm
index 4f069625..f963ad02 100755
--- a/application/third_party/dompdf/lib/fonts/log.htm
+++ b/application/third_party/dompdf/lib/fonts/log.htm
@@ -1 +1 @@
-14,080 KB 1,982.8620 ms
\ No newline at end of file
+20,480 KB 1,034.0412 ms
\ No newline at end of file
diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php
old mode 100755
new mode 100644
index 1ed39a74..eb56f786
--- a/application/views/editRevenueAmendPO.php
+++ b/application/views/editRevenueAmendPO.php
@@ -250,6 +250,7 @@ if(insurancestatus == 1)
var PercentageType = '';
var POMaxDate = '';
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 = ;
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 = ;
-
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()
'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);
?>
@@ -1879,6 +1887,7 @@ function calculateEditTaxValue()
foreach($POItem as $record)
{
+ //print_r($POItem);
$index = $index + 1;
?>
@@ -1933,12 +1942,13 @@ function calculateEditTaxValue()
+
-
+
@@ -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());