Merge branch 'develop'

diegosteiner · Oct 23, 2024 · b88f693 · b88f693
2 parents a11d58c + 7275317
commit b88f693
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/domain/booking_actions/public/cancel.rb b/app/domain/booking_actions/public/cancel.rb
@@ -5,8 +5,8 @@ module Public
     class Cancel < BookingActions::Base
       def invoke!
         booking.reload
-        transition_to = if booking.can_transition_to?(:declined_request)
-                          :declined_request
+        transition_to = if booking.can_transition_to?(:cancelled_request)
+                          :cancelled_request
                         elsif booking.can_transition_to?(:cancelation_pending)
                           :cancelation_pending
                         end

diff --git a/app/models/payment_infos/qr_bill.rb b/app/models/payment_infos/qr_bill.rb
@@ -69,7 +69,7 @@ def creditor_address_lines
     end
 
     def debitor_address_lines
-      @debitor_address_lines ||= [invoice_address.lines, invoice_address.represented_by].max_by(&:size)
+      @debitor_address_lines ||= [invoice_address.lines, invoice_address.represented_by].compact.max_by(&:size)
     end
 
     def creditor_account