diff --git a/app/Views/addemppaydate.php b/app/Views/addemppaydate.php index ffe7439a..b839fd55 100755 --- a/app/Views/addemppaydate.php +++ b/app/Views/addemppaydate.php @@ -4,6 +4,7 @@ $("#loan_issued_date").datepicker({ minDate: 'now', + orientation: 'bottom', // maxDate : 'now', dateFormat: 'dd-mm-yy', changeMonth: true, @@ -55,24 +56,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/Views/approvalstorerequisitionslip.php b/app/Views/approvalstorerequisitionslip.php index 40e86045..3b5b14a8 100755 --- a/app/Views/approvalstorerequisitionslip.php +++ b/app/Views/approvalstorerequisitionslip.php @@ -1,184 +1,185 @@ - - - +
- - -
- -
-
-

Store Requisition Approval List

-
- - 'form-label-left Approve ','name' => 'Approve','id' => 'Approve'); - - echo form_open(base_url().'storerequisitionlist/SearchRequistLists',$attributes); ?> -
- - - - -
+ + + Comments + ?> + + + Comments ?> + + + + + + + + + + + +
+
- - + //alert("A new date range was chosen: " + start.format('DD-MM-YYYY') + ' to ' + end.format('DD-MM-YYYY')); + }); + + + }); + $(function() { + + $('#Items').DataTable({ + "paging": false, + "lengthChange": true, + "searching": false, + "ordering": false, + "info": false, + "autoWidth": false + + }); + $.fn.dataTable.moment('DD-MM-YYYY'); + $('#Requisition').DataTable({ + "paging": true, + "lengthChange": true, + "searching": true, + "ordering": true, + // "columnDefs" : [{"targets":2, "type":"date-eu"}], + "aaSorting": [ + [2, "desc"] + ], + "info": true, + "autoWidth": true + + }); + }); + + \ No newline at end of file diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index bbdf2950..db1c3195 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -149,14 +149,13 @@ // changeYear: true, // yearRange: '0:+10' // }); - // $("#Exchangerateon").datepicker({ - // //minDate : d, - // maxDate: 'now', - // dateFormat: 'dd-mm-yy', - // changeMonth: true, - // changeYear: true, - // yearRange: '-100:+0' - // }); + $("#Exchangerateon").datepicker({ + format: 'dd-mm-yyyy', + startDate: new Date(), + autoclose: true, + todayHighlight: true, + clearBtn: true + }); $('#Date').click(function() { //for Dispatch range selection @@ -395,8 +394,8 @@
format('Y-m-d'); - $data = array('type' => 'date', 'name' => 'Deliverydate', 'value' => set_value('Deliverydate', $formattedDate), 'id' => 'Deliverydate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); + $formattedDate = $dt->format('d-m-Y'); + $data = array('type' => 'text', 'name' => 'Deliverydate', 'value' => set_value('Deliverydate', $formattedDate), 'id' => 'Deliverydate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); echo form_input($data); ?>
@@ -420,8 +419,8 @@
format('Y-m-d'); - $data = array('type' => 'date', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $formattedDate), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); + $formattedDate = $dt->format('d-m-Y'); + $data = array('type' => 'text', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $formattedDate), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); echo form_input($data); ?>
@@ -454,8 +453,8 @@
format('Y-m-d'); - $data = array('type' => "date", 'name' => 'PODate', 'value' => set_value('PODate', $formattedDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); + $formattedDate = $dt->format('d-m-Y'); + $data = array('type' => "text", 'name' => 'PODate', 'value' => set_value('PODate', $formattedDate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); echo form_input($data); ?>
@@ -1479,126 +1478,126 @@
-
- -
+
+ +
- 'Select Req No'); - if (!empty($RequistionDetails)) { - foreach ($RequistionDetails as $SID) : - $RL[$SID->ReqNo] = $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName; - endforeach; - } + 'Select Req No'); + if (!empty($RequistionDetails)) { + foreach ($RequistionDetails as $SID) : + $RL[$SID->ReqNo] = $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName; + endforeach; + } - $data = array('name' => 'EditReqnumber', 'value' => set_value('EditReqnumber'), 'id' => 'EditReqnumber', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); + $data = array('name' => 'EditReqnumber', 'value' => set_value('EditReqnumber'), 'id' => 'EditReqnumber', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); - ?> + ?> -
-
- -
- 'EditCapitalDepartmentName', 'value' => set_value('EditCapitalDepartmentName'), 'id' => 'EditCapitalDepartmentName', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> -
+
+
+ +
+ 'EditCapitalDepartmentName', 'value' => set_value('EditCapitalDepartmentName'), 'id' => 'EditCapitalDepartmentName', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?>
+
-
- -
- + +
+ 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); + $data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); - ?> -
-
-
-
'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); ?>
+ ?>
+
+
+
'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); ?>
+
-
- -
- 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
+
+ +
+ 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?>
- +
+
-
- -
- 'Item Code'); - echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2"'); - ?> -
-
-
- -
- 'EditCapitalItemName', 'value' => set_value('EditCapitalItemName'), 'id' => 'EditCapitalItemName', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
- -
- 'EditCPUOM', 'value' => set_value('EditCPUOM'), 'id' => 'EditCPUOM', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
- -
- 'EditCPQuantity', 'value' => set_value('EditCPQuantity'), 'id' => 'EditCPQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()'); - echo form_input($data); - ?> -
-
-
- * -
- 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()'); - echo form_input($data); - ?> -
-
-
- 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control'); - echo form_input($data); ?> -
-
- -
- 'EditCPTotalAmount', 'value' => set_value('EditCPTotalAmount'), 'id' => 'EditCPTotalAmount', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
+
+ +
+ 'Item Code'); + echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2"'); + ?> +
+
+
+ +
+ 'EditCapitalItemName', 'value' => set_value('EditCapitalItemName'), 'id' => 'EditCapitalItemName', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ 'EditCPUOM', 'value' => set_value('EditCPUOM'), 'id' => 'EditCPUOM', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ 'EditCPQuantity', 'value' => set_value('EditCPQuantity'), 'id' => 'EditCPQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()'); + echo form_input($data); + ?> +
+
+
+ * +
+ 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()'); + echo form_input($data); + ?> +
+
+
+ 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control'); + echo form_input($data); ?> +
+
+ +
+ 'EditCPTotalAmount', 'value' => set_value('EditCPTotalAmount'), 'id' => 'EditCPTotalAmount', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
@@ -2254,21 +2253,20 @@ $(function() { - // $("#PODate").datepicker({ - // minDate: d, - // maxDate: 'now', - // dateFormat: 'dd-mm-yy', - // changeMonth: true, - // changeYear: true, - // yearRange: '-100:+0' - // }); - // $("#Deliverydate").datepicker({ - // minDate: 'now', - // dateFormat: 'dd-mm-yy', - // changeMonth: true, - // changeYear: true, - // yearRange: '0:+10' - // }); + $("#PODate").datepicker({ + format: 'dd-mm-yyyy', + startDate: new Date(), + autoclose: true, + todayHighlight: true, + clearBtn: true + }); + $("#Deliverydate").datepicker({ + format: 'dd-mm-yyyy', + startDate: new Date(), + autoclose: true, + todayHighlight: true, + clearBtn: true + }); var a = parseFloat($('#optcapital').val()); @@ -3312,7 +3310,7 @@ `; -$('#capitalAppend').append(rowHtml); + $('#capitalAppend').append(rowHtml); //clearCapitalModalFields(); var theForm = $(".CapitalPO"); @@ -4033,149 +4031,150 @@ $('#capitalAppend').append(rowHtml); } /* get Edit Capital Po Modal*/ - $(document).ready(function() { - $("#EDITCAPITAL").on("shown.bs.modal", function(e) { + $(document).ready(function() { + $("#EDITCAPITAL").on("shown.bs.modal", function(e) { - userid = $(e.relatedTarget).data('userid'); + userid = $(e.relatedTarget).data('userid'); - $('#isEdit').val(1); - //alert(userid); - var tr = document.getElementById(userid); + $('#isEdit').val(1); + //alert(userid); + var tr = document.getElementById(userid); - var cellval = tr.cells; + var cellval = tr.cells; - var id = $('#Reqnumber' + userid).val(); + var id = $('#Reqnumber' + userid).val(); - $('#EditReqnumber').val($('#Reqnumber' + userid).val()); - $('#EditCapitalDepartmentName').val($('#departmentName' + userid).val()); - $("#EditCostCenter").val($('#CPCostCode' + userid).val()); - $('#EditCapitalbudAmt').val($('#AvilBudget' + userid).val()); - $('#EditExchangeRtModal').val($('#echangeRate' + userid).val()); + $('#EditReqnumber').val($('#Reqnumber' + userid).val()); + $('#EditCapitalDepartmentName').val($('#departmentName' + userid).val()); + $("#EditCostCenter").val($('#CPCostCode' + userid).val()); + $('#EditCapitalbudAmt').val($('#AvilBudget' + userid).val()); + $('#EditExchangeRtModal').val($('#echangeRate' + userid).val()); - $('#EditCapitalItemName').val($('#materialName' + userid).val()); - $('#EditCPUOM').val($('#uom' + userid).val()); - $('#EditPer').val($('#per' + userid).val()); - var EditUOM = $('#uom' + userid).val(); - $('#EditCPQuantity').val($('#quantity' + userid).val()); - $('#EditCPRate').val($('#rateInUs' + userid).val()); + $('#EditCapitalItemName').val($('#materialName' + userid).val()); + $('#EditCPUOM').val($('#uom' + userid).val()); + $('#EditPer').val($('#per' + userid).val()); + var EditUOM = $('#uom' + userid).val(); + $('#EditCPQuantity').val($('#quantity' + userid).val()); + $('#EditCPRate').val($('#rateInUs' + userid).val()); - $('#EditCPTotalAmount').val($('#basicval' + userid).val()); + $('#EditCPTotalAmount').val($('#basicval' + userid).val()); - RequistQuantity = $('#quantity' + userid).val(); + RequistQuantity = $('#quantity' + userid).val(); - $('#EditAfterServiceTax').val($('#AfterServiceTax' + userid).val()); - $('#EditAfterEduCess').val($('#AfterEduCess' + userid).val()); - $('#EditAfterSecHighTax').val($('#AfterSecHighTax' + userid).val()); - $('#EditAfterKrishiTax').val($('#AfterKrishiTax' + userid).val()); - $('#EditAfterSwachhTax').val($('#AfterSwachhTax' + userid).val()); + $('#EditAfterServiceTax').val($('#AfterServiceTax' + userid).val()); + $('#EditAfterEduCess').val($('#AfterEduCess' + userid).val()); + $('#EditAfterSecHighTax').val($('#AfterSecHighTax' + userid).val()); + $('#EditAfterKrishiTax').val($('#AfterKrishiTax' + userid).val()); + $('#EditAfterSwachhTax').val($('#AfterSwachhTax' + userid).val()); - $('#EditAfterBasicPriceTax').val($('#basicvalInINR' + userid).val()); - $('#EditAfterLandingCharge').val($('#landingCharge' + userid).val()); + $('#EditAfterBasicPriceTax').val($('#basicvalInINR' + userid).val()); + $('#EditAfterLandingCharge').val($('#landingCharge' + userid).val()); - $('#EditAfterCustomduty').val($('#CustomDuty' + userid).val()); + $('#EditAfterCustomduty').val($('#CustomDuty' + userid).val()); - $('#EditAfterCustomEDcess').val($('#CustomEDCess' + userid).val()); - $('#EditAfterCustomSHcess').val($('#CustomSHCess' + userid).val()); + $('#EditAfterCustomEDcess').val($('#CustomEDCess' + userid).val()); + $('#EditAfterCustomSHcess').val($('#CustomSHCess' + userid).val()); - $('#EditGrossdutypayable').val($('#GrossDutyPayable' + userid).val()); - $('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val()); - //$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val()); + $('#EditGrossdutypayable').val($('#GrossDutyPayable' + userid).val()); + $('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val()); + //$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val()); - $('#EdittxtTotalOrderValue').val(cellval[9].innerHTML); - $('#EditCgst').val($('#Cgst' + userid).val()); - $('#EditAfterCgst').val($('#AfterCgst' + userid).val()); - $('#EditSgst').val($('#Sgst' + userid).val()); - $('#EditAfterSgst').val($('#AfterSgst' + userid).val()); - $('#EditIgst').val($('#Igst' + userid).val()); - $('#EditAfterIgst').val($('#AfterIgst' + userid).val()); - $('#EditOtherAllowances').val($('#OtherAmt' + userid).val()); - /* get % value */ + $('#EdittxtTotalOrderValue').val(cellval[9].innerHTML); + $('#EditCgst').val($('#Cgst' + userid).val()); + $('#EditAfterCgst').val($('#AfterCgst' + userid).val()); + $('#EditSgst').val($('#Sgst' + userid).val()); + $('#EditAfterSgst').val($('#AfterSgst' + userid).val()); + $('#EditIgst').val($('#Igst' + userid).val()); + $('#EditAfterIgst').val($('#AfterIgst' + userid).val()); + $('#EditOtherAllowances').val($('#OtherAmt' + userid).val()); + /* get % value */ - $('#EditLandingCharge').val($('#beforeLanding' + userid).val()); + $('#EditLandingCharge').val($('#beforeLanding' + userid).val()); - $('#EditCustomduty').val($('#beforeCustomDuty' + userid).val()); + $('#EditCustomduty').val($('#beforeCustomDuty' + userid).val()); - $('#EditCustomEDcess').val($('#beforeCustomEDCess' + userid).val()); - $('#EditCustomSHcess').val($('#beforeCustomSHCess' + userid).val()); + $('#EditCustomEDcess').val($('#beforeCustomEDCess' + userid).val()); + $('#EditCustomSHcess').val($('#beforeCustomSHCess' + userid).val()); - $('#EditPurQuantity').val($('#PurQuantity' + userid).val()); - $('#txtEditFreight').val($('#FreightVal' + userid).val()); - $('#txtEditAfterFreight').val($('#AfterFreightVal' + userid).val()); - $('#EditNOOfTrips').val($('#NoOfTrip' + userid).val()); - $("#drpEditFreight").val($('#FreightType' + userid).val()); + $('#EditPurQuantity').val($('#PurQuantity' + userid).val()); + $('#txtEditFreight').val($('#FreightVal' + userid).val()); + $('#txtEditAfterFreight').val($('#AfterFreightVal' + userid).val()); + $('#EditNOOfTrips').val($('#NoOfTrip' + userid).val()); + $("#drpEditFreight").val($('#FreightType' + userid).val()); - $("#drpFreighteditloc").val($('#FreightTypeloc' + userid).val()); - $("#NOOfTripslocedit").val($('#NoofTriploc' + userid).val()); - $("#txtFreightlocedit").val($('#FreightRateloc' + userid).val()); - $("#txtAfterFreightlocedit").val($('#AfterFreightRateloc' + userid).val()); + $("#drpFreighteditloc").val($('#FreightTypeloc' + userid).val()); + $("#NOOfTripslocedit").val($('#NoofTriploc' + userid).val()); + $("#txtFreightlocedit").val($('#FreightRateloc' + userid).val()); + $("#txtAfterFreightlocedit").val($('#AfterFreightRateloc' + userid).val()); - $('#EditAfterAssessable').val($("#AfterAssessable" + userid).val()); - $('#EditSubtotal').val($("#Subtotal" + userid).val()); - $('#EditIgstInt').val($("#IgstInt" + userid).val()); - $('#EditAfterIgstInt').val($("#AfterIgstInt" + userid).val()); - $('#EditDutyImpact').val($("#Dutyimpact" + userid).val()); - $('#EditClearingCharges').val($("#ClearingCharges" + userid).val()); - $('#EditNett').val($("#Nett" + userid).val()); + $('#EditAfterAssessable').val($("#AfterAssessable" + userid).val()); + $('#EditSubtotal').val($("#Subtotal" + userid).val()); + $('#EditIgstInt').val($("#IgstInt" + userid).val()); + $('#EditAfterIgstInt').val($("#AfterIgstInt" + userid).val()); + $('#EditDutyImpact').val($("#Dutyimpact" + userid).val()); + $('#EditClearingCharges').val($("#ClearingCharges" + userid).val()); + $('#EditNett').val($("#Nett" + userid).val()); - var a = parseFloat($('#EditDutyImpact').val()); - //var b =parseFloat($('#Dutyimpact'+userid).val()); + var a = parseFloat($('#EditDutyImpact').val()); + //var b =parseFloat($('#Dutyimpact'+userid).val()); - // console.log(a); - //console.log(b); + // console.log(a); + //console.log(b); - var FreightTypeloc = $('#FreightTypeloc' + userid).val(); + var FreightTypeloc = $('#FreightTypeloc' + userid).val(); - if (FreightTypeloc == '') { - $('#TripsValuelocedit').show(); - } else { - $('#TripsValuelocedit').hide(); - } + if (FreightTypeloc == '') { + $('#TripsValuelocedit').show(); + } else { + $('#TripsValuelocedit').hide(); + } - var FreightType = $('#FreightType' + userid).val(); + var FreightType = $('#FreightType' + userid).val(); - if (FreightType == "PER TRIP") { - $('#EditTripsValue').show(); - } else { - $('#EditTripsValue').hide(); - } - $("#EditDiscountType").val($('#DisType' + userid).val()); - $('#txtEditDiscount').val($('#DisVal' + userid).val()); - $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val()); + if (FreightType == "PER TRIP") { + $('#EditTripsValue').show(); + } else { + $('#EditTripsValue').hide(); + } + $("#EditDiscountType").val($('#DisType' + userid).val()); + $('#txtEditDiscount').val($('#DisVal' + userid).val()); + $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val()); - tinyMCE.get('EditItemDescription').setContent($('#CapitalItemDescrition' + userid).val()); + tinyMCE.get('EditItemDescription').setContent($('#CapitalItemDescrition' + userid).val()); - var Material = ; + var Material = ; - $("#EditMaterialCode").empty(); + $("#EditMaterialCode").empty(); - $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())); - $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')'); - for (i = 0; i < Material.length; i++) { - $.each(Material[i], function(idx, obj) { - if (obj.MaterialCode != $('#materialCode' + userid).val()) { - $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName)); + $("#EditMaterialCode").append($('').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())); + $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')'); + for (i = 0; i < Material.length; i++) { + $.each(Material[i], function(idx, obj) { + if (obj.MaterialCode != $('#materialCode' + userid).val()) { + $("#EditMaterialCode").append($('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName)); - } - }); - } + } + }); + } - }); }); + }); + }); /*get edit material list*/ $('#EditMaterialCode').change(function() { diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index c2857f80..0a1f0151 100755 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -11,6 +11,7 @@ if (!empty($EmpCount)) { ?>