Note option for perticulars

KaushikOP · Jul 21, 2021 · dd72ad2 · dd72ad2
1 parent 8ce47b0
commit dd72ad2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 91 deletions.
diff --git a/JS/fill.js b/JS/fill.js
@@ -84,7 +84,7 @@ $(document).ready(function() {
             return this.value == pName;
         }).data('id');
 
-        $("#selectGSTParticular").before("<div class='m-3 col-auto row' id='divPerticularNo" + counterGST + "' ><input type='text' class='col-6 form-control mr-2' name='PerticularNo" + counterGST + "' value='" + $("#perticularGSTName").val() + "'readonly><input type='hidden' name='PerticularNo" + counterGST + "' value='" + id + "'><input type='number' class='form-control col-3 mr-2' name='PerticularAmt" + counterGST + "' required><button type='button' class='btn btn-danger col-auto' id='btnPerticularNo" + counterGST + "'  onclick='removeGSTDivision(" + counterGST + ")' >Remove</button></div>");
+        $("#selectGSTParticular").before("<div class='m-3 col-auto row' id='divPerticularNo" + counterGST + "' ><input type='text' class='col-5 form-control mr-2' name='PerticularNo" + counterGST + "' value='" + $("#perticularGSTName").val() + "'readonly><input type='hidden' name='PerticularNo" + counterGST + "' value='" + id + "'><input type='text' class='form-control col-3 mr-2' name='PerticularNote" + counterGST + "'placeholder='Note'><input type='number' class='form-control col-2 mr-2' name='PerticularAmt" + counterGST + "' required placeholder='Taxable Amount'><button type='button' class='btn btn-danger col-auto' id='btnPerticularNo" + counterGST + "'  onclick='removeGSTDivision(" + counterGST + ")' >Remove</button></div>");
 
         $("#perticularGSTName").val("");
         counterGST++;
@@ -97,7 +97,7 @@ $(document).ready(function() {
             return this.value == pName;
         }).data('id');
 
-        $("#selectNGSTParticular").before("<div class='m-3 col-auto row' id='divPerticularNo" + counterNGST + "' ><input type='text' class='col-6 form-control mr-2' name='PerticularNo" + counterNGST + "' value='" + $("#NGSTPerticularName").val() + "'readonly><input type='hidden' name='PerticularNo" + counterNGST + "' value='" + id + "'><input type='number' class='form-control col-3 mr-2' name='PerticularAmt" + counterNGST + "' required><button type='button' class='btn btn-danger col-auto' id='btnPerticularNo" + counterNGST + "'  onclick='removeNGSTDivision(" + counterNGST + ")' >Remove</button></div>");
+        $("#selectNGSTParticular").before("<div class='m-3 col-auto row' id='divPerticularNo" + counterNGST + "' ><input type='text' class='col-5 form-control mr-2' name='PerticularNo" + counterNGST + "' value='" + $("#NGSTPerticularName").val() + "'readonly><input type='hidden' name='PerticularNo" + counterNGST + "' value='" + id + "'><input type='text' class='form-control col-3 mr-2' name='PerticularNote" + counterNGST + "' placeholder='Note'><input type='number' class='form-control col-2 mr-2' name='PerticularAmt" + counterNGST + "' required placeholder='Taxable Amount'><button type='button' class='btn btn-danger col-auto' id='btnPerticularNo" + counterNGST + "'  onclick='removeNGSTDivision(" + counterNGST + ")' >Remove</button></div>");
         $("#NGSTPerticularName").val("");
         counterNGST++;
     });
@@ -205,89 +205,6 @@ $(document).ready(function() {
             },
         });
     });
-
-    $("#addBtn").click(function() {
-        var pName = $("#perticularGSTName").val();
-        var id = $("#perticulersGST option")
-            .filter(function() {
-                return this.value == pName;
-            })
-            .data("id");
-
-        $("#selectGSTParticular").before(
-            "<div class='m-3 col-auto row' id='divPerticularNo" +
-            counterGST +
-            "' ><input type='text' class='col-6 form-control mr-2' name='PerticularNo" +
-            counterGST +
-            "' value='" +
-            $("#perticularGSTName").val() +
-            "'readonly><input type='hidden' name='PerticularNo" +
-            counterGST +
-            "' value='" +
-            id +
-            "'><input type='number' class='form-control col-3 mr-2' name='PerticularAmt" +
-            counterGST +
-            "' required><button type='button' class='btn btn-danger col-auto' id='btnPerticularNo" +
-            counterGST +
-            "'  onclick='removeGSTDivision(" +
-            counterGST +
-            ")' >Remove</button></div>"
-        );
-
-        $("#perticularGSTName").val("");
-        counterGST++;
-    });
-
-    $("#addNBtn").click(function() {
-        var pName = $("#NGSTPerticularName").val();
-        var id = $("#perticulersNGST option")
-            .filter(function() {
-                return this.value == pName;
-            })
-            .data("id");
-
-        $("#selectNGSTParticular").before(
-            "<div class='m-3 col-auto row' id='divPerticularNo" +
-            counterNGST +
-            "' ><input type='text' class='col-6 form-control mr-2' name='PerticularNo" +
-            counterNGST +
-            "' value='" +
-            $("#NGSTPerticularName").val() +
-            "'readonly><input type='hidden' name='PerticularNo" +
-            counterNGST +
-            "' value='" +
-            id +
-            "'><input type='number' class='form-control col-3 mr-2' name='PerticularAmt" +
-            counterNGST +
-            "' required><button type='button' class='btn btn-danger col-auto' id='btnPerticularNo" +
-            counterNGST +
-            "'  onclick='removeNGSTDivision(" +
-            counterNGST +
-            ")' >Remove</button></div>"
-        );
-        $("#NGSTPerticularName").val("");
-        counterNGST++;
-    });
-
-    // $("#firm").change(function() {
-    //     firmId = $("#firm").val();
-
-    //     var fYear = getFinancialYear();
-
-    //     $.ajax({
-    //         method: "GET",
-    //         url: "getInvoiceNo.php",
-    //         data: {
-    //             "firmId": firmId,
-    //             "fYear": fYear
-    //         },
-    //         success: function(result) {
-    //             $("#invoiceNumber").val(result);
-    //             $("#NinvoiceNumber").val(result);
-    //             // console.log(result);
-    //         },
-    //     });
-    // });
 });
 
 function removeGSTDivision(cnt) {

diff --git a/fill.html b/fill.html
@@ -135,7 +135,6 @@ <h3 id="firmName" class="text-center text-primary"></h3>
                       list="fYearListGST" placeholder="2021-22" />
 
                     <datalist id="fYearListGST">
-                      <option data-id="0" >All Years</option>
                       <option data-id="1" >2000-01</option>
                       <option data-id="2" >2001-02</option>
                       <option data-id="3" >2002-03</option>
@@ -365,7 +364,6 @@ <h4 class="text-center m-3">Invoice Particulars</h4>
                       list="fYearList" placeholder="2021-22" />
 
                     <datalist id="fYearList">
-                      <option data-id="0" >All Years</option>
                       <option data-id="1" >2000-01</option>
                       <option data-id="2" >2001-02</option>
                       <option data-id="3" >2002-03</option>

diff --git a/insertInvoiceData.php b/insertInvoiceData.php
@@ -7,8 +7,8 @@
         $firmId = $_COOKIE['firmId'];
         $clientId = $_COOKIE['clientId'];
 
-        // print_r($temp);
-
+        print_r($temp);
+        
         $formData  = array();
         $particulars = array();
 
@@ -36,6 +36,10 @@
 
         }
 
+        print_r($particulars);
+        print_r($formData);
+        return;
+
         $totalAmount = array_sum(array_values($particulars));
 
         if($firmId==3){
@@ -78,11 +82,11 @@
             echo "<script>alert('Error during Bill Master Generation');</script>";
         }  
 
-        echo "
+        /*echo "
             <script>
                 window.location = './fill.html';
             </script>
-        ";  
+        ";*/  
 
     }