move overrides to override dir

Author: Torsten Ruger

app/models/pos_item.rb

@@ -0,0 +1,20 @@
+if Spree::Variant.first and Spree::Variant.first.respond_to? :ean
+  Deface::Override.new(:virtual_path => "spree/admin/products/_form",
+                       :name => "Add ean to product form",
+                       :insert_after => "code[erb-silent]:contains('has_variants')",
+                       :text => "<% unless @product.has_variants? %> <p>
+                              <%= f.label :ean, t(:ean) %><br>
+                              <%= f.text_field :ean, :size => 16 %>
+                              </p> <%end%>",
+                       :disabled => false)
+  Deface::Override.new(:virtual_path => "spree/admin/variants/_form",
+                       :name => "add_ean_to_variants_edit",
+                       :insert_after => "[data-hook='sku']",
+                       :text => "<p data-hook='ean'>
+                              <%= f.label :ean, t(:ean) %><br>
+                              <%= f.text_field :ean, :size => 16 %>
+                              </p>",
+                       :disabled => false)
+else
+  puts "POS: EAN support disabled, run migration to activate"
+end

app/overrides/ean_fields.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(:virtual_path => "spree/layouts/admin",
+                     :name => "Add Pos tab to menu",
+                     :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
+                     :text => " <%= tab( :pos , :url => admin_pos_path) %>",
+                     :sequence => {:after => "promo_admin_tabs"},
+                     :disabled => false)

app/overrides/pos_tab.rb

@@ -14,42 +14,11 @@ def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*decorator.rb")) do |c|
         Rails.env.production? ? require(c) : load(c)
       end
-      Deface::Override.new(:virtual_path => "spree/layouts/admin",
-                           :name => "Add Pos tab to menu",
-                           :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
-                           :text => " <%= tab( :pos , :url => admin_pos_path) %>",
-                           :sequence => {:after => "promo_admin_tabs"},
-                           :disabled => false)
-      if Spree::Variant.first and Spree::Variant.first.respond_to? :ean
-        Deface::Override.new(:virtual_path => "spree/admin/products/_form",
-                             :name => "Add ean to product form",
-                             :insert_after => "code[erb-silent]:contains('has_variants')",
-                             :text => "<% unless @product.has_variants? %> <p>
-                                    <%= f.label :ean, t(:ean) %><br>
-                                    <%= f.text_field :ean, :size => 16 %>
-                                    </p> <%end%>",
-                             :disabled => false)
-        Deface::Override.new(:virtual_path => "spree/admin/variants/_form",
-                             :name => "add_ean_to_variants_edit",
-                             :insert_after => "[data-hook='sku']",
-                             :text => "<p data-hook='ean'>
-                                    <%= f.label :ean, t(:ean) %><br>
-                                    <%= f.text_field :ean, :size => 16 %>
-                                    </p>",
-                             :disabled => false)
-      else
-        puts "POS: EAN support disabled, run migration to activate"
-      end
-      Spree::Variant.class_eval do
-
-        def tax_price
-          (self.price * (1 + self.product.effective_tax_rate)).round(2, BigDecimal::ROUND_HALF_UP)
-        end
+      Dir.glob(File.join(File.dirname(__FILE__), '../../../app/overrides/*.rb')) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
       end
       Spree::Product.class_eval do
-
         delegate_belongs_to :master, :ean
-
       end
     end