aaden-cli 1.2.24 → 1.2.26

package/AadenDeploy/Utils/fixCronJob.sh

@@ -10,7 +10,7 @@ echo "0 */12 * * * wget -O /dev/null http://localhost/PHP/CloudStuff/ReportAllTe
 echo "* * * * * wget -O /dev/null http://localhost/PHP/CloudStuff/FetchOrdersForAllTerminal.php" >>conf
 echo "* * * * *  wget -O /dev/null http://localhost/PHP/AccessLog.php?op=reportStatus" >>conf
 echo "* * * * *  /var/www/html/crontab.sh > /dev/null" >>conf
-echo "59 4 1 * *   wget -O /dev/null http://localhost/PHP/Datev.php?op=autoSendDatevCsv > /dev/null" >>conf
+echo "0 * * * *   wget -O /dev/null http://localhost/PHP/Datev.php?op=autoSendDatevCsv > /dev/null" >>conf
 echo "* * * * * curl --location --request GET 'http://localhost/PHP/BackendData.php?op=autoSend3In1'" >>conf
 echo "* * * * * curl --location --request GET 'http://localhost/PHP/BackendData.php?op=autoSendMonthSummary'" >>conf
 sudo crontab -u aaden -r

package/AadenDeploy/Utils/writeGdpduService.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+ServiceFileName=/etc/systemd/system/aaden-gdpdu.service
+
+sudo touch $ServiceFileName
+sudo chmod 777 $ServiceFileName
+echo -e "
+[Unit]
+Description=Gdpdu Service For Aaden
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+User=root
+ExecStart=/usr/bin/php /var/www/html/PHP/autoWriteGdpdu.php
+
+[Install]
+WantedBy=multi-user.target
+" > $ServiceFileName
+
+sudo systemctl start aaden-gdpdu.service
+sudo systemctl enable aaden-gdpdu.service
+echo 'gdpdu auto write start'
+sudo service aaden-gdpdu start

package/dist/index.js

@@ -58161,7 +58161,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.2.23"};
+module.exports = {"i8":"1.2.25"};
 
 /***/ }),
 
@@ -58450,6 +58450,15 @@ program.command('enable-resource-track').action(enableResourceTrack)
 program.command('start-resource-track').action(startResourceTrack)
 program.command('auto-send-mail').action(editIni)
 program.command('auto-send-summary').action(autoSendSummaryLastMonth)
+program.command('set-do-not-send-zbon-when-print-true').
+  action(editConfigIni(setConfig('Email', 'DoNotSendZbonWhenPrint', true)))
+program.command('set-do-not-send-zbon-when-print-false').
+  action(editConfigIni(setConfig('Email', 'DoNotSendZbonWhenPrint', false)))
+program.command('set-auto-send-3in1-today-true').
+  action(editConfigIni(setConfig('Email', 'AutoSend3in1Today', true)))
+program.command('set-auto-send-3in1-today-false').
+  action(editConfigIni(setConfig('Email', 'AutoSend3in1Today', false)))
+program.command('auto-write-gdpdu').action(autoWriteGdpdu)
 
 if (program.debug) {
   debugInfo()
@@ -59073,18 +59082,13 @@ function editIni () {
   cli.executeInShell([
     'sudo chmod 777 /var/www/html/Resource/config/config.ini',
     'aaden-cli fix-cronjob',
-  ],program.debug)
-  const ini = __nccwpck_require__(80045)
-  const filePath = '/var/www/html/Resource/config/config.ini'
-  const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
-  console.log(info)
-  if(!info.Email) {
-    info.Email  = {}
-  }
-  info.Email.AutoSend3in1LastMonth = true
-
-  fs.writeFileSync(filePath, ini.stringify(info))
+  ], program.debug)
 
+  editConfigIni(composeMany([
+    setConfig('Email', 'AutoSend3in1LastMonth', true),
+    setConfig('Email', 'DoNotSendZbonWhenPrint', true),
+    setConfig('Email', 'AutoSend3in1Today', false),
+  ]))()
 }
 
 function autoSendSummaryLastMonth () {
@@ -59092,17 +59096,32 @@ function autoSendSummaryLastMonth () {
     'sudo chmod 777 /var/www/html/Resource/config/config.ini',
     'aaden-cli fix-cronjob',
   ], program.debug)
-  const ini = __nccwpck_require__(80045)
-  const filePath = '/var/www/html/Resource/config/config.ini'
-  const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
-  console.log(info)
-  if (!info.Email) {
-    info.Email = {}
+
+  editConfigIni(setConfig('Email', 'AutoSendSummaryLastMonth', true))()
+}
+
+function editConfigIni (f) {
+  return () => {
+    const ini = __nccwpck_require__(80045)
+    const filePath = '/var/www/html/Resource/config/config.ini'
+    const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
+    f(info)
+    fs.writeFileSync(filePath, ini.stringify(info))
   }
-  info.Email.AutoSendSummaryLastMonth = true
+}
 
-  fs.writeFileSync(filePath, ini.stringify(info))
+function setConfig (section, key, value) {
+  return file => {
+    if (!file[section]) {
+      file[section] = {}
+    }
+    file[section][key] = value
+    return file
+  }
+}
 
+function composeMany (fs) {
+  return fs.reduce((f, g) => x => g(f(x)), x => x)
 }
 
 function getPrivilegeCMD (path, pri = '+x', relativePath = true) {
@@ -59114,6 +59133,11 @@ function getPrivilegeCMD (path, pri = '+x', relativePath = true) {
   return command
 }
 
+function autoWriteGdpdu () {
+  const files = ['AadenDeploy/Utils/writeGdpduService.sh']
+  runMultiple(files)
+}
+
 })();
 
 module.exports = __webpack_exports__;

package/index.js

@@ -69,6 +69,15 @@ program.command('enable-resource-track').action(enableResourceTrack)
 program.command('start-resource-track').action(startResourceTrack)
 program.command('auto-send-mail').action(editIni)
 program.command('auto-send-summary').action(autoSendSummaryLastMonth)
+program.command('set-do-not-send-zbon-when-print-true').
+  action(editConfigIni(setConfig('Email', 'DoNotSendZbonWhenPrint', true)))
+program.command('set-do-not-send-zbon-when-print-false').
+  action(editConfigIni(setConfig('Email', 'DoNotSendZbonWhenPrint', false)))
+program.command('set-auto-send-3in1-today-true').
+  action(editConfigIni(setConfig('Email', 'AutoSend3in1Today', true)))
+program.command('set-auto-send-3in1-today-false').
+  action(editConfigIni(setConfig('Email', 'AutoSend3in1Today', false)))
+program.command('auto-write-gdpdu').action(autoWriteGdpdu)
 
 if (program.debug) {
   debugInfo()
@@ -692,18 +701,13 @@ function editIni () {
   cli.executeInShell([
     'sudo chmod 777 /var/www/html/Resource/config/config.ini',
     'aaden-cli fix-cronjob',
-  ],program.debug)
-  const ini = require("ini")
-  const filePath = '/var/www/html/Resource/config/config.ini'
-  const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
-  console.log(info)
-  if(!info.Email) {
-    info.Email  = {}
-  }
-  info.Email.AutoSend3in1LastMonth = true
-
-  fs.writeFileSync(filePath, ini.stringify(info))
+  ], program.debug)
 
+  editConfigIni(composeMany([
+    setConfig('Email', 'AutoSend3in1LastMonth', true),
+    setConfig('Email', 'DoNotSendZbonWhenPrint', true),
+    setConfig('Email', 'AutoSend3in1Today', false),
+  ]))()
 }
 
 function autoSendSummaryLastMonth () {
@@ -711,17 +715,32 @@ function autoSendSummaryLastMonth () {
     'sudo chmod 777 /var/www/html/Resource/config/config.ini',
     'aaden-cli fix-cronjob',
   ], program.debug)
-  const ini = require("ini")
-  const filePath = '/var/www/html/Resource/config/config.ini'
-  const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
-  console.log(info)
-  if (!info.Email) {
-    info.Email = {}
+
+  editConfigIni(setConfig('Email', 'AutoSendSummaryLastMonth', true))()
+}
+
+function editConfigIni (f) {
+  return () => {
+    const ini = require('ini')
+    const filePath = '/var/www/html/Resource/config/config.ini'
+    const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
+    f(info)
+    fs.writeFileSync(filePath, ini.stringify(info))
   }
-  info.Email.AutoSendSummaryLastMonth = true
+}
 
-  fs.writeFileSync(filePath, ini.stringify(info))
+function setConfig (section, key, value) {
+  return file => {
+    if (!file[section]) {
+      file[section] = {}
+    }
+    file[section][key] = value
+    return file
+  }
+}
 
+function composeMany (fs) {
+  return fs.reduce((f, g) => x => g(f(x)), x => x)
 }
 
 function getPrivilegeCMD (path, pri = '+x', relativePath = true) {
@@ -732,3 +751,8 @@ function getPrivilegeCMD (path, pri = '+x', relativePath = true) {
   command.push(`echo "Innerken322." | sudo -S chmod ${pri} ${path}`)
   return command
 }
+
+function autoWriteGdpdu () {
+  const files = ['AadenDeploy/Utils/writeGdpduService.sh']
+  runMultiple(files)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaden-cli",
-  "version": "1.2.24",
+  "version": "1.2.26",
   "description": "",
   "main": "dist/index.js",
   "scripts": {