spree_promo 1.1.6 → 1.2.0.rc1

data/app/assets/javascripts/admin/promotions.js

@@ -1,6 +1,6 @@
 var initProductActions = function(){
 
-  $("#add_product_name").product_autocomplete();
+  $(".product_autocomplete").product_autocomplete();
 
   $('.calculator-fields').each(function(){
     var $fields_container = $(this);

data/app/assets/javascripts/admin/spree_promo.js

@@ -1,3 +1,2 @@
 //= require admin/spree_core
-//= require admin/spree_auth
 //= require_tree .

data/app/assets/javascripts/store/spree_promo.js

@@ -1,2 +1 @@
 //= require store/spree_core
-//= require store/spree_auth

data/app/assets/stylesheets/admin/spree_promo.css

@@ -1,5 +1,4 @@
 /*
  *= require admin/spree_core
- *= require admin/spree_auth
  *= require admin/promotions
 */

data/app/assets/stylesheets/store/spree_promo.css

@@ -1,4 +1,17 @@
 /*
  *= require store/spree_core
- *= require store/spree_auth
+ *= require_self
 */
+
+#update-cart .coupon-code-field {
+  /* yes, this is ugly... */
+  margin-top: -42px !important;
+}
+
+@media only screen and (max-width: 767px) {
+  #empty-cart,
+  #update-cart .coupon-code-field {
+    /* yes, this is ugly... */
+    margin-top: 0 !important;
+  }
+}

data/app/controllers/spree/orders_controller_decorator.rb

@@ -0,0 +1,30 @@
+Spree::OrdersController.class_eval do
+
+  def update
+    @order = current_order
+    if @order.update_attributes(params[:order])
+      if @order.coupon_code.present?
+        if apply_coupon_code
+          flash[:notice] = t(:coupon_code_applied)
+        else
+          flash[:error] = t(:promotion_not_found)
+          render :edit and return
+        end
+      end
+      @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
+      fire_event('spree.order.contents_changed')
+      respond_with(@order) { |format| format.html { redirect_to cart_path } }
+    else
+      respond_with(@order)
+    end
+  end
+
+  def apply_coupon_code
+    return if @order.coupon_code.blank?
+    if Spree::Promotion.exists?(:code => @order.coupon_code)
+      fire_event('spree.checkout.coupon_code_added', :coupon_code => @order.coupon_code)
+      true
+    end
+  end
+
+end

data/app/models/spree/order_decorator.rb

@@ -23,8 +23,4 @@ Spree::Order.class_eval do
     end
     alias_method_chain :update_adjustments, :promotion_limiting
   end
-
-  def promo_total
-    adjustments.promotion.map(&:amount).sum
-  end
 end

data/app/models/spree/product_decorator.rb

@@ -1,5 +1,5 @@
 Spree::Product.class_eval do
-  has_and_belongs_to_many :promotion_rules, :join_table => 'spree_products_promotion_rules'
+  has_and_belongs_to_many :promotion_rules, :join_table => :spree_products_promotion_rules
 
   def possible_promotions
     all_rules = promotion_rules

data/app/models/spree/promotion.rb

@@ -6,11 +6,11 @@ module Spree
     Activator.event_names << 'spree.checkout.coupon_code_added'
     Activator.event_names << 'spree.content.visited'
 
-    has_many :promotion_rules, :foreign_key => 'activator_id', :autosave => true, :dependent => :destroy
+    has_many :promotion_rules, :foreign_key => :activator_id, :autosave => true, :dependent => :destroy
     alias_method :rules, :promotion_rules
     accepts_nested_attributes_for :promotion_rules
 
-    has_many :promotion_actions, :foreign_key => 'activator_id', :autosave => true, :dependent => :destroy
+    has_many :promotion_actions, :foreign_key => :activator_id, :autosave => true, :dependent => :destroy
     alias_method :actions, :promotion_actions
     accepts_nested_attributes_for :promotion_actions
 

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -45,4 +45,4 @@ module Spree
       end
     end
   end
-end
+end

data/app/models/spree/promotion/actions/create_line_items.rb

@@ -2,7 +2,7 @@ module Spree
   class Promotion
     module Actions
       class CreateLineItems < PromotionAction
-        has_many :promotion_action_line_items, :foreign_key => 'promotion_action_id'
+        has_many :promotion_action_line_items, :foreign_key => :promotion_action_id
 
         attr_accessor :line_items_string
 
@@ -33,4 +33,4 @@ module Spree
       end
     end
   end
-end
+end

data/app/models/spree/promotion/rules/user.rb

@@ -4,8 +4,8 @@ module Spree
       class User < PromotionRule
         attr_accessible :user_ids_string
 
-        belongs_to :user, :class_name => "Spree::User"
-        has_and_belongs_to_many :users, :class_name => '::Spree::User', :join_table => 'spree_promotion_rules_users', :foreign_key => 'promotion_rule_id'
+        belongs_to :user, :class_name => Spree.user_class.to_s
+        has_and_belongs_to_many :users, :class_name => Spree.user_class.to_s, :join_table => 'spree_promotion_rules_users', :foreign_key => 'promotion_rule_id'
 
         def eligible?(order, options = {})
           users.none? or users.include?(order.user)

data/app/overrides/promo_cart_coupon_code_field.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(:virtual_path => "spree/orders/edit",
+                     :name => "promo_cart_coupon_code_field",
+                     :insert_after => "[data-hook='cart_buttons']",
+                     :partial => "spree/orders/coupon_code_field",
+                     :disabled => false,
+                     :original => "c11d9a1996fb86e992aba19035074cf5f688dea2")

data/app/views/spree/admin/promotion_actions/create.js.erb

@@ -5,4 +5,5 @@ initProductActions();
 $('#<%= dom_id @promotion_action %>').hide();
 $('#<%= dom_id @promotion_action %>').fadeIn();
 $('#<%= dom_id @promotion_action %> .tokeninput.products').productPicker();
+$('.product_autocomplete').product_autocomplete();
 

data/app/views/spree/admin/promotions/_form.html.erb

@@ -1,17 +1,4 @@
-<% if @promotion && (@promotion.errors.any? || @promotion.rules.any? { |r| r.errors.any? }) %>
-  <% error_group = [@promotion.errors, @promotion.rules.map(&:errors)].flatten %>
-  <div id="errorExplanation" class="errorExplanation" data-hook>
-    <h2><%= t(:errors_prohibited_this_record_from_being_saved, :count => error_group.count) %>:</h2>
-    <p><%= t(:there_were_problems_with_the_following_fields) %>:</p>
-     <ul>
-     <% error_group.each do |errors| %>
-       <% errors.full_messages.each do |msg| %>
-         <li><%= msg %></li>
-       <% end %>
-      <% end %>
-     </ul>
-  </div>
-<% end %>
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @promotion } %>
 <fieldset id="general_fields">
   <legend><%= t(:general) %></legend>
   <%= f.field_container :name do %>

data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb

@@ -27,7 +27,7 @@
     <legend><%= t(:add_product) %></legend>
     <div style="float:left; width:50%; margin-right:5%;">
       <%= label_tag :add_product_name, t(:name_or_sku) %>
-      <%= text_field_tag :add_product_name, nil, :class => 'fullwidth' %>
+      <%= text_field_tag :add_product_name, nil, :class => 'fullwidth product_autocomplete' %>
       <%= hidden_field_tag :add_variant_id %>
       <%= hidden_field_tag :add_line_item_variant_id %>
     </div>

data/app/views/spree/checkout/_coupon_code_field.html.erb

@@ -1,6 +1,6 @@
 <% if Spree::Promotion.count > 0 %>
-  <p class='field' data-hook='coupon_code'>
-    <%= form.label :coupon_code %><br />
-    <%= form.text_field :coupon_code %>
-  </p>
+<p>
+  <%= form.label :coupon_code %><br />
+  <%= form.text_field :coupon_code %>
+</p>
 <% end %>

data/app/views/spree/orders/_coupon_code_field.html.erb

@@ -0,0 +1,7 @@
+<% if Spree::Promotion.count > 0 %>
+<div class="five columns alpha offset-by-nine coupon-code-field">
+  <%= order_form.label :coupon_code %><br />
+  <%= order_form.text_field :coupon_code, :size => 10 %>
+  <%= order_form.submit I18n.t(:apply) %>
+</div>
+<% end %>

data/config/locales/en.yml

@@ -16,6 +16,7 @@ en:
   add_rule_of_type: Add rule of type
   coupon: Coupon
   coupon_code: Coupon code
+  coupon_code_applied: The coupon code was successfully applied to your order.
   editing_promotion: Editing Promotion
   events:
     spree:

data/lib/spree/promo.rb

@@ -1,5 +1,4 @@
 require 'spree/core'
-require 'spree/auth'
 
 module Spree
   module Promo

data/lib/spree/promo/engine.rb

@@ -7,14 +7,15 @@ module Spree
       def self.activate
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
           Rails.configuration.cache_classes ? require(c) : load(c)
-        end
 
-        # Include list of visited paths in notification payload hash
-        Spree::Core::ControllerHelpers.class_eval do
-          def default_notification_payload
-            { :user => current_user, :order => current_order, :visited_paths => session[:visited_paths] }
+          Spree::BaseController.class_eval do
+            # Include list of visited paths in notification payload hash
+            def default_notification_payload
+              { :user => try_spree_current_user, :order => current_order, :visited_paths => session[:visited_paths] }
+            end
           end
         end
+
       end
 
       config.autoload_paths += %W(#{config.root}/lib)

metadata

@@ -1,48 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.1.6
+  version: 1.2.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - David North
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.6
   name: spree_core
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
-- !ruby/object:Gem::Dependency
+        version: 1.2.0.rc1
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.6
-  name: spree_auth
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.0.rc1
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -61,11 +45,11 @@ files:
 - app/controllers/spree/admin/promotions_controller.rb
 - app/controllers/spree/checkout_controller_decorator.rb
 - app/controllers/spree/content_controller_decorator.rb
+- app/controllers/spree/orders_controller_decorator.rb
 - app/helpers/spree/promotion_rules_helper.rb
 - app/models/spree/adjustment_decorator.rb
 - app/models/spree/calculator/free_shipping.rb
 - app/models/spree/order_decorator.rb
-- app/models/spree/payment_decorator.rb
 - app/models/spree/product_decorator.rb
 - app/models/spree/promotion/actions/create_adjustment.rb
 - app/models/spree/promotion/actions/create_line_items.rb
@@ -79,6 +63,7 @@ files:
 - app/models/spree/promotion_action_line_item.rb
 - app/models/spree/promotion_rule.rb
 - app/overrides/promo_admin_tabs.rb
+- app/overrides/promo_cart_coupon_code_field.rb
 - app/overrides/promo_coupon_code_field.rb
 - app/overrides/promo_product_properties.rb
 - app/views/spree/admin/promotion_actions/create.js.erb
@@ -103,6 +88,7 @@ files:
 - app/views/spree/admin/promotions/rules/_user.html.erb
 - app/views/spree/admin/promotions/rules/_user_logged_in.html.erb
 - app/views/spree/checkout/_coupon_code_field.html.erb
+- app/views/spree/orders/_coupon_code_field.html.erb
 - app/views/spree/products/_promotions.html.erb
 - config/locales/en.yml
 - config/routes.rb
@@ -124,8 +110,7 @@ files:
 - db/migrate/20120119024708_create_spree_pending_promotions.rb
 - db/migrate/20120119024721_content_visited_event.rb
 homepage: http://spreecommerce.com
-licenses:
-- BSD-3
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -139,12 +124,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -1663519733063640268
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 

data/app/models/spree/payment_decorator.rb

@@ -1,5 +0,0 @@
-Spree::Payment.class_eval do
-  def promo_total
-    order.promo_total * 100
-  end
-end