final touches in entryPage for correcting jameKol and Upgrade calcula…

…tion
devomid · Jul 17, 2024 · 5f55fda · 5f55fda
1 parent 7140243
commit 5f55fda
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/pages/EntrySection.js b/src/pages/EntrySection.js
@@ -490,12 +490,17 @@ const EntrySection = () => {
 
     const calculateJameKol = () => {
         let total = Number((Number(destPrice) + Number(upgradeDifference) + (Number(tamdidPrice) - Number(motevaliPrice)) + Number(karbaeEzafePrice) + Number(destChandSherkatiPrice) + Number(tabdilBeGhoflPrice) + Number(modulesPrice) + Number(khadamatPrice)) - Number(bargashtiPrice));
+        console.log(forooshJadid);
         if (forooshJadid) {
             setJameKol(total);
         } else if (!forooshJadid) {
             const currentDate = moment();
             const differdDate = moment(tamdidDate, 'jYYYY/jMM/jDD');
             const daysDifference = currentDate.diff(differdDate, 'days');
+            if (upgradeDifference) {
+                setJameKol(upgradeDifference)
+                return
+            }
             if (daysDifference <= 365) {
                 setJameKol(total - Number(destPrice) - Number(tamdidPrice) + Number(tashvighiPrice));
             } else {

diff --git a/src/start.js b/src/start.js
@@ -14,10 +14,10 @@ let mainWindow
 
 function createWindow() {
     mainWindow = new BrowserWindow({
-        width: 1545,
-        height: 727,
-        // width: 1091,
+        // width: 1545,
         // height: 727,
+        width: 1091,
+        height: 727,
         webPreferences: {
             sandbox: false,
             nodeIntegration: true,
@@ -30,7 +30,7 @@ function createWindow() {
 
     mainWindow.setMenuBarVisibility(false)
 
-    mainWindow.webContents.openDevTools()
+    // mainWindow.webContents.openDevTools()
 
     mainWindow.loadURL(
         process.env.ELECTRON_START_URL ||