SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new fields added in AmendPO and EmergencyPO

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-09-04 16:23:34 +05:30
parent a548da6207
commit 1f5144e164
16 changed files with 302 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
application/controllers/companycontroller.php Normal file → Executable file
View File

0
application/controllers/configurationctrl.php Normal file → Executable file
View File

0
application/controllers/department.php Normal file → Executable file
View File

6
application/logs/log-2017-09-04.php Normal file → Executable file
View File

@ -1,3 +1,9 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
ERROR - 2017-09-04 09:18:14 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/4sept222/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
ERROR - 2017-09-04 12:39:04 --> Severity: Notice --> Undefined variable: RequistionDetails /opt/lampp/htdocs/4sept333/siddharth_application/application/views/alterpurchaseorder.php 193
ERROR - 2017-09-04 12:39:04 --> Severity: Notice --> Undefined variable: CostList /opt/lampp/htdocs/4sept333/siddharth_application/application/views/alterpurchaseorder.php 194
ERROR - 2017-09-04 12:39:04 --> Severity: Notice --> Undefined variable: MaterialList /opt/lampp/htdocs/4sept333/siddharth_application/application/views/alterpurchaseorder.php 195
ERROR - 2017-09-04 12:39:04 --> Severity: Notice --> Undefined variable: MaterialList /opt/lampp/htdocs/4sept333/siddharth_application/application/views/alterpurchaseorder.php 241
ERROR - 2017-09-04 12:39:04 --> Severity: Notice --> Undefined variable: CostList /opt/lampp/htdocs/4sept333/siddharth_application/application/views/alterpurchaseorder.php 269
ERROR - 2017-09-04 12:41:40 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/4sept333/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38

0
application/models/companydetailsmodel.php Normal file → Executable file
View File

0
application/models/configmodel.php Normal file → Executable file
View File

0
application/models/department_model.php Normal file → Executable file
View File

2
application/views/EditservicePurchaseorder.php
View File

@ -135,7 +135,7 @@ foreach ($PaymentTerms as $TER)
toolbar: false
});
tinymce.init({
selector: "textarea#descofpo", //main screen description PO
selector: "textarea#editdescofpo", //main screen description PO
menubar: false,
statusbar: false,
toolbar: false

0
application/views/addconfig.php Normal file → Executable file
View File

0
application/views/adddepartment.php Normal file → Executable file
View File

188
application/views/alterpurchaseorder.php
View File

@ -78,6 +78,27 @@ if(!empty($INRSYMBOL))
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#emergdescofpo", //main page description of service
menubar: false,
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#txtSpcialInstructionSingle", //service Add model description service
menubar: false,
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#EdittxtSpcialInstructionSingle", //service Edit model description service
menubar: false,
statusbar: false,
toolbar: false
});
</script>
@ -2186,7 +2207,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
</div>
<div class="col-md-3" id="Deliveryby" style="display:none;">
<div class="col-md-3" id="Deliveryby" style="display:none;padding: 0px;">
<div class="col-md-12" id="Schedulediv" style="display:none;">
<label >Schedule By</label>
@ -2309,9 +2330,9 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
<div class="row">
<div class="col-md-12">
<div class="col-md-4" id="DisplayScheduleDiv" style="display:none;">
<div class="row">
<div class="col-md-12" style="padding: 0px;" >
<div class="col-md-3" id="DisplayScheduleDiv" style="display:none;">
<label>Select Service Schedule Type</label>
<div class="form-group">
<?php
@ -2332,7 +2353,7 @@ function populateValueMainFormForDeleteItem(rowid)
?>
</div>
</div>
<div class="col-md-4" id="ServicePeriodOption" style="display:none;">
<div class="col-md-3" id="ServicePeriodOption" style="display:none;">
<label>Select Service Period Option</label>
<div class="form-group">
<?php
@ -2353,7 +2374,7 @@ function populateValueMainFormForDeleteItem(rowid)
?>
</div>
</div>
<div class="col-md-4" id="NoServices" style="display:none;">
<div class="col-md-3" id="NoServices" style="display:none;">
<label>Number of Services</label>
<div class="form-group">
<?php
@ -2365,12 +2386,89 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
</div>
</div>
<!--start new fields 1 sep-->
<div class="row">
<div class="col-md-12" style="padding: 0px;">
<div class="col-md-3">
<div class="col-md-12" style="padding: 0px;">
<label>Mode Of Shipment</label>
<div class="form-group">
<?php
$data = array('name' => 'emergmodeofshipment','value' => set_value('emergmodeofshipment'),'id'=>'emergmodeofshipment', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-9" style="padding:0px;">
<div class="col-md-4" style="padding:0px;" >
<div class="col-md-12">
<label>Supplier Reference</label>
<div class="form-group">
<?php
$data = array('name' => 'emergsupplierreference','value' => set_value('emergsupplierreference'),'id'=>'emergsupplierreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-12">
<label>Supplier's Offer No</label>
<div class="form-group">
<?php
$data = array('name' => 'emergsupplierofferno','value' => set_value('emergsupplierofferno'),'id'=>'emergsupplierofferno', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;">
<label>Other Reference(S)</label>
<div class="form-group">
<?php
$data = array('name' => 'emergotherreference','value' => set_value('emergotherreference'),'id'=>'emergotherreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'emergfincap','value' => set_value('emergfincap'),'id'=>'emergfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>
</div><!--End new fields 1 sep-->
</div>
<div class="col-md-12">
<legend>Payment Details</legend>
<!-- Text input-->
<div class="col-md-4">
<div class="col-md-12" style="padding:0px;">
<div class="col-md-3">
<label for="payablefrom">Payable Terms</label>
<?php
$options1 = array("0"=>'Select Payment method');
@ -2388,7 +2486,7 @@ function populateValueMainFormForDeleteItem(rowid)
?>
</div>
<div class="col-md-4" id="otheroptiondiv" style="display:none;">
<div class="col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
<div class="form-group">
<?php
@ -2686,12 +2784,9 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
</div> -->
<div class="col-md-12">
<div class="col-md-6">
<label>Service Description</label> <?php
$data = array('name' => 'EdittxtSpcialInstructionSingle','value' => set_value('EdittxtSpcialInstructionSingle'),'id'=>'EdittxtSpcialInstructionSingle', 'class' => 'form-control' );
echo form_input($data); ?>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Quantity</label>
<div class="form-group">
<?php
@ -2700,7 +2795,7 @@ function populateValueMainFormForDeleteItem(rowid)
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label><?php echo "Rate ($INRSYM)";?></label>
<div class="form-group">
<?php
@ -2709,7 +2804,12 @@ function populateValueMainFormForDeleteItem(rowid)
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Per</label> <?php
$data = array('name' => 'EditEmergPer','value' => set_value('EditEmergPer'),'id'=>'EditEmergPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label><?php echo "Basic Amount In ($INRSYM)";?></label>
<div class="form-group">
<?php
@ -2831,6 +2931,11 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
</div>
</div>
<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
<label>Service Description</label> <?php
$data = array('name' => 'EdittxtSpcialInstructionSingle','value' => set_value('EdittxtSpcialInstructionSingle'),'id'=>'EdittxtSpcialInstructionSingle', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?>
</div>
</div>
@ -3642,12 +3747,9 @@ function populateValueMainFormForDeleteItem(rowid)
</div> -->
<div class="col-md-12">
<div class="col-md-6">
<label>Service Description</label> <?php
$data = array('name' => 'txtSpcialInstructionSingle','value' => set_value('txtSpcialInstructionSingle'),'id'=>'txtSpcialInstructionSingle', 'class' => 'form-control' );
echo form_input($data); ?>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Quantity</label>
<div class="form-group">
<?php
@ -3656,7 +3758,7 @@ function populateValueMainFormForDeleteItem(rowid)
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label><?php echo "Rate ($INRSYM)";?></label>
<div class="form-group">
<?php
@ -3665,7 +3767,12 @@ function populateValueMainFormForDeleteItem(rowid)
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Per</label> <?php
$data = array('name' => 'AddEmergPer','value' => set_value('AddEmergPer'),'id'=>'AddEmergPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label><?php echo "Basic Amount In ($INRSYM)";?></label>
<div class="form-group">
<?php
@ -3795,6 +3902,12 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
</div>
<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
<label>Service Description</label> <?php
$data = array('name' => 'txtSpcialInstructionSingle','value' => set_value('txtSpcialInstructionSingle'),'id'=>'txtSpcialInstructionSingle', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
echo form_textarea($data); ?>
</div>
</div>
@ -4926,8 +5039,8 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
<!-- Service po taxes -->
<div class="col-md-12 " style='border : 1px solid; display:none;' id="servicepotaxes">
<div class="col-md-12">
<div class="col-md-12" style="border : 1px solid; display:none;" id="servicepotaxes">
<div class="col-md-12" style="padding:0px;">
<div class="col-md-2">
<label>Basic Amount In INR</label>
@ -4980,13 +5093,24 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
</div>
<div class="col-md-12">
<!--start new fields 1 sep-->
<div class="col-md-12" id="emergdescofpo" style="display:none;">
<label>Description Of Service</label>
<div class="form-group">
<?php
$data = array('name' => 'emergdescofpo','value' => set_value('emergdescofpo'),'id'=>'emergdescofpo', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
echo form_textarea($data);
?>
</div>
</div><!--end new fields 1 sep-->
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12">
<label>Scope Of Work</label> <?php
$data = array('name' => 'ScopeOfWork','value' => set_value('ScopeOfWork'),'id'=>'ScopeOfWork', 'class' => 'form-control','rows' => '8');
echo form_textarea($data); ?>
</div>
</div>
<div class="col-md-12">
<div class="row">
<br/>
@ -5297,6 +5421,7 @@ function populateValueMainFormForDeleteItem(rowid)
$("#Deliveryby").show();
$("#selectdeliveryby").show();
$("#txtPoRange").show();
$("#emergdescofpo").hide();
}
else if ( this.value == 'SERVICE') // Service po
{
@ -5309,6 +5434,7 @@ function populateValueMainFormForDeleteItem(rowid)
$('#DisplayScheduleDiv').show();
$('#EditDisplayScheduleDiv').show();
$("#txtPoRange").hide();
$("#emergdescofpo").show();
}
else if ( this.value == 'IMPORT') // Import po
@ -5869,6 +5995,7 @@ function populateValueMainFormForDeleteItem(rowid)
*/
$('.AddService').click(function(){
tinyMCE.triggerSave();
if(validateServiceTax())
{
// alert('inside Addservice');
@ -6080,6 +6207,7 @@ function populateValueMainFormForDeleteItem(rowid)
var EditGetMaterialData;
$("#EDITSERVICE").on("shown.bs.modal", function(e) {
tinyMCE.triggerSave();
EditGetMaterialData='';

0
application/views/companyview.php Normal file → Executable file
View File

0
application/views/configlisting.php Normal file → Executable file
View File

0
application/views/departmentListing.php Normal file → Executable file
View File

172
application/views/editServiceAmendPO.php
View File

@ -129,7 +129,21 @@ foreach ($PaymentTerms as $TER)
tinymce.init({
selector: "textarea#ScopeofWork",
selector: "textarea#ScopeofWork",
menubar: false,
statusbar: false,
toolbar: false,
// plugins: "link image"
});
tinymce.init({
selector: "textarea#amenddescofpo", // amend service description
menubar: false,
statusbar: false,
toolbar: false,
// plugins: "link image"
});
tinymce.init({
selector: "textarea#EdittxtSpcialInstruction", //model service description
menubar: false,
statusbar: false,
toolbar: false,
@ -632,7 +646,7 @@ $(document).ready(function () {
<div class="row">
<div class="col-md-12">
<div class="col-md-3">
<div class="col-md-12">
<div class="col-md-12" style="padding:0px;">
<label>Requistion No</label>
@ -650,7 +664,7 @@ $(document).ready(function () {
?>
</div>
<div class="col-md-12">
<div class="col-md-12" style="padding:0px;">
<label>Purchase Order Date</label>
<div class="form-group">
<?php
@ -662,7 +676,7 @@ $(document).ready(function () {
</div>
<div class="col-md-9" style="padding:0px;">
<div class="col-md-4">
<div class="col-md-4" style="padding:0px;">
<div class="col-md-12">
<label>Supplier</label>
<?php
@ -694,7 +708,7 @@ $(document).ready(function () {
</div>
</div>
</div>
<div class="col-md-4">
<div class="col-md-4" style="padding:0px;">
<div class="col-md-12">
<label>Purchase Order Type</label>
<div class="form-group">
@ -760,7 +774,7 @@ $(document).ready(function () {
?>
</div>
<div class="col-md-12" id="Deliverydtdiv"><br/>
<div class="col-md-12" id="Deliverydtdiv" style="padding-left:0px;"><br/>
<label>Delivery Date</label>
<?php if($DeliverOption==1){
$Deliverydt=null;
@ -773,7 +787,7 @@ $(document).ready(function () {
?>
</div>
</div>
<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
<div class="col-md-12" id="Schedulediv" style="display:none;padding-left:0px;"><br/>
<label >Schedule By</label>
<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule?>">
<?php
@ -785,10 +799,85 @@ $(document).ready(function () {
</div>
</div>
<div class="col-md-12">
<legend>Payment Details</legend>
<!-- Text input-->
<div class="col-md-4">
<!--start new fields 1 sep-->
<div class="row">
<div class="col-md-12">
<div class="col-md-3">
<div class="col-md-12" style="padding: 0px;">
<label>Mode Of Shipment</label>
<div class="form-group">
<?php
$data = array('name' => 'addmodeofshipment','value' => set_value('addmodeofshipment'),'id'=>'addmodeofshipment', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-9" style="padding:0px;">
<div class="col-md-4" style="padding:0px;" >
<div class="col-md-12">
<label>Supplier Reference</label>
<div class="form-group">
<?php
$data = array('name' => 'amendsupplierreference','value' => set_value('amendsupplierreference'),'id'=>'amendsupplierreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-12">
<label>Supplier's Offer No</label>
<div class="form-group">
<?php
$data = array('name' => 'amendsupplierofferno','value' => set_value('amendsupplierofferno'),'id'=>'amendsupplierofferno', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;">
<label>Other Reference(S)</label>
<div class="form-group">
<?php
$data = array('name' => 'amendotherreference','value' => set_value('amendotherreference'),'id'=>'amendotherreference', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-6">
<label>Fincap</label>
<div class="form-group">
<?php
$data = array('name' => 'amendfincap','value' => set_value('amendfincap'),'id'=>'amendfincap', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>
</div><!--End new fields 1 sep-->
<div class="col-md-12" style="padding:0px;">
<div class="col-md-3">
<label>Payment Terms</label>
<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms?>">
@ -828,7 +917,7 @@ $(document).ready(function () {
</div>
<div class="col-md-4" id="otheroptiondiv" style="display:none;">
<div class="col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
<div class="form-group">
@ -924,16 +1013,7 @@ $(document).ready(function () {
?>
</div>
</div>
<div class="col-md-6">
<label>Service Description</label> <?php
$data = array('name' => 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceMaterialDescription),'id'=>'EdittxtSpcialInstruction', 'class' => 'form-control');
echo form_input($data);
?> <input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction" value="<?php echo $ServiceMaterialDescription;?>">
</div>
</div>
<div class="col-md-12">
<div class="col-md-2">
<div class="col-md-3">
<label>UOM</label>
<div class="form-group">
<?php
@ -942,7 +1022,7 @@ $(document).ready(function () {
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Frequency</label>
<div>
<?php
@ -952,7 +1032,13 @@ $(document).ready(function () {
<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />
</div>
</div>
<div class="col-md-2">
</div>
<div class="col-md-12">
<div class="col-md-3">
<label>Quantity</label>
<div class="form-group">
<?php
@ -961,7 +1047,7 @@ $(document).ready(function () {
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label><?php echo "Rate ($INRSYM)";?></label>
<div class="form-group">
<?php
@ -970,7 +1056,12 @@ $(document).ready(function () {
?>
</div>
</div>
<div class="col-md-4">
<div class="col-md-3">
<label>Per</label> <?php
$data = array('name' => 'EditAmendPer','value' => set_value('EditAmendPer'),'id'=>'EditAmendPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label><?php echo "Basic Amount ($INRSYM)";?></label>
<div class="form-group">
<?php
@ -1093,11 +1184,13 @@ $(document).ready(function () {
</div>
</div>
</div>
<br/>
<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
<label>Service Description</label> <?php
$data = array('name' => 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceMaterialDescription),'id'=>'EdittxtSpcialInstruction', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?> <input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction" value="<?php echo $ServiceMaterialDescription;?>">
</div>
<br/>
<div class="modal-footer">
<div class="col-md-12">
@ -1245,7 +1338,7 @@ $(document).ready(function () {
<div class="row" style="border: 1px solid">
<div class="col-md-12">
<div class="col-md-12" style="padding:0px;">
<div class="col-md-2">
<label>Basic Amount In INR </label>
@ -1297,9 +1390,18 @@ $(document).ready(function () {
</div>
</div>
<!--start new fields 1 sep-->
<div class="col-md-12">
<label>Description Of Service</label>
<div class="form-group">
<?php
$data = array('name' => 'amenddescofpo','value' => set_value('amenddescofpo'),'id'=>'amenddescofpo', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
echo form_textarea($data);
?>
</div>
</div><!--end new fields 1 sep-->
<div class="col-md-12">
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12">
<label>Scope Of Work</label> <?php
$data = array('name' => 'ScopeofWork','value' => set_value('ScopeofWork',$ServiceDescription),'id'=>'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40' );
@ -1471,7 +1573,7 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$('.EditService').click(function(){
tinyMCE.triggerSave();
if( validateEditServiceTax())
{

0
application/views/editconfig.php Normal file → Executable file
View File