diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index b4fd7bfb..49b59eb1 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -391,12 +391,15 @@ if (!empty($INRSYMBOL)) {
         Editchange();
     });
 
+   
+
     $('#PackagingType').change(function () {
         $('#txtPackaging').val('');
         $('#txtAfterPackaging').val('');
         selValue = $("#PackagingType").val();
         if (selValue == PercentageType) {
             var PackagingCalculation = '';
+            $('#REVENUE').modal('hide');
             $('#packagingcalmodel').modal('show');
             $('#txtPackaging').removeAttr('readonly', 'true');
         } else {
@@ -412,6 +415,7 @@ if (!empty($INRSYMBOL)) {
         }
         //change();
     });
+
     $('#EditPackagingType').change(function () {
         $('#txtEditPackaging').val('');
         $('#txtEditAfterPackaging').val('');
@@ -504,6 +508,7 @@ if (!empty($INRSYMBOL)) {
         selValue = $("#drpFreight").val();
         if (selValue == PercentageType) {
             var freightCalculation = '';
+            $('#REVENUE').modal('hide');
             $('#freightmodel').modal('show');
             $('#txtFreight').removeAttr('readonly', 'true');
         } else if (selValue == NilType) {
@@ -1542,11 +1547,13 @@ if (!empty($INRSYMBOL)) {
     function SetPackagingOption() {
         PackagingCalculation = $("input:radio[name='optPackaging']:checked").val();
         $('#packagingcalmodel').modal('hide');
+        showmodel();
     }
 
     function setfreightOption() {
         freightCalculation = $("input:radio[name='optfreight']:checked").val();
         $('#freightmodel').modal('hide');
+        showmodel();
     }
     /* Set the Packaging calculation option for calculating Packaging */
     function SetExciseCalculation() {
@@ -2735,7 +2742,7 @@ if (!empty($INRSYMBOL)) {
                                     <div align="right" style="padding-right:10px">
 
                                         <!-- Model for revenue PO -->
-                                        <div id="REVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel"
+                                        <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
                                             aria-hidden="true">
                                             <div class="modal-dialog">
                                                 <!-- Modal content-->
@@ -2748,7 +2755,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                         <div align="left" style="padding: 31px;">
                                                             <div class="row">
-                                                                <div class="col-md-2">
+                                                                <div class="col-md-3">
                                                                     <label>Item Code<span class="badge mandatory">*</span></label>
                                                                     <div>
                                                                         <?php
@@ -2758,7 +2765,7 @@ if (!empty($INRSYMBOL)) {
                                                                     </div>
                                                                 </div>
 
-                                                                <div class="col-md-2">
+                                                                <div class="col-md-3">
                                                                     <label>Item Name</label>
                                                                     <div class="form-group">
                                                                         <?php
@@ -2767,7 +2774,7 @@ if (!empty($INRSYMBOL)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-1">
+                                                                <div class="col-md-3">
                                                                     <label>UOM</label>
                                                                     <div class="form-group">
                                                                         <?php
@@ -2776,7 +2783,7 @@ if (!empty($INRSYMBOL)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-2">
+                                                                <div class="col-md-3">
                                                                     <label>Quantity<span class="badge mandatory">*</span></label>
                                                                     <div class="form-group">
                                                                         <?php
@@ -2785,22 +2792,27 @@ if (!empty($INRSYMBOL)) {
                                                                         ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-2">
-                                                                    <label><?php echo "Rate  ($INRSYM)"; ?><span
-                                                                            class="badge mandatory"></label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
+                                                            </div>
+
+                                                            <div class="row">
+                                                                <div class="col-md-3"></div>
+                                                                
+                                                                <div class="col-md-3">  
+                                                                        <label><?php echo "Rate  ($INRSYM)"; ?><span
+                                                                                class="badge mandatory"></label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
+                                                                            echo form_input($data);
+                                                                            ?>
                                                                 </div>
-                                                                <div class="col-md-1">
+                                                                </div>
+                                                                <div class="col-md-3">
                                                                     <label>Per</label> <?php
                                                                     $data = array('name' => 'addrevenueEmergPer', 'value' => set_value('addrevenueEmergPer'), 'id' => 'addrevenueEmergPer', 'class' => 'form-control');
                                                                     echo form_input($data); ?>
                                                                 </div>
-                                                                <div class="col-md-2">
+                                                                <div class="col-md-3">
                                                                     <label><?php echo "Basic Amt  ($INRSYM)"; ?></label>
                                                                     <div class="form-group">
                                                                         <?php
@@ -2812,264 +2824,273 @@ if (!empty($INRSYMBOL)) {
                                                                     </div>
                                                                 </div>
                                                             </div>
-
-                                                            <div>
-
-                                                                <div class="row">
-                                                                    <div class="col-md-4"></div>
-                                                                    <div class="col-md-4">
-                                                                        <label>Discount Type <span
-                                                                                class="badge mandatory"></span></label>
-                                                                        <div>
-                                                                            <?php
-                                                                            $options = array("0" => 'Select Discount Type');
-                                                                            //print_r(  $options);
-                                                                            
-                                                                            if (!empty($TaxType)) {
-                                                                                foreach ($TaxType as $SID):
-
-
-                                                                                    $options[$SID->ConfigValue] = $SID->ConfigValue;
-
-                                                                                endforeach;
-                                                                            }
-
-                                                                            echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType"', 'class="form-control"');
-
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="col-md-2">
-                                                                        <label>Discount Rate<span class="badge mandatory"></span>
-                                                                        </label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();calculateDiscount(0);');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="col-md-2">
-                                                                        <label>Discounted Amt <?php echo "($INRSYM)" ?></label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount'), 'id' => 'txtAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="row" style="text-align:left;">
-                                                                    <div class="col-md-4"></div>
-                                                                    <div class="col-md-4">
-                                                                        <label>Packaging Type <span
-                                                                                class="badge mandatory"></span></label>
-                                                                        <div>
-                                                                            <?php
-                                                                            $options = array("0" => 'Select Packaging Type');
-                                                                            //print_r(  $options);
-                                                                            
-                                                                            if (!empty($TaxType)) {
-                                                                                foreach ($TaxType as $SID):
-
-
-                                                                                    $options[$SID->ConfigValue] = $SID->ConfigValue;
-
-                                                                                endforeach;
-                                                                            }
-
-                                                                            echo form_dropdown('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType"', 'class="form-control "');
-
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="col-md-2">
-                                                                        <label>Packaging Rate <span
-                                                                                class="badge mandatory"></span></label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging(0);change();');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="col-md-2">
-                                                                        <label>Packaging Amt <?php echo "($INRSYM)" ?></label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging'), 'id' => 'txtAfterPackaging', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="row">
-                                                                    <div class="col-md-4"></div>
-                                                                    <div class="col-md-4">
-                                                                        <label>Freight Type <span class="badge mandatory"></label>
-                                                                        <div>
-                                                                            <?php
-                                                                            $options = array("0" => 'Select Freight Type');
-                                                                            //print_r(  $options);
-                                                                            
-                                                                            if (!empty($FreightType)) {
-                                                                                foreach ($FreightType as $SID):
-
-
-                                                                                    $options[$SID->ConfigValue] = $SID->ConfigValue;
-
-                                                                                endforeach;
-                                                                            }
-
-                                                                            echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight"', 'class="form-control "');
-
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="col-md-2" id="TripsValue" style="display:none;">
-                                                                        <label>NO Of Trips<span class="badge mandatory"></label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="col-md-2">
-                                                                        <label>Freight Rate <span class="badge mandatory"></label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);change();');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="col-md-2">
-                                                                        <label>Freight Amt <?php echo "($INRSYM)" ?></label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-
-                                                                <div class="row">
-                                                                    <div class="col-md-8"></div>
-                                                                    <div class="col-md-2">
-                                                                        <label>CGST In %</label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'RevenueCgst', 'value' => set_value('RevenueCgst', 0), 'id' => 'RevenueCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="col-md-2">
-                                                                        <label>CGST Amt <?php echo "($INRSYM)" ?></label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'RevenueAfterCgst', 'value' => set_value('RevenueAfterCgst', 0), 'id' => 'RevenueAfterCgst', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="row" id="SGSTAddModel">
-                                                                    <div class="col-md-8"></div>
-                                                                    <div class="col-md-2">
-                                                                        <label>SGST In %</label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'RevenueSgst', 'value' => set_value('RevenueSgst', 0), 'id' => 'RevenueSgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="col-md-2">
-                                                                        <label>SGST Amt <?php echo "($INRSYM)" ?></label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'RevenueAfterSgst', 'value' => set_value('RevenueAfterSgst', 0), 'id' => 'RevenueAfterSgst', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="row" style="text-align:left;">
-                                                                    <div id="IGSTAddModel" style="display:none;">
-                                                                        <div class="col-md-8"></div>
-                                                                        <div class="col-md-2">
-                                                                            <label>IGST In %</label>
-                                                                            <div class="form-group">
-                                                                                <?php
-                                                                                $data = array('name' => 'RevenueIgst', 'value' => set_value('RevenueIgst', 0), 'id' => 'RevenueIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
-                                                                                echo form_input($data);
-                                                                                ?>
-                                                                            </div>
-                                                                        </div>
-                                                                        <div class="col-md-2">
-                                                                            <label>IGST Amt <?php echo "($INRSYM)" ?></label>
-                                                                            <div class="form-group">
-                                                                                <?php
-                                                                                $data = array('name' => 'RevenueAfterIgst', 'value' => set_value('RevenueAfterIgst', 0), 'id' => 'RevenueAfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                                echo form_input($data);
-                                                                                ?>
-                                                                            </div>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-
-                                                                <div class="row">
-                                                                    <div class="col-md-8">
-                                                                    </div>
-                                                                    <div class="col-md-4">
-                                                                        <label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance'), 'id' => 'txtInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-
-                                                                <div class="row">
-                                                                    <div class="col-md-8">
-                                                                    </div>
-                                                                    <div class="col-md-4 ">
-                                                                        <label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
-                                                                        <div class="form-group">
-                                                                            <?php
-                                                                            $data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                            echo form_input($data);
-                                                                            ?>
-                                                                        </div>
-                                                                    </div>
-
-
-                                                                </div>
-                                                                <div class="row">
-                                                                    <div class="col-12">
-                                                                        <label><?php echo "Revenue Description"; ?></label>
+                    
+                                                            <div class="row">
+                                                                <div class="col-md-3"></div>
+                                                                <div class="col-md-3">
+                                                                    <label>Discount Type <span
+                                                                            class="badge mandatory"></span></label>
+                                                                    <div>
                                                                         <?php
-                                                                        $data = array('name' => 'Add_Service_Description', 'value' => set_value('Add_Service_Description'), 'id' => 'Add_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100');
-                                                                        echo form_textarea($data);
-                                                                        ;
-                                                                        ?>
+                                                                        $options = array("0" => 'Select Discount Type');
+                                                                        //print_r(  $options);
+                                                                        
+                                                                        if (!empty($TaxType)) {
+                                                                            foreach ($TaxType as $SID):
 
+
+                                                                                $options[$SID->ConfigValue] = $SID->ConfigValue;
+
+                                                                            endforeach;
+                                                                        }
+
+                                                                        echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType"', 'class="form-control"');
+
+                                                                        ?>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-12 text-right">
-                                                                    <a class="btn btn-secondary waves-effect" data-dismiss="modal"
-                                                                        value="Cancel">Cancel</a>
-                                                                    <a class="btn btn-success font AddRevenue" ID="AddRevenue">
-                                                                        &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
+                                                                <div class="col-md-3">
+                                                                    <label>Discount Rate<span class="badge mandatory"></span>
+                                                                    </label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();calculateDiscount(0);');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
                                                                 </div>
+                                                                <div class="col-md-3">
+                                                                    <label>Discounted Amt <?php echo "($INRSYM)" ?></label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount'), 'id' => 'txtAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                            <!-- cmtl-packaging type -->
+                                                            <div class="row" style="text-align:left;">
+                                                                <div class="col-md-3"></div>
+                                                                <div class="col-md-3">
+                                                                    <label>Packaging Type <span
+                                                                            class="badge mandatory"></span></label>
+                                                                    <div>
+                                                                        <?php
+                                                                        $options = array("0" => 'Select Packaging Type');
+                                                                        //print_r(  $options);
+                                                                        
+                                                                        if (!empty($TaxType)) {
+                                                                            foreach ($TaxType as $SID):
+
+
+                                                                                $options[$SID->ConfigValue] = $SID->ConfigValue;
+
+                                                                            endforeach;
+                                                                        }
+
+                                                                        echo form_dropdown('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType"', 'class="form-control "');
+
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="col-md-3">
+                                                                    <label>Packaging Rate <span
+                                                                            class="badge mandatory"></span></label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging(0);change();');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="col-md-3">
+                                                                    <label>Packaging Amt <?php echo "($INRSYM)" ?></label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging'), 'id' => 'txtAfterPackaging', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                            <!-- cmtl-freight type -->
+                                                            <div class="row">
+                                                                <div class="col-md-3"></div>
+                                                                <div class="col-md-3">
+                                                                    <label>Freight Type <span class="badge mandatory"></label>
+                                                                    <div>
+                                                                        <?php
+                                                                        $options = array("0" => 'Select Freight Type');
+                                                                        //print_r(  $options);
+                                                                        
+                                                                        if (!empty($FreightType)) {
+                                                                            foreach ($FreightType as $SID):
+
+
+                                                                                $options[$SID->ConfigValue] = $SID->ConfigValue;
+
+                                                                            endforeach;
+                                                                        }
+
+                                                                        echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight"', 'class="form-control "');
+
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="col-md-3" id="TripsValue" style="display:none;">
+                                                                    <label>NO Of Trips<span class="badge mandatory"></label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="col-md-3">
+                                                                    <label>Freight Rate <span class="badge mandatory"></label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);change();');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="col-md-3">
+                                                                    <label>Freight Amt <?php echo "($INRSYM)" ?></label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="row">
+                                                                <div class="col-md-6"></div>
+                                                                <div class="col-md-3">
+                                                                    <label>CGST In %</label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'RevenueCgst', 'value' => set_value('RevenueCgst', 0), 'id' => 'RevenueCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="col-md-3">
+                                                                    <label>CGST Amt <?php echo "($INRSYM)" ?></label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'RevenueAfterCgst', 'value' => set_value('RevenueAfterCgst', 0), 'id' => 'RevenueAfterCgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="row" id="SGSTAddModel">
+                                                                <div class="col-md-6"></div>
+                                                                <div class="col-md-3">
+                                                                    <label>SGST In %</label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'RevenueSgst', 'value' => set_value('RevenueSgst', 0), 'id' => 'RevenueSgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="col-md-3">
+                                                                    <label>SGST Amt <?php echo "($INRSYM)" ?></label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'RevenueAfterSgst', 'value' => set_value('RevenueAfterSgst', 0), 'id' => 'RevenueAfterSgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="row" style="text-align:left;">
+                                                                <div id="IGSTAddModel" style="display:none;">
+                                                                    <div class="col-md-6"></div>
+                                                                    <div class="col-md-3">
+                                                                        <label>IGST In %</label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'RevenueIgst', 'value' => set_value('RevenueIgst', 0), 'id' => 'RevenueIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <label>IGST Amt <?php echo "($INRSYM)" ?></label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'RevenueAfterIgst', 'value' => set_value('RevenueAfterIgst', 0), 'id' => 'RevenueAfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="row">
+                                                                <div class="col-md-9">
+                                                                </div>
+                                                                <div class="col-md-3">
+                                                                    <label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance'), 'id' => 'txtInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="row">
+                                                                <div class="col-md-9">
+                                                                </div>
+                                                                <div class="col-md-3 ">
+                                                                    <label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
+                                                                    <div class="form-group">
+                                                                        <?php
+                                                                        $data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                        echo form_input($data);
+                                                                        ?>
+                                                                    </div>
+                                                                </div>
+
 
                                                             </div>
 
+                                                            <div class="row">
+                                                                <div class="col-12">
+                                                                    <label><?php echo "Revenue Description"; ?></label>
+                                                                    <?php
+                                                                    $data = array('name' => 'Add_Service_Description', 'value' => set_value('Add_Service_Description'), 'id' => 'Add_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100');
+                                                                    echo form_textarea($data);
+                                                                    ;
+                                                                    ?>
+
+                                                                </div>
+                                                            </div>
+                                                            <br>
+
+                                                            <div class="col-12 text-right">
+                                                                <a class="btn btn-secondary waves-effect" data-dismiss="modal"
+                                                                    value="Cancel">Cancel</a> &nbsp;&nbsp;
+                                                            
+                                                                    <a class="btn btn-success font AddRevenue" ID="AddRevenue">
+                                                                    &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
+                                                            </div>
+                                                            
+
+                                                            
+
 
                                                         </div>
                                                         <!-- footer for revenue po -->
@@ -4602,9 +4623,15 @@ if (!empty($INRSYMBOL)) {
                                 </div>
                             </div>
                             <div class="modal-footer">
-                                <button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal"
+                           
+                                <button type="button" class="btn btn-secondary waves-effect" 
+                                onclick="
+                               $('#packagingcalmodel').modal('hide');
+                               showmodel();"
+                                  
                                     value="Cancel">Cancel</button>
                                 <button type="button" class="btn btn-info waves-effect waves-light"
+                              
                                     onclick="SetPackagingOption()">Save</button>
                             </div>
                         </div>
@@ -4822,8 +4849,13 @@ if (!empty($INRSYMBOL)) {
                             </div>
                             <div class="modal-footer">
                                 <a class="btn btn-danger" data-dismiss="modal" 
+                               onclick="
+                               $('#freightmodel').modal('hide');
+                               showmodel()"
                                     value="Cancel">Cancel</a>
-                                <a class="btn btn-success" ID="freightOption" onclick="setfreightOption();"
+                                <a class="btn btn-success" ID="freightOption"
+                                data-bs-target="#REVENUE" data-bs-toggle="modal" data-bs-dismiss="modal"
+                                onclick="setfreightOption();"
                                    ><span class="bold">Ok</span></a>
                             </div>
                         </div>
@@ -8551,4 +8583,6 @@ if (!empty($INRSYMBOL)) {
                 $this.addClass('select2');
             }
         });
-    </script>
\ No newline at end of file
+    </script>
+
+  
\ No newline at end of file