feat: add character criteria

app/Helpers/AssetHelpers.php

@@ -127,11 +127,12 @@ function createAssetsArray($isCharacter = false) {
  *
  * @param array $first
  * @param array $second
+ * @param mixed $isCharacter
  *
  * @return array
  */
-function mergeAssetsArrays($first, $second) {
-    $keys = getAssetKeys();
+function mergeAssetsArrays($first, $second, $isCharacter = false) {
+    $keys = getAssetKeys($isCharacter);
     foreach ($keys as $key) {
         foreach ($second[$key] as $item) {
             addAsset($first, $item['asset'], $item['quantity']);
@@ -210,11 +211,12 @@ function getDataReadyAssets($array, $isCharacter = false) {
  * basically reversing the above function.
  *
  * @param array $array
+ * @param mixed $isCharacter
  *
  * @return array
  */
-function parseAssetData($array) {
-    $assets = createAssetsArray();
+function parseAssetData($array, $isCharacter = false) {
+    $assets = createAssetsArray($isCharacter);
     foreach ($array as $key => $contents) {
         $model = getAssetModelString($key);
         if ($model) {

app/Http/Controllers/Admin/Data/PromptController.php

@@ -38,7 +38,8 @@ public function getIndex() {
      */
     public function getCreatePromptCategory() {
         return view('admin.prompts.create_edit_prompt_category', [
-            'category' => new PromptCategory,
+            'category'   => new PromptCategory,
+            'categories' => PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
 
@@ -56,7 +57,8 @@ public function getEditPromptCategory($id) {
         }
 
         return view('admin.prompts.create_edit_prompt_category', [
-            'category' => $category,
+            'category'   => $category,
+            'categories' => PromptCategory::where('id', '!=', $category->id)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
 
@@ -71,7 +73,7 @@ public function getEditPromptCategory($id) {
     public function postCreateEditPromptCategory(Request $request, PromptService $service, $id = null) {
         $id ? $request->validate(PromptCategory::$updateRules) : $request->validate(PromptCategory::$createRules);
         $data = $request->only([
-            'name', 'description', 'image', 'remove_image',
+            'name', 'description', 'image', 'remove_image', 'parent_id',
         ]);
         if ($id && $service->updatePromptCategory(PromptCategory::find($id), $data, Auth::user())) {
             flash('Category updated successfully.')->success();
@@ -149,23 +151,76 @@ public function postSortPromptCategory(Request $request, PromptService $service)
     **********************************************************************************************/
 
     /**
-     * Shows the prompt category index.
+     * Shows the prompt index.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
     public function getPromptIndex(Request $request) {
-        $query = Prompt::query();
-        $data = $request->only(['prompt_category_id', 'name']);
+        $query = Prompt::query()->with('category');
+        $data = $request->only(['prompt_category_id', 'name', 'sort', 'open_prompts']);
         if (isset($data['prompt_category_id']) && $data['prompt_category_id'] != 'none') {
-            $query->where('prompt_category_id', $data['prompt_category_id']);
+            if ($data['prompt_category_id'] == 'withoutOption') {
+                $query->whereNull('prompt_category_id');
+            } else {
+                $query->where('prompt_category_id', $data['prompt_category_id']);
+            }
         }
         if (isset($data['name'])) {
             $query->where('name', 'LIKE', '%'.$data['name'].'%');
         }
 
+        if (isset($data['open_prompts'])) {
+            switch ($data['open_prompts']) {
+                case 'open':
+                    $query->open(true);
+                    break;
+                case 'closed':
+                    $query->open(false);
+                    break;
+                case 'any':
+                default:
+                    // Don't filter
+                    break;
+            }
+        }
+
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
+                case 'alpha':
+                    $query->sortAlphabetical();
+                    break;
+                case 'alpha-reverse':
+                    $query->sortAlphabetical(true);
+                    break;
+                case 'category':
+                    $query->sortCategory();
+                    break;
+                case 'newest':
+                    $query->sortNewest();
+                    break;
+                case 'oldest':
+                    $query->sortNewest(true);
+                    break;
+                case 'start':
+                    $query->sortStart();
+                    break;
+                case 'start-reverse':
+                    $query->sortStart(true);
+                    break;
+                case 'end':
+                    $query->sortEnd();
+                    break;
+                case 'end-reverse':
+                    $query->sortEnd(true);
+                    break;
+            }
+        } else {
+            $query->sortCategory();
+        }
+
         return view('admin.prompts.prompts', [
             'prompts'    => $query->paginate(20)->appends($request->query()),
-            'categories' => ['none' => 'Any Category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'categories' => ['none' => 'Any Category'] + ['withoutOption' => 'Without Category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
 
@@ -176,9 +231,10 @@ public function getPromptIndex(Request $request) {
      */
     public function getCreatePrompt() {
         return view('admin.prompts.create_edit_prompt', [
-            'prompt'     => new Prompt,
-            'categories' => ['none' => 'No category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'criteria'   => Criterion::active()->orderBy('name')->pluck('name', 'id'),
+            'prompt'        => new Prompt,
+            'categories'    => ['none' => 'No category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'limit_periods' => config('lorekeeper.extensions.limit_periods'),
+            'criteria'      => Criterion::active()->orderBy('name')->pluck('name', 'id'),
         ]);
     }
 
@@ -196,9 +252,10 @@ public function getEditPrompt($id) {
         }
 
         return view('admin.prompts.create_edit_prompt', [
-            'prompt'     => $prompt,
-            'categories' => ['none' => 'No category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'criteria'   => Criterion::active()->orderBy('name')->pluck('name', 'id'),
+            'prompt'        => $prompt,
+            'categories'    => ['none' => 'No category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'limit_periods' => config('lorekeeper.extensions.limit_periods'),
+            'criteria'      => Criterion::active()->orderBy('name')->pluck('name', 'id'),
         ]);
     }
 
@@ -215,6 +272,7 @@ public function postCreateEditPrompt(Request $request, PromptService $service, $
         $data = $request->only([
             'name', 'prompt_category_id', 'summary', 'description', 'start_at', 'end_at', 'hide_before_start', 'hide_after_end', 'is_active', 'image', 'remove_image', 'prefix', 'hide_submissions', 'staff_only',
             'rewardable_type', 'rewardable_id', 'quantity', 'rewardable_recipient',
+            'limit', 'limit_period', 'limit_character',
             'criterion_id', 'criterion', 'criterion_currency_id', 'default_criteria',
         ]);
         if ($id && $service->updatePrompt(Prompt::find($id), $data, Auth::user())) {

app/Http/Controllers/Admin/NewsController.php

@@ -14,9 +14,40 @@ class NewsController extends Controller {
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex() {
+    public function getIndex(Request $request) {
+        $query = News::visible(Auth::user() ?? null);
+        $data = $request->only(['title', 'sort']);
+        if (isset($data['title'])) {
+            $query->where('title', 'LIKE', '%'.$data['title'].'%');
+        }
+
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
+                case 'alpha':
+                    $query->sortAlphabetical();
+                    break;
+                case 'alpha-reverse':
+                    $query->sortAlphabetical(true);
+                    break;
+                case 'newest':
+                    $query->sortNewest();
+                    break;
+                case 'oldest':
+                    $query->sortNewest(true);
+                    break;
+                case 'bump':
+                    $query->sortBump();
+                    break;
+                case 'bump-reverse':
+                    $query->sortBump(true);
+                    break;
+            }
+        } else {
+            $query->sortBump(true);
+        }
+
         return view('admin.news.news', [
-            'newses' => News::orderBy('updated_at', 'DESC')->paginate(20),
+            'newses' => $query->paginate(20)->appends($request->query()),
         ]);
     }
 

app/Http/Controllers/Admin/SalesController.php

@@ -15,9 +15,43 @@ class SalesController extends Controller {
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex() {
+    public function getIndex(Request $request) {
+        $query = Sales::visible(Auth::user() ?? null);
+        $data = $request->only(['title', 'is_open', 'sort']);
+        if (isset($data['is_open']) && $data['is_open'] != 'none') {
+            $query->where('is_open', $data['is_open']);
+        }
+        if (isset($data['title'])) {
+            $query->where('title', 'LIKE', '%'.$data['title'].'%');
+        }
+
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
+                case 'alpha':
+                    $query->sortAlphabetical();
+                    break;
+                case 'alpha-reverse':
+                    $query->sortAlphabetical(true);
+                    break;
+                case 'newest':
+                    $query->sortNewest();
+                    break;
+                case 'oldest':
+                    $query->sortNewest(true);
+                    break;
+                case 'bump':
+                    $query->sortBump();
+                    break;
+                case 'bump-reverse':
+                    $query->sortBump(true);
+                    break;
+            }
+        } else {
+            $query->sortBump(true);
+        }
+
         return view('admin.sales.sales', [
-            'saleses' => Sales::orderBy('post_at', 'DESC')->paginate(20),
+            'saleses' => $query->paginate(20)->appends($request->query()),
         ]);
     }
 

app/Http/Controllers/Admin/SubmissionController.php

@@ -64,6 +64,14 @@ public function getSubmission($id) {
             abort(404);
         }
 
+        $prompt = $submission->prompt;
+
+        if ($prompt->limit_character) {
+            $limit = $prompt->limit * Character::visible()->where('is_myo_slot', 0)->where('user_id', $submission->user_id)->count();
+        } else {
+            $limit = $prompt->limit;
+        }
+
         return view('admin.submissions.submission', [
             'submission'       => $submission,
             'inventory'        => $inventory,
@@ -78,7 +86,8 @@ public function getSubmission($id) {
             'currencies'          => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
             'tables'              => LootTable::orderBy('name')->pluck('name', 'id'),
             'raffles'             => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
-            'count'               => Submission::where('prompt_id', $submission->prompt_id)->where('status', 'Approved')->where('user_id', $submission->user_id)->count(),
+            'count'               => $prompt->getCount($submission->user),
+            'limit'               => $limit,
         ] : []));
     }
 

app/Http/Controllers/CriterionController.php

@@ -52,6 +52,37 @@ public function getCriterionForm($entity, $id, $entity_id = null, $form_id = nul
         ]);
     }
 
+    /**
+     * returns a character criterion's form based on steps.
+     *
+     * @param mixed|null $entity
+     * @param mixed      $id
+     * @param mixed|null $entity_id
+     * @param mixed|null $form_id
+     * @param mixed      $slug
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getCharacterCriterionForm($slug, $entity, $id, $entity_id = null, $form_id = null) {
+        if ($entity_id && $entity) {
+            if ($entity === 'prompt') {
+                $entityCriteria = PromptCriterion::where('prompt_id', $entity_id)->where('criterion_id', $id)->first();
+            } elseif ($entity === 'gallery') {
+                $entityCriteria = GalleryCriterion::where('gallery_id', $entity_id)->where('criterion_id', $id)->first();
+            }
+        }
+
+        return view('criteria._minimum_character_requirements', [
+            'criterion'          => Criterion::where('id', $id)->first(),
+            'character'          => $slug,
+            'minRequirements'    => isset($entityCriteria) ? $entityCriteria->minRequirements : null,
+            'title'              => isset($entityCriteria) ? 'Criterion Options' : null,
+            'limitByMinReq'      => isset($entityCriteria) ? true : null,
+            'id'                 => $form_id,
+            'criterion_currency' => $entityCriteria->criterion_currency_id ?? $entityCriteria->criterion->currency_id,
+        ]);
+    }
+
     /**
      * returns a criterion dd based on entity.
      *
@@ -62,7 +93,7 @@ public function getCriterionForm($entity, $id, $entity_id = null, $form_id = nul
      */
     public function getCriterionSelector($entity, $id) {
         if ($entity === 'prompt') {
-            $entityCriteria = PromptCriterion::where('prompt_id', $id)->pluck('criterion_id')->toArray();
+            $entityCriteria = PromptCriterion::where('prompt_id', $id)->get()->where('characterCriteria', '=', false)->pluck('criterion_id')->toArray();
         } elseif ($entity === 'gallery') {
             $entityCriteria = GalleryCriterion::where('gallery_id', $id)->pluck('criterion_id')->toArray();
         }
@@ -74,6 +105,28 @@ public function getCriterionSelector($entity, $id) {
         ]);
     }
 
+    /**
+     * returns a criterion dd based on entity.
+     *
+     * @param mixed $entity
+     * @param mixed $id
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getCharacterCriterionSelector($entity, $id) {
+        if ($entity === 'prompt') {
+            $entityCriteria = PromptCriterion::where('prompt_id', $id)->get()->where('characterCriteria', '=', true)->pluck('criterion_id')->toArray();
+        } elseif ($entity === 'gallery') {
+            $entityCriteria = GalleryCriterion::where('gallery_id', $id)->pluck('criterion_id')->toArray();
+        }
+
+        $criteria = Criterion::whereIn('id', $entityCriteria)->pluck('name', 'id');
+
+        return view('criteria._criterion_character_selector', [
+            'criteria' => $criteria,
+        ]);
+    }
+
     /**
      * returns an amount based on a criterion id and data.
      *