Campaign export settings fix

owlchester · Apr 26, 2024 · bda5b1d · bda5b1d
1 parent d32a12f
commit bda5b1d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/app/Models/Campaign.php b/app/Models/Campaign.php
@@ -210,15 +210,6 @@ public function enabled(string $module): bool
         return (bool) CampaignCache::settings()->get($module);
     }
 
-    /**
-     * Determine if a campaign has a module enabled or not
-     *
-     */
-    public function modules()
-    {
-        return CampaignCache::settings();
-    }
-
     /**
      * Get the is public attribute for forms
      */

diff --git a/app/Services/Campaign/ExportService.php b/app/Services/Campaign/ExportService.php
@@ -18,7 +18,6 @@
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use App\Facades\Module;
 use Zip;
 
 class ExportService
@@ -119,12 +118,22 @@ public function filesize(): int
     protected function campaignModules(): self
     {
         $modules = [];
-        foreach ($this->campaign->modules() as $name => $active) {
+        $settings = $this->campaign->setting->toArray();
+        unset($settings['id'], $settings['campaign_id'], $settings['created_at'], $settings['updated_at']);
+        $entities = config('entities.ids');
+
+        foreach ($settings as $name => $active) {
             $module = ['enabled' => $active];
             if (!in_array($name, ['dice_rolls', 'conversations', 'bookmarks', 'inventories', 'entity_attributes', 'assets'])) {
-                $module['name_singular'] = Module::campaign($this->campaign)->singular($name);
-                $module['name_plural'] = Module::campaign($this->campaign)->plural($name);
-                $module['icon'] = Module::campaign($this->campaign)->icon($name);
+                if ($this->campaign->hasModuleName($entities[Str::singular($name)])) {
+                    $module['name_singular'] = $this->campaign->moduleName($entities[Str::singular($name)]);
+                }
+                if ($this->campaign->hasModuleName($entities[Str::singular($name)], true)) {
+                    $module['name_plural'] = $this->campaign->moduleName($entities[Str::singular($name)], true);
+                }
+                if ($this->campaign->hasModuleIcon($entities[Str::singular($name)])) {
+                    $module['icon'] = $this->campaign->moduleIcon($entities[Str::singular($name)]);
+                }
             }
 
             $modules[$name] = $module;