Merge pull request #174 from basoro/mlite

Update ke 4.0.7
basoro · May 25, 2024 · 2b8f210 · 2b8f210
2 parents ef6f9a7 + a5aca89
commit 2b8f210
Show file tree

Hide file tree

Showing 63 changed files with 32,657 additions and 472 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,7 +24,7 @@ plugins/desktop
 plugins/kasir
 plugins/dokter_radiologi
 plugins/dokter_ulun
-#plugins/satu_sehat
+plugins/reg_periksa
 plugins/khanza
 plugins/pasien_galleries
 plugins/cssd
@@ -33,11 +33,11 @@ plugins/utd/Site.php
 plugins/utd/view/adonan.html
 websocket
 plugins/khanza.zip
-plugins/dokter_ulun
 plugins/khanza
 plugins/pasien_galleries
 
 
 .env
 logs/
 config.php
+workerman.php
diff --git a/admin/index.php b/admin/index.php
@@ -41,10 +41,26 @@
                 $url = array_merge([ADMIN], $arrayURL);
                 redirect(url($url));
             }
-            redirect(url([ADMIN, 'dashboard', 'main']));
+            if(MULTI_APP) {
+                if(!empty(MULTI_APP_REDIRECT)) {
+                    redirect(url([ADMIN, MULTI_APP_REDIRECT, 'main']));
+                } else {
+                    redirect(url([ADMIN, 'dashboard', 'main']));
+                }
+            } else {
+                redirect(url([ADMIN, 'dashboard', 'main']));
+            }
         }
     }
-    $core->drawTheme('login.html');
+    if(MULTI_APP) {
+      if(!empty(MULTI_APP_REDIRECT)) {
+        echo $core->tpl->draw(MODULES.'/'.MULTI_APP_REDIRECT.'/view/login.html', true);
+      } else {
+        $core->drawTheme('login.html');
+      }
+    } else {
+      $core->drawTheme('login.html');
+    }
 
 }
 

diff --git a/assets/css/datatables.min.css b/assets/css/datatables.min.css
diff --git a/assets/jscripts/datatables.min.js b/assets/jscripts/datatables.min.js