Merge pull request #589 from dOpensource/v0.76

Fix Stubborn Woocommerce "Delivered" Status Check
dOpensource · Aug 13, 2024 · d86799a · d86799a
2 parents 1a2f20e + 59a7452
commit d86799a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dsiprouter.sh b/dsiprouter.sh
@@ -3650,7 +3650,7 @@ function createSwapFile() {
         (
             grep -vF "$SWAP_FILE" /etc/fstab
             echo "${SWAP_FILE} none swap sw 0 0"
-        ) >/etc/fstab &&
+        ) >>/etc/fstab &&
         printdbg 'swapfile created successfully'
     fi
 
@@ -3839,7 +3839,7 @@ function processCMD() {
     case $ARG in
         install)
             # always add official repo's, set platform, and create init service
-            RUN_COMMANDS+=(configureSystemRepos setCloudPlatform createInitService createSwapFile installDsiprouterCli)
+            RUN_COMMANDS+=(configureSystemRepos setCloudPlatform createInitService installDsiprouterCli)
             shift
 
             local NEW_ROOT_DB_USER="" NEW_ROOT_DB_PASS="" NEW_ROOT_DB_NAME="" DB_CONN_URI="" TMP_ARG=""
@@ -4092,7 +4092,7 @@ function processCMD() {
                     # same goes for official repo configs, we only remove if all dsiprouter configs are being removed
                     -all|--all)
                         DEFAULT_SERVICES=0
-                        RUN_COMMANDS+=(uninstallRTPEngine uninstallDsiprouter uninstallNginx uninstallKamailio uninstallMysql uninstallDnsmasq uninstallSipsak uninstallDsiprouterCli removeSwapFile removeInitService removeDsipSystemConfig)
+                        RUN_COMMANDS+=(uninstallRTPEngine uninstallDsiprouter uninstallNginx uninstallKamailio uninstallMysql uninstallDnsmasq uninstallSipsak uninstallDsiprouterCli removeInitService removeDsipSystemConfig)
                         shift
                         ;;
                     *)  # fail on unknown option

diff --git a/gui/modules/api/licensemanager/classes.py b/gui/modules/api/licensemanager/classes.py
@@ -142,7 +142,7 @@ def expires(self):
 
     @property
     def active(self):
-        return self._status == 3 and self._times_activated > 0 and self.expires > datetime.datetime.now()
+        return (self._status == 3 or self._status == 2) and self._times_activated > 0 and self.expires > datetime.datetime.now()
 
     @property
     def license_key(self):