fix a bug on merge! function... it now accept as second argument user…

… even if not used + added add label to locale file en
charredUtensil · Nov 10, 2013 · 9aec142 · 9aec142
1 parent 698ae27
commit 9aec142
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
@@ -37,7 +37,7 @@ def contains?(variant, ad_hoc_option_value_ids, product_customizations)
       end
     end
 
-    def merge!(order)
+    def merge!(order, user)
       order.line_items.each do |line_item|
         self.add_variant(line_item.variant, line_item.quantity, line_item.ad_hoc_option_value_ids, line_item.product_customizations)
       end

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1,5 +1,6 @@
 ---
 en:
+  add: "Add"
   required: "Required?"
   price_modifier: "Price Adjustment"
   price_modifier_type: "What price modifier strategy does this option type use?"
@@ -46,4 +47,4 @@ en:
   customize: 'Customize'
   reset: 'Reset'
   position_within_product: 'Display order relative to other Ad Hoc Options (low numbers are displayed first)'
-  selected_by_default: 'Selected by default?'
+  selected_by_default: 'Selected by default?'