From 3f16d84be938f72c2fa7080ebe38c860a24015b9 Mon Sep 17 00:00:00 2001
From: itinerare <adestus@gmail.com>
Date: Fri, 22 May 2020 10:22:54 -0400
Subject: [PATCH 1/4] Changes up to this point, gitignore

---
 .gitignore                                             | 1 +
 app/Services/SubmissionManager.php                     | 2 ++
 resources/views/admin/submissions/submission.blade.php | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7de15a1e8b..160f291c6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 /composer.lock
+*.env
diff --git a/app/Services/SubmissionManager.php b/app/Services/SubmissionManager.php
index a824ff6ab6..94adb890a1 100644
--- a/app/Services/SubmissionManager.php
+++ b/app/Services/SubmissionManager.php
@@ -287,7 +287,9 @@ public function approveSubmission($data, $user)
             // 1. staff ID
             // 2. status
             // 3. final rewards
+			// 4. Also, staff comments!
             $submission->update([
+			    'staff_comments' => $data['staff_comments'],
                 'staff_id' => $user->id,
                 'status' => 'Approved',
                 'data' => json_encode(getDataReadyAssets($rewards))
diff --git a/resources/views/admin/submissions/submission.blade.php b/resources/views/admin/submissions/submission.blade.php
index 48f0246903..f23cb47d10 100644
--- a/resources/views/admin/submissions/submission.blade.php
+++ b/resources/views/admin/submissions/submission.blade.php
@@ -133,7 +133,11 @@
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
                 </div>
                 <div class="modal-body">
-                    <p>This will approve the {{ $submission->prompt_id ? 'submission' : 'claim' }} and distribute the above rewards to the user.</p>
+                    <p>This will approve the {{ $submission->prompt_id ? 'submission' : 'claim' }} and distribute the above rewards to the user. Enter an optional comment below to explain why the {{ $submission->prompt_id ? 'submission' : 'claim' }} was approved.</p>
+					<div class="form-group">
+                        {!! Form::label('staff_comments', 'Staff Comments') !!}
+                        {!! Form::textarea('', null, ['class' => 'form-control', 'id' =>  'modalStaffComments']) !!}
+                    </div>
                     <div class="text-right">
                         <a href="#" id="approvalSubmit" class="btn btn-success">Approve</a>
                     </div>

From 8d39d4278c90e34e255786b930fc06ffe9604dc1 Mon Sep 17 00:00:00 2001
From: itinerare <adestus@gmail.com>
Date: Fri, 22 May 2020 11:01:05 -0400
Subject: [PATCH 2/4] Remove form from submission processing page, since it's
 what causes rejection comments to fail.

---
 resources/views/admin/submissions/submission.blade.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/resources/views/admin/submissions/submission.blade.php b/resources/views/admin/submissions/submission.blade.php
index f23cb47d10..56c194d931 100644
--- a/resources/views/admin/submissions/submission.blade.php
+++ b/resources/views/admin/submissions/submission.blade.php
@@ -134,10 +134,7 @@
                 </div>
                 <div class="modal-body">
                     <p>This will approve the {{ $submission->prompt_id ? 'submission' : 'claim' }} and distribute the above rewards to the user. Enter an optional comment below to explain why the {{ $submission->prompt_id ? 'submission' : 'claim' }} was approved.</p>
-					<div class="form-group">
-                        {!! Form::label('staff_comments', 'Staff Comments') !!}
-                        {!! Form::textarea('', null, ['class' => 'form-control', 'id' =>  'modalStaffComments']) !!}
-                    </div>
+					
                     <div class="text-right">
                         <a href="#" id="approvalSubmit" class="btn btn-success">Approve</a>
                     </div>

From 2adc877054c8b43112bb9b4d07a98a81b940cf8f Mon Sep 17 00:00:00 2001
From: itinerare <adestus@gmail.com>
Date: Fri, 22 May 2020 13:02:15 -0400
Subject: [PATCH 3/4] Test moving the form out of the modal and into the main
 page body.

---
 resources/views/admin/submissions/submission.blade.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/admin/submissions/submission.blade.php b/resources/views/admin/submissions/submission.blade.php
index 56c194d931..79fc3bd33c 100644
--- a/resources/views/admin/submissions/submission.blade.php
+++ b/resources/views/admin/submissions/submission.blade.php
@@ -124,6 +124,11 @@
         </table>
     </div>
     @include('widgets._loot_select_row', ['items' => $items, 'currencies' => $currencies, 'showLootTables' => false])
+	
+	<div class="form-group">
+                        {!! Form::label('staff_comments', 'Staff Comments') !!}
+                        {!! Form::textarea('', null, ['class' => 'form-control', 'id' =>  'modalStaffComments']) !!}
+    </div>
 
     <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
         <div class="modal-dialog" role="document">
@@ -134,7 +139,6 @@
                 </div>
                 <div class="modal-body">
                     <p>This will approve the {{ $submission->prompt_id ? 'submission' : 'claim' }} and distribute the above rewards to the user. Enter an optional comment below to explain why the {{ $submission->prompt_id ? 'submission' : 'claim' }} was approved.</p>
-					
                     <div class="text-right">
                         <a href="#" id="approvalSubmit" class="btn btn-success">Approve</a>
                     </div>
@@ -147,10 +151,6 @@
                 </div>
                 <div class="modal-body">
                     <p>This will reject the {{ $submission->prompt_id ? 'submission' : 'claim' }}. Enter an optional comment below to explain why the {{ $submission->prompt_id ? 'submission' : 'claim' }} was rejected.</p>
-                    <div class="form-group">
-                        {!! Form::label('staff_comments', 'Staff Comments') !!}
-                        {!! Form::textarea('', null, ['class' => 'form-control', 'id' =>  'modalStaffComments']) !!}
-                    </div>
                     <div class="text-right">
                         <a href="#" id="rejectionSubmit" class="btn btn-danger">Reject</a>
                     </div>

From 3949b273369010009264db87ffd40ff168a0ac23 Mon Sep 17 00:00:00 2001
From: itinerare <adestus@gmail.com>
Date: Fri, 22 May 2020 14:18:44 -0400
Subject: [PATCH 4/4] Make staff comments on submissions available on both
 acceptance and rejection, as well as move the form into the main page body.
 The form remains optional. Display of staff comments on processed submissions
 is also made more prominent and not danger in accordance with this.

---
 .../Controllers/Admin/SubmissionController.php    |  2 +-
 app/Services/SubmissionManager.php                |  8 ++++----
 .../views/admin/submissions/submission.blade.php  | 15 +++++++--------
 .../views/home/_submission_content.blade.php      |  4 ++--
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/Admin/SubmissionController.php b/app/Http/Controllers/Admin/SubmissionController.php
index 355197ff76..d8131fe2cb 100644
--- a/app/Http/Controllers/Admin/SubmissionController.php
+++ b/app/Http/Controllers/Admin/SubmissionController.php
@@ -105,7 +105,7 @@ public function getClaim($id)
      */
     public function postSubmission(Request $request, SubmissionManager $service, $id, $action)
     {
-        $data = $request->only(['slug',  'character_quantity', 'character_currency_id', 'rewardable_type', 'rewardable_id', 'quantity' ]);
+        $data = $request->only(['slug',  'character_quantity', 'character_currency_id', 'rewardable_type', 'rewardable_id', 'quantity', 'staff_comments' ]);
         if($action == 'reject' && $service->rejectSubmission($request->only(['staff_comments']) + ['id' => $id], Auth::user())) {
             flash('Submission rejected successfully.')->success();
         }
diff --git a/app/Services/SubmissionManager.php b/app/Services/SubmissionManager.php
index 94adb890a1..ffb8fa3b21 100644
--- a/app/Services/SubmissionManager.php
+++ b/app/Services/SubmissionManager.php
@@ -284,10 +284,10 @@ public function approveSubmission($data, $user)
             }
 
             // Finally, set: 
-            // 1. staff ID
-            // 2. status
-            // 3. final rewards
-			// 4. Also, staff comments!
+			// 1. staff comments
+            // 2. staff ID
+            // 3. status
+            // 4. final rewards
             $submission->update([
 			    'staff_comments' => $data['staff_comments'],
                 'staff_id' => $user->id,
diff --git a/resources/views/admin/submissions/submission.blade.php b/resources/views/admin/submissions/submission.blade.php
index 79fc3bd33c..a50c576274 100644
--- a/resources/views/admin/submissions/submission.blade.php
+++ b/resources/views/admin/submissions/submission.blade.php
@@ -65,6 +65,10 @@
         </div>
         <div class="text-right mb-3">
             <a href="#" class="btn btn-outline-info" id="addCharacter">Add Character</a>
+        </div>
+		<div class="form-group">
+            {!! Form::label('staff_comments', 'Staff Comments') !!}
+            {!! Form::textarea('', null, ['class' => 'form-control', 'id' =>  'modalStaffComments']) !!}
         </div>
         {!! Form::hidden('staff_comments', null, ['id' => 'staffComments']) !!}
         <div class="text-right">
@@ -124,11 +128,6 @@
         </table>
     </div>
     @include('widgets._loot_select_row', ['items' => $items, 'currencies' => $currencies, 'showLootTables' => false])
-	
-	<div class="form-group">
-                        {!! Form::label('staff_comments', 'Staff Comments') !!}
-                        {!! Form::textarea('', null, ['class' => 'form-control', 'id' =>  'modalStaffComments']) !!}
-    </div>
 
     <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
         <div class="modal-dialog" role="document">
@@ -138,7 +137,7 @@
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
                 </div>
                 <div class="modal-body">
-                    <p>This will approve the {{ $submission->prompt_id ? 'submission' : 'claim' }} and distribute the above rewards to the user. Enter an optional comment below to explain why the {{ $submission->prompt_id ? 'submission' : 'claim' }} was approved.</p>
+                    <p>This will approve the {{ $submission->prompt_id ? 'submission' : 'claim' }} and distribute the above rewards to the user.</p>
                     <div class="text-right">
                         <a href="#" id="approvalSubmit" class="btn btn-success">Approve</a>
                     </div>
@@ -150,7 +149,7 @@
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
                 </div>
                 <div class="modal-body">
-                    <p>This will reject the {{ $submission->prompt_id ? 'submission' : 'claim' }}. Enter an optional comment below to explain why the {{ $submission->prompt_id ? 'submission' : 'claim' }} was rejected.</p>
+                    <p>This will reject the {{ $submission->prompt_id ? 'submission' : 'claim' }}.</p>
                     <div class="text-right">
                         <a href="#" id="rejectionSubmit" class="btn btn-danger">Reject</a>
                     </div>
@@ -203,7 +202,7 @@
 
             $approvalSubmit.on('click', function(e) {
                 e.preventDefault();
-                $staffComments.val('');
+                $staffComments.val($modalStaffComments.val());
                 $submissionForm.attr('action', '{{ url()->current() }}/approve');
                 $submissionForm.submit();
             });
diff --git a/resources/views/home/_submission_content.blade.php b/resources/views/home/_submission_content.blade.php
index e0a2f64afb..8f464f028b 100644
--- a/resources/views/home/_submission_content.blade.php
+++ b/resources/views/home/_submission_content.blade.php
@@ -32,8 +32,8 @@
 <h2>Comments</h2>
 <div class="card mb-3"><div class="card-body">{!! nl2br(htmlentities($submission->comments)) !!}</div></div>
 @if(Auth::check() && $submission->staff_comments && ($submission->user_id == Auth::user()->id || Auth::user()->hasPower('manage_submissions')))
-    <h5 class="text-danger">Staff Comments</h5>
-    <div class="card border-danger mb-3"><div class="card-body">{!! nl2br(htmlentities($submission->staff_comments)) !!}</div></div>
+    <h2>Staff Comments</h2>
+    <div class="card mb-3"><div class="card-body">{!! nl2br(htmlentities($submission->staff_comments)) !!}</div></div>
 @endif
 
 <h2>Rewards</h2>