Decoupling promo cont.

priceflex · Nov 11, 2011 · d967ad1 · d967ad1
1 parent f4668ed
commit d967ad1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/auth/spec/controllers/admin/admin_orders_controller_spec.rb b/auth/spec/controllers/admin/admin_orders_controller_spec.rb
@@ -4,7 +4,7 @@
 
 describe Spree::Admin::OrdersController do
 
-  let(:order) { mock_model(Spree::Order, :number => 'R123', :reload => nil, :save! => true, :coupon_code= => nil, :coupon_code => nil) }
+  let(:order) { mock_model(Spree::Order, :number => 'R123', :reload => nil, :save! => true) }
   before do
     Spree::Order.stub :find_by_number => order
     #ensure no respond_overrides are in effect

diff --git a/auth/spec/controllers/admin/admin_shipments_controller_spec.rb b/auth/spec/controllers/admin/admin_shipments_controller_spec.rb
@@ -7,7 +7,7 @@
     let(:user) { Spree::User.new }
     let(:shipment) { mock_model Spree::Shipment }
     let(:shipping_method) { mock_model Spree::ShippingMethod }
-    let(:order) { mock_model(Spree::Order, :number => 'R123', :reload => nil, :save! => true, :coupon_code= => nil, :coupon_code => nil) }
+    let(:order) { mock_model(Spree::Order, :number => 'R123', :reload => nil, :save! => true) }
 
     before do
       controller.stub :current_user => user

diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
@@ -67,7 +67,6 @@ en:
           zipcode: "Shipping address zipcode"
         checkout_complete: "Checkout Complete"
         completed_at: "Completed At"
-        coupon_code: "Coupon Code"
         ip_address: "IP Address"
         item_total: "Item Total"
         number: Number
@@ -398,8 +397,6 @@ en:
     spree:
       cart:
         add: 'Add to cart'
-      checkout:
-        coupon_code_added: "Coupon code added"
       order:
         contents_changed: "Order contents changed"
       user:

diff --git a/core/spec/controllers/spree/orders_controller_spec.rb b/core/spec/controllers/spree/orders_controller_spec.rb
@@ -2,7 +2,7 @@
 
 describe Spree::OrdersController do
 
-  let(:order) { mock_model(Spree::Order, :number => "R123", :reload => nil, :save! => true, :coupon_code= => nil, :coupon_code => nil) }
+  let(:order) { mock_model(Spree::Order, :number => "R123", :reload => nil, :save! => true) }
   before do
     Spree::Order.stub(:find).with(1).and_return(order)
     controller.stub :current_user => nil

diff --git a/promo/config/locales/en.yml b/promo/config/locales/en.yml
@@ -15,6 +15,10 @@ en:
   coupon: Coupon
   coupon_code: Coupon code
   editing_promotion: Editing Promotion
+  events:
+    spree:
+      checkout:
+        coupon_code_added: Coupon code added
   expiry: Expiry
   free_shipping: Free Shipping
   new_promotion: New Promotion
@@ -65,6 +69,8 @@ en:
       group: From product group
       manual: Manually choose
   rules: Rules
+  spree/order:
+    coupon_code: Coupon Code
   user_rule:
     choose_users: Choose users
   item_total_rule: