From 8813edaed88b2afca480419e88c89d0dfdc56963 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 6 Jun 2023 14:59:03 +0100
Subject: [PATCH] Fix variables in form partial

---
 app/views/spree/admin/orders/_form.html.haml | 9 +++++----
 app/views/spree/admin/orders/edit.html.haml  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/spree/admin/orders/_form.html.haml b/app/views/spree/admin/orders/_form.html.haml
index 9f8b00c6e2..02969f99e0 100644
--- a/app/views/spree/admin/orders/_form.html.haml
+++ b/app/views/spree/admin/orders/_form.html.haml
@@ -5,17 +5,18 @@
   - if !@order.completed? && @order.insufficient_stock_lines.any?
     = render 'spree/admin/orders/insufficient_stock_lines', insufficient_stock_lines: @order.insufficient_stock_lines
 
-  = render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order }
-  - if order.line_items.exists?
+  = render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => @order }
+
+  - if @order.line_items.exists?
     = render partial: "spree/admin/orders/note", locals: { order: @order }
 
   = render :partial => "spree/admin/orders/_form/adjustments", :locals => { :adjustments => @order.line_item_adjustments, :title => t(".line_item_adjustments")}
   = render :partial => "spree/admin/orders/_form/adjustments", :locals => { :adjustments => order_adjustments_for_display(@order), :title => t(".order_adjustments")}
 
-  - if order.line_items.exists?
+  - if @order.line_items.exists?
     %fieldset#order-total.no-border-bottom.order-details-total
       %legend{ align: 'center' }= t(".order_total")
-      %span.order-total= order.display_total
+      %span.order-total= @order.display_total
 
   = form_for @order, url: spree.admin_order_url(@order), method: :put do |f|
     = render partial: 'spree/admin/orders/_form/distribution_fields'
diff --git a/app/views/spree/admin/orders/edit.html.haml b/app/views/spree/admin/orders/edit.html.haml
index b8556d861a..6a88c85ebd 100644
--- a/app/views/spree/admin/orders/edit.html.haml
+++ b/app/views/spree/admin/orders/edit.html.haml
@@ -32,4 +32,4 @@
         = Spree.t(:your_order_is_empty_add_product)
 
     %div.admin-order-edit-form
-      = render :partial => 'form', :locals => { :order => @order }
+      = render partial: 'form'