Merge pull request #169 from fnf-org/156-payment-amounts

fix delete button
fnf-org · May 13, 2024 · a43f319 · a43f319
2 parents 60335a7 + 53ae539
commit a43f319
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/controllers/ticket_requests_controller.rb b/app/controllers/ticket_requests_controller.rb
@@ -190,7 +190,12 @@ def update
 
   def destroy
     unless @event.admin?(current_user) || current_user == @ticket_request.user
-      flash.now[:error] = 'You do not have sufficient priviliges to delete this request.'
+      flash.now[:error] = 'You do not have sufficient privileges to delete this request.'
+      return render_flash(flash)
+    end
+
+    if @ticket_request.payment_received?
+      flash.now[:error] = 'Can not delete request when payment has been received.'
       return render_flash(flash)
     end
 

diff --git a/app/views/ticket_requests/show.html.haml b/app/views/ticket_requests/show.html.haml
@@ -241,8 +241,9 @@
           = link_to edit_event_ticket_request_path(@event, @ticket_request), class: 'btn btn-primary btn-round mx-0' do
             = @event.admin?(current_user) ? 'Edit Ticket Request' : 'Edit Guests'
 
-        - if @event.admin?(current_user) || @ticket_request.user == current_user
-          = button_to "Delete this Ticket Request ✘ ", event_ticket_request_path(@event, @ticket_request), class: 'btn btn-warning', method: :delete, data: { "turbo-confirm": "Are you sure?" }
+        - if !@ticket_request.payment_received?
+          - if @event.admin?(current_user) || @ticket_request.user == current_user
+            = button_to "Delete this Ticket Request ✘ ", event_ticket_request_path(@event, @ticket_request), class: 'btn btn-warning', method: :destroy, data: { "turbo-confirm": "Are you sure?" }