Merge pull request #5427 from solidusio/elia/admin/order-states

Don't show missing order shipment and payment states
solidusio · Oct 11, 2023 · cfa016a · cfa016a
2 parents dc8dad1 + 8302a83
commit cfa016a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/admin/app/components/solidus_admin/orders/index/component.rb b/admin/app/components/solidus_admin/orders/index/component.rb
@@ -158,7 +158,7 @@ def payment_column
     {
       header: :payment,
       data: ->(order) do
-        component('ui/badge').new(name: order.payment_state&.humanize, color: order.paid? ? :green : :yellow)
+        component('ui/badge').new(name: order.payment_state.humanize, color: order.paid? ? :green : :yellow) if order.payment_state?
       end
     }
   end
@@ -167,7 +167,7 @@ def shipment_column
     {
       header: :shipment,
       data: ->(order) do
-        component('ui/badge').new(name: order.shipment_state&.humanize, color: order.shipped? ? :green : :yellow)
+        component('ui/badge').new(name: order.shipment_state.humanize, color: order.shipped? ? :green : :yellow) if order.shipment_state?
       end
     }
   end