From 33fdebf5a963d1d59452a0f8de775c4f14dd70c0 Mon Sep 17 00:00:00 2001
From: Informatic <msaadat1379@gmail.com>
Date: Thu, 23 Jul 2020 20:52:22 +0430
Subject: [PATCH 01/10] redo money

---
 .idea/misc.xml                       |   2 +-
 .idea/workspace.xml                  | 310 ++++++++++++++-------------
 src/main/java/Controller/Server.java |  18 ++
 3 files changed, 176 insertions(+), 154 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7417b01..d528a03 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -12,7 +12,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 558431b..b39ede8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="complete Auction">
+    <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/Data/test.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Client.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Client.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/Database.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Data/Accounts/Buyers.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Accounts/Buyers.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Data/Accounts/Sellers.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Accounts/Sellers.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Data/IDs/Id.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/IDs/Id.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Data/Products/Categories.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Products/Categories.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Data/Products/Products.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Products/Products.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Data/Requests/NewProductRequests.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Requests/NewProductRequests.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Controller/Server.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/Server.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/SellerMenus/SellerMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/SellerMenus/SellerMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -92,7 +100,7 @@
   <component name="RunManager" selected="Application.Client">
     <configuration name="Client" type="Application" factoryName="Application" singleton="false" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Client" />
-      <module name="Project-2" />
+      <module name="Project" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -106,7 +114,7 @@
     </configuration>
     <configuration name="Server" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Controller.Server" />
-      <module name="Project-2" />
+      <module name="Project" />
       <extension name="coverage">
         <pattern>
           <option name="PATTERN" value="Controller.*" />
@@ -119,6 +127,7 @@
     </configuration>
     <configuration name="All in Project-2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="Project" />
+      <useClassPathOnly />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="" />
       <option name="METHOD_NAME" value="" />
@@ -366,71 +375,6 @@
       <workItem from="1593177955371" duration="115000" />
       <workItem from="1593178150008" duration="253000" />
       <workItem from="1593187077572" duration="84000" />
-      <workItem from="1595246472217" duration="1537000" />
-      <workItem from="1595398225651" duration="1068000" />
-    </task>
-    <task id="LOCAL-00056" summary="result of Buyer manager methods changed to String">
-      <created>1589816017514</created>
-      <option name="number" value="00056" />
-      <option name="presentableId" value="LOCAL-00056" />
-      <option name="project" value="LOCAL" />
-      <updated>1589816017514</updated>
-    </task>
-    <task id="LOCAL-00057" summary="complete tests and menus">
-      <created>1589828474462</created>
-      <option name="number" value="00057" />
-      <option name="presentableId" value="LOCAL-00057" />
-      <option name="project" value="LOCAL" />
-      <updated>1589828474462</updated>
-    </task>
-    <task id="LOCAL-00058" summary="add OffMenu">
-      <created>1589833893359</created>
-      <option name="number" value="00058" />
-      <option name="presentableId" value="LOCAL-00058" />
-      <option name="project" value="LOCAL" />
-      <updated>1589833893359</updated>
-    </task>
-    <task id="LOCAL-00059" summary="Ass AllOffManagerTest">
-      <created>1589835631380</created>
-      <option name="number" value="00059" />
-      <option name="presentableId" value="LOCAL-00059" />
-      <option name="project" value="LOCAL" />
-      <updated>1589835631380</updated>
-    </task>
-    <task id="LOCAL-00060" summary="complete menus">
-      <created>1589836131909</created>
-      <option name="number" value="00060" />
-      <option name="presentableId" value="LOCAL-00060" />
-      <option name="project" value="LOCAL" />
-      <updated>1589836131909</updated>
-    </task>
-    <task id="LOCAL-00061" summary="fix bug v1.1">
-      <created>1589876310685</created>
-      <option name="number" value="00061" />
-      <option name="presentableId" value="LOCAL-00061" />
-      <option name="project" value="LOCAL" />
-      <updated>1589876310685</updated>
-    </task>
-    <task id="LOCAL-00062" summary="fix bug v1.2">
-      <created>1589876974981</created>
-      <option name="number" value="00062" />
-      <option name="presentableId" value="LOCAL-00062" />
-      <option name="project" value="LOCAL" />
-      <updated>1589876974981</updated>
-    </task>
-    <task id="LOCAL-00063" summary="fix bug v1.3 (add some filter in product)">
-      <created>1589881974880</created>
-      <option name="number" value="00063" />
-      <option name="presentableId" value="LOCAL-00063" />
-      <option name="project" value="LOCAL" />
-      <updated>1589881974881</updated>
-    </task>
-    <task id="LOCAL-00064" summary="debug menus">
-      <created>1589884717933</created>
-      <option name="number" value="00064" />
-      <option name="presentableId" value="LOCAL-00064" />
-      <option name="project" value="LOCAL" />
-      <updated>1589884717933</updated>
     </task>
     <task id="LOCAL-00065" summary="complete FilteringMenu">
       <created>1589886526890</created>
@@ -712,7 +656,70 @@
       <option name="project" value="LOCAL" />
       <updated>1595190322167</updated>
     </task>
-    <option name="localTasksCounter" value="105" />
+    <task id="LOCAL-00105" summary="debug and complete">
+      <created>1595246000405</created>
+      <option name="number" value="00105" />
+      <option name="presentableId" value="LOCAL-00105" />
+      <option name="project" value="LOCAL" />
+      <updated>1595246000405</updated>
+    </task>
+    <task id="LOCAL-00106" summary="debug cart">
+      <created>1595249215945</created>
+      <option name="number" value="00106" />
+      <option name="presentableId" value="LOCAL-00106" />
+      <option name="project" value="LOCAL" />
+      <updated>1595249215946</updated>
+    </task>
+    <task id="LOCAL-00107" summary="make sure from client and server">
+      <created>1595252645946</created>
+      <option name="number" value="00107" />
+      <option name="presentableId" value="LOCAL-00107" />
+      <option name="project" value="LOCAL" />
+      <updated>1595252645946</updated>
+    </task>
+    <task id="LOCAL-00108" summary="try to make p2p">
+      <created>1595372157522</created>
+      <option name="number" value="00108" />
+      <option name="presentableId" value="LOCAL-00108" />
+      <option name="project" value="LOCAL" />
+      <updated>1595372157522</updated>
+    </task>
+    <task id="LOCAL-00109" summary="debug add discount and show accounts">
+      <created>1595417003834</created>
+      <option name="number" value="00109" />
+      <option name="presentableId" value="LOCAL-00109" />
+      <option name="project" value="LOCAL" />
+      <updated>1595417003835</updated>
+    </task>
+    <task id="LOCAL-00110" summary="debug manage requests">
+      <created>1595418246103</created>
+      <option name="number" value="00110" />
+      <option name="presentableId" value="LOCAL-00110" />
+      <option name="project" value="LOCAL" />
+      <updated>1595418246104</updated>
+    </task>
+    <task id="LOCAL-00111" summary="debug login">
+      <created>1595418554746</created>
+      <option name="number" value="00111" />
+      <option name="presentableId" value="LOCAL-00111" />
+      <option name="project" value="LOCAL" />
+      <updated>1595418554746</updated>
+    </task>
+    <task id="LOCAL-00112" summary="edit NewProductRequest for file products">
+      <created>1595447720551</created>
+      <option name="number" value="00112" />
+      <option name="presentableId" value="LOCAL-00112" />
+      <option name="project" value="LOCAL" />
+      <updated>1595447720551</updated>
+    </task>
+    <task id="LOCAL-00113" summary="edit Product for file Product">
+      <created>1595448623948</created>
+      <option name="number" value="00113" />
+      <option name="presentableId" value="LOCAL-00113" />
+      <option name="project" value="LOCAL" />
+      <updated>1595448623948</updated>
+    </task>
+    <option name="localTasksCounter" value="114" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -720,15 +727,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="complete handle user" />
-    <MESSAGE value="complete show product for manager" />
-    <MESSAGE value="product Menu" />
-    <MESSAGE value="edit something" />
-    <MESSAGE value="complete ProductMenu" />
-    <MESSAGE value="add filter and sort and buyers" />
-    <MESSAGE value="Category added" />
-    <MESSAGE value="fix bugs v1.1" />
-    <MESSAGE value="cart styles2" />
     <MESSAGE value="zoom picture" />
     <MESSAGE value="ProductsMenu styles" />
     <MESSAGE value="debug music" />
@@ -745,7 +743,16 @@
     <MESSAGE value="handle show online users" />
     <MESSAGE value="show auctions for buyer" />
     <MESSAGE value="complete Auction" />
-    <option name="LAST_COMMIT_MESSAGE" value="complete Auction" />
+    <MESSAGE value="debug and complete" />
+    <MESSAGE value="debug cart" />
+    <MESSAGE value="make sure from client and server" />
+    <MESSAGE value="try to make p2p" />
+    <MESSAGE value="debug add discount and show accounts" />
+    <MESSAGE value="debug manage requests" />
+    <MESSAGE value="debug login" />
+    <MESSAGE value="edit NewProductRequest for file products" />
+    <MESSAGE value="edit Product for file Product" />
+    <option name="LAST_COMMIT_MESSAGE" value="edit Product for file Product" />
   </component>
   <component name="WindowStateProjectService">
     <state x="280" y="20" key="#AccountManagerTest" timestamp="1589226101281">
@@ -793,10 +800,6 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="280" y="0" key="#All_in_Project-2_(1)/0.0.1366.728@0.0.1366.728" timestamp="1593165627201" />
-    <state x="400" y="26" key="#Client" timestamp="1595246541331">
-      <screen x="0" y="0" width="1366" height="738" />
-    </state>
-    <state x="400" y="26" key="#Client/0.0.1366.738@0.0.1366.738" timestamp="1595246541331" />
     <state x="275" y="26" key="#Inspections" timestamp="1591540003920">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -820,10 +823,6 @@
     </state>
     <state x="280" y="29" key="#SellerAccountTest/0.0.1366.728@0.0.1366.728" timestamp="1589388895849" />
     <state x="280" y="29" key="#SellerAccountTest/0.0.1366.738@0.0.1366.738" timestamp="1589400111089" />
-    <state x="400" y="26" key="#Server" timestamp="1595246483846">
-      <screen x="0" y="0" width="1366" height="738" />
-    </state>
-    <state x="400" y="26" key="#Server/0.0.1366.738@0.0.1366.738" timestamp="1595246483846" />
     <state x="280" y="0" key="#Temp_suite" timestamp="1589228140962">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -856,10 +855,10 @@
     </state>
     <state x="412" y="149" key="#com.intellij.ide.util.TreeClassChooserDialog/0.0.1366.728@0.0.1366.728" timestamp="1589388879706" />
     <state x="412" y="151" key="#com.intellij.ide.util.TreeClassChooserDialog/0.0.1366.738@0.0.1366.738" timestamp="1589230109625" />
-    <state x="531" y="254" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog" timestamp="1593177959020">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state x="531" y="251" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog" timestamp="1595409573947">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="531" y="251" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/0.0.1366.728@0.0.1366.728" timestamp="1593098308740" />
+    <state x="531" y="251" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/0.0.1366.728@0.0.1366.728" timestamp="1595409573947" />
     <state x="531" y="254" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/0.0.1366.738@0.0.1366.738" timestamp="1593177959020" />
     <state x="263" y="17" key="#com.intellij.openapi.projectRoots.ui.ProjectJdksEditor" timestamp="1587840031430">
       <screen x="0" y="0" width="1366" height="728" />
@@ -882,15 +881,15 @@
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="280" y="6" key="#null./0.0.1366.738@0.0.1366.738" timestamp="1589226532697" />
-    <state x="438" y="65" key="#xdebugger.evaluate" timestamp="1594728596073">
+    <state x="438" y="65" key="#xdebugger.evaluate" timestamp="1595501308315">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="438" y="65" key="#xdebugger.evaluate/0.0.1366.728@0.0.1366.728" timestamp="1594728596073" />
-    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595399013745">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state x="438" y="65" key="#xdebugger.evaluate/0.0.1366.728@0.0.1366.728" timestamp="1595501308315" />
+    <state x="499" y="0" key="CommitChangelistDialog2" timestamp="1595448621930">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="499" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1595190320159" />
-    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595399013745" />
+    <state x="499" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1595448621930" />
+    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1593178423340" />
     <state x="92" y="93" width="1182" height="552" key="DiffContextDialog" timestamp="1593178422199">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -900,55 +899,55 @@
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="463" y="122" key="FileChooserDialogImpl/0.0.1366.738@0.0.1366.738" timestamp="1592855183500" />
-    <state width="661" height="131" key="GridCell.Tab.0.bottom" timestamp="1595399201822">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state width="1322" height="174" key="GridCell.Tab.0.bottom" timestamp="1595502246975">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="244" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1595245974244" />
-    <state width="661" height="131" key="GridCell.Tab.0.bottom/0.0.1366.738@0.0.1366.738" timestamp="1595399201822" />
-    <state width="661" height="131" key="GridCell.Tab.0.center" timestamp="1595399201822">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state width="1322" height="174" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
+    <state width="1322" height="185" key="GridCell.Tab.0.bottom/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
+    <state width="1322" height="174" key="GridCell.Tab.0.center" timestamp="1595502246975">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="244" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1595245974244" />
-    <state width="661" height="131" key="GridCell.Tab.0.center/0.0.1366.738@0.0.1366.738" timestamp="1595399201822" />
-    <state width="661" height="131" key="GridCell.Tab.0.left" timestamp="1595399201821">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state width="1322" height="174" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
+    <state width="1322" height="185" key="GridCell.Tab.0.center/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
+    <state width="1322" height="174" key="GridCell.Tab.0.left" timestamp="1595502246975">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="244" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1595245974244" />
-    <state width="661" height="131" key="GridCell.Tab.0.left/0.0.1366.738@0.0.1366.738" timestamp="1595399201821" />
-    <state width="661" height="131" key="GridCell.Tab.0.right" timestamp="1595399201822">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state width="1322" height="174" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
+    <state width="1322" height="185" key="GridCell.Tab.0.left/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
+    <state width="1322" height="174" key="GridCell.Tab.0.right" timestamp="1595502246975">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="244" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1595245974244" />
-    <state width="661" height="131" key="GridCell.Tab.0.right/0.0.1366.738@0.0.1366.738" timestamp="1595399201822" />
-    <state width="1322" height="244" key="GridCell.Tab.1.bottom" timestamp="1595245974244">
+    <state width="1322" height="174" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
+    <state width="1322" height="185" key="GridCell.Tab.0.right/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
+    <state width="1322" height="244" key="GridCell.Tab.1.bottom" timestamp="1595502161406">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="244" key="GridCell.Tab.1.bottom/0.0.1366.728@0.0.1366.728" timestamp="1595245974244" />
+    <state width="1322" height="244" key="GridCell.Tab.1.bottom/0.0.1366.728@0.0.1366.728" timestamp="1595502161406" />
     <state width="1322" height="221" key="GridCell.Tab.1.bottom/0.0.1366.738@0.0.1366.738" timestamp="1589873506234" />
-    <state width="1322" height="244" key="GridCell.Tab.1.center" timestamp="1595245974244">
+    <state width="1322" height="244" key="GridCell.Tab.1.center" timestamp="1595502161406">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="244" key="GridCell.Tab.1.center/0.0.1366.728@0.0.1366.728" timestamp="1595245974244" />
+    <state width="1322" height="244" key="GridCell.Tab.1.center/0.0.1366.728@0.0.1366.728" timestamp="1595502161406" />
     <state width="1322" height="221" key="GridCell.Tab.1.center/0.0.1366.738@0.0.1366.738" timestamp="1589873506234" />
-    <state width="1322" height="244" key="GridCell.Tab.1.left" timestamp="1595245974244">
+    <state width="1322" height="244" key="GridCell.Tab.1.left" timestamp="1595502161406">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="244" key="GridCell.Tab.1.left/0.0.1366.728@0.0.1366.728" timestamp="1595245974244" />
+    <state width="1322" height="244" key="GridCell.Tab.1.left/0.0.1366.728@0.0.1366.728" timestamp="1595502161406" />
     <state width="1322" height="221" key="GridCell.Tab.1.left/0.0.1366.738@0.0.1366.738" timestamp="1589873506234" />
-    <state width="1322" height="244" key="GridCell.Tab.1.right" timestamp="1595245974244">
+    <state width="1322" height="244" key="GridCell.Tab.1.right" timestamp="1595502161406">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="244" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1595245974244" />
+    <state width="1322" height="244" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1595502161406" />
     <state width="1322" height="221" key="GridCell.Tab.1.right/0.0.1366.738@0.0.1366.738" timestamp="1589873506234" />
     <state x="213" y="22" key="Maven.ArtifactSearchDialog" timestamp="1589017820205">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="213" y="22" key="Maven.ArtifactSearchDialog/0.0.1366.728@0.0.1366.728" timestamp="1589017820205" />
     <state x="213" y="22" key="Maven.ArtifactSearchDialog/0.0.1366.738@0.0.1366.738" timestamp="1587804864740" />
-    <state x="395" y="78" key="MultipleFileMergeDialog" timestamp="1595167663413">
+    <state x="395" y="78" key="MultipleFileMergeDialog" timestamp="1595409550298">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="395" y="78" key="MultipleFileMergeDialog/0.0.1366.728@0.0.1366.728" timestamp="1595167663413" />
+    <state x="395" y="78" key="MultipleFileMergeDialog/0.0.1366.728@0.0.1366.728" timestamp="1595409550298" />
     <state x="348" y="66" key="NewModule_or_Project.wizard" timestamp="1590740672995">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -958,24 +957,24 @@
     </state>
     <state x="184" y="0" key="SettingsEditor/0.0.1366.728@0.0.1366.728" timestamp="1594551371835" />
     <state x="184" y="0" key="SettingsEditor/0.0.1366.738@0.0.1366.738" timestamp="1591433792246" />
-    <state x="275" y="95" key="Vcs.Push.Dialog.v2" timestamp="1595167700928">
+    <state x="275" y="95" key="Vcs.Push.Dialog.v2" timestamp="1595246035246">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="275" y="95" key="Vcs.Push.Dialog.v2/0.0.1366.728@0.0.1366.728" timestamp="1595167700928" />
+    <state x="275" y="95" key="Vcs.Push.Dialog.v2/0.0.1366.728@0.0.1366.728" timestamp="1595246035246" />
     <state x="275" y="96" key="Vcs.Push.Dialog.v2/0.0.1366.738@0.0.1366.738" timestamp="1593112604984" />
     <state width="691" height="372" key="XDebugger.FullValuePopup" timestamp="1595066970216">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state width="691" height="372" key="XDebugger.FullValuePopup/0.0.1366.728@0.0.1366.728" timestamp="1595066970216" />
-    <state x="378" y="186" key="com.intellij.ide.util.TipDialog" timestamp="1595230342074">
+    <state x="378" y="186" key="com.intellij.ide.util.TipDialog" timestamp="1595497346786">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="378" y="186" key="com.intellij.ide.util.TipDialog/0.0.1366.728@0.0.1366.728" timestamp="1595230342074" />
-    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1595398283041">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state x="378" y="186" key="com.intellij.ide.util.TipDialog/0.0.1366.728@0.0.1366.728" timestamp="1595497346786" />
+    <state x="492" y="279" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1595409531168">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="492" y="279" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.728@0.0.1366.728" timestamp="1595167647792" />
-    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.738@0.0.1366.738" timestamp="1595398283041" />
+    <state x="492" y="279" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.728@0.0.1366.728" timestamp="1595409531168" />
+    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.738@0.0.1366.738" timestamp="1593112595135" />
     <state x="380" y="100" width="737" height="606" key="find.popup" timestamp="1593190820824">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
@@ -1001,56 +1000,61 @@
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/Model/Cart.java</url>
-          <line>30</line>
-          <option name="timeStamp" value="8" />
+          <url>file://$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java</url>
+          <line>386</line>
+          <option name="timeStamp" value="13" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java</url>
+          <line>331</line>
+          <option name="timeStamp" value="19" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/Project_team_53$AccountTest.ic" NAME="AccountTest Coverage Results" MODIFIED="1589230660323" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
-      <FILTER>ControllerTest.*</FILTER>
-    </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2__1_.ic" NAME="All in Project-2 (1) Coverage Results" MODIFIED="1593158770773" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2.ic" NAME="All in Project-2 Coverage Results" MODIFIED="1593010274041" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-    <SUITE FILE_PATH="coverage/Project$AllProductManagerTest.ic" NAME="AllProductManagerTest Coverage Results" MODIFIED="1589544649151" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
-      <FILTER>ControllerTest.*</FILTER>
-    </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest.ic" NAME="SellerManagerTest Coverage Results" MODIFIED="1589580271799" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project$AccountManagerTest.ic" NAME="AccountManagerTest Coverage Results" MODIFIED="1588943574745" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_team_53$ControllerTest_in_Project_team_53.ic" NAME="ControllerTest in Project_team-53 Coverage Results" MODIFIED="1589568222105" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_team_53$AccountTest.ic" NAME="AccountTest Coverage Results" MODIFIED="1589230660323" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
     <SUITE FILE_PATH="coverage/Project$SellerAccountTest.ic" NAME="SellerAccountTest Coverage Results" MODIFIED="1589388843464" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ModelTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest_showRequestWithIDTest.ic" NAME="AdminManagerTest.showRequestWithIDTest Coverage Results" MODIFIED="1589226973100" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_2$Main.ic" NAME="Main Coverage Results" MODIFIED="1589874331120" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2__1_.ic" NAME="All in Project-2 (1) Coverage Results" MODIFIED="1593158770773" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/Project_team_53$AccountManagerTest_registerTest1.ic" NAME="AccountManagerTest.registerTest1 Coverage Results" MODIFIED="1589228895297" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
+      <FILTER>*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$Main.ic" NAME="Main Coverage Results" MODIFIED="1589874331120" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
     <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest_showAccountWithUsernameTest.ic" NAME="AdminManagerTest.showAccountWithUsernameTest Coverage Results" MODIFIED="1589226667004" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
     <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest_sendDeleteProductTest1.ic" NAME="SellerManagerTest.sendDeleteProductTest1 Coverage Results" MODIFIED="1589580219781" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
+    <SUITE FILE_PATH="coverage/Project$AllProductManagerTest.ic" NAME="AllProductManagerTest Coverage Results" MODIFIED="1589544649151" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+      <FILTER>ControllerTest.*</FILTER>
+    </SUITE>
     <SUITE FILE_PATH="coverage/Project_team_53$AccountManagerTest.ic" NAME="AccountManagerTest Coverage Results" MODIFIED="1589229190334" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest_sendEditProductRequestTest1.ic" NAME="SellerManagerTest.sendEditProductRequestTest1 Coverage Results" MODIFIED="1589580324813" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2.ic" NAME="All in Project-2 Coverage Results" MODIFIED="1593010274041" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest_showRequestWithIDTest.ic" NAME="AdminManagerTest.showRequestWithIDTest Coverage Results" MODIFIED="1589226973100" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project$All_in_Project.ic" NAME="All in Project Coverage Results" MODIFIED="1589921803728" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-    <SUITE FILE_PATH="coverage/Project$AccountManagerTest.ic" NAME="AccountManagerTest Coverage Results" MODIFIED="1588943574745" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest.ic" NAME="AdminManagerTest Coverage Results" MODIFIED="1589226535228" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_team_53$AccountManagerTest_registerTest1.ic" NAME="AccountManagerTest.registerTest1 Coverage Results" MODIFIED="1589228895297" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest.ic" NAME="SellerManagerTest Coverage Results" MODIFIED="1589580271799" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
-      <FILTER>*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest.ic" NAME="AdminManagerTest Coverage Results" MODIFIED="1589226535228" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project$All_in_Project.ic" NAME="All in Project Coverage Results" MODIFIED="1589921803728" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/Project_team_53$ControllerTest_in_Project_team_53.ic" NAME="ControllerTest in Project_team-53 Coverage Results" MODIFIED="1589568222105" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+      <FILTER>ControllerTest.*</FILTER>
+    </SUITE>
+    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest_sendEditProductRequestTest1.ic" NAME="SellerManagerTest.sendEditProductRequestTest1 Coverage Results" MODIFIED="1589580324813" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
   </component>
diff --git a/src/main/java/Controller/Server.java b/src/main/java/Controller/Server.java
index f3dc141..970f542 100644
--- a/src/main/java/Controller/Server.java
+++ b/src/main/java/Controller/Server.java
@@ -8,12 +8,14 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
+import java.util.HashMap;
 
 public class Server {
     private ServerSocket serverSocket;
     private ArrayList<AdminAccount> allOnlineAdmins;
     private ArrayList<BuyerAccount> allOnlineBuyers;
     private ArrayList<SellerAccount> allOnlineSellers;
+    private HashMap<SellerAccount, Integer> portOfOnlineSellers;
 
     public static void main(String[] args) {
         Server server = new Server();
@@ -27,6 +29,7 @@ public Server() {
             allOnlineAdmins = new ArrayList<>();
             allOnlineBuyers = new ArrayList<>();
             allOnlineSellers = new ArrayList<>();
+            portOfOnlineSellers = new HashMap<>();
         } catch (IOException e) {
             System.out.println(e.getMessage());
         }
@@ -83,4 +86,19 @@ private void waitForClient()
         }
     }
 
+    public void setPortForSeller(SellerAccount sellerAccount, int port)
+    {
+        portOfOnlineSellers.put(sellerAccount, port);
+    }
+
+    public int getPortOfSeller(SellerAccount sellerAccount)
+    {
+        return portOfOnlineSellers.getOrDefault(sellerAccount, -1);
+    }
+
+    public void writeDataOnFile()
+    {
+        Database.writeDataOnFile();
+    }
+
 }

From c4a93f509423e14d5c970b44f90a1aaf7a8c0a45 Mon Sep 17 00:00:00 2001
From: Informatic <msaadat1379@gmail.com>
Date: Thu, 23 Jul 2020 20:55:51 +0430
Subject: [PATCH 02/10] redo money 1

---
 .idea/workspace.xml                           |  49 +++----
 Data/test.txt                                 |   1 +
 src/main/java/Controller/ClientThread.java    |  88 ++++++++++---
 src/main/java/Controller/SellerManager.java   |   4 +-
 src/main/java/Controller/WorkWithBank.java    |   4 +
 src/main/java/Model/Account/BuyerAccount.java |   7 +-
 src/main/java/Model/Product/Product.java      |  16 ++-
 .../java/Model/Request/NewProductRequest.java |   8 +-
 .../java/View/Menu/AdminMenus/AdminMenu.java  |  62 ++++++---
 .../java/View/Menu/BuyerMenus/BuyerMenu.java  |  15 ++-
 .../View/Menu/BuyerMenus/ViewCartMenu.java    | 100 ++++++++++++--
 src/main/java/View/Menu/LoginMenu.java        |  53 ++++----
 src/main/java/View/Menu/Menu.java             |  34 +----
 .../View/Menu/SellerMenus/SellerMenu.java     | 123 ++++++++++++++++--
 14 files changed, 414 insertions(+), 150 deletions(-)
 create mode 100644 Data/test.txt
 create mode 100644 src/main/java/Controller/WorkWithBank.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b39ede8..6078675 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,18 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Data/test.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/Accounts/Buyers.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Accounts/Buyers.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/Accounts/Sellers.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Accounts/Sellers.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/IDs/Id.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/IDs/Id.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/Products/Categories.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Products/Categories.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/Products/Products.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Products/Products.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/Requests/NewProductRequests.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Requests/NewProductRequests.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/Server.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/Server.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/SellerMenus/SellerMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/SellerMenus/SellerMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -78,7 +67,7 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../Space" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="list.type.of.created.stylesheet" value="CSS" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.15" />
@@ -376,13 +365,6 @@
       <workItem from="1593178150008" duration="253000" />
       <workItem from="1593187077572" duration="84000" />
     </task>
-    <task id="LOCAL-00065" summary="complete FilteringMenu">
-      <created>1589886526890</created>
-      <option name="number" value="00065" />
-      <option name="presentableId" value="LOCAL-00065" />
-      <option name="project" value="LOCAL" />
-      <updated>1589886526891</updated>
-    </task>
     <task id="LOCAL-00066" summary="debug Menus">
       <created>1589892897797</created>
       <option name="number" value="00066" />
@@ -719,7 +701,14 @@
       <option name="project" value="LOCAL" />
       <updated>1595448623948</updated>
     </task>
-    <option name="localTasksCounter" value="114" />
+    <task id="LOCAL-00114" summary="redo money">
+      <created>1595521343115</created>
+      <option name="number" value="00114" />
+      <option name="presentableId" value="LOCAL-00114" />
+      <option name="project" value="LOCAL" />
+      <updated>1595521343115</updated>
+    </task>
+    <option name="localTasksCounter" value="115" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -727,7 +716,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="zoom picture" />
     <MESSAGE value="ProductsMenu styles" />
     <MESSAGE value="debug music" />
     <MESSAGE value="small edit" />
@@ -752,7 +740,8 @@
     <MESSAGE value="debug login" />
     <MESSAGE value="edit NewProductRequest for file products" />
     <MESSAGE value="edit Product for file Product" />
-    <option name="LAST_COMMIT_MESSAGE" value="edit Product for file Product" />
+    <MESSAGE value="redo money" />
+    <option name="LAST_COMMIT_MESSAGE" value="redo money" />
   </component>
   <component name="WindowStateProjectService">
     <state x="280" y="20" key="#AccountManagerTest" timestamp="1589226101281">
@@ -885,11 +874,11 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="438" y="65" key="#xdebugger.evaluate/0.0.1366.728@0.0.1366.728" timestamp="1595501308315" />
-    <state x="499" y="0" key="CommitChangelistDialog2" timestamp="1595448621930">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595521342183">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="499" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1595448621930" />
-    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1593178423340" />
+    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595521342183" />
     <state x="92" y="93" width="1182" height="552" key="DiffContextDialog" timestamp="1593178422199">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -957,6 +946,10 @@
     </state>
     <state x="184" y="0" key="SettingsEditor/0.0.1366.728@0.0.1366.728" timestamp="1594551371835" />
     <state x="184" y="0" key="SettingsEditor/0.0.1366.738@0.0.1366.738" timestamp="1591433792246" />
+    <state x="470" y="83" key="VCS.ChangeListViewerDialog" timestamp="1595521367658">
+      <screen x="0" y="0" width="1366" height="738" />
+    </state>
+    <state x="470" y="83" key="VCS.ChangeListViewerDialog/0.0.1366.738@0.0.1366.738" timestamp="1595521367658" />
     <state x="275" y="95" key="Vcs.Push.Dialog.v2" timestamp="1595246035246">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
@@ -970,11 +963,11 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="378" y="186" key="com.intellij.ide.util.TipDialog/0.0.1366.728@0.0.1366.728" timestamp="1595497346786" />
-    <state x="492" y="279" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1595409531168">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1595521360851">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="492" y="279" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.728@0.0.1366.728" timestamp="1595409531168" />
-    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.738@0.0.1366.738" timestamp="1593112595135" />
+    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.738@0.0.1366.738" timestamp="1595521360851" />
     <state x="380" y="100" width="737" height="606" key="find.popup" timestamp="1593190820824">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
diff --git a/Data/test.txt b/Data/test.txt
new file mode 100644
index 0000000..c030c83
--- /dev/null
+++ b/Data/test.txt
@@ -0,0 +1 @@
+this is for testing my code
\ No newline at end of file
diff --git a/src/main/java/Controller/ClientThread.java b/src/main/java/Controller/ClientThread.java
index a43cf42..31fa3bd 100644
--- a/src/main/java/Controller/ClientThread.java
+++ b/src/main/java/Controller/ClientThread.java
@@ -5,6 +5,7 @@
 import Model.Account.BuyerAccount;
 import Model.Account.SellerAccount;
 import Model.Product.Auction;
+import Model.Product.Product;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
@@ -101,11 +102,6 @@ else if (input.startsWith("ViewAccount"))
                     Gson gson = new Gson();
                     output = gson.toJson(account.viewPersonalInfoInGraphic());
                 }
-                else if (input.startsWith("AllAccounts"))
-                {
-                    Gson gson = new Gson();
-                    output = gson.toJson(Database.getAllAccounts());
-                }
                 else if (input.startsWith("AllProducts"))
                 {
                     Gson gson = new Gson();
@@ -116,11 +112,6 @@ else if (input.startsWith("AllDiscounts"))
                     Gson gson = new Gson();
                     output = gson.toJson(Database.getAllDiscounts());
                 }
-                else if (input.startsWith("AllRequest"))
-                {
-                    Gson gson = new Gson();
-                    output = gson.toJson(Database.getAllRequest());
-                }
                 else if (input.startsWith("AllCategories"))
                 {
                     Gson gson = new Gson();
@@ -182,8 +173,9 @@ else if (input.startsWith("RemoveDiscount"))
                 }
                 else if (input.startsWith("AddDiscount"))
                 {
-                    details = input.split(" ");
+                    details = input.split("\n");
                     Gson gson = new Gson();
+                    String buyers = details[6];
                     ArrayList<String> users = gson.fromJson(details[6], new TypeToken<ArrayList<String>>(){}.getType());
                     output = adminManager.addNewDiscount(Integer.parseInt(details[1]), Integer.parseInt(details[2]), details[3], details[4], Integer.parseInt(details[5]), users);
                 }
@@ -196,7 +188,7 @@ else if (input.startsWith("ViewUsername"))
                 {
                     Account temp = Database.getAccountByUsername(input.split(" ")[1]);
                     Gson gson = new Gson();
-                    output = gson.toJson(temp.viewPersonalInfoInGraphic());
+                    output = gson.toJson(Objects.requireNonNull(temp).viewPersonalInfoInGraphic());
                 }
                 else if (input.startsWith("GetAccount"))
                 {
@@ -228,7 +220,7 @@ else if (input.startsWith("GetProduct"))
                 }
                 else if (input.startsWith("ViewProduct"))
                 {
-                    output = new Gson().toJson(Database.getProductByID(Integer.parseInt(input.split(" ")[1])).showProductFullInfoGraphic());
+                    output = new Gson().toJson(Objects.requireNonNull(Database.getProductByID(Integer.parseInt(input.split(" ")[1]))).showProductFullInfoGraphic());
                 }
                 else if (input.startsWith("ShowAllProduct"))
                 {
@@ -266,7 +258,6 @@ else if (input.startsWith("GetMainProduct"))
                 }
                 else if (input.startsWith("AddToCart"))
                 {
-                    int test = productManager.getProduct().getProductId();
                     output = buyerManager.addProductToCart(productManager.getProduct(), account);
                 }
                 else if (input.startsWith("GiveComment"))
@@ -302,7 +293,7 @@ else if (input.startsWith("AddNewProduct"))
                 {
                     details = input.split(" ");
                     output = sellerManager.sendAddProductRequest(details[1], details[2], Boolean.parseBoolean(details[3]),
-                            Integer.parseInt(details[4]), details[5], details[6], Integer.parseInt(details[7]), account);
+                            Integer.parseInt(details[4]), details[5], details[6], Integer.parseInt(details[7]), account, Boolean.parseBoolean(details[8]), details[9]);
                 }
                 else  if (input.startsWith("GetBuyerOfProduct"))
                 {
@@ -357,9 +348,76 @@ else if (input.startsWith("GetAuctionOfAccount"))
                     }
                     output = new Gson().toJson(myAuctions);
                 }
+                else if (input.startsWith("GetCostOfAccountCart"))
+                {
+                    output = Long.toString(((BuyerAccount)account).getCart().getCost());
+
+                }
+                else if (input.startsWith("GetCartOfAccount"))
+                {
+                    output = new Gson().toJson(((BuyerAccount)account).getCart());
+                }
+                else if (input.startsWith("SetPortOfSeller"))
+                {
+                    server.setPortForSeller((SellerAccount) account, Integer.parseInt(input.split(" ")[1]));
+                }
+                else if (input.startsWith("GetPortOfSeller"))
+                {
+                    output = Integer.toString(server.getPortOfSeller(((SellerAccount)Database.getAccountByUsername(input.split(" ")[1]))));
+                }
+                else if (input.startsWith("GetAllBuyerAccounts"))
+                {
+                    output = new Gson().toJson(Database.getAllBuyerAccounts());
+                }
+                else if (input.startsWith("GetAllSellerAccounts"))
+                {
+                    output = new Gson().toJson(Database.getAllSellerAccounts());
+                }
+                else if (input.startsWith("GetAllAdminAccounts"))
+                {
+                    output = new Gson().toJson(Database.getAllAdminAccounts());
+                }
+                else if (input.startsWith("GetAllAddNewOffRequest"))
+                {
+                    output = new Gson().toJson(Database.getAllAddNewOffRequests());
+                }
+                else if (input.startsWith("GetAllDeleteProductRequest"))
+                {
+                    output = new Gson().toJson(Database.getAllDeleteProductRequests());
+                }
+                else if (input.startsWith("GetAllEditOffRequest"))
+                {
+                    output = new Gson().toJson(Database.getAllEditOffRequests());
+                }
+                else if (input.startsWith("GetAllEditProductRequest"))
+                {
+                    output = new Gson().toJson(Database.getAllEditProductRequests());
+                }
+                else if (input.startsWith("GetAllNewProductRequest"))
+                {
+                    output = new Gson().toJson(Database.getAllNewProductRequests());
+                }
+                else if (input.startsWith("GetAllNewSellerRequest"))
+                {
+                    output = new Gson().toJson(Database.getAllNewSellerRequests());
+                }
+                else if (input.startsWith("GetDiscountOfAccount"))
+                {
+                    output = new Gson().toJson(((BuyerAccount)account).getDiscountIds());
+                }
+                else if (input.startsWith("PrOfCart"))
+                {
+                    ArrayList<Integer> productsID = ((BuyerAccount)account).getCart().getProductsID();
+                    ArrayList<Product> allProducts = new ArrayList<>();
+                    for (Integer integer : productsID) {
+                        allProducts.add(Database.getProductByID(integer));
+                    }
+                    output = new Gson().toJson(allProducts);
+                }
                 else if (input.startsWith("Exit"))
                 {
                     clientSocket.close();
+                    server.writeDataOnFile();
                     if (account != null)
                     {
                         if (this.account instanceof AdminAccount)
diff --git a/src/main/java/Controller/SellerManager.java b/src/main/java/Controller/SellerManager.java
index 951f805..c455eea 100644
--- a/src/main/java/Controller/SellerManager.java
+++ b/src/main/java/Controller/SellerManager.java
@@ -17,8 +17,8 @@
 
 public class SellerManager {
 
-    public String sendAddProductRequest(String status, String name, boolean available, int number, String description, String categoryName, int price, Account account) {
-        Database.addRequest(new NewProductRequest(status, name, account.getUsername(), available, number, description, categoryName, price));
+    public String sendAddProductRequest(String status, String name, boolean available, int number, String description, String categoryName, int price, Account account, boolean hasFile, String address) {
+        Database.addRequest(new NewProductRequest(status, name, account.getUsername(), available, number, description, categoryName, price, hasFile, address));
         return "Your request registered.";
     }
 
diff --git a/src/main/java/Controller/WorkWithBank.java b/src/main/java/Controller/WorkWithBank.java
new file mode 100644
index 0000000..78212d3
--- /dev/null
+++ b/src/main/java/Controller/WorkWithBank.java
@@ -0,0 +1,4 @@
+package Controller;
+
+public class WorkWithBank {
+}
diff --git a/src/main/java/Model/Account/BuyerAccount.java b/src/main/java/Model/Account/BuyerAccount.java
index 5638215..34764ca 100644
--- a/src/main/java/Model/Account/BuyerAccount.java
+++ b/src/main/java/Model/Account/BuyerAccount.java
@@ -33,7 +33,12 @@ public boolean buyerProduct(int productId){
     }
 
     public ArrayList<Integer> getDiscountIds() {
-        return discountIds;
+        ArrayList<Integer> finalDiscounts = new ArrayList<>();
+        for (Integer discountId : discountIds) {
+            if (this.canUseDiscount(discountId))
+                finalDiscounts.add(discountId);
+        }
+        return finalDiscounts;
     }
 
     public ArrayList<BuyLog> getBuyLogs() {
diff --git a/src/main/java/Model/Product/Product.java b/src/main/java/Model/Product/Product.java
index 55e462d..462c251 100644
--- a/src/main/java/Model/Product/Product.java
+++ b/src/main/java/Model/Product/Product.java
@@ -39,6 +39,8 @@ public class Product {
     ArrayList<Score> scores = new ArrayList<>();
     ArrayList<Comment> comments = new ArrayList<>();
     int offId;
+    boolean doesHasFile;
+    String address;
 
     public static int getNumberOfAllProducts() {
         return numberOfAllProducts;
@@ -48,7 +50,7 @@ public static void setNumberOfAllProducts(int numberOfAllProducts) {
         Product.numberOfAllProducts = numberOfAllProducts;
     }
 
-    public Product(String status, String name, String sellerUsername, boolean available, int number, String description, String categoryName, int price) {
+    public Product(String status, String name, String sellerUsername, boolean available, int number, String description, String categoryName, int price, boolean doesHasFile, String address) {
         this.status = status;
         this.name = name;
         this.sellerUsername = sellerUsername;
@@ -58,6 +60,8 @@ public Product(String status, String name, String sellerUsername, boolean availa
         this.productId = numberOfAllProducts;
         this.categoryName = categoryName;
         this.price = price;
+        this.doesHasFile = doesHasFile;
+        this.address = address;
         numberOfAllProducts++;
         averageScore = 0;
         this.offId = -1;
@@ -395,4 +399,14 @@ public ScrollPane showCommentsOfProduct() {
 
         return scrollPane;
     }
+
+    public String getAddressOfProduct()
+    {
+        return this.address;
+    }
+
+    public boolean doesHasFile()
+    {
+        return this.doesHasFile;
+    }
 }
diff --git a/src/main/java/Model/Request/NewProductRequest.java b/src/main/java/Model/Request/NewProductRequest.java
index 78d1c85..b2e9517 100644
--- a/src/main/java/Model/Request/NewProductRequest.java
+++ b/src/main/java/Model/Request/NewProductRequest.java
@@ -14,8 +14,10 @@ public class NewProductRequest extends Request {
     String description;
     String categoryName;
     int price;
+    boolean hasFile;
+    String address;
 
-    public NewProductRequest(String status, String name, String sellerUsername, boolean available, int number, String description, String categoryName, int price) {
+    public NewProductRequest(String status, String name, String sellerUsername, boolean available, int number, String description, String categoryName, int price, boolean hasFile, String addrses) {
         this.status = status;
         this.name = name;
         this.sellerUsername = sellerUsername;
@@ -24,6 +26,8 @@ public NewProductRequest(String status, String name, String sellerUsername, bool
         this.description = description;
         this.categoryName = categoryName;
         this.price = price;
+        this.hasFile = hasFile;
+        this.address = addrses;
     }
 
     public String getStatus() {
@@ -60,7 +64,7 @@ public int getPrice() {
 
     @Override
     public String acceptRequest(AdminManager adminManager) {
-        Product product = new Product(status, name, sellerUsername, available, number, description , categoryName, price);
+        Product product = new Product(status, name, sellerUsername, available, number, description , categoryName, price, hasFile, address);
         Database.addAllProduct(product);
         Database.getCategoryByName(product.getCategoryName()).addProduct(product.getProductId());
         return "product added successfully.";
diff --git a/src/main/java/View/Menu/AdminMenus/AdminMenu.java b/src/main/java/View/Menu/AdminMenus/AdminMenu.java
index f37ed91..1630607 100644
--- a/src/main/java/View/Menu/AdminMenus/AdminMenu.java
+++ b/src/main/java/View/Menu/AdminMenus/AdminMenu.java
@@ -1,6 +1,5 @@
 package View.Menu.AdminMenus;
 
-import Controller.Database;
 import Model.Account.Account;
 import Model.Account.AdminAccount;
 import Model.Account.BuyerAccount;
@@ -235,11 +234,30 @@ public void handleManageRequest()
     {
         try {
             super.setPane();
-            ArrayList<Request> allRequest;
-            dataOutputStream.writeUTF("AllRequest");
+            dataOutputStream.writeUTF("GetAllAddNewOffRequest");
             dataOutputStream.flush();
-            Gson gson = new Gson();
-            allRequest = gson.fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<Request>>(){}.getType());
+            ArrayList<AddNewOffRequest> addNewOffRequests = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<AddNewOffRequest>>(){}.getType());
+            dataOutputStream.writeUTF("GetAllDeleteProductRequest");
+            dataOutputStream.flush();
+            ArrayList<DeleteProduct> deleteProducts = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<DeleteProduct>>(){}.getType());
+            dataOutputStream.writeUTF("GetAllEditOffRequest");
+            dataOutputStream.flush();
+            ArrayList<EditOffRequest> editOffRequests = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<EditOffRequest>>(){}.getType());
+            dataOutputStream.writeUTF("GetAllEditProductRequest");
+            dataOutputStream.flush();
+            ArrayList<EditProductRequest> editProductRequests = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<EditProductRequest>>(){}.getType());
+            dataOutputStream.writeUTF("GetAllNewProductRequest");
+            dataOutputStream.flush();
+            ArrayList<NewProductRequest> newProductRequests = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<NewProductRequest>>(){}.getType());
+            dataOutputStream.writeUTF("GetAllNewSellerRequest");
+            dataOutputStream.flush();
+            ArrayList<NewSellerRequest> newSellerRequests = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<NewSellerRequest>>(){}.getType());
+            ArrayList<Request> allRequest = new ArrayList<>(addNewOffRequests);
+            allRequest.addAll(deleteProducts);
+            allRequest.addAll(editOffRequests);
+            allRequest.addAll(editProductRequests);
+            allRequest.addAll(newProductRequests);
+            allRequest.addAll(newSellerRequests);
             Scene scene = new Scene(super.mainPane, 1000, 600);
             scene.getStylesheets().add(new File("Data/Styles/Buttons.css").toURI().toString());
             scene.getStylesheets().add(new File("Data/Styles/textfield.css").toURI().toString());
@@ -392,11 +410,22 @@ public void handleManageUsers()
     {
         try {
             super.setPane();
-            ArrayList<Account> allAccount;
-            dataOutputStream.writeUTF("AllAccounts");
+            ArrayList<BuyerAccount> allBuyerAccount;
+            ArrayList<SellerAccount> allSellerAccount;
+            ArrayList<AdminAccount> allAdminAccount;
+            dataOutputStream.writeUTF("GetAllBuyerAccounts");
             dataOutputStream.flush();
             Gson gson = new Gson();
-            allAccount = gson.fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<Account>>(){}.getType());
+            allBuyerAccount = gson.fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<BuyerAccount>>(){}.getType());
+            dataOutputStream.writeUTF("GetAllSellerAccounts");
+            dataOutputStream.flush();
+            allSellerAccount = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<SellerAccount>>(){}.getType());
+            dataOutputStream.writeUTF("GetAllAdminAccounts");
+            dataOutputStream.flush();
+            allAdminAccount = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<AdminAccount>>(){}.getType());
+            ArrayList<Account> allAccount = new ArrayList<>(allAdminAccount);
+            allAccount.addAll(allSellerAccount);
+            allAccount.addAll(allBuyerAccount);
             Scene scene = new Scene(super.mainPane, 1000, 600);
             scene.getStylesheets().add(new File("Data/Styles/Buttons.css").toURI().toString());
             scene.getStylesheets().add(new File("Data/Styles/textfield.css").toURI().toString());
@@ -1143,13 +1172,14 @@ public void handleAddDiscount()
             numberOfTimes.setPromptText("Number Of Times");
 
             ArrayList<CheckBox> checkBoxes = new ArrayList<>();
-            ArrayList<Account> allAccounts = Database.getAllAccounts();
+            ArrayList<Account> allAccounts;
+            dataOutputStream.writeUTF("GetAllBuyerAccounts");
+            dataOutputStream.flush();
+            allAccounts = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<BuyerAccount>>(){}.getType());
             for (Account account : allAccounts) {
-                if (account instanceof BuyerAccount){
-                    CheckBox checkBox = new CheckBox(account.getUsername());
-                    checkBox.setId(account.getUsername());
-                    checkBoxes.add(checkBox);
-                }
+                CheckBox checkBox = new CheckBox(account.getUsername());
+                checkBox.setId(account.getUsername());
+                checkBoxes.add(checkBox);
             }
 
             Button add = new Button("Add");
@@ -1162,8 +1192,8 @@ public void handleAddDiscount()
                             unIAL.add(checkBox.getId());
                         }
                     }
-                    dataOutputStream.writeUTF("AddDiscount " + Integer.parseInt(maxValue.getText()) + " " + Integer.parseInt(percent.getText()) + " " +
-                            startDate.getText() + " " + endDate.getText() + " " + Integer.parseInt(numberOfTimes.getText()) + " " + new Gson().toJson(unIAL));
+                    dataOutputStream.writeUTF("AddDiscount\n" + Integer.parseInt(maxValue.getText()) + "\n" + Integer.parseInt(percent.getText()) + "\n" +
+                            startDate.getText() + "\n" + endDate.getText() + "\n" + Integer.parseInt(numberOfTimes.getText()) + "\n" + new Gson().toJson(unIAL));
                     dataOutputStream.flush();
                     status.setText(dataInputStream.readUTF());
                 }
diff --git a/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java b/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java
index 7567eee..498058b 100644
--- a/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java
+++ b/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java
@@ -363,7 +363,6 @@ public void handleLogout()
     public void handleAllDiscountShow()
     {
         super.setPane();
-        ArrayList<Integer> allDiscountIds = ((BuyerAccount)Menu.account).getDiscountIds();
         Scene scene = new Scene(super.mainPane, 1000, 600);
         scene.getStylesheets().add(new File("Data/Styles/Buttons.css").toURI().toString());
         scene.getStylesheets().add(new File("Data/Styles/textfield.css").toURI().toString());
@@ -385,10 +384,18 @@ public void handleAllDiscountShow()
         info.setAlignment(Pos.CENTER);
         GridPane.setConstraints(info, 1, 0);
         gridPane.getChildren().add(info);
+        ArrayList<Integer> allDiscountIds = null;
+        try {
+            dataOutputStream.writeUTF("GetDiscountOfAccount");
+            dataOutputStream.flush();
+            allDiscountIds = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<Integer>>(){}.getType());
+        }
+        catch (Exception e)
+        {
+            System.out.println(e.getMessage());
+        }
         int i = 1;
-        for (Integer discountId : allDiscountIds) {
-            if (!((BuyerAccount)Menu.account).canUseDiscount(discountId))
-                continue;
+        for (Integer discountId : Objects.requireNonNull(allDiscountIds)) {
 
             Label label = new Label(discountId.toString());
             label.setFont(Font.font(15));
diff --git a/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java b/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java
index 314c82a..b7a1dc3 100644
--- a/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java
+++ b/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java
@@ -1,6 +1,5 @@
 package View.Menu.BuyerMenus;
 
-import Model.Account.BuyerAccount;
 import Model.Cart;
 import Model.Product.Product;
 import View.Menu.Menu;
@@ -21,11 +20,10 @@
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
+import java.io.*;
+import java.net.Socket;
 import java.util.ArrayList;
+import java.util.Objects;
 
 public class ViewCartMenu extends Menu {
     private Label message = new Label();
@@ -43,8 +41,17 @@ public ViewCartMenu(Menu parentMenu) {
     public void show() {
         try {
             super.setPane();
-            Cart cart = ((BuyerAccount) Menu.account).getCart();
-            ArrayList<Integer> allProductIds = cart.getProductsID();
+            Cart cart = null;
+            try {
+                dataOutputStream.writeUTF("GetCartOfAccount");
+                dataOutputStream.flush();
+                cart = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<Cart>(){}.getType());
+            }
+            catch (Exception e)
+            {
+                System.out.println(e.getMessage());
+            }
+            ArrayList<Integer> allProductIds = Objects.requireNonNull(cart).getProductsID();
             Scene scene = new Scene(super.mainPane, 1000, 600);
             scene.getStylesheets().add(new File("Data/Styles/Buttons.css").toURI().toString());
             scene.getStylesheets().add(new File("Data/Styles/textfield.css").toURI().toString());
@@ -166,7 +173,17 @@ public void show() {
 
                 newWindow.showAndWait();
             });
-            Label costOfAll = new Label("cost : " + cart.getCost());
+            long totalCost = 0;
+            try {
+                dataOutputStream.writeUTF("GetCostOfAccountCart");
+                dataOutputStream.flush();
+                totalCost = Long.parseLong(dataInputStream.readUTF());
+            }
+            catch (Exception e)
+            {
+                System.out.println(e.getMessage());
+            }
+            Label costOfAll = new Label("cost : " + totalCost);
             costOfAll.setFont(Font.font(20));
             GridPane.setConstraints(costOfAll, 7 , i);
             GridPane.setConstraints(back,7, i+1);
@@ -210,7 +227,11 @@ private void handlePay(Stage newWindow) {
             if (discountId.getText() != null && discountId.getText().matches("[0-9]+"))
                 id = Integer.parseInt(discountId.getText());
             String res = "";
+            ArrayList<Product> allProducts = null;
             try {
+                dataOutputStream.writeUTF("PrOfCart");
+                dataOutputStream.flush();
+                allProducts = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<ArrayList<Product>>(){}.getType());
                 dataOutputStream.writeUTF("Pay " + id);
                 dataOutputStream.flush();
                 res = dataInputStream.readUTF();
@@ -222,6 +243,15 @@ private void handlePay(Stage newWindow) {
             alert.setHeaderText("Process Result");
             alert.setContentText(res);
             alert.showAndWait();
+            if (res.equalsIgnoreCase("product bought successfully"))
+            {
+                for (Product product : allProducts) {
+                    if (product.doesHasFile())
+                    {
+                        getFileOfProduct(product);
+                    }
+                }
+            }
             show();
             newWindow.close();
         });
@@ -250,7 +280,7 @@ private void handleDecrease(int productId) {
 
     private void handleIncrease(int productId) {
         try {
-            dataOutputStream.writeUTF("IncreaseProduct");
+            dataOutputStream.writeUTF("IncreaseProduct " + productId);
             dataOutputStream.flush();
             message.setText(dataInputStream.readUTF());
         } catch (IOException e) {
@@ -259,7 +289,7 @@ private void handleIncrease(int productId) {
         show();
     }
 
-    public void handleShowProduct(Product product)
+    private void handleShowProduct(Product product)
     {
         Stage newWindow = new Stage();
         Pane pane = product.showProductFullInfoGraphic();
@@ -272,4 +302,54 @@ public void handleShowProduct(Product product)
         newWindow.showAndWait();
 
     }
+
+    private void getFileOfProduct(Product product)
+    {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    dataOutputStream.writeUTF("GetPortOfSeller " + product.getSellerUsername());
+                    dataOutputStream.flush();
+                    int port = Integer.parseInt(dataInputStream.readUTF());
+                    if (port == -1)
+                    {
+                        Alert alert = new Alert(Alert.AlertType.ERROR);
+                        alert.setTitle("Failure");
+                        alert.setHeaderText("Process Failed");
+                        alert.setContentText("The Seller is not online now");
+                        alert.showAndWait();
+                    }
+                    Socket sellerSocket = new Socket("127.0.0.1", port);
+                    DataInputStream buyerDataInputStream = new DataInputStream(new BufferedInputStream(sellerSocket.getInputStream()));
+                    DataOutputStream buyerDataOutputStream = new DataOutputStream(new BufferedOutputStream(sellerSocket.getOutputStream()));
+                    String nameAndFormat = product.getAddressOfProduct().split("/")[product.getAddressOfProduct().split("/").length - 1];
+                    File file = new File("F:/downloads/" + nameAndFormat);
+                    BufferedOutputStream fileBufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file));
+                    buyerDataOutputStream.writeUTF("GetProduct " + product.getProductId());
+                    buyerDataOutputStream.flush();
+                    int bytesRead;
+                    int current = 0;
+                    byte[] fileBytes = new byte[6022386];
+                    bytesRead = buyerDataInputStream.read(fileBytes, 0, fileBytes.length);
+                    current = bytesRead;
+                    do {
+                        bytesRead = buyerDataInputStream.read(fileBytes, current, (fileBytes.length - current));
+                        if (bytesRead >= 0)
+                            current += bytesRead;
+                    }while (bytesRead > -1);
+                    fileBufferedOutputStream.write(fileBytes, 0, current);
+                    fileBufferedOutputStream.flush();
+                    fileBufferedOutputStream.close();
+                    buyerDataInputStream.close();
+                    buyerDataOutputStream.close();
+                    sellerSocket.close();
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                }
+            }
+        }).start();
+    }
 }
diff --git a/src/main/java/View/Menu/LoginMenu.java b/src/main/java/View/Menu/LoginMenu.java
index 983d405..06772b2 100644
--- a/src/main/java/View/Menu/LoginMenu.java
+++ b/src/main/java/View/Menu/LoginMenu.java
@@ -85,32 +85,37 @@ public void handleLoginChild()
             try {
                 dataOutputStream.writeUTF("login " + userName.getText() + " " + password.getText());
                 dataOutputStream.flush();
-                status.setText(dataInputStream.readUTF());
-                dataOutputStream.writeUTF("GetLoggedAccount");
-                dataOutputStream.flush();
-                String data = dataInputStream.readUTF();
-                String[]  details = data.split("_");
-                String role = details[0];
-                String accountInJson = details[1];
-
-                Type type;
-                if (role.equalsIgnoreCase("Admin")){
-                    type = new TypeToken<AdminAccount>(){}.getType();
-                    Menu.account = new Gson().fromJson(accountInJson, type);
-                }
-                else if (role.equalsIgnoreCase("Seller"))
-                {
-                    type = new TypeToken<SellerAccount>(){}.getType();
-                    Menu.account = new Gson().fromJson(accountInJson, type);
-                }
-                else if (role.equalsIgnoreCase("Buyer"))
+                String dataOfStatus = dataInputStream.readUTF();
+                status.setText(dataOfStatus);
+                if (dataOfStatus.startsWith("Welcome"))
                 {
-                    type = new TypeToken<BuyerAccount>(){}.getType();
-                    Menu.account = new Gson().fromJson(accountInJson, type);
-                }
-                else {
-                    Menu.account = null;
+                    dataOutputStream.writeUTF("GetLoggedAccount");
+                    dataOutputStream.flush();
+                    String data = dataInputStream.readUTF();
+                    String[]  details = data.split("_");
+                    String role = details[0];
+                    String accountInJson = details[1];
+
+                    Type type;
+                    if (role.equalsIgnoreCase("Admin")){
+                        type = new TypeToken<AdminAccount>(){}.getType();
+                        Menu.account = new Gson().fromJson(accountInJson, type);
+                    }
+                    else if (role.equalsIgnoreCase("Seller"))
+                    {
+                        type = new TypeToken<SellerAccount>(){}.getType();
+                        Menu.account = new Gson().fromJson(accountInJson, type);
+                    }
+                    else if (role.equalsIgnoreCase("Buyer"))
+                    {
+                        type = new TypeToken<BuyerAccount>(){}.getType();
+                        Menu.account = new Gson().fromJson(accountInJson, type);
+                    }
+                    else {
+                        Menu.account = null;
+                    }
                 }
+
             } catch (IOException ex) {
                 System.out.println(ex.getMessage());
             }
diff --git a/src/main/java/View/Menu/Menu.java b/src/main/java/View/Menu/Menu.java
index 84629c4..12207aa 100644
--- a/src/main/java/View/Menu/Menu.java
+++ b/src/main/java/View/Menu/Menu.java
@@ -1,6 +1,5 @@
 package View.Menu;
 
-import Controller.Database;
 import Model.Account.Account;
 import Model.Account.BuyerAccount;
 import View.Menu.ProductsMenus.ProductsMenu;
@@ -150,38 +149,7 @@ public void handleAuction() {
 
     public void show() {}
 
-    public void execute(){
-        int input;
-        try {
-            String inputInString = scanner.nextLine();
-            input = Integer.parseInt(inputInString);
-            if((input > this.subMenus.size() + 1) || (input < 1))
-            {
-                throw new Exception("invalid input");
-            }
-        }
-        catch (Exception e){
-            System.out.println("your input is invalid");
-            this.execute();
-            return;
-        }
-        if(input == this.subMenus.size() + 1)
-        {
-            if(this.parentMenu == null)
-            {
-                Database.writeDataOnFile();
-                System.exit(1);
-            }
-            else {
-                this.parentMenu.show();
-                this.parentMenu.execute();
-            }
-        }
-        else{
-            this.subMenus.get(input).show();
-            this.subMenus.get(input).execute();
-        }
-    }
+    public void execute(){ }
 
     public static void setSocket(Socket socket) {
         Menu.socket = socket;
diff --git a/src/main/java/View/Menu/SellerMenus/SellerMenu.java b/src/main/java/View/Menu/SellerMenus/SellerMenu.java
index 06fcbf7..676fc88 100644
--- a/src/main/java/View/Menu/SellerMenus/SellerMenu.java
+++ b/src/main/java/View/Menu/SellerMenus/SellerMenu.java
@@ -10,6 +10,8 @@
 import View.Menu.UserMenu;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.geometry.HPos;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
@@ -20,9 +22,10 @@
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
 import java.lang.reflect.Type;
+import java.net.ServerSocket;
+import java.net.Socket;
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -41,6 +44,13 @@ public SellerMenu(Menu parentMenu) {
     }
 
     public void show(){
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                handleBuyer();
+            }
+        }).start();
+
         super.setPane();
 
         Scene scene = new Scene(super.mainPane, 1000, 600);
@@ -139,6 +149,54 @@ else if (role.equalsIgnoreCase("Buyer"))
 
     }
 
+    private void handleBuyer()
+    {
+        try {
+            ServerSocket sellerServerSocket = new ServerSocket(0);
+            dataOutputStream.writeUTF("SetPortOfSeller " + sellerServerSocket.getLocalPort());
+            dataOutputStream.flush();
+            while (true)
+            {
+                Socket buyerSocket = sellerServerSocket.accept();
+                DataInputStream sellerDataInputStream = new DataInputStream(new BufferedInputStream(buyerSocket.getInputStream()));
+                DataOutputStream sellerDataOutputStream = new DataOutputStream(new BufferedOutputStream(buyerSocket.getOutputStream()));
+                String input = sellerDataInputStream.readUTF();
+                if (input.startsWith("exit"))
+                {
+                    sellerDataInputStream.close();
+                    sellerDataOutputStream.close();
+                    buyerSocket.close();
+                    break;
+                }
+                else if (input.startsWith("GetProduct"))
+                {
+                    dataOutputStream.writeUTF("GetProduct " + input.split(" ")[1]);
+                    dataOutputStream.flush();
+                    Product product = new Gson().fromJson(dataInputStream.readUTF(), new TypeToken<Product>(){}.getType());
+                    String address = product.getAddressOfProduct();
+                    try {
+                        File file = new File(address);
+                        BufferedInputStream fileBufferedInputStream = new BufferedInputStream(new FileInputStream(file));
+                        byte[] fileBytes = new byte[(int) file.length()];
+                        fileBufferedInputStream.read(fileBytes, 0, fileBytes.length);
+                        sellerDataOutputStream.write(fileBytes, 0, fileBytes.length);
+                        sellerDataOutputStream.flush();
+                        fileBufferedInputStream.close();
+                    }
+                    catch (Exception e)
+                    {
+                        System.out.println(e.getMessage());
+                    }
+                    sellerDataInputStream.close();
+                    sellerDataOutputStream.close();
+                    buyerSocket.close();
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     private void handleAddAuction(){
         super.setPane();
         GridPane gridPane = new GridPane();
@@ -477,7 +535,7 @@ private void handleEditOff(Off off, Stage newWindow) {
         newWindow.setScene(scene);
     }
 
-    public void handleManageProducts()
+    private void handleManageProducts()
     {
         super.setPane();
         ArrayList<Product> allProduct = null;
@@ -610,16 +668,42 @@ private void handleAddNewProduct() {
         price.getStyleClass().add("text-field");
         price.setPromptText("Price");
 
+        TextField address = new TextField();
+        address.getStyleClass().add("text-field");
+        address.setPromptText("AddressOfFile");
+        address.setDisable(true);
+
+        CheckBox doesProductHasFile = new CheckBox("DoesProductHasFile");
+        doesProductHasFile.selectedProperty().addListener(new ChangeListener<Boolean>() {
+            @Override
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                if (doesProductHasFile.isSelected())
+                    address.setDisable(false);
+                else if (!doesProductHasFile.isSelected())
+                    address.setDisable(true);
+            }
+        });
+
         Button sendRequest = new Button("Send Request");
         sendRequest.getStyleClass().add("dark-blue");
         sendRequest.setMaxWidth(Double.MAX_VALUE);
         sendRequest.setAlignment(Pos.CENTER);
         sendRequest.setOnAction(e -> {
             try {
-                dataOutputStream.writeUTF("AddNewProduct " + statusTextField.getText() +  " " + name.getText() +  " "
-                + available.isSelected() + " " + number.getText() + " " + description.getText() + " " + categoryName.getText() + " "
-                + price.getText());
-                dataOutputStream.flush();
+                if (doesProductHasFile.isSelected())
+                {
+                    dataOutputStream.writeUTF("AddNewProduct " + statusTextField.getText() +  " " + name.getText() +  " "
+                            + available.isSelected() + " " + number.getText() + " " + description.getText() + " " + categoryName.getText() + " "
+                            + price.getText() + " " + doesProductHasFile.isSelected() + " " + address.getText());
+                    dataOutputStream.flush();
+                }
+                else if (!doesProductHasFile.isSelected())
+                {
+                    dataOutputStream.writeUTF("AddNewProduct " + statusTextField.getText() +  " " + name.getText() +  " "
+                            + available.isSelected() + " " + number.getText() + " " + description.getText() + " " + categoryName.getText() + " "
+                            + price.getText() + " " + doesProductHasFile.isSelected() + " " + "DoesNotHaveFile");
+                    dataOutputStream.flush();
+                }
                 status.setText(dataInputStream.readUTF());
             } catch (IOException ex) {
                 System.out.println(ex.getMessage());
@@ -642,9 +726,11 @@ private void handleAddNewProduct() {
         GridPane.setConstraints(categoryName, 0, 4);
         GridPane.setConstraints(price, 0, 5);
         GridPane.setConstraints(available, 0, 6);
-        GridPane.setConstraints(sendRequest, 0, 7);
-        GridPane.setConstraints(back, 0, 8);
-        GridPane.setConstraints(status, 0, 9);
+        GridPane.setConstraints(doesProductHasFile, 0, 7);
+        GridPane.setConstraints(address, 0, 8);
+        GridPane.setConstraints(sendRequest, 0, 9);
+        GridPane.setConstraints(back, 0, 10);
+        GridPane.setConstraints(status, 0, 11);
 
         GridPane.setHalignment(status, HPos.CENTER);
         GridPane.setHalignment(name, HPos.CENTER);
@@ -654,10 +740,12 @@ private void handleAddNewProduct() {
         GridPane.setHalignment(categoryName, HPos.CENTER);
         GridPane.setHalignment(price, HPos.CENTER);
         GridPane.setHalignment(sendRequest, HPos.CENTER);
+        GridPane.setHalignment(doesProductHasFile, HPos.CENTER);
+        GridPane.setHalignment(address, HPos.CENTER);
         GridPane.setHalignment(back, HPos.CENTER);
         GridPane.setHalignment(status, HPos.CENTER);
 
-        gridPane.getChildren().addAll(statusTextField, name, available, number, description, categoryName, price, sendRequest, back, status);
+        gridPane.getChildren().addAll(statusTextField, name, available, number, description, categoryName, price, sendRequest, back, status, doesProductHasFile, address);
         super.mainPane.setCenter(gridPane);
 
         Menu.window.setScene(scene);
@@ -736,7 +824,7 @@ private void handleShowLog(SellLog sellLog) {
         newWindow.showAndWait();
     }
 
-    public void handleShowProduct(Product product, Stage newWindow)
+    private void handleShowProduct(Product product, Stage newWindow)
     {
         Pane pane = product.showProductFullInfoGraphic();
         ((GridPane)pane).setAlignment(Pos.CENTER);
@@ -855,7 +943,7 @@ private void handleEditProduct(Product product, Stage newWindow) {
         newWindow.setScene(scene);
     }
 
-    public void handleEdit()
+    private void handleEdit()
     {
         super.setPane();
         GridPane gridPane = new GridPane();
@@ -915,9 +1003,16 @@ public void handleEdit()
         Menu.window.setScene(scene);
     }
 
-    public void handleLogout()
+    private void handleLogout()
     {
         try {
+            dataOutputStream.writeUTF("GetPortOfSeller " + account.getUsername());
+            dataOutputStream.flush();
+            Socket socket = new Socket("127.0.0.1", Integer.parseInt(dataInputStream.readUTF()));
+            DataOutputStream temp = new DataOutputStream(new BufferedOutputStream(socket.getOutputStream()));
+            temp.writeUTF("exit");
+            temp.flush();
+            temp.close();
             dataOutputStream.writeUTF("logout");
             dataOutputStream.flush();
         } catch (IOException e) {

From 7a4f2ecadb6d0b49eecc1b4fef111ef8c35dedb3 Mon Sep 17 00:00:00 2001
From: Informatic <msaadat1379@gmail.com>
Date: Thu, 23 Jul 2020 21:42:40 +0430
Subject: [PATCH 03/10] redo money 2(buyer can decrease)

---
 .idea/workspace.xml                           | 84 ++++++++++-------
 Data/Accounts/Buyers.json                     |  2 +-
 Data/Products/Products.json                   |  2 +-
 src/main/java/Client.java                     |  2 +-
 src/main/java/Controller/AccountManager.java  | 13 +++
 src/main/java/Controller/ClientThread.java    |  4 +
 src/main/java/Controller/Server.java          |  7 +-
 src/main/java/Controller/WorkWithBank.java    | 50 +++++++++++
 .../java/View/Menu/BuyerMenus/BuyerMenu.java  | 90 ++++++++++++++++++-
 9 files changed, 213 insertions(+), 41 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6078675..e409f79 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="">
+    <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="redo money 1">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Client.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Client.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/AccountManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/AccountManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/Server.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/Server.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/WorkWithBank.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/WorkWithBank.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -89,7 +95,7 @@
   <component name="RunManager" selected="Application.Client">
     <configuration name="Client" type="Application" factoryName="Application" singleton="false" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Client" />
-      <module name="Project" />
+      <module name="Project-2" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -103,7 +109,7 @@
     </configuration>
     <configuration name="Server" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Controller.Server" />
-      <module name="Project" />
+      <module name="Project-2" />
       <extension name="coverage">
         <pattern>
           <option name="PATTERN" value="Controller.*" />
@@ -364,13 +370,8 @@
       <workItem from="1593177955371" duration="115000" />
       <workItem from="1593178150008" duration="253000" />
       <workItem from="1593187077572" duration="84000" />
-    </task>
-    <task id="LOCAL-00066" summary="debug Menus">
-      <created>1589892897797</created>
-      <option name="number" value="00066" />
-      <option name="presentableId" value="LOCAL-00066" />
-      <option name="project" value="LOCAL" />
-      <updated>1589892897797</updated>
+      <workItem from="1595521459852" duration="1736000" />
+      <workItem from="1595523242523" duration="938000" />
     </task>
     <task id="LOCAL-00067" summary="make better package">
       <created>1589895211449</created>
@@ -708,7 +709,14 @@
       <option name="project" value="LOCAL" />
       <updated>1595521343115</updated>
     </task>
-    <option name="localTasksCounter" value="115" />
+    <task id="LOCAL-00115" summary="redo money 1">
+      <created>1595521551168</created>
+      <option name="number" value="00115" />
+      <option name="presentableId" value="LOCAL-00115" />
+      <option name="project" value="LOCAL" />
+      <updated>1595521551168</updated>
+    </task>
+    <option name="localTasksCounter" value="116" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -716,7 +724,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="ProductsMenu styles" />
     <MESSAGE value="debug music" />
     <MESSAGE value="small edit" />
     <MESSAGE value="make server and client system and many changes on classes" />
@@ -741,7 +748,8 @@
     <MESSAGE value="edit NewProductRequest for file products" />
     <MESSAGE value="edit Product for file Product" />
     <MESSAGE value="redo money" />
-    <option name="LAST_COMMIT_MESSAGE" value="redo money" />
+    <MESSAGE value="redo money 1" />
+    <option name="LAST_COMMIT_MESSAGE" value="redo money 1" />
   </component>
   <component name="WindowStateProjectService">
     <state x="280" y="20" key="#AccountManagerTest" timestamp="1589226101281">
@@ -789,6 +797,10 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="280" y="0" key="#All_in_Project-2_(1)/0.0.1366.728@0.0.1366.728" timestamp="1593165627201" />
+    <state x="400" y="26" key="#Client" timestamp="1595523936920">
+      <screen x="0" y="0" width="1366" height="738" />
+    </state>
+    <state x="400" y="26" key="#Client/0.0.1366.738@0.0.1366.738" timestamp="1595523936920" />
     <state x="275" y="26" key="#Inspections" timestamp="1591540003920">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -812,6 +824,10 @@
     </state>
     <state x="280" y="29" key="#SellerAccountTest/0.0.1366.728@0.0.1366.728" timestamp="1589388895849" />
     <state x="280" y="29" key="#SellerAccountTest/0.0.1366.738@0.0.1366.738" timestamp="1589400111089" />
+    <state x="400" y="26" key="#Server" timestamp="1595523871823">
+      <screen x="0" y="0" width="1366" height="738" />
+    </state>
+    <state x="400" y="26" key="#Server/0.0.1366.738@0.0.1366.738" timestamp="1595523871823" />
     <state x="280" y="0" key="#Temp_suite" timestamp="1589228140962">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -874,11 +890,11 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="438" y="65" key="#xdebugger.evaluate/0.0.1366.728@0.0.1366.728" timestamp="1595501308315" />
-    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595521342183">
+    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595523122826">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="499" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1595448621930" />
-    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595521342183" />
+    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595523122826" />
     <state x="92" y="93" width="1182" height="552" key="DiffContextDialog" timestamp="1593178422199">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -888,26 +904,26 @@
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="463" y="122" key="FileChooserDialogImpl/0.0.1366.738@0.0.1366.738" timestamp="1592855183500" />
-    <state width="1322" height="174" key="GridCell.Tab.0.bottom" timestamp="1595502246975">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="661" height="176" key="GridCell.Tab.0.bottom" timestamp="1595524252972">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="1322" height="185" key="GridCell.Tab.0.bottom/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
-    <state width="1322" height="174" key="GridCell.Tab.0.center" timestamp="1595502246975">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="661" height="176" key="GridCell.Tab.0.bottom/0.0.1366.738@0.0.1366.738" timestamp="1595524252972" />
+    <state width="661" height="176" key="GridCell.Tab.0.center" timestamp="1595524252972">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="1322" height="185" key="GridCell.Tab.0.center/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
-    <state width="1322" height="174" key="GridCell.Tab.0.left" timestamp="1595502246975">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="661" height="176" key="GridCell.Tab.0.center/0.0.1366.738@0.0.1366.738" timestamp="1595524252972" />
+    <state width="661" height="176" key="GridCell.Tab.0.left" timestamp="1595524252972">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="1322" height="185" key="GridCell.Tab.0.left/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
-    <state width="1322" height="174" key="GridCell.Tab.0.right" timestamp="1595502246975">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="661" height="176" key="GridCell.Tab.0.left/0.0.1366.738@0.0.1366.738" timestamp="1595524252972" />
+    <state width="661" height="176" key="GridCell.Tab.0.right" timestamp="1595524252972">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="1322" height="185" key="GridCell.Tab.0.right/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
+    <state width="661" height="176" key="GridCell.Tab.0.right/0.0.1366.738@0.0.1366.738" timestamp="1595524252972" />
     <state width="1322" height="244" key="GridCell.Tab.1.bottom" timestamp="1595502161406">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
@@ -978,23 +994,23 @@
     </state>
     <state x="389" y="0" key="refactoring.ChangeSignatureDialog/0.0.1366.728@0.0.1366.728" timestamp="1589710761386" />
     <state x="389" y="0" key="refactoring.ChangeSignatureDialog/0.0.1366.738@0.0.1366.738" timestamp="1589271483679" />
-    <state x="339" y="157" width="672" height="677" key="run.anything.popup" timestamp="1595015821937">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="339" y="159" key="run.anything.popup" timestamp="1595522058211">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="339" y="157" width="672" height="677" key="run.anything.popup/0.0.1366.728@0.0.1366.728" timestamp="1595015821937" />
-    <state x="339" y="159" key="run.anything.popup/0.0.1366.738@0.0.1366.738" timestamp="1593009407885" />
-    <state x="346" y="58" width="672" height="669" key="search.everywhere.popup" timestamp="1595237231689">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="339" y="159" key="run.anything.popup/0.0.1366.738@0.0.1366.738" timestamp="1595522058211" />
+    <state x="346" y="59" width="672" height="678" key="search.everywhere.popup" timestamp="1595522980091">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="346" y="58" width="672" height="669" key="search.everywhere.popup/0.0.1366.728@0.0.1366.728" timestamp="1595237231689" />
-    <state x="346" y="59" width="672" height="678" key="search.everywhere.popup/0.0.1366.738@0.0.1366.738" timestamp="1591438296011" />
+    <state x="346" y="59" width="672" height="678" key="search.everywhere.popup/0.0.1366.738@0.0.1366.738" timestamp="1595522980091" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java</url>
-          <line>386</line>
+          <line>469</line>
           <option name="timeStamp" value="13" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
diff --git a/Data/Accounts/Buyers.json b/Data/Accounts/Buyers.json
index 391b4ff..ff54436 100644
--- a/Data/Accounts/Buyers.json
+++ b/Data/Accounts/Buyers.json
@@ -1 +1 @@
-[{"buyLogs":[{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:28:48","price":12,"deliveryStatus":"preparing...","logId":1,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:34:00","price":12,"deliveryStatus":"preparing...","logId":2,"productId":4},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 10:56:44","price":123,"deliveryStatus":"preparing...","logId":3,"productId":3},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 10:57:58","price":123,"deliveryStatus":"preparing...","logId":4,"productId":3},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:58:22","price":12,"deliveryStatus":"preparing...","logId":5,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:58:50","price":123,"deliveryStatus":"preparing...","logId":6,"productId":3},{"discountValue":12,"sellerUsername":"saleman","date":"2020/06/26 11:14:40","price":12,"deliveryStatus":"preparing...","logId":7,"productId":4},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 11:16:31","price":123,"deliveryStatus":"preparing...","logId":8,"productId":3},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/26 12:35:52","price":10,"deliveryStatus":"preparing...","logId":9,"productId":7},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 14:32:45","price":12,"deliveryStatus":"preparing...","logId":10,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 16:20:40","price":12,"deliveryStatus":"preparing...","logId":11,"productId":2},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 16:24:14","price":123,"deliveryStatus":"preparing...","logId":12,"productId":3},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/29 10:39:49","price":15,"deliveryStatus":"preparing...","logId":13,"productId":8},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/29 10:57:55","price":10,"deliveryStatus":"preparing...","logId":14,"productId":7},{"discountValue":24,"sellerUsername":"saleman","date":"2020/06/29 11:06:24","price":123,"deliveryStatus":"preparing...","logId":15,"productId":3},{"discountValue":24,"sellerUsername":"saleman","date":"2020/06/29 11:08:57","price":123,"deliveryStatus":"preparing...","logId":16,"productId":3}],"discountIds":[1,2,3,4],"numberOfUse":{"1":0,"2":2,"3":2,"4":2},"cart":{"productsID":[],"muchOfProductID":{}},"username":"Buyer","firstName":"Buyer","lastName":"Buyer","password":"Buyer","email":"Buye@gmail.com","phoneNumber":"021","credit":8811},{"buyLogs":[],"discountIds":[1,2,4],"numberOfUse":{"1":0,"2":0,"4":0},"cart":{"productsID":[],"muchOfProductID":{}},"username":"parham","firstName":"parham","lastName":"chavoshian","password":"parham","email":"parham@gmail.com","phoneNumber":"021","credit":100000},{"buyLogs":[],"discountIds":[],"numberOfUse":{},"cart":{"productsID":[],"muchOfProductID":{}},"username":"milad","firstName":"milad","lastName":"saadat","password":"salam","email":"m@gmail.com","phoneNumber":"1231","credit":12312}]
\ No newline at end of file
+[{"buyLogs":[{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:28:48","price":12,"deliveryStatus":"preparing...","logId":1,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:34:00","price":12,"deliveryStatus":"preparing...","logId":2,"productId":4},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 10:56:44","price":123,"deliveryStatus":"preparing...","logId":3,"productId":3},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 10:57:58","price":123,"deliveryStatus":"preparing...","logId":4,"productId":3},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:58:22","price":12,"deliveryStatus":"preparing...","logId":5,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:58:50","price":123,"deliveryStatus":"preparing...","logId":6,"productId":3},{"discountValue":12,"sellerUsername":"saleman","date":"2020/06/26 11:14:40","price":12,"deliveryStatus":"preparing...","logId":7,"productId":4},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 11:16:31","price":123,"deliveryStatus":"preparing...","logId":8,"productId":3},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/26 12:35:52","price":10,"deliveryStatus":"preparing...","logId":9,"productId":7},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 14:32:45","price":12,"deliveryStatus":"preparing...","logId":10,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 16:20:40","price":12,"deliveryStatus":"preparing...","logId":11,"productId":2},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 16:24:14","price":123,"deliveryStatus":"preparing...","logId":12,"productId":3},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/29 10:39:49","price":15,"deliveryStatus":"preparing...","logId":13,"productId":8},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/29 10:57:55","price":10,"deliveryStatus":"preparing...","logId":14,"productId":7},{"discountValue":24,"sellerUsername":"saleman","date":"2020/06/29 11:06:24","price":123,"deliveryStatus":"preparing...","logId":15,"productId":3},{"discountValue":24,"sellerUsername":"saleman","date":"2020/06/29 11:08:57","price":123,"deliveryStatus":"preparing...","logId":16,"productId":3}],"discountIds":[1,2,3,4],"numberOfUse":{"1":0,"2":2,"3":2,"4":2},"cart":{"productsID":[],"muchOfProductID":{}},"username":"Buyer","firstName":"Buyer","lastName":"Buyer","password":"Buyer","email":"Buye@gmail.com","phoneNumber":"021","credit":9011},{"buyLogs":[],"discountIds":[1,2,4],"numberOfUse":{"1":0,"2":0,"4":0},"cart":{"productsID":[],"muchOfProductID":{}},"username":"parham","firstName":"parham","lastName":"chavoshian","password":"parham","email":"parham@gmail.com","phoneNumber":"021","credit":100000},{"buyLogs":[],"discountIds":[],"numberOfUse":{},"cart":{"productsID":[],"muchOfProductID":{}},"username":"milad","firstName":"milad","lastName":"saadat","password":"salam","email":"m@gmail.com","phoneNumber":"1231","credit":12312}]
\ No newline at end of file
diff --git a/Data/Products/Products.json b/Data/Products/Products.json
index 47ecd29..f7fc10b 100644
--- a/Data/Products/Products.json
+++ b/Data/Products/Products.json
@@ -1 +1 @@
-[{"productId":2,"status":"ava","name":"shampoo","available":true,"number":18,"description":"awli","averageScore":5.0,"categoryName":"shampoo","price":12,"sellerUsername":"saleman","scores":[{"score":5,"buyerUsername":"Buyer"}],"comments":[],"offId":1},{"productId":4,"status":"sava","name":"lif","available":false,"number":11,"description":"ajab","averageScore":0.0,"categoryName":"cleaning","price":12,"sellerUsername":"saleman","scores":[],"comments":[],"offId":2},{"productId":3,"status":"dava","name":"saboon","available":true,"number":10,"description":"eybaba","averageScore":3.0,"categoryName":"cleaning","price":123,"sellerUsername":"saleman","scores":[{"score":3,"buyerUsername":"Buyer"}],"comments":[],"offId":1},{"productId":7,"status":"kd","name":"golnar","available":true,"number":9,"description":"aikm","averageScore":0.0,"categoryName":"cleaning","price":10,"sellerUsername":"Seller","scores":[],"comments":[],"offId":4}]
\ No newline at end of file
+[{"productId":2,"status":"ava","name":"shampoo","available":true,"number":18,"description":"awli","averageScore":5.0,"categoryName":"shampoo","price":12,"sellerUsername":"saleman","scores":[{"score":5,"buyerUsername":"Buyer"}],"comments":[],"offId":1,"doesHasFile":false},{"productId":4,"status":"sava","name":"lif","available":false,"number":11,"description":"ajab","averageScore":0.0,"categoryName":"cleaning","price":12,"sellerUsername":"saleman","scores":[],"comments":[],"offId":2,"doesHasFile":false},{"productId":3,"status":"dava","name":"saboon","available":true,"number":10,"description":"eybaba","averageScore":3.0,"categoryName":"cleaning","price":123,"sellerUsername":"saleman","scores":[{"score":3,"buyerUsername":"Buyer"}],"comments":[],"offId":1,"doesHasFile":false},{"productId":7,"status":"kd","name":"golnar","available":true,"number":9,"description":"aikm","averageScore":0.0,"categoryName":"cleaning","price":10,"sellerUsername":"Seller","scores":[],"comments":[],"offId":4,"doesHasFile":false}]
\ No newline at end of file
diff --git a/src/main/java/Client.java b/src/main/java/Client.java
index b7bc41b..854cc0f 100644
--- a/src/main/java/Client.java
+++ b/src/main/java/Client.java
@@ -11,7 +11,7 @@ public class Client extends Application {
 
     public static void main(String[] args){
         try {
-            Socket socket = new Socket("127.0.0.1", 8080);
+            Socket socket = new Socket("127.0.0.1", 9595);
             DataInputStream dataInputStream = new DataInputStream(new BufferedInputStream(socket.getInputStream()));
             DataOutputStream dataOutputStream = new DataOutputStream(new BufferedOutputStream(socket.getOutputStream()));
             window.setOnCloseRequest(e -> {
diff --git a/src/main/java/Controller/AccountManager.java b/src/main/java/Controller/AccountManager.java
index 9bb1631..782fa4d 100644
--- a/src/main/java/Controller/AccountManager.java
+++ b/src/main/java/Controller/AccountManager.java
@@ -114,5 +114,18 @@ else if (loggedInAccount instanceof SellerAccount)
         return "nothing to show.";
     }
 
+    public String changeCredit(Account account , int much , String bankUsername , String bankPassword , String bankId){
+        String res = "not available";
+        if (much > 0){
+            res = WorkWithBank.increaseCredit(much , bankUsername, bankPassword, bankId);
+            if (res.equalsIgnoreCase("done successfully")){
+                account.setCredit(account.getCredit() + much);
+            }
+        }
+        else if (account instanceof SellerAccount){
+//            doish
+        }
+        return res;
+    }
 
 }
diff --git a/src/main/java/Controller/ClientThread.java b/src/main/java/Controller/ClientThread.java
index 31fa3bd..a6b999b 100644
--- a/src/main/java/Controller/ClientThread.java
+++ b/src/main/java/Controller/ClientThread.java
@@ -414,6 +414,10 @@ else if (input.startsWith("PrOfCart"))
                     }
                     output = new Gson().toJson(allProducts);
                 }
+                else if (input.startsWith("changeCredit")){
+                    details = input.split(" ");
+                    output = accountManager.changeCredit(account , Integer.parseInt(details[1]), details[2] , details[3], details[4]);
+                }
                 else if (input.startsWith("Exit"))
                 {
                     clientSocket.close();
diff --git a/src/main/java/Controller/Server.java b/src/main/java/Controller/Server.java
index 970f542..510717c 100644
--- a/src/main/java/Controller/Server.java
+++ b/src/main/java/Controller/Server.java
@@ -20,12 +20,17 @@ public class Server {
     public static void main(String[] args) {
         Server server = new Server();
         Database.initialize();
+        try {
+            WorkWithBank.ConnectToBankServer();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         server.waitForClient();
     }
 
     public Server() {
         try {
-            this.serverSocket = new ServerSocket(8080);
+            this.serverSocket = new ServerSocket(9595);
             allOnlineAdmins = new ArrayList<>();
             allOnlineBuyers = new ArrayList<>();
             allOnlineSellers = new ArrayList<>();
diff --git a/src/main/java/Controller/WorkWithBank.java b/src/main/java/Controller/WorkWithBank.java
index 78212d3..ee19844 100644
--- a/src/main/java/Controller/WorkWithBank.java
+++ b/src/main/java/Controller/WorkWithBank.java
@@ -1,4 +1,54 @@
 package Controller;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.Socket;
+
 public class WorkWithBank {
+    public static final int PORT = 2222;
+    public static final String IP = "127.0.0.1";
+
+    private static DataOutputStream outputStream;
+    private static DataInputStream inputStream;
+
+    private static final String AdminBankUsername = "Admin";
+    private static final String AdminBankPassword = "Admin";
+    private static final String AdminBankId = "47039";
+
+    public static void ConnectToBankServer() throws IOException {
+        try {
+            Socket socket = new Socket(IP, PORT);
+            outputStream = new DataOutputStream(socket.getOutputStream());
+            inputStream = new DataInputStream(socket.getInputStream());
+            inputStream.readUTF();
+        } catch (IOException e) {
+            throw new IOException("Exception while initiating connection:");
+        }
+    }
+
+
+
+    private static String sendMessage(String msg){
+        try {
+            outputStream.writeUTF(msg);
+            return inputStream.readUTF();
+        } catch (IOException e) {
+            return "Exception while sending message:";
+        }
+
+    }
+
+    public static String increaseCredit(int much, String bankUsername, String bankPassword, String bankId) {
+        String token = get_token(bankUsername , bankPassword);
+        String res = sendMessage("create_receipt " + token + " move " + much + " " + bankId + " " + AdminBankId +  " increaseCredit");
+        if (res.matches("[0-9]+")){
+            res = sendMessage("pay " + res) ;
+        }
+        return res ;
+    }
+
+    private static String get_token(String bankUsername, String bankPassword) {
+        return sendMessage("get_token " + bankUsername + " " + bankPassword);
+    }
 }
diff --git a/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java b/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java
index 498058b..6d2adb9 100644
--- a/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java
+++ b/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java
@@ -87,13 +87,19 @@ public void show(){
         logout.setMaxWidth(Double.MAX_VALUE);
         logout.setOnAction(e -> handleLogout());
 
+        Button changeCredit = new Button("Change Credit");
+        changeCredit.getStyleClass().add("dark-blue");
+        changeCredit.setMaxWidth(Double.MAX_VALUE);
+        changeCredit.setOnAction(e -> handleChangeCredit());
+
         GridPane.setConstraints(viewAllDiscounts, 0, 0);
         GridPane.setConstraints(viewAllLogs, 0, 1);
         GridPane.setConstraints(viewMyAuctions, 0, 2);
         GridPane.setConstraints(viewCart,0, 3);
         GridPane.setConstraints(editInfoButton, 0, 4);
         GridPane.setConstraints(showSupporterButton, 0, 5);
-        GridPane.setConstraints(logout, 0, 6);
+        GridPane.setConstraints(changeCredit , 0 , 6);
+        GridPane.setConstraints(logout, 0, 7);
 
         GridPane.setHalignment(viewAllDiscounts, HPos.CENTER);
         GridPane.setHalignment(viewAllLogs, HPos.CENTER);
@@ -102,7 +108,7 @@ public void show(){
         GridPane.setHalignment(editInfoButton, HPos.CENTER);
         GridPane.setHalignment(showSupporterButton, HPos.CENTER);
         GridPane.setHalignment(logout, HPos.CENTER);
-
+        GridPane.setHalignment(changeCredit , HPos.CENTER);
         try {
             dataOutputStream.writeUTF("GetLoggedAccount");
             dataOutputStream.flush();
@@ -130,7 +136,7 @@ else if (role.equalsIgnoreCase("Buyer"))
             System.out.println(e.getMessage());
         }
         Pane pane = Objects.requireNonNull(Menu.account).viewPersonalInfoInGraphic();
-        allButtons.getChildren().addAll(viewAllDiscounts, viewAllLogs, viewCart, editInfoButton, logout, viewMyAuctions, showSupporterButton);
+        allButtons.getChildren().addAll(viewAllDiscounts, viewAllLogs, viewCart, editInfoButton, logout, viewMyAuctions, showSupporterButton , changeCredit);
 
         GridPane.setConstraints(pane, 0, 0);
         GridPane.setConstraints(allButtons, 3, 0);
@@ -145,6 +151,84 @@ else if (role.equalsIgnoreCase("Buyer"))
         window.setScene(scene);
     }
 
+    private void handleChangeCredit() {
+        super.setPane();
+        GridPane gridPane = new GridPane();
+        Scene scene = new Scene(super.mainPane, 1000, 600);
+        scene.getStylesheets().add(new File("Data/Styles/Buttons.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/textfield.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/backgrounds.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/choicebox.css").toURI().toString());
+        super.mainPane.getStyleClass().add("admin-page");
+        gridPane.setAlignment(Pos.CENTER);
+        gridPane.setVgap(10);
+        Label status = new Label();
+
+        TextField much = new TextField();
+        much.setPromptText("amount ");
+        much.getStyleClass().add("textfield.css");
+
+
+        TextField bankUsername = new TextField();
+        bankUsername.setPromptText("Bank Username");
+        bankUsername.getStyleClass().add("textfield.css");
+
+        TextField bankPassword = new TextField();
+        bankPassword.setPromptText("Bank Password");
+        bankPassword.getStyleClass().add("textfield.css");
+
+
+        TextField bankId = new TextField();
+        bankId.setPromptText("Bank Id");
+        bankId.getStyleClass().add("textfield.css");
+
+        Button edit = new Button("edit");
+        edit.getStyleClass().add("dark-blue");
+        edit.setMaxWidth(Double.MAX_VALUE);
+        edit.setOnAction(e -> {
+            try {
+                dataOutputStream.writeUTF("changeCredit " +  much.getText() + " " + bankUsername.getText() + " " + bankPassword.getText() + " " + bankId.getText());
+                dataOutputStream.flush();
+                status.setText(dataInputStream.readUTF());
+            }
+            catch (Exception ex)
+            {
+                Alert alert = new Alert(Alert.AlertType.ERROR);
+                alert.setTitle("Error");
+                alert.setHeaderText("Process Fail");
+                alert.setContentText("Wrong input for change to");
+
+                alert.showAndWait();
+            }
+        });
+        Button back = new Button("back");
+        back.getStyleClass().add("dark-blue");
+        back.setMaxWidth(Double.MAX_VALUE);
+        back.setOnAction(e -> {
+            show();
+        });
+        GridPane.setConstraints(much, 0, 1);
+        GridPane.setConstraints(bankUsername, 0 , 2);
+        GridPane.setConstraints(bankPassword, 0 , 3);
+        GridPane.setConstraints(bankId, 0 , 4);
+
+        GridPane.setConstraints(edit, 0, 5);
+        GridPane.setConstraints(back, 0, 6);
+        GridPane.setConstraints(status, 0, 7);
+        GridPane.setHalignment(edit, HPos.CENTER);
+        GridPane.setHalignment(back, HPos.CENTER);
+        GridPane.setHalignment(bankUsername, HPos.CENTER);
+
+        GridPane.setHalignment(bankPassword, HPos.CENTER);
+        GridPane.setHalignment(bankId, HPos.CENTER);
+        GridPane.setHalignment(status, HPos.CENTER);
+        gridPane.getChildren().addAll(much, bankUsername , bankPassword , bankId , edit, back, status);
+        super.mainPane.setCenter(gridPane);
+
+        Menu.window.setScene(scene);
+    }
+
+
     private void handleAllLogs() {
         super.setPane();
         ArrayList<BuyLog> allLogs = ((BuyerAccount)Menu.account).getBuyLogs();

From e63bceeed2cb3ad2461915b3382ccb0f153cd102 Mon Sep 17 00:00:00 2001
From: Informatic <msaadat1379@gmail.com>
Date: Thu, 23 Jul 2020 22:30:30 +0430
Subject: [PATCH 04/10] redo money 3(seller can change)

---
 .idea/workspace.xml                           | 58 ++++++------
 Data/Accounts/Sellers.json                    |  2 +-
 src/main/java/Controller/AccountManager.java  |  4 +
 src/main/java/Controller/WorkWithBank.java    |  9 ++
 .../View/Menu/SellerMenus/SellerMenu.java     | 88 ++++++++++++++++++-
 5 files changed, 128 insertions(+), 33 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e409f79..54390eb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="redo money 1">
+    <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Client.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Client.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Controller/AccountManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/AccountManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/Server.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/Server.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Controller/WorkWithBank.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/WorkWithBank.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/BuyerMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/SellerMenus/SellerMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/SellerMenus/SellerMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -371,14 +368,8 @@
       <workItem from="1593178150008" duration="253000" />
       <workItem from="1593187077572" duration="84000" />
       <workItem from="1595521459852" duration="1736000" />
-      <workItem from="1595523242523" duration="938000" />
-    </task>
-    <task id="LOCAL-00067" summary="make better package">
-      <created>1589895211449</created>
-      <option name="number" value="00067" />
-      <option name="presentableId" value="LOCAL-00067" />
-      <option name="project" value="LOCAL" />
-      <updated>1589895211449</updated>
+      <workItem from="1595523242523" duration="2349000" />
+      <workItem from="1595526605128" duration="397000" />
     </task>
     <task id="LOCAL-00068" summary="fix some bugs v1.5">
       <created>1591440442743</created>
@@ -716,7 +707,14 @@
       <option name="project" value="LOCAL" />
       <updated>1595521551168</updated>
     </task>
-    <option name="localTasksCounter" value="116" />
+    <task id="LOCAL-00116" summary="redo money 2(buyer can decrease)">
+      <created>1595524360748</created>
+      <option name="number" value="00116" />
+      <option name="presentableId" value="LOCAL-00116" />
+      <option name="project" value="LOCAL" />
+      <updated>1595524360748</updated>
+    </task>
+    <option name="localTasksCounter" value="117" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -724,7 +722,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="debug music" />
     <MESSAGE value="small edit" />
     <MESSAGE value="make server and client system and many changes on classes" />
     <MESSAGE value="delete extra methods and classes" />
@@ -749,7 +746,8 @@
     <MESSAGE value="edit Product for file Product" />
     <MESSAGE value="redo money" />
     <MESSAGE value="redo money 1" />
-    <option name="LAST_COMMIT_MESSAGE" value="redo money 1" />
+    <MESSAGE value="redo money 2(buyer can decrease)" />
+    <option name="LAST_COMMIT_MESSAGE" value="redo money 2(buyer can decrease)" />
   </component>
   <component name="WindowStateProjectService">
     <state x="280" y="20" key="#AccountManagerTest" timestamp="1589226101281">
@@ -890,11 +888,11 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="438" y="65" key="#xdebugger.evaluate/0.0.1366.728@0.0.1366.728" timestamp="1595501308315" />
-    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595523122826">
+    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595524358232">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="499" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1595448621930" />
-    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595523122826" />
+    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595524358232" />
     <state x="92" y="93" width="1182" height="552" key="DiffContextDialog" timestamp="1593178422199">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -904,26 +902,26 @@
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="463" y="122" key="FileChooserDialogImpl/0.0.1366.738@0.0.1366.738" timestamp="1592855183500" />
-    <state width="661" height="176" key="GridCell.Tab.0.bottom" timestamp="1595524252972">
+    <state width="661" height="176" key="GridCell.Tab.0.bottom" timestamp="1595527156442">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="661" height="176" key="GridCell.Tab.0.bottom/0.0.1366.738@0.0.1366.738" timestamp="1595524252972" />
-    <state width="661" height="176" key="GridCell.Tab.0.center" timestamp="1595524252972">
+    <state width="661" height="176" key="GridCell.Tab.0.bottom/0.0.1366.738@0.0.1366.738" timestamp="1595527156442" />
+    <state width="661" height="176" key="GridCell.Tab.0.center" timestamp="1595527156442">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="661" height="176" key="GridCell.Tab.0.center/0.0.1366.738@0.0.1366.738" timestamp="1595524252972" />
-    <state width="661" height="176" key="GridCell.Tab.0.left" timestamp="1595524252972">
+    <state width="661" height="176" key="GridCell.Tab.0.center/0.0.1366.738@0.0.1366.738" timestamp="1595527156442" />
+    <state width="661" height="176" key="GridCell.Tab.0.left" timestamp="1595527156442">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="661" height="176" key="GridCell.Tab.0.left/0.0.1366.738@0.0.1366.738" timestamp="1595524252972" />
-    <state width="661" height="176" key="GridCell.Tab.0.right" timestamp="1595524252972">
+    <state width="661" height="176" key="GridCell.Tab.0.left/0.0.1366.738@0.0.1366.738" timestamp="1595527156442" />
+    <state width="661" height="176" key="GridCell.Tab.0.right" timestamp="1595527156442">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="661" height="176" key="GridCell.Tab.0.right/0.0.1366.738@0.0.1366.738" timestamp="1595524252972" />
+    <state width="661" height="176" key="GridCell.Tab.0.right/0.0.1366.738@0.0.1366.738" timestamp="1595527156442" />
     <state width="1322" height="244" key="GridCell.Tab.1.bottom" timestamp="1595502161406">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
@@ -994,16 +992,16 @@
     </state>
     <state x="389" y="0" key="refactoring.ChangeSignatureDialog/0.0.1366.728@0.0.1366.728" timestamp="1589710761386" />
     <state x="389" y="0" key="refactoring.ChangeSignatureDialog/0.0.1366.738@0.0.1366.738" timestamp="1589271483679" />
-    <state x="339" y="159" key="run.anything.popup" timestamp="1595522058211">
+    <state x="339" y="159" key="run.anything.popup" timestamp="1595526957406">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="339" y="157" width="672" height="677" key="run.anything.popup/0.0.1366.728@0.0.1366.728" timestamp="1595015821937" />
-    <state x="339" y="159" key="run.anything.popup/0.0.1366.738@0.0.1366.738" timestamp="1595522058211" />
-    <state x="346" y="59" width="672" height="678" key="search.everywhere.popup" timestamp="1595522980091">
+    <state x="339" y="159" key="run.anything.popup/0.0.1366.738@0.0.1366.738" timestamp="1595526957406" />
+    <state x="346" y="59" width="672" height="678" key="search.everywhere.popup" timestamp="1595526960054">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="346" y="58" width="672" height="669" key="search.everywhere.popup/0.0.1366.728@0.0.1366.728" timestamp="1595237231689" />
-    <state x="346" y="59" width="672" height="678" key="search.everywhere.popup/0.0.1366.738@0.0.1366.738" timestamp="1595522980091" />
+    <state x="346" y="59" width="672" height="678" key="search.everywhere.popup/0.0.1366.738@0.0.1366.738" timestamp="1595526960054" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/Data/Accounts/Sellers.json b/Data/Accounts/Sellers.json
index 83ec757..d8fff8a 100644
--- a/Data/Accounts/Sellers.json
+++ b/Data/Accounts/Sellers.json
@@ -1 +1 @@
-[{"company":"Selling","sellLogs":[{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 12:35:52","price":10,"deliveryStatus":"preparing...","logId":9,"productId":7},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/29 10:39:49","price":15,"deliveryStatus":"preparing...","logId":13,"productId":8},{"OffValue":2,"buyerUsername":"Buyer","date":"2020/06/29 10:57:55","price":10,"deliveryStatus":"preparing...","logId":14,"productId":7}],"username":"Seller","firstName":"Seller","lastName":"Seller","password":"Seller","email":"Seller@gmail.com","phoneNumber":"021","credit":10058},{"company":"Selling","sellLogs":[],"username":"Seller","firstName":"Seller","lastName":"Seller","password":"Seller","email":"Seller@gmail.com","phoneNumber":"021","credit":100000},{"company":"sale","sellLogs":[{"OffValue":10,"buyerUsername":"Buyer","date":"2020/06/26 10:28:48","price":12,"deliveryStatus":"preparing...","logId":1,"productId":4},{"OffValue":10,"buyerUsername":"Buyer","date":"2020/06/26 10:34:00","price":12,"deliveryStatus":"preparing...","logId":2,"productId":4},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 10:56:44","price":123,"deliveryStatus":"preparing...","logId":3,"productId":3},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 10:57:58","price":123,"deliveryStatus":"preparing...","logId":4,"productId":3},{"OffValue":10,"buyerUsername":"Buyer","date":"2020/06/26 10:58:22","price":12,"deliveryStatus":"preparing...","logId":5,"productId":4},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 10:58:50","price":123,"deliveryStatus":"preparing...","logId":6,"productId":3},{"OffValue":10,"buyerUsername":"Buyer","date":"2020/06/26 11:14:40","price":12,"deliveryStatus":"preparing...","logId":7,"productId":4},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 11:16:31","price":123,"deliveryStatus":"preparing...","logId":8,"productId":3},{"OffValue":10,"buyerUsername":"Buyer","date":"2020/06/26 14:32:45","price":12,"deliveryStatus":"preparing...","logId":10,"productId":4},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 16:20:40","price":12,"deliveryStatus":"preparing...","logId":11,"productId":2},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 16:24:14","price":123,"deliveryStatus":"preparing...","logId":12,"productId":3},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/29 11:06:24","price":123,"deliveryStatus":"preparing...","logId":15,"productId":3},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/29 11:08:57","price":123,"deliveryStatus":"preparing...","logId":16,"productId":3}],"username":"saleman","firstName":"sale","lastName":"sale","password":"saleman","email":"sale@gmail.com","phoneNumber":"1234","credit":2148}]
\ No newline at end of file
+[{"company":"Selling","sellLogs":[{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 12:35:52","price":10,"deliveryStatus":"preparing...","logId":9,"productId":7},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/29 10:39:49","price":15,"deliveryStatus":"preparing...","logId":13,"productId":8},{"OffValue":2,"buyerUsername":"Buyer","date":"2020/06/29 10:57:55","price":10,"deliveryStatus":"preparing...","logId":14,"productId":7}],"username":"Seller","firstName":"Seller","lastName":"Seller","password":"Seller","email":"Seller@gmail.com","phoneNumber":"021","credit":9958},{"company":"Selling","sellLogs":[],"username":"Seller","firstName":"Seller","lastName":"Seller","password":"Seller","email":"Seller@gmail.com","phoneNumber":"021","credit":100000},{"company":"sale","sellLogs":[{"OffValue":10,"buyerUsername":"Buyer","date":"2020/06/26 10:28:48","price":12,"deliveryStatus":"preparing...","logId":1,"productId":4},{"OffValue":10,"buyerUsername":"Buyer","date":"2020/06/26 10:34:00","price":12,"deliveryStatus":"preparing...","logId":2,"productId":4},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 10:56:44","price":123,"deliveryStatus":"preparing...","logId":3,"productId":3},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 10:57:58","price":123,"deliveryStatus":"preparing...","logId":4,"productId":3},{"OffValue":10,"buyerUsername":"Buyer","date":"2020/06/26 10:58:22","price":12,"deliveryStatus":"preparing...","logId":5,"productId":4},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 10:58:50","price":123,"deliveryStatus":"preparing...","logId":6,"productId":3},{"OffValue":10,"buyerUsername":"Buyer","date":"2020/06/26 11:14:40","price":12,"deliveryStatus":"preparing...","logId":7,"productId":4},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 11:16:31","price":123,"deliveryStatus":"preparing...","logId":8,"productId":3},{"OffValue":10,"buyerUsername":"Buyer","date":"2020/06/26 14:32:45","price":12,"deliveryStatus":"preparing...","logId":10,"productId":4},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 16:20:40","price":12,"deliveryStatus":"preparing...","logId":11,"productId":2},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/26 16:24:14","price":123,"deliveryStatus":"preparing...","logId":12,"productId":3},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/29 11:06:24","price":123,"deliveryStatus":"preparing...","logId":15,"productId":3},{"OffValue":0,"buyerUsername":"Buyer","date":"2020/06/29 11:08:57","price":123,"deliveryStatus":"preparing...","logId":16,"productId":3}],"username":"saleman","firstName":"sale","lastName":"sale","password":"saleman","email":"sale@gmail.com","phoneNumber":"1234","credit":2148}]
\ No newline at end of file
diff --git a/src/main/java/Controller/AccountManager.java b/src/main/java/Controller/AccountManager.java
index 782fa4d..7541a2c 100644
--- a/src/main/java/Controller/AccountManager.java
+++ b/src/main/java/Controller/AccountManager.java
@@ -124,6 +124,10 @@ public String changeCredit(Account account , int much , String bankUsername , St
         }
         else if (account instanceof SellerAccount){
 //            doish
+            res = WorkWithBank.decreaseCredit(-much , bankUsername , bankPassword, bankId);
+            if (res.equalsIgnoreCase("done successfully")){
+                account.setCredit(account.getCredit() + much);
+            }
         }
         return res;
     }
diff --git a/src/main/java/Controller/WorkWithBank.java b/src/main/java/Controller/WorkWithBank.java
index ee19844..66c3f23 100644
--- a/src/main/java/Controller/WorkWithBank.java
+++ b/src/main/java/Controller/WorkWithBank.java
@@ -51,4 +51,13 @@ public static String increaseCredit(int much, String bankUsername, String bankPa
     private static String get_token(String bankUsername, String bankPassword) {
         return sendMessage("get_token " + bankUsername + " " + bankPassword);
     }
+
+    public static String decreaseCredit(int much, String bankUsername, String bankPassword, String bankId) {
+        String token = get_token(AdminBankUsername , AdminBankPassword);
+        String res = sendMessage("create_receipt " + token + " move " + much + " " + AdminBankId + " " + bankId +  " decreaseCredit");
+        if (res.matches("[0-9]+")){
+            res = sendMessage("pay " + res) ;
+        }
+        return res ;
+    }
 }
diff --git a/src/main/java/View/Menu/SellerMenus/SellerMenu.java b/src/main/java/View/Menu/SellerMenus/SellerMenu.java
index 676fc88..3c02999 100644
--- a/src/main/java/View/Menu/SellerMenus/SellerMenu.java
+++ b/src/main/java/View/Menu/SellerMenus/SellerMenu.java
@@ -87,6 +87,11 @@ public void run() {
         editInfoButton.setMaxWidth(Double.MAX_VALUE);
         editInfoButton.setOnAction(e -> handleEdit());
 
+        Button changeCredit = new Button("Change Credit");
+        changeCredit.getStyleClass().add("dark-blue");
+        changeCredit.setMaxWidth(Double.MAX_VALUE);
+        changeCredit.setOnAction(e -> handleChangeCredit());
+
         Button logout = new Button("Logout");
         logout.getStyleClass().add("dark-blue");
         logout.setMaxWidth(Double.MAX_VALUE);
@@ -97,7 +102,8 @@ public void run() {
         GridPane.setConstraints(manageOffs, 0, 2);
         GridPane.setConstraints(editInfoButton, 0, 3);
         GridPane.setConstraints(addAuction, 0, 4);
-        GridPane.setConstraints(logout, 0, 5);
+        GridPane.setConstraints(changeCredit , 0 , 5);
+        GridPane.setConstraints(logout, 0, 6);
 
         GridPane.setHalignment(viewAllLogs, HPos.CENTER);
         GridPane.setHalignment(manageProducts, HPos.CENTER);
@@ -105,6 +111,7 @@ public void run() {
         GridPane.setHalignment(editInfoButton, HPos.CENTER);
         GridPane.setHalignment(logout, HPos.CENTER);
         GridPane.setHalignment(addAuction, HPos.CENTER);
+        GridPane.setHalignment(changeCredit, HPos.CENTER);
 
         try {
             dataOutputStream.writeUTF("GetLoggedAccount");
@@ -133,7 +140,7 @@ else if (role.equalsIgnoreCase("Buyer"))
             System.out.println(e.getMessage());
         }
         Pane pane = Objects.requireNonNull(Menu.account).viewPersonalInfoInGraphic();
-        allButtons.getChildren().addAll(viewAllLogs, manageProducts, manageOffs, editInfoButton, logout, addAuction);
+        allButtons.getChildren().addAll(viewAllLogs, manageProducts, manageOffs, editInfoButton, logout, addAuction , changeCredit);
 
         GridPane.setConstraints(pane, 0, 0);
         GridPane.setConstraints(allButtons, 3, 0);
@@ -197,6 +204,83 @@ else if (input.startsWith("GetProduct"))
         }
     }
 
+    private void handleChangeCredit() {
+        super.setPane();
+        GridPane gridPane = new GridPane();
+        Scene scene = new Scene(super.mainPane, 1000, 600);
+        scene.getStylesheets().add(new File("Data/Styles/Buttons.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/textfield.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/backgrounds.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/choicebox.css").toURI().toString());
+        super.mainPane.getStyleClass().add("admin-page");
+        gridPane.setAlignment(Pos.CENTER);
+        gridPane.setVgap(10);
+        Label status = new Label();
+
+        TextField much = new TextField();
+        much.setPromptText("amount (negative for decrease)");
+        much.getStyleClass().add("textfield.css");
+
+
+        TextField bankUsername = new TextField();
+        bankUsername.setPromptText("Bank Username");
+        bankUsername.getStyleClass().add("textfield.css");
+
+        TextField bankPassword = new TextField();
+        bankPassword.setPromptText("Bank Password");
+        bankPassword.getStyleClass().add("textfield.css");
+
+
+        TextField bankId = new TextField();
+        bankId.setPromptText("Bank Id");
+        bankId.getStyleClass().add("textfield.css");
+
+        Button edit = new Button("edit");
+        edit.getStyleClass().add("dark-blue");
+        edit.setMaxWidth(Double.MAX_VALUE);
+        edit.setOnAction(e -> {
+            try {
+                dataOutputStream.writeUTF("changeCredit " +  much.getText() + " " + bankUsername.getText() + " " + bankPassword.getText() + " " + bankId.getText());
+                dataOutputStream.flush();
+                status.setText(dataInputStream.readUTF());
+            }
+            catch (Exception ex)
+            {
+                Alert alert = new Alert(Alert.AlertType.ERROR);
+                alert.setTitle("Error");
+                alert.setHeaderText("Process Fail");
+                alert.setContentText("Wrong input for change to");
+
+                alert.showAndWait();
+            }
+        });
+        Button back = new Button("back");
+        back.getStyleClass().add("dark-blue");
+        back.setMaxWidth(Double.MAX_VALUE);
+        back.setOnAction(e -> {
+            show();
+        });
+        GridPane.setConstraints(much, 0, 1);
+        GridPane.setConstraints(bankUsername, 0 , 2);
+        GridPane.setConstraints(bankPassword, 0 , 3);
+        GridPane.setConstraints(bankId, 0 , 4);
+
+        GridPane.setConstraints(edit, 0, 5);
+        GridPane.setConstraints(back, 0, 6);
+        GridPane.setConstraints(status, 0, 7);
+        GridPane.setHalignment(edit, HPos.CENTER);
+        GridPane.setHalignment(back, HPos.CENTER);
+        GridPane.setHalignment(bankUsername, HPos.CENTER);
+
+        GridPane.setHalignment(bankPassword, HPos.CENTER);
+        GridPane.setHalignment(bankId, HPos.CENTER);
+        GridPane.setHalignment(status, HPos.CENTER);
+        gridPane.getChildren().addAll(much, bankUsername , bankPassword , bankId , edit, back, status);
+        super.mainPane.setCenter(gridPane);
+
+        Menu.window.setScene(scene);
+    }
+
     private void handleAddAuction(){
         super.setPane();
         GridPane gridPane = new GridPane();

From 59563f552efdb2a519e476651bababa9bf4558c6 Mon Sep 17 00:00:00 2001
From: Informatic <msaadat1379@gmail.com>
Date: Thu, 23 Jul 2020 23:01:10 +0430
Subject: [PATCH 05/10] redo money 4(Admin can set financial setting)

---
 .idea/workspace.xml                           | 54 ++++++++-------
 src/main/java/Controller/AccountManager.java  |  3 +-
 src/main/java/Controller/AdminManager.java    | 33 +++++++++
 src/main/java/Controller/ClientThread.java    |  4 ++
 .../java/View/Menu/AdminMenus/AdminMenu.java  | 69 ++++++++++++++++++-
 5 files changed, 134 insertions(+), 29 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 54390eb..39903c0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,9 @@
     <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Controller/AccountManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/AccountManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/WorkWithBank.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/WorkWithBank.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/SellerMenus/SellerMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/SellerMenus/SellerMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/AdminManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/AdminManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/AdminMenus/AdminMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/AdminMenus/AdminMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -369,14 +370,8 @@
       <workItem from="1593187077572" duration="84000" />
       <workItem from="1595521459852" duration="1736000" />
       <workItem from="1595523242523" duration="2349000" />
-      <workItem from="1595526605128" duration="397000" />
-    </task>
-    <task id="LOCAL-00068" summary="fix some bugs v1.5">
-      <created>1591440442743</created>
-      <option name="number" value="00068" />
-      <option name="presentableId" value="LOCAL-00068" />
-      <option name="project" value="LOCAL" />
-      <updated>1591440442743</updated>
+      <workItem from="1595526605128" duration="1775000" />
+      <workItem from="1595528419464" duration="614000" />
     </task>
     <task id="LOCAL-00069" summary="Add javafx maven dependency">
       <created>1591540407462</created>
@@ -714,7 +709,14 @@
       <option name="project" value="LOCAL" />
       <updated>1595524360748</updated>
     </task>
-    <option name="localTasksCounter" value="117" />
+    <task id="LOCAL-00117" summary="redo money 3(seller can change)">
+      <created>1595527230178</created>
+      <option name="number" value="00117" />
+      <option name="presentableId" value="LOCAL-00117" />
+      <option name="project" value="LOCAL" />
+      <updated>1595527230178</updated>
+    </task>
+    <option name="localTasksCounter" value="118" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -722,7 +724,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="small edit" />
     <MESSAGE value="make server and client system and many changes on classes" />
     <MESSAGE value="delete extra methods and classes" />
     <MESSAGE value="complete SellerMenu and SellerManager" />
@@ -747,7 +748,8 @@
     <MESSAGE value="redo money" />
     <MESSAGE value="redo money 1" />
     <MESSAGE value="redo money 2(buyer can decrease)" />
-    <option name="LAST_COMMIT_MESSAGE" value="redo money 2(buyer can decrease)" />
+    <MESSAGE value="redo money 3(seller can change)" />
+    <option name="LAST_COMMIT_MESSAGE" value="redo money 3(seller can change)" />
   </component>
   <component name="WindowStateProjectService">
     <state x="280" y="20" key="#AccountManagerTest" timestamp="1589226101281">
@@ -844,11 +846,11 @@
     </state>
     <state x="130" y="260" width="1182" height="544" key="#com.intellij.execution.junit2.states.ComparisonFailureState$DiffDialog/0.0.1366.728@0.0.1366.728" timestamp="1589918033880" />
     <state x="130" y="264" width="1182" height="552" key="#com.intellij.execution.junit2.states.ComparisonFailureState$DiffDialog/0.0.1366.738@0.0.1366.738" timestamp="1593156646580" />
-    <state x="488" y="72" key="#com.intellij.ide.util.MemberChooser" timestamp="1595189809635">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="488" y="73" key="#com.intellij.ide.util.MemberChooser" timestamp="1595527570414">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="488" y="72" key="#com.intellij.ide.util.MemberChooser/0.0.1366.728@0.0.1366.728" timestamp="1595189809635" />
-    <state x="488" y="73" key="#com.intellij.ide.util.MemberChooser/0.0.1366.738@0.0.1366.738" timestamp="1593148011683" />
+    <state x="488" y="73" key="#com.intellij.ide.util.MemberChooser/0.0.1366.738@0.0.1366.738" timestamp="1595527570414" />
     <state x="412" y="143" key="#com.intellij.ide.util.PackageChooserDialog" timestamp="1589230984213">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -888,11 +890,11 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="438" y="65" key="#xdebugger.evaluate/0.0.1366.728@0.0.1366.728" timestamp="1595501308315" />
-    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595524358232">
+    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595527228707">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="499" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1595448621930" />
-    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595524358232" />
+    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595527228707" />
     <state x="92" y="93" width="1182" height="552" key="DiffContextDialog" timestamp="1593178422199">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -902,26 +904,26 @@
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="463" y="122" key="FileChooserDialogImpl/0.0.1366.738@0.0.1366.738" timestamp="1592855183500" />
-    <state width="661" height="176" key="GridCell.Tab.0.bottom" timestamp="1595527156442">
+    <state width="661" height="176" key="GridCell.Tab.0.bottom" timestamp="1595528949205">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="661" height="176" key="GridCell.Tab.0.bottom/0.0.1366.738@0.0.1366.738" timestamp="1595527156442" />
-    <state width="661" height="176" key="GridCell.Tab.0.center" timestamp="1595527156442">
+    <state width="661" height="176" key="GridCell.Tab.0.bottom/0.0.1366.738@0.0.1366.738" timestamp="1595528949205" />
+    <state width="661" height="176" key="GridCell.Tab.0.center" timestamp="1595528949205">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="661" height="176" key="GridCell.Tab.0.center/0.0.1366.738@0.0.1366.738" timestamp="1595527156442" />
-    <state width="661" height="176" key="GridCell.Tab.0.left" timestamp="1595527156442">
+    <state width="661" height="176" key="GridCell.Tab.0.center/0.0.1366.738@0.0.1366.738" timestamp="1595528949205" />
+    <state width="661" height="176" key="GridCell.Tab.0.left" timestamp="1595528949205">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="661" height="176" key="GridCell.Tab.0.left/0.0.1366.738@0.0.1366.738" timestamp="1595527156442" />
-    <state width="661" height="176" key="GridCell.Tab.0.right" timestamp="1595527156442">
+    <state width="661" height="176" key="GridCell.Tab.0.left/0.0.1366.738@0.0.1366.738" timestamp="1595528949205" />
+    <state width="661" height="176" key="GridCell.Tab.0.right" timestamp="1595528949205">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="661" height="176" key="GridCell.Tab.0.right/0.0.1366.738@0.0.1366.738" timestamp="1595527156442" />
+    <state width="661" height="176" key="GridCell.Tab.0.right/0.0.1366.738@0.0.1366.738" timestamp="1595528949205" />
     <state width="1322" height="244" key="GridCell.Tab.1.bottom" timestamp="1595502161406">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
diff --git a/src/main/java/Controller/AccountManager.java b/src/main/java/Controller/AccountManager.java
index 7541a2c..23a4ff4 100644
--- a/src/main/java/Controller/AccountManager.java
+++ b/src/main/java/Controller/AccountManager.java
@@ -123,7 +123,8 @@ public String changeCredit(Account account , int much , String bankUsername , St
             }
         }
         else if (account instanceof SellerAccount){
-//            doish
+            if (account.getCredit() + much < AdminManager.getMinimumValue())
+                return "Not enough money";
             res = WorkWithBank.decreaseCredit(-much , bankUsername , bankPassword, bankId);
             if (res.equalsIgnoreCase("done successfully")){
                 account.setCredit(account.getCredit() + much);
diff --git a/src/main/java/Controller/AdminManager.java b/src/main/java/Controller/AdminManager.java
index 937d858..9d45d06 100644
--- a/src/main/java/Controller/AdminManager.java
+++ b/src/main/java/Controller/AdminManager.java
@@ -15,6 +15,39 @@
 import java.util.ArrayList;
 
 public class AdminManager {
+    private static int commission = 5 ;
+    private static int minimumValue = 100;
+
+    public static int getCommission() {
+        return commission;
+    }
+
+    public static void setCommission(int commission) {
+        AdminManager.commission = commission;
+    }
+
+    public static int getMinimumValue() {
+        return minimumValue;
+    }
+
+    public static void setMinimumValue(int minimumValue) {
+        AdminManager.minimumValue = minimumValue;
+    }
+
+    public String changeFinancialSetting(String field, String changTo){
+        if (field.equalsIgnoreCase("minimumValue")){
+            setMinimumValue(Integer.parseInt(changTo));
+            return "Done" ;
+        }
+        else if (field.equalsIgnoreCase("commission")){
+            if (Integer.parseInt(changTo) > 100)
+                return "Should be less than 100" ;
+            setCommission(Integer.parseInt(changTo));
+            return "Done";
+        }
+        else
+            return "Invalid field";
+    }
 
     public String showAccountWithUsername(String username) {
         Account account = Database.getAccountByUsername(username);
diff --git a/src/main/java/Controller/ClientThread.java b/src/main/java/Controller/ClientThread.java
index a6b999b..9a5b157 100644
--- a/src/main/java/Controller/ClientThread.java
+++ b/src/main/java/Controller/ClientThread.java
@@ -418,6 +418,10 @@ else if (input.startsWith("changeCredit")){
                     details = input.split(" ");
                     output = accountManager.changeCredit(account , Integer.parseInt(details[1]), details[2] , details[3], details[4]);
                 }
+                else if (input.startsWith("changeFinancialSetting")){
+                    details = input.split(" ");
+                    output = adminManager.changeFinancialSetting(details[1] , details[2]);
+                }
                 else if (input.startsWith("Exit"))
                 {
                     clientSocket.close();
diff --git a/src/main/java/View/Menu/AdminMenus/AdminMenu.java b/src/main/java/View/Menu/AdminMenus/AdminMenu.java
index 1630607..2c8d4d2 100644
--- a/src/main/java/View/Menu/AdminMenus/AdminMenu.java
+++ b/src/main/java/View/Menu/AdminMenus/AdminMenu.java
@@ -99,6 +99,10 @@ public void show() {
         manageAddAdmin.getStyleClass().add("dark-blue");
         manageAddAdmin.setMaxWidth(Double.MAX_VALUE);
 
+        Button changeFinancialSetting = new Button("Financial Setting");
+        changeFinancialSetting.setOnAction(e -> handleChangeFinancialSetting());
+        changeFinancialSetting.getStyleClass().add("dark-blue");
+        changeFinancialSetting.setMaxWidth(Double.MAX_VALUE);
 
         GridPane.setConstraints(editInfoButton, 0, 0);
         GridPane.setConstraints(manageUser, 0, 1);
@@ -108,7 +112,8 @@ public void show() {
         GridPane.setConstraints(manageCategories, 0, 5);
         GridPane.setConstraints(manageDiscounts, 0, 6);
         GridPane.setConstraints(manageAddAdmin, 0, 7);
-        GridPane.setConstraints(logout, 0, 8);
+        GridPane.setConstraints(changeFinancialSetting, 0, 8);
+        GridPane.setConstraints(logout, 0, 9);
         GridPane.setHalignment(editInfoButton, HPos.CENTER);
         GridPane.setHalignment(manageUser, HPos.CENTER);
         GridPane.setHalignment(onlineUser, HPos.CENTER);
@@ -118,8 +123,9 @@ public void show() {
         GridPane.setHalignment(manageDiscounts, HPos.CENTER);
         GridPane.setHalignment(manageAddAdmin, HPos.CENTER);
         GridPane.setHalignment(logout, HPos.CENTER);
+        GridPane.setHalignment(changeFinancialSetting, HPos.CENTER);
 
-        allButtons.getChildren().addAll(editInfoButton, manageUser, manageRequest, manageProduct, manageCategories, manageDiscounts, manageAddAdmin, logout, onlineUser);
+        allButtons.getChildren().addAll(editInfoButton, manageUser, manageRequest, manageProduct, manageCategories, manageDiscounts, manageAddAdmin, logout, onlineUser, changeFinancialSetting);
 
         try {
             dataOutputStream.writeUTF("GetLoggedAccount");
@@ -160,6 +166,65 @@ else if (role.equalsIgnoreCase("Buyer"))
         window.setScene(scene);
     }
 
+    private void handleChangeFinancialSetting()
+    {
+            super.setPane();
+            GridPane gridPane = new GridPane();
+            Scene scene = new Scene(super.mainPane, 1000, 600);
+            scene.getStylesheets().add(new File("Data/Styles/Buttons.css").toURI().toString());
+            scene.getStylesheets().add(new File("Data/Styles/textfield.css").toURI().toString());
+            scene.getStylesheets().add(new File("Data/Styles/backgrounds.css").toURI().toString());
+            scene.getStylesheets().add(new File("Data/Styles/choicebox.css").toURI().toString());
+            super.mainPane.getStyleClass().add("admin-page");
+            gridPane.setAlignment(Pos.CENTER);
+            gridPane.setVgap(10);
+            Label status = new Label();
+            ChoiceBox<String> field = new ChoiceBox<>();
+            field.getItems().addAll("minimumValue" , "commission");
+            field.setValue("minimumValue");
+            field.getStyleClass().add("choice-box");
+            TextField changeTo = new TextField();
+            changeTo.setPromptText("change to");
+            changeTo.getStyleClass().add("textfield.css");
+            Button edit = new Button("edit");
+            edit.getStyleClass().add("dark-blue");
+            edit.setMaxWidth(Double.MAX_VALUE);
+            edit.setOnAction(e -> {
+                try {
+                    dataOutputStream.writeUTF("changeFinancialSetting " + field.getValue() + " " + changeTo.getText());
+                    dataOutputStream.flush();
+                    status.setText(dataInputStream.readUTF());
+                }
+                catch (Exception ex)
+                {
+                    Alert alert = new Alert(Alert.AlertType.ERROR);
+                    alert.setTitle("Error");
+                    alert.setHeaderText("Process Fail");
+                    alert.setContentText("Wrong input");
+
+                    alert.showAndWait();
+                }
+            });
+            Button back = new Button("back");
+            back.getStyleClass().add("dark-blue");
+            back.setMaxWidth(Double.MAX_VALUE);
+            back.setOnAction(e -> show());
+            GridPane.setConstraints(field, 0, 0 );
+            GridPane.setConstraints(changeTo, 0, 1);
+            GridPane.setConstraints(edit, 0, 2);
+            GridPane.setConstraints(back, 0, 3);
+            GridPane.setConstraints(status, 0, 4);
+            GridPane.setHalignment(edit, HPos.CENTER);
+            GridPane.setHalignment(back, HPos.CENTER);
+            GridPane.setHalignment(field, HPos.CENTER);
+            GridPane.setHalignment(status, HPos.CENTER);
+            gridPane.getChildren().addAll(field, changeTo, edit, back, status);
+            super.mainPane.setCenter(gridPane);
+
+            Menu.window.setScene(scene);
+        }
+
+
     public void handleEdit()
     {
         super.setPane();

From bee67a901b6fc78d64234da8f400a04b55cafdc2 Mon Sep 17 00:00:00 2001
From: Informatic <msaadat1379@gmail.com>
Date: Thu, 23 Jul 2020 23:18:22 +0430
Subject: [PATCH 06/10] redo money 5

---
 .idea/workspace.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 39903c0..974ee80 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -890,11 +890,11 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="438" y="65" key="#xdebugger.evaluate/0.0.1366.728@0.0.1366.728" timestamp="1595501308315" />
-    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595527228707">
+    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595530076990">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="499" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1595448621930" />
-    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595527228707" />
+    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595530076990" />
     <state x="92" y="93" width="1182" height="552" key="DiffContextDialog" timestamp="1593178422199">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -962,10 +962,10 @@
     </state>
     <state x="184" y="0" key="SettingsEditor/0.0.1366.728@0.0.1366.728" timestamp="1594551371835" />
     <state x="184" y="0" key="SettingsEditor/0.0.1366.738@0.0.1366.738" timestamp="1591433792246" />
-    <state x="470" y="83" key="VCS.ChangeListViewerDialog" timestamp="1595521367658">
+    <state x="470" y="83" key="VCS.ChangeListViewerDialog" timestamp="1595530062886">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
-    <state x="470" y="83" key="VCS.ChangeListViewerDialog/0.0.1366.738@0.0.1366.738" timestamp="1595521367658" />
+    <state x="470" y="83" key="VCS.ChangeListViewerDialog/0.0.1366.738@0.0.1366.738" timestamp="1595530062886" />
     <state x="275" y="95" key="Vcs.Push.Dialog.v2" timestamp="1595246035246">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
@@ -979,11 +979,11 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="378" y="186" key="com.intellij.ide.util.TipDialog/0.0.1366.728@0.0.1366.728" timestamp="1595497346786" />
-    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1595521360851">
+    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1595530055377">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="492" y="279" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.728@0.0.1366.728" timestamp="1595409531168" />
-    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.738@0.0.1366.738" timestamp="1595521360851" />
+    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.738@0.0.1366.738" timestamp="1595530055377" />
     <state x="380" y="100" width="737" height="606" key="find.popup" timestamp="1593190820824">
       <screen x="0" y="0" width="1366" height="728" />
     </state>

From 6c239dd3de68ecf6f3c9f3a73c255e9008a37ad5 Mon Sep 17 00:00:00 2001
From: Informatic <msaadat1379@gmail.com>
Date: Thu, 23 Jul 2020 23:24:19 +0430
Subject: [PATCH 07/10] redo money 6

---
 Data/IDs/Id.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/IDs/Id.json b/Data/IDs/Id.json
index 0704e93..2cae1d8 100644
--- a/Data/IDs/Id.json
+++ b/Data/IDs/Id.json
@@ -1 +1 @@
-[17,24,5,5,9]
\ No newline at end of file
+[25,26,5,5,10]
\ No newline at end of file

From 419b294cbf6622e070dc34289e7865d1eff47fde Mon Sep 17 00:00:00 2001
From: Informatic <msaadat1379@gmail.com>
Date: Thu, 23 Jul 2020 23:29:07 +0430
Subject: [PATCH 08/10] redo money 7

---
 .idea/workspace.xml                   | 7 ++-----
 Data/IDs/Id.json                      | 2 +-
 Data/Products/Categories.json         | 2 +-
 Data/Requests/NewProductRequests.json | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 974ee80..019b47d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/AccountManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/AccountManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/AdminManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/AdminManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/AdminMenus/AdminMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/AdminMenus/AdminMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Data/IDs/Id.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/IDs/Id.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Data/Requests/NewProductRequests.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Requests/NewProductRequests.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/Data/IDs/Id.json b/Data/IDs/Id.json
index 2cae1d8..0704e93 100644
--- a/Data/IDs/Id.json
+++ b/Data/IDs/Id.json
@@ -1 +1 @@
-[25,26,5,5,10]
\ No newline at end of file
+[17,24,5,5,9]
\ No newline at end of file
diff --git a/Data/Products/Categories.json b/Data/Products/Categories.json
index 7c9e939..c2b411b 100644
--- a/Data/Products/Categories.json
+++ b/Data/Products/Categories.json
@@ -1 +1 @@
-[{"name":"cleaning","feature":"clean","allSubCategoryNames":["shampoo"],"parent":"null","allProductIds":[3,4,7]},{"name":"shampoo","feature":"sar","allSubCategoryNames":[],"parent":"cleaning","allProductIds":[1]}]
\ No newline at end of file
+[{"name":"cleaning","feature":"clean","allSubCategoryNames":["shampoo"],"parent":"null","allProductIds":[3,4,7,9]},{"name":"shampoo","feature":"sar","allSubCategoryNames":[],"parent":"cleaning","allProductIds":[1]}]
\ No newline at end of file
diff --git a/Data/Requests/NewProductRequests.json b/Data/Requests/NewProductRequests.json
index 0637a08..2d4a650 100644
--- a/Data/Requests/NewProductRequests.json
+++ b/Data/Requests/NewProductRequests.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[{"status":"Greate","name":"TextFile","sellerUsername":"Seller","available":true,"number":5,"description":"GoodProduct","categoryName":"nothing","price":10,"hasFile":true,"address":"Data/test.txt","id":24}]
\ No newline at end of file

From d54da51d3f86077b77fe6fa95bff6545ccecc558 Mon Sep 17 00:00:00 2001
From: Informatic <msaadat1379@gmail.com>
Date: Thu, 23 Jul 2020 23:31:16 +0430
Subject: [PATCH 09/10] redo money 8

---
 .idea/workspace.xml | 4 ++--
 Data/IDs/Id.json    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 019b47d..648cd34 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -887,11 +887,11 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="438" y="65" key="#xdebugger.evaluate/0.0.1366.728@0.0.1366.728" timestamp="1595501308315" />
-    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595530076990">
+    <state x="470" y="0" key="CommitChangelistDialog2" timestamp="1595530857490">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="499" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1595448621930" />
-    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595530076990" />
+    <state x="470" y="0" key="CommitChangelistDialog2/0.0.1366.738@0.0.1366.738" timestamp="1595530857490" />
     <state x="92" y="93" width="1182" height="552" key="DiffContextDialog" timestamp="1593178422199">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
diff --git a/Data/IDs/Id.json b/Data/IDs/Id.json
index 0704e93..2cae1d8 100644
--- a/Data/IDs/Id.json
+++ b/Data/IDs/Id.json
@@ -1 +1 @@
-[17,24,5,5,9]
\ No newline at end of file
+[25,26,5,5,10]
\ No newline at end of file

From be3b450e90b3d6d642d6dcd43d55a82e22ec5576 Mon Sep 17 00:00:00 2001
From: Informatic <msaadat1379@gmail.com>
Date: Thu, 23 Jul 2020 23:48:52 +0430
Subject: [PATCH 10/10] redo money 10

---
 .idea/workspace.xml                           | 90 ++++++++++---------
 Data/Accounts/Buyers.json                     |  2 +-
 src/main/java/Controller/ClientThread.java    |  8 ++
 .../View/Menu/SellerMenus/SellerMenu.java     | 88 +++++++++++++++++-
 4 files changed, 143 insertions(+), 45 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 08118b6..34f23d3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,17 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Data/test.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Data/Accounts/Buyers.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Accounts/Buyers.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/Accounts/Sellers.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Accounts/Sellers.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/IDs/Id.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/IDs/Id.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/Products/Categories.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Products/Categories.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/Products/Products.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Products/Products.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/Requests/NewProductRequests.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Requests/NewProductRequests.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/Server.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/Server.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/SellerMenus/SellerMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/SellerMenus/SellerMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -100,7 +92,7 @@
   <component name="RunManager" selected="Application.Client">
     <configuration name="Client" type="Application" factoryName="Application" singleton="false" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Client" />
-      <module name="Project" />
+      <module name="Project-2" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -114,7 +106,7 @@
     </configuration>
     <configuration name="Server" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Controller.Server" />
-      <module name="Project" />
+      <module name="Project-2" />
       <extension name="coverage">
         <pattern>
           <option name="PATTERN" value="Controller.*" />
@@ -375,6 +367,7 @@
       <workItem from="1593177955371" duration="115000" />
       <workItem from="1593178150008" duration="253000" />
       <workItem from="1593187077572" duration="84000" />
+      <workItem from="1595531161992" duration="739000" />
     </task>
     <task id="LOCAL-00065" summary="complete FilteringMenu">
       <created>1589886526890</created>
@@ -800,6 +793,10 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="280" y="0" key="#All_in_Project-2_(1)/0.0.1366.728@0.0.1366.728" timestamp="1593165627201" />
+    <state x="400" y="26" key="#Client" timestamp="1595531628297">
+      <screen x="0" y="0" width="1366" height="738" />
+    </state>
+    <state x="400" y="26" key="#Client/0.0.1366.738@0.0.1366.738" timestamp="1595531628297" />
     <state x="275" y="26" key="#Inspections" timestamp="1591540003920">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -823,6 +820,10 @@
     </state>
     <state x="280" y="29" key="#SellerAccountTest/0.0.1366.728@0.0.1366.728" timestamp="1589388895849" />
     <state x="280" y="29" key="#SellerAccountTest/0.0.1366.738@0.0.1366.738" timestamp="1589400111089" />
+    <state x="400" y="26" key="#Server" timestamp="1595531613500">
+      <screen x="0" y="0" width="1366" height="738" />
+    </state>
+    <state x="400" y="26" key="#Server/0.0.1366.738@0.0.1366.738" timestamp="1595531613500" />
     <state x="280" y="0" key="#Temp_suite" timestamp="1589228140962">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -899,26 +900,26 @@
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="463" y="122" key="FileChooserDialogImpl/0.0.1366.738@0.0.1366.738" timestamp="1592855183500" />
-    <state width="1322" height="174" key="GridCell.Tab.0.bottom" timestamp="1595502246975">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="661" height="176" key="GridCell.Tab.0.bottom" timestamp="1595531628573">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="1322" height="185" key="GridCell.Tab.0.bottom/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
-    <state width="1322" height="174" key="GridCell.Tab.0.center" timestamp="1595502246975">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="661" height="176" key="GridCell.Tab.0.bottom/0.0.1366.738@0.0.1366.738" timestamp="1595531628573" />
+    <state width="661" height="176" key="GridCell.Tab.0.center" timestamp="1595531628573">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="1322" height="185" key="GridCell.Tab.0.center/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
-    <state width="1322" height="174" key="GridCell.Tab.0.left" timestamp="1595502246975">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="661" height="176" key="GridCell.Tab.0.center/0.0.1366.738@0.0.1366.738" timestamp="1595531628573" />
+    <state width="661" height="176" key="GridCell.Tab.0.left" timestamp="1595531628573">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="1322" height="185" key="GridCell.Tab.0.left/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
-    <state width="1322" height="174" key="GridCell.Tab.0.right" timestamp="1595502246975">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="661" height="176" key="GridCell.Tab.0.left/0.0.1366.738@0.0.1366.738" timestamp="1595531628573" />
+    <state width="661" height="176" key="GridCell.Tab.0.right" timestamp="1595531628573">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state width="1322" height="174" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1595502246975" />
-    <state width="1322" height="185" key="GridCell.Tab.0.right/0.0.1366.738@0.0.1366.738" timestamp="1593178427051" />
+    <state width="661" height="176" key="GridCell.Tab.0.right/0.0.1366.738@0.0.1366.738" timestamp="1595531628573" />
     <state width="1322" height="244" key="GridCell.Tab.1.bottom" timestamp="1595502161406">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
@@ -944,10 +945,15 @@
     </state>
     <state x="213" y="22" key="Maven.ArtifactSearchDialog/0.0.1366.728@0.0.1366.728" timestamp="1589017820205" />
     <state x="213" y="22" key="Maven.ArtifactSearchDialog/0.0.1366.738@0.0.1366.738" timestamp="1587804864740" />
-    <state x="395" y="78" key="MultipleFileMergeDialog" timestamp="1595409550298">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="129" y="50" key="MergeDialog" timestamp="1595531358100">
+      <screen x="0" y="0" width="1366" height="738" />
+    </state>
+    <state x="129" y="50" key="MergeDialog/0.0.1366.738@0.0.1366.738" timestamp="1595531358100" />
+    <state x="395" y="79" key="MultipleFileMergeDialog" timestamp="1595531358104">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="395" y="78" key="MultipleFileMergeDialog/0.0.1366.728@0.0.1366.728" timestamp="1595409550298" />
+    <state x="395" y="79" key="MultipleFileMergeDialog/0.0.1366.738@0.0.1366.738" timestamp="1595531358104" />
     <state x="348" y="66" key="NewModule_or_Project.wizard" timestamp="1590740672995">
       <screen x="0" y="0" width="1366" height="738" />
     </state>
@@ -970,11 +976,11 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="378" y="186" key="com.intellij.ide.util.TipDialog/0.0.1366.728@0.0.1366.728" timestamp="1595497346786" />
-    <state x="492" y="279" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1595409531168">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1595531597851">
+      <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="492" y="279" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.728@0.0.1366.728" timestamp="1595409531168" />
-    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.738@0.0.1366.738" timestamp="1593112595135" />
+    <state x="492" y="283" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1366.738@0.0.1366.738" timestamp="1595531597851" />
     <state x="380" y="100" width="737" height="606" key="find.popup" timestamp="1593190820824">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
@@ -1013,48 +1019,48 @@
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest_sendEditProductRequestTest1.ic" NAME="SellerManagerTest.sendEditProductRequestTest1 Coverage Results" MODIFIED="1589580324813" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
-      <FILTER>ControllerTest.*</FILTER>
-    </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest.ic" NAME="SellerManagerTest Coverage Results" MODIFIED="1589580271799" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project$AccountManagerTest.ic" NAME="AccountManagerTest Coverage Results" MODIFIED="1588943574745" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
     <SUITE FILE_PATH="coverage/Project_team_53$AccountTest.ic" NAME="AccountTest Coverage Results" MODIFIED="1589230660323" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
+    <SUITE FILE_PATH="coverage/Project$SellerAccountTest.ic" NAME="SellerAccountTest Coverage Results" MODIFIED="1589388843464" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+      <FILTER>ModelTest.*</FILTER>
+    </SUITE>
+    <SUITE FILE_PATH="coverage/Project_2$Main.ic" NAME="Main Coverage Results" MODIFIED="1589874331120" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
     <SUITE FILE_PATH="coverage/Project_team_53$AccountManagerTest_registerTest1.ic" NAME="AccountManagerTest.registerTest1 Coverage Results" MODIFIED="1589228895297" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
       <FILTER>*</FILTER>
     </SUITE>
+    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2__1_.ic" NAME="All in Project-2 (1) Coverage Results" MODIFIED="1593158770773" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
     <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest_showAccountWithUsernameTest.ic" NAME="AdminManagerTest.showAccountWithUsernameTest Coverage Results" MODIFIED="1589226667004" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest_showRequestWithIDTest.ic" NAME="AdminManagerTest.showRequestWithIDTest Coverage Results" MODIFIED="1589226973100" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest_sendDeleteProductTest1.ic" NAME="SellerManagerTest.sendDeleteProductTest1 Coverage Results" MODIFIED="1589580219781" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2__1_.ic" NAME="All in Project-2 (1) Coverage Results" MODIFIED="1593158770773" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
     <SUITE FILE_PATH="coverage/Project_team_53$AccountManagerTest.ic" NAME="AccountManagerTest Coverage Results" MODIFIED="1589229190334" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project$AccountManagerTest.ic" NAME="AccountManagerTest Coverage Results" MODIFIED="1588943574745" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project$AllProductManagerTest.ic" NAME="AllProductManagerTest Coverage Results" MODIFIED="1589544649151" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest.ic" NAME="AdminManagerTest Coverage Results" MODIFIED="1589226535228" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2.ic" NAME="All in Project-2 Coverage Results" MODIFIED="1593010274041" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest_showRequestWithIDTest.ic" NAME="AdminManagerTest.showRequestWithIDTest Coverage Results" MODIFIED="1589226973100" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_team_53$ControllerTest_in_Project_team_53.ic" NAME="ControllerTest in Project_team-53 Coverage Results" MODIFIED="1589568222105" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest.ic" NAME="AdminManagerTest Coverage Results" MODIFIED="1589226535228" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$Main.ic" NAME="Main Coverage Results" MODIFIED="1589874331120" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-    <SUITE FILE_PATH="coverage/Project$AllProductManagerTest.ic" NAME="AllProductManagerTest Coverage Results" MODIFIED="1589544649151" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest.ic" NAME="SellerManagerTest Coverage Results" MODIFIED="1589580271799" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
     <SUITE FILE_PATH="coverage/Project$All_in_Project.ic" NAME="All in Project Coverage Results" MODIFIED="1589921803728" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-    <SUITE FILE_PATH="coverage/Project$SellerAccountTest.ic" NAME="SellerAccountTest Coverage Results" MODIFIED="1589388843464" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
-      <FILTER>ModelTest.*</FILTER>
+    <SUITE FILE_PATH="coverage/Project_team_53$ControllerTest_in_Project_team_53.ic" NAME="ControllerTest in Project_team-53 Coverage Results" MODIFIED="1589568222105" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+      <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2.ic" NAME="All in Project-2 Coverage Results" MODIFIED="1593010274041" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest_sendDeleteProductTest1.ic" NAME="SellerManagerTest.sendDeleteProductTest1 Coverage Results" MODIFIED="1589580219781" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest_sendEditProductRequestTest1.ic" NAME="SellerManagerTest.sendEditProductRequestTest1 Coverage Results" MODIFIED="1589580324813" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
   </component>
diff --git a/Data/Accounts/Buyers.json b/Data/Accounts/Buyers.json
index 9606be0..d8d7319 100644
--- a/Data/Accounts/Buyers.json
+++ b/Data/Accounts/Buyers.json
@@ -1 +1 @@
-[{"buyLogs":[{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:28:48","price":12,"deliveryStatus":"preparing...","logId":1,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:34:00","price":12,"deliveryStatus":"preparing...","logId":2,"productId":4},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 10:56:44","price":123,"deliveryStatus":"preparing...","logId":3,"productId":3},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 10:57:58","price":123,"deliveryStatus":"preparing...","logId":4,"productId":3},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:58:22","price":12,"deliveryStatus":"preparing...","logId":5,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:58:50","price":123,"deliveryStatus":"preparing...","logId":6,"productId":3},{"discountValue":12,"sellerUsername":"saleman","date":"2020/06/26 11:14:40","price":12,"deliveryStatus":"preparing...","logId":7,"productId":4},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 11:16:31","price":123,"deliveryStatus":"preparing...","logId":8,"productId":3},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/26 12:35:52","price":10,"deliveryStatus":"preparing...","logId":9,"productId":7},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 14:32:45","price":12,"deliveryStatus":"preparing...","logId":10,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 16:20:40","price":12,"deliveryStatus":"preparing...","logId":11,"productId":2},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 16:24:14","price":123,"deliveryStatus":"preparing...","logId":12,"productId":3},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/29 10:39:49","price":15,"deliveryStatus":"preparing...","logId":13,"productId":8},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/29 10:57:55","price":10,"deliveryStatus":"preparing...","logId":14,"productId":7},{"discountValue":24,"sellerUsername":"saleman","date":"2020/06/29 11:06:24","price":123,"deliveryStatus":"preparing...","logId":15,"productId":3},{"discountValue":24,"sellerUsername":"saleman","date":"2020/06/29 11:08:57","price":123,"deliveryStatus":"preparing...","logId":16,"productId":3},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 14:49:19","price":10,"deliveryStatus":"preparing...","logId":17,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 14:52:11","price":10,"deliveryStatus":"preparing...","logId":18,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:04:43","price":10,"deliveryStatus":"preparing...","logId":19,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:08:29","price":10,"deliveryStatus":"preparing...","logId":20,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:16:34","price":10,"deliveryStatus":"preparing...","logId":21,"productId":9}],"discountIds":[1,2,3,4],"numberOfUse":{"1":0,"2":2,"3":2,"4":2},"cart":{"productsID":[],"muchOfProductID":{}},"username":"Buyer","firstName":"Buyer","lastName":"Buyer","password":"Buyer","email":"Buye@gmail.com","phoneNumber":"021","credit":8761},{"buyLogs":[{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:22:32","price":10,"deliveryStatus":"preparing...","logId":22,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:30:19","price":10,"deliveryStatus":"preparing...","logId":23,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:33:31","price":10,"deliveryStatus":"preparing...","logId":24,"productId":9}],"discountIds":[1,2,4],"numberOfUse":{"1":0,"2":0,"4":0},"cart":{"productsID":[],"muchOfProductID":{}},"username":"parham","firstName":"parham","lastName":"chavoshian","password":"parham","email":"parham@gmail.com","phoneNumber":"021","credit":99970},{"buyLogs":[],"discountIds":[],"numberOfUse":{},"cart":{"productsID":[],"muchOfProductID":{}},"username":"milad","firstName":"milad","lastName":"saadat","password":"salam","email":"m@gmail.com","phoneNumber":"1231","credit":12312}]
\ No newline at end of file
+[{"buyLogs":[{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:28:48","price":12,"deliveryStatus":"preparing...","logId":1,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:34:00","price":12,"deliveryStatus":"preparing...","logId":2,"productId":4},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 10:56:44","price":123,"deliveryStatus":"preparing...","logId":3,"productId":3},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 10:57:58","price":123,"deliveryStatus":"preparing...","logId":4,"productId":3},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:58:22","price":12,"deliveryStatus":"preparing...","logId":5,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 10:58:50","price":123,"deliveryStatus":"preparing...","logId":6,"productId":3},{"discountValue":12,"sellerUsername":"saleman","date":"2020/06/26 11:14:40","price":12,"deliveryStatus":"preparing...","logId":7,"productId":4},{"discountValue":123,"sellerUsername":"saleman","date":"2020/06/26 11:16:31","price":123,"deliveryStatus":"preparing...","logId":8,"productId":3},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/26 12:35:52","price":10,"deliveryStatus":"preparing...","logId":9,"productId":7},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 14:32:45","price":12,"deliveryStatus":"preparing...","logId":10,"productId":4},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 16:20:40","price":12,"deliveryStatus":"preparing...","logId":11,"productId":2},{"discountValue":0,"sellerUsername":"saleman","date":"2020/06/26 16:24:14","price":123,"deliveryStatus":"preparing...","logId":12,"productId":3},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/29 10:39:49","price":15,"deliveryStatus":"preparing...","logId":13,"productId":8},{"discountValue":0,"sellerUsername":"Seller","date":"2020/06/29 10:57:55","price":10,"deliveryStatus":"preparing...","logId":14,"productId":7},{"discountValue":24,"sellerUsername":"saleman","date":"2020/06/29 11:06:24","price":123,"deliveryStatus":"preparing...","logId":15,"productId":3},{"discountValue":24,"sellerUsername":"saleman","date":"2020/06/29 11:08:57","price":123,"deliveryStatus":"preparing...","logId":16,"productId":3},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 14:49:19","price":10,"deliveryStatus":"preparing...","logId":17,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 14:52:11","price":10,"deliveryStatus":"preparing...","logId":18,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:04:43","price":10,"deliveryStatus":"preparing...","logId":19,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:08:29","price":10,"deliveryStatus":"preparing...","logId":20,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:16:34","price":10,"deliveryStatus":"preparing...","logId":21,"productId":9}],"discountIds":[1,2,3,4],"numberOfUse":{"1":0,"2":2,"3":2,"4":2},"cart":{"productsID":[],"muchOfProductID":{}},"username":"Buyer","firstName":"Buyer","lastName":"Buyer","password":"Buyer","email":"Buye@gmail.com","phoneNumber":"021","credit":8961},{"buyLogs":[{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:22:32","price":10,"deliveryStatus":"preparing...","logId":22,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:30:19","price":10,"deliveryStatus":"preparing...","logId":23,"productId":9},{"discountValue":0,"sellerUsername":"Seller","date":"2020/07/23 15:33:31","price":10,"deliveryStatus":"preparing...","logId":24,"productId":9}],"discountIds":[1,2,4],"numberOfUse":{"1":0,"2":0,"4":0},"cart":{"productsID":[],"muchOfProductID":{}},"username":"parham","firstName":"parham","lastName":"chavoshian","password":"parham","email":"parham@gmail.com","phoneNumber":"021","credit":99970},{"buyLogs":[],"discountIds":[],"numberOfUse":{},"cart":{"productsID":[],"muchOfProductID":{}},"username":"milad","firstName":"milad","lastName":"saadat","password":"salam","email":"m@gmail.com","phoneNumber":"1231","credit":12312}]
\ No newline at end of file
diff --git a/src/main/java/Controller/ClientThread.java b/src/main/java/Controller/ClientThread.java
index 31fa3bd..9a5b157 100644
--- a/src/main/java/Controller/ClientThread.java
+++ b/src/main/java/Controller/ClientThread.java
@@ -414,6 +414,14 @@ else if (input.startsWith("PrOfCart"))
                     }
                     output = new Gson().toJson(allProducts);
                 }
+                else if (input.startsWith("changeCredit")){
+                    details = input.split(" ");
+                    output = accountManager.changeCredit(account , Integer.parseInt(details[1]), details[2] , details[3], details[4]);
+                }
+                else if (input.startsWith("changeFinancialSetting")){
+                    details = input.split(" ");
+                    output = adminManager.changeFinancialSetting(details[1] , details[2]);
+                }
                 else if (input.startsWith("Exit"))
                 {
                     clientSocket.close();
diff --git a/src/main/java/View/Menu/SellerMenus/SellerMenu.java b/src/main/java/View/Menu/SellerMenus/SellerMenu.java
index 676fc88..728f383 100644
--- a/src/main/java/View/Menu/SellerMenus/SellerMenu.java
+++ b/src/main/java/View/Menu/SellerMenus/SellerMenu.java
@@ -87,6 +87,11 @@ public void run() {
         editInfoButton.setMaxWidth(Double.MAX_VALUE);
         editInfoButton.setOnAction(e -> handleEdit());
 
+        Button changeCredit = new Button("Change Credit");
+        changeCredit.getStyleClass().add("dark-blue");
+        changeCredit.setMaxWidth(Double.MAX_VALUE);
+        changeCredit.setOnAction(e -> handleChangeCredit());
+
         Button logout = new Button("Logout");
         logout.getStyleClass().add("dark-blue");
         logout.setMaxWidth(Double.MAX_VALUE);
@@ -97,7 +102,8 @@ public void run() {
         GridPane.setConstraints(manageOffs, 0, 2);
         GridPane.setConstraints(editInfoButton, 0, 3);
         GridPane.setConstraints(addAuction, 0, 4);
-        GridPane.setConstraints(logout, 0, 5);
+        GridPane.setConstraints(changeCredit ,  0 , 5);
+        GridPane.setConstraints(logout, 0, 6);
 
         GridPane.setHalignment(viewAllLogs, HPos.CENTER);
         GridPane.setHalignment(manageProducts, HPos.CENTER);
@@ -105,6 +111,7 @@ public void run() {
         GridPane.setHalignment(editInfoButton, HPos.CENTER);
         GridPane.setHalignment(logout, HPos.CENTER);
         GridPane.setHalignment(addAuction, HPos.CENTER);
+        GridPane.setHalignment(changeCredit, HPos.CENTER);
 
         try {
             dataOutputStream.writeUTF("GetLoggedAccount");
@@ -133,7 +140,7 @@ else if (role.equalsIgnoreCase("Buyer"))
             System.out.println(e.getMessage());
         }
         Pane pane = Objects.requireNonNull(Menu.account).viewPersonalInfoInGraphic();
-        allButtons.getChildren().addAll(viewAllLogs, manageProducts, manageOffs, editInfoButton, logout, addAuction);
+        allButtons.getChildren().addAll(viewAllLogs, manageProducts, manageOffs, editInfoButton, logout, addAuction, changeCredit);
 
         GridPane.setConstraints(pane, 0, 0);
         GridPane.setConstraints(allButtons, 3, 0);
@@ -196,6 +203,83 @@ else if (input.startsWith("GetProduct"))
             e.printStackTrace();
         }
     }
+    private void handleChangeCredit() {
+        super.setPane();
+        GridPane gridPane = new GridPane();
+        Scene scene = new Scene(super.mainPane, 1000, 600);
+        scene.getStylesheets().add(new File("Data/Styles/Buttons.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/textfield.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/backgrounds.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/choicebox.css").toURI().toString());
+        super.mainPane.getStyleClass().add("admin-page");
+        gridPane.setAlignment(Pos.CENTER);
+        gridPane.setVgap(10);
+        Label status = new Label();
+
+        TextField much = new TextField();
+        much.setPromptText("amount (negative for decrease)");
+        much.getStyleClass().add("textfield.css");
+
+
+        TextField bankUsername = new TextField();
+        bankUsername.setPromptText("Bank Username");
+        bankUsername.getStyleClass().add("textfield.css");
+
+        TextField bankPassword = new TextField();
+        bankPassword.setPromptText("Bank Password");
+        bankPassword.getStyleClass().add("textfield.css");
+
+
+        TextField bankId = new TextField();
+        bankId.setPromptText("Bank Id");
+        bankId.getStyleClass().add("textfield.css");
+
+        Button edit = new Button("edit");
+        edit.getStyleClass().add("dark-blue");
+        edit.setMaxWidth(Double.MAX_VALUE);
+        edit.setOnAction(e -> {
+            try {
+                dataOutputStream.writeUTF("changeCredit " +  much.getText() + " " + bankUsername.getText() + " " + bankPassword.getText() + " " + bankId.getText());
+                dataOutputStream.flush();
+                status.setText(dataInputStream.readUTF());
+            }
+            catch (Exception ex)
+            {
+                Alert alert = new Alert(Alert.AlertType.ERROR);
+                alert.setTitle("Error");
+                alert.setHeaderText("Process Fail");
+                alert.setContentText("Wrong input for change to");
+
+                alert.showAndWait();
+            }
+        });
+        Button back = new Button("back");
+        back.getStyleClass().add("dark-blue");
+        back.setMaxWidth(Double.MAX_VALUE);
+        back.setOnAction(e -> {
+            show();
+        });
+        GridPane.setConstraints(much, 0, 1);
+        GridPane.setConstraints(bankUsername, 0 , 2);
+        GridPane.setConstraints(bankPassword, 0 , 3);
+        GridPane.setConstraints(bankId, 0 , 4);
+
+        GridPane.setConstraints(edit, 0, 5);
+        GridPane.setConstraints(back, 0, 6);
+        GridPane.setConstraints(status, 0, 7);
+        GridPane.setHalignment(edit, HPos.CENTER);
+        GridPane.setHalignment(back, HPos.CENTER);
+        GridPane.setHalignment(bankUsername, HPos.CENTER);
+
+        GridPane.setHalignment(bankPassword, HPos.CENTER);
+        GridPane.setHalignment(bankId, HPos.CENTER);
+        GridPane.setHalignment(status, HPos.CENTER);
+        gridPane.getChildren().addAll(much, bankUsername , bankPassword , bankId , edit, back, status);
+        super.mainPane.setCenter(gridPane);
+
+        Menu.window.setScene(scene);
+    }
+
 
     private void handleAddAuction(){
         super.setPane();