Delegate firstname and lastname to bill_address instead of creating s…

…eparate methods
tanmay3011 · Dec 2, 2015 · fb7a278 · fb7a278 · cbrunsdon · Dec 2, 2015
1 parent 10ea458
commit fb7a278
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
@@ -101,7 +101,11 @@ def states
 
     make_permalink field: :number
 
-    delegate :update_totals, :persist_totals, :to => :updater
+    delegate :update_totals, :persist_totals, to: :updater
+    delegate :firstname, :lastname, to: :bill_address, prefix: true, allow_nil: true
+    alias_method :billing_firstname, :bill_address_firstname
+    alias_method :billing_lastname, :bill_address_lastname
+
 
     class_attribute :update_hooks
     self.update_hooks = Set.new
@@ -410,14 +414,6 @@ def available_payment_methods
       ).uniq
     end
 
-    def billing_firstname
-      bill_address.try(:firstname)
-    end
-
-    def billing_lastname
-      bill_address.try(:lastname)
-    end
-
     def insufficient_stock_lines
       line_items.select(&:insufficient_stock?)
     end