Merge pull request #14 from Shivi2401/main

Sale Bill Update #12
Kanav-Arora · May 23, 2021 · e10c2ec · e10c2ec
2 parents 3d17e83 + 61e5d88
commit e10c2ec
Show file tree

Hide file tree

Showing 24 changed files with 108 additions and 40 deletions.
diff --git a/EndSem/build/built-jar.properties b/EndSem/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Sat, 22 May 2021 19:58:40 +0530
+#Sun, 23 May 2021 00:26:05 +0530
 
 
-C\:\\Users\\Kanav\\Google\ Drive\ ([email protected])\\Git\ Files\\JavaCSEProject\\EndSem=
+D\:\\COLLEGE\\CODING\\Github\ Repos\\Java-CSE-Project\\EndSem=
diff --git a/EndSem/build/classes/Frames/LedgerAccounts.class b/EndSem/build/classes/Frames/LedgerAccounts.class
diff --git a/EndSem/build/classes/Frames/Login.class b/EndSem/build/classes/Frames/Login.class
diff --git a/EndSem/build/classes/Frames/Main.class b/EndSem/build/classes/Frames/Main.class
diff --git a/EndSem/build/classes/Frames/Sale$1.class b/EndSem/build/classes/Frames/Sale$1.class
diff --git a/EndSem/build/classes/Frames/Sale$10.class b/EndSem/build/classes/Frames/Sale$10.class
diff --git a/EndSem/build/classes/Frames/Sale$11.class b/EndSem/build/classes/Frames/Sale$11.class
diff --git a/EndSem/build/classes/Frames/Sale$12.class b/EndSem/build/classes/Frames/Sale$12.class
diff --git a/EndSem/build/classes/Frames/Sale$2.class b/EndSem/build/classes/Frames/Sale$2.class
diff --git a/EndSem/build/classes/Frames/Sale$3.class b/EndSem/build/classes/Frames/Sale$3.class
diff --git a/EndSem/build/classes/Frames/Sale$4.class b/EndSem/build/classes/Frames/Sale$4.class
diff --git a/EndSem/build/classes/Frames/Sale$5.class b/EndSem/build/classes/Frames/Sale$5.class
diff --git a/EndSem/build/classes/Frames/Sale$6.class b/EndSem/build/classes/Frames/Sale$6.class
diff --git a/EndSem/build/classes/Frames/Sale$7.class b/EndSem/build/classes/Frames/Sale$7.class
diff --git a/EndSem/build/classes/Frames/Sale$8.class b/EndSem/build/classes/Frames/Sale$8.class
diff --git a/EndSem/build/classes/Frames/Sale$9.class b/EndSem/build/classes/Frames/Sale$9.class
diff --git a/EndSem/build/classes/Frames/Sale.class b/EndSem/build/classes/Frames/Sale.class
diff --git a/EndSem/nbproject/private/private.properties b/EndSem/nbproject/private/private.properties
@@ -5,4 +5,4 @@ do.jlink=false
 javac.debug=true
 javadoc.preview=true
 jlink.strip=false
-user.properties.file=C:\\Users\\Kanav\\AppData\\Roaming\\NetBeans\\12.0\\build.properties
+user.properties.file=C:\\Users\\shivam\\AppData\\Roaming\\NetBeans\\12.0\\build.properties
diff --git a/EndSem/nbproject/private/private.xml b/EndSem/nbproject/private/private.xml
@@ -3,10 +3,11 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/Users/Kanav/Google%20Drive%20([email protected])/Git%20Files/JavaCSEProject/EndSem/src/Frames/Login.java</file>
-            <file>file:/C:/Users/Kanav/Google%20Drive%20([email protected])/Git%20Files/JavaCSEProject/EndSem/src/Frames/LedgerAccounts.java</file>
-            <file>file:/C:/Users/Kanav/Google%20Drive%20([email protected])/Git%20Files/JavaCSEProject/EndSem/src/Frames/Sale.java</file>
-            <file>file:/C:/Users/Kanav/Google%20Drive%20([email protected])/Git%20Files/JavaCSEProject/EndSem/src/Frames/Main.java</file>
+            <file>file:/D:/COLLEGE/CODING/Github%20Repos/Java-CSE-Project/EndSem/src/Frames/AccountSetup.java</file>
+            <file>file:/D:/COLLEGE/CODING/Github%20Repos/Java-CSE-Project/EndSem/src/Frames/Main.java</file>
+            <file>file:/D:/COLLEGE/CODING/Github%20Repos/Java-CSE-Project/EndSem/src/Frames/Sale.java</file>
+            <file>file:/D:/COLLEGE/CODING/Github%20Repos/Java-CSE-Project/EndSem/src/Frames/Login.java</file>
+            <file>file:/D:/COLLEGE/CODING/Github%20Repos/Java-CSE-Project/EndSem/src/Frames/LedgerAccounts.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/EndSem/src/Frames/LedgerAccounts.java b/EndSem/src/Frames/LedgerAccounts.java
@@ -66,7 +66,7 @@ public LedgerAccounts() {
     try {
 
         Class.forName("java.sql.DriverManager");
-        Connection con = (Connection) DriverManager.getConnection("jdbc:mysql://localhost:3306/jvp","root","bhulgaya123");
+        Connection con = (Connection) DriverManager.getConnection("jdbc:mysql://localhost:3306/jvp","root","Shivam@020401");
         System.out.println("Connection is created successfully");
         Statement stmt = (Statement) con.createStatement();
         String query = "select acc_name from accounts where username = '"+username+"'";
@@ -630,7 +630,7 @@ private void jLabel8MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
         // TODO add your handling code here:
 
         Class.forName("java.sql.DriverManager");
-        Connection con = (Connection) DriverManager.getConnection("jdbc:mysql://localhost:3306/jvp","root","bhulgaya123");
+        Connection con = (Connection) DriverManager.getConnection("jdbc:mysql://localhost:3306/jvp","root","Shivam@020401");
         System.out.println("Connection is created successfully");
         Statement stmt = (Statement) con.createStatement();
         String query = "select count(*) from transactions WHERE username = '"+username+"' and acc_name = '"+acc +"'";

diff --git a/EndSem/src/Frames/Login.java b/EndSem/src/Frames/Login.java
@@ -207,7 +207,7 @@ private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
         {
 
             Class.forName("java.sql.DriverManager");
-            Connection con = (Connection) DriverManager.getConnection("jdbc:mysql://localhost:3306/jvp","root","bhulgaya123");
+            Connection con = (Connection) DriverManager.getConnection("jdbc:mysql://localhost:3306/jvp","root","Shivam@020401");
 
             Statement stmt = (Statement) con.createStatement();
             String query = "select * from users";

diff --git a/EndSem/src/Frames/Main.java b/EndSem/src/Frames/Main.java
@@ -43,7 +43,7 @@ public Main() throws SQLException {
 
 
             Class.forName("java.sql.DriverManager");
-            Connection con = (Connection) DriverManager.getConnection("jdbc:mysql://localhost:3306/jvp","root","bhulgaya123");
+            Connection con = (Connection) DriverManager.getConnection("jdbc:mysql://localhost:3306/jvp","root","Shivam@020401");
 
             Statement stmt = (Statement) con.createStatement();
             String query = "select name,gender from users where username = '"+username+"'";

diff --git a/EndSem/src/Frames/Sale.form b/EndSem/src/Frames/Sale.form
@@ -367,8 +367,8 @@
                     <Column editable="true" title="Item Name" type="java.lang.Object"/>
                     <Column editable="true" title="Pcs" type="java.lang.Integer"/>
                     <Column editable="true" title="Qty (kg)" type="java.lang.Float"/>
-                    <Column editable="true" title="Net Rate" type="java.lang.Float"/>
                     <Column editable="true" title="Rate" type="java.lang.Float"/>
+                    <Column editable="true" title="Net Rate" type="java.lang.Float"/>
                     <Column editable="false" title="Amount" type="java.lang.Float"/>
                     <Column editable="true" title="Discount" type="java.lang.Float"/>
                     <Column editable="true" title="Disc (%)" type="java.lang.Float"/>