dup_spree_promo 1.3.0.rc1

data/app/overrides/promo_admin_tabs.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(:virtual_path => "spree/layouts/admin",
+                     :name => "promo_admin_tabs",
+                     :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
+                     :text => "<%= tab(:promotions, :url => spree.admin_promotions_path, :icon => 'icon-bullhorn') %>",
+                     :disabled => false,
+                     :original => '3e847740dc3e7f924aba1ccb4cb00c7b841649e3')

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/overrides/promo_coupon_code_field.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(:virtual_path => "spree/checkout/_payment",
+                     :name => "promo_coupon_code_field",
+                     :replace => "[data-hook='coupon_code_field'], #coupon_code_field[data-hook]",
+                     :partial => "spree/checkout/coupon_code_field",
+                     :disabled => false,
+                     :original => '9c9f7058eb6fd9236a241621ab53b43e1caa1a0b' )

data/app/overrides/promo_product_properties.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(:virtual_path => "spree/products/show",
+                     :name => "promo_product_properties",
+                     :insert_after => "[data-hook='product_properties'], #product_properties[data-hook]",
+                     :partial => "spree/products/promotions",
+                     :disabled => false,
+                     :original => '21a1d0ddb6ae24042f130d64f0ad4b90e69cd088')

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

@@ -0,0 +1,12 @@
+$('#actions').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_action', :object => @promotion_action) ) %>');
+$('#actions .no-objects-found').hide();
+initProductActions();
+
+<% unless Rails.env.test? %>
+  $('.type-select.select2').select2();
+<% end %>
+
+$('#<%= 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/promotion_actions/destroy.js.erb

@@ -0,0 +1 @@
+$('#<%= dom_id @promotion_action %>').fadeOut().remove();

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

@@ -0,0 +1,13 @@
+$('#rules').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_rule', :object => @promotion_rule) ) %>');
+$('#rules .no-objects-found').hide();
+
+$('#<%= dom_id @promotion_rule %>').hide();
+$('#<%= dom_id @promotion_rule %>').fadeIn();
+$('#<%= dom_id @promotion_rule %> .tokeninput.products').productPicker();
+$('#<%= dom_id @promotion_rule %> .tokeninput.users').userPicker();
+
+$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
+
+<% unless Rails.env.test? %>
+  $('.select_item_total.select2, .select_product.select2').select2();
+<% end %>

data/app/views/spree/admin/promotion_rules/destroy.js.erb

@@ -0,0 +1,3 @@
+$('#<%= dom_id @promotion_rule %>').fadeOut().remove();
+
+$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');

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

@@ -0,0 +1,32 @@
+<fieldset id="action_fields" class="eight columns omega no-border-top">
+
+  <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), :remote => true, :id => 'new_promotion_action_form' do %>
+    <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
+    <fieldset>
+      <legend align="center"><%= t(:promotion_actions) %></legend>
+      <div class="field">
+        <%= label_tag :action_type, t(:add_action_of_type)%>
+        <%= select_tag 'action_type', options, :class => 'select2 fullwidth' %>  
+      </div>
+      <div class="filter-actions actions">
+        <%= button t(:add), 'icon-plus', :class => 'fullwidth' %>
+      </div>
+    </fieldset>
+  <% end %>
+
+  <%= form_for @promotion, :url => spree.admin_promotion_path(@promotion), :method => :put do |f| %>
+    <div id="actions" class="filter_list">
+      <% if @promotion.actions.any? %>
+        <%= render :partial => 'promotion_action',  :collection => @promotion.actions %>
+      <% else %>
+        <div class="no-objects-found">
+          <%= t(:no_actions_added) %>
+        </div>
+      <% end %>
+    </div>
+    <div class="filter-actions actions promotion-update">
+      <%= button t(:update), 'icon-refresh' %>
+    </div>
+  <% end %>
+
+</fieldset>

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

@@ -0,0 +1,56 @@
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @promotion } %>
+<div class="row">
+  <div id="general_fields" class="alpha thirteen columns">
+    <div class="alpha four columns">
+      <%= f.field_container :name do %>
+        <%= f.label :name %>
+        <%= f.text_field :name, :class => 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :event_name do %>
+        <%= f.label :event_name %>
+        <%= f.select :event_name, Spree::Activator.event_names.map{|name| [t("events.#{name}"), name] }, {}, {:class => 'select2 fullwidth'} %>
+      <% end %>
+
+      <%= f.field_container :code do %>
+        <%= f.label :code %>
+        <%= f.text_field :code, :class => 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :path do %>
+        <%= f.label :path %>
+        <%= f.text_field :path, :class => 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :advertise do %>
+        <%= f.check_box :advertise %>
+        <%= f.label :advertise %>
+      <% end %>
+    </div>
+
+    <div class="omega nine columns">
+      <%= f.field_container :description do %>
+        <%= f.label :description %><br />
+        <%= f.text_area :description, :rows => 7, :class => 'fullwidth' %>
+      <% end %>      
+    </div>
+  </div>
+
+  <div id="expiry_fields" class="three columns omega">
+    <%= f.field_container :usage_limit do %>
+      <%= f.label :usage_limit %><br />
+      <%= f.number_field :usage_limit, :min => 0, :class => 'fullwidth' %><br>
+      <%= t(:current_promotion_usage, :count => @promotion.credits_count) %>
+    <% end %>
+    
+    <div id="starts_at_field" class="field">
+      <%= f.label :starts_at %>
+      <%= f.text_field :starts_at, :class => 'datepicker datepicker-from fullwidth' %>
+    </div>
+
+    <div id="expires_at_field" class="field">
+      <%= f.label :expires_at %>
+      <%= f.text_field :expires_at, :class => 'datepicker datepicker-top fullwidth' %>
+    </div>  
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+<div class="promotion_action promotion-block <%= promotion_action.type.to_s.demodulize.underscore %>" id="<%= dom_id promotion_action %>">
+  <% type_name = promotion_action.class.name.demodulize.underscore %>
+  <h6 class="promotion-title"><%= t("promotion_action_types.#{type_name}.description") %></h6>
+  <%= link_to_with_icon 'icon-trash', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), :remote => true, :method => :delete, :class => 'delete' %>
+  
+  <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
+  <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
+  
+  <%= render :partial => "spree/admin/promotions/actions/#{type_name}",
+             :locals => { :promotion_action => promotion_action, :param_prefix => param_prefix } %>
+</div>

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

@@ -0,0 +1,9 @@
+<div class="promotion_rule promotion-block alpha omega eight columns" id="<%= dom_id promotion_rule %>">
+  <% type_name = promotion_rule.class.name.demodulize.underscore %>
+  <h6 class='promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= t("promotion_rule_types.#{type_name}.description") %></h6>
+  <%= link_to_with_icon 'icon-trash', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), :remote => true, :method => :delete, :class => 'delete' %>
+  
+  <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
+  <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>  
+  <%= render :partial => "spree/admin/promotions/rules/#{type_name}", :locals => { :promotion_rule => promotion_rule, :param_prefix => param_prefix } %>
+</div>

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

@@ -0,0 +1,45 @@
+<fieldset id="rule_fields" class ="alpha eight columns no-border-bottom no-border-top">
+
+  <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), :remote => true, :id => 'new_product_rule_form' do %>
+    <fieldset>
+      <legend align="center"><%= t(:rules) %></legend>
+
+      <div class="field">
+        <%= label_tag :promotion_rule_type, t(:add_rule_of_type) %>  
+        <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), :class => 'select2 fullwidth') %>
+      </div>
+      <div class="filter-actions actions">
+        <%= button t(:add), 'icon-plus' %>
+      </div>
+    </fieldset>
+  <% end %>
+
+  
+    <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
+      <fieldset class="no-border-top">
+        <div id="promotion-pilicy-select" class="align-center row">
+          <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
+            <div class="alpha four columns">
+              <label><%= f.radio_button :match_policy, policy %> <%= t "promotion_form.match_policies.#{policy}" %></label>  
+            </div>
+          <% end %>
+        </div>
+        
+        <div id="rules" class="filter_list row">
+          <% if @promotion.rules.any? %>
+            <%= render :partial => 'promotion_rule', :collection => @promotion.rules, :locals => {} %>
+          <% else %>
+            <div class="no-objects-found">
+              <%= t(:no_rules_added) %>
+            </div>
+          <% end %>
+        </div>
+
+        <div class="promotion-update filter-actions actions">
+          <%= button t(:update), 'icon-refresh' %>
+        </div>
+      </fieldset>
+    <% end %>
+  
+
+</fieldset>

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

@@ -0,0 +1 @@
+<%= tab(:promotions) %>

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

@@ -0,0 +1,26 @@
+<div class="calculator-fields row">
+
+  <div class="field alpha four columns">
+    <% field_name = "#{param_prefix}[calculator_type]" %>
+    <%= label_tag field_name, t(:calculator) %>
+    <%= select_tag field_name,
+                   options_from_collection_for_select(@calculators, :to_s, :description, promotion_action.calculator.type),
+                   :class => 'type-select select2 fullwidth' %>
+    <% if promotion_action.calculator.respond_to?(:preferences) %>
+      <span class="warning info"><%= t(:calculator_settings_warning) %></span>
+    <% end %>
+  </div>
+
+  <% unless promotion_action.new_record? %>
+    <div class="settings field omega four columns">
+      <% promotion_action.calculator.preferences.keys.map do |key| %>
+        <% field_name = "#{param_prefix}[calculator_attributes][preferred_#{key}]" %>
+        <%= label_tag field_name, t(key.to_s) %>
+        <%= preference_field_tag(field_name,
+                                 promotion_action.calculator.get_preference(key),
+                                 :type => promotion_action.calculator.preference_type(key)) %>
+      <% end %>
+      <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,22 @@
+<% promotion_action.promotion_action_line_items.each do |item| %>
+  <strong><%= item.quantity %> x <%= item.variant.product.name %></strong>
+  <%= item.variant.options_text %>
+<% end %>
+
+<% if promotion_action.promotion_action_line_items.empty? %>
+  <% line_items = promotion_action.promotion_action_line_items %>
+  <% line_items.build %>
+
+  <% line_items.each_with_index do |line_item, index| %>
+    <div class="add-line-item row">
+        <div class="field alpha four columns">
+          <% line_item_prefix = "#{param_prefix}[promotion_action_line_items_attributes][#{index}]" %>
+          <%= hidden_field_tag "#{line_item_prefix}[variant_id]", line_item.variant_id, :class => "variant_autocomplete fullwidth" %>
+          <div class='options_placeholder'></div>
+        </div>
+        <div class="field omega four columns">
+          <%= number_field_tag "#{line_item_prefix}[quantity]", line_item.quantity, :min => 1, :class => 'fullwidth' %>
+        </div>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,28 @@
+<% content_for :page_title do %>
+  <%= t(:editing_promotion) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:back_to_promotions_list), admin_promotions_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
+
+<%= form_for @promotion, :url => object_url, :method => :put do |f| %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>
+
+<div id="promotion-filters" class="row">
+  <div id="rules_container" class="alpha eight columns">
+    <%= render :partial => 'rules' %>
+  </div>
+
+  <div id="actions_container" class="omega eight columns">
+    <%= render :partial => 'actions' %>
+  </div>
+</div>
+
+<%= render :partial => "spree/admin/variants/autocomplete", :formats => [:js] %>

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

@@ -0,0 +1,52 @@
+<% content_for :page_title do %>
+  <%= t(:promotions) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:new_promotion), spree.new_admin_promotion_path, :icon => 'icon-plus' %>
+  </li>
+<% end %>
+
+<% unless @promotions.any? %>
+  <div class="no-objects-found">
+    <%= t(:no_promotions_found) %>.
+    <%= link_to t(:add_one), spree.new_admin_promotion_path %>!
+  </div>
+<% else %>
+  <table class="index">
+    <colgroup>
+      <col style="width: 20%">
+      <col style="width: 10%">
+      <col style="width: 35%">
+      <col style="width: 10%">
+      <col style="width: 15%">
+      <col style="width: 10%">
+    </colgroup>
+    <thead>
+      <tr>
+        <th><%= t(:name) %></th>
+        <th><%= t(:code) %></th>
+        <th><%= t(:description) %></th>
+        <th><%= t(:usage_limit) %></th>
+        <th><%= t(:expiration) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @promotions.each do |promotion| %>
+        <tr id="<%= spree_dom_id promotion %>" class="<%= cycle('odd', 'even')%>">
+          <td><%= promotion.name %></td>
+          <td class="align-center"><%= promotion.code %></td>
+          <td><%= promotion.description %></td>
+          <td class="align-center"><%= promotion.usage_limit %></td>
+          <td class="align-center"><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
+          <td class="actions">
+            <%= link_to_edit promotion, :no_text => true %>
+            <%= link_to_delete promotion, :no_text => true %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

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

@@ -0,0 +1,16 @@
+<% content_for :page_title do %>
+  <%= t(:new_promotion) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:back_to_promotions_list), spree.admin_promotions_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
+
+<%= form_for :promotion, :url => collection_url do |f| %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/promotions/rules/_item_total.html.erb

@@ -0,0 +1,6 @@
+<div class="field alpha four columns">
+  <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator), {:class => 'select2 select_item_total fullwidth'} %>
+</div>
+<div class="field omega four columns">
+  <%= text_field_tag "#{param_prefix}[preferred_amount]", promotion_rule.preferred_amount, :class => 'fullwidth' %>  
+</div>

data/app/views/spree/admin/promotions/rules/_landing_page.html.erb

@@ -0,0 +1,5 @@
+<div class="field alpha omega eight columns">
+  <label for="<%= "#{param_prefix}_preferred_path" %>"><%= t('promotion_rule_types.landing_page.description') %>:</label>  
+  <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, :class => 'fullwidth' %>  
+  <span class="info"><%= t('landing_page_rule.must_have_visited_path') %></span>
+</div>

data/app/views/spree/admin/promotions/rules/_product.html.erb

@@ -0,0 +1,9 @@
+<div class="field alpha omega eight columns products_rule_products">
+  <%= label_tag t('product_rule.choose_products') %>
+  <%= product_picker_field "#{param_prefix}[product_ids_string]", promotion_rule.product_ids_string %>
+</div>
+<div class="field alpha omega eight columns">
+  <label>
+    <%= t('product_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {:class => 'select_product select2'})).html_safe %>
+  </label>
+</div>

data/app/views/spree/admin/promotions/rules/_user.html.erb

@@ -0,0 +1,4 @@
+<div class="field alpha omega eight columns">
+  <label><%= t('user_rule.choose_users') %></label><br>
+  <input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker fullwidth' value='<%= promotion_rule.user_ids.join(",") %>'>
+</div>

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

@@ -0,0 +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>
+<% 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/app/views/spree/products/_promotions.html.erb

@@ -0,0 +1,23 @@
+<% promotions = @product.possible_promotions %>
+<% if promotions.any? %>
+<div id="promotions">
+  <h3><%= t(:promotions) %></h3>
+
+  <% promotions.each do |promotion| %>
+  <div>
+    <h4><%= promotion.name %></h4>
+    <p><%= promotion.description %></p>
+    <% if promotion.products.any? %>
+    <ul>
+      <% promotion.products.each do |product| %>
+        <li><%= link_to product.name, product_path(product) %></li>
+      <% end %>
+    </ul>
+    <% end %>
+  </div>
+  <% end %>
+
+</div>
+<% end %>
+
+