Merge pull request #9 from itinerare/Submissions-Exp

Submissions-Exp
corowne · May 23, 2020 · 0ac6a0f · 0ac6a0f
2 parents 73b8525 + 3949b27
commit 0ac6a0f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 /composer.lock
+*.env
diff --git 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
@@ -284,10 +284,12 @@ public function approveSubmission($data, $user)
             }
 
             // Finally, set: 
-            // 1. staff ID
-            // 2. status
-            // 3. final rewards
+			// 1. staff comments
+            // 2. staff ID
+            // 3. status
+            // 4. final rewards
             $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
@@ -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">
@@ -145,11 +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>
-                    <div class="form-group">
-                        {!! Form::label('staff_comments', 'Staff Comments') !!}
-                        {!! Form::textarea('', null, ['class' => 'form-control', 'id' =>  'modalStaffComments']) !!}
-                    </div>
+                    <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>
@@ -202,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
@@ -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>