spree_core 2.3.13 → 2.4.0.rc1

data/app/views/spree/order_mailer/cancel_email.html.erb

@@ -0,0 +1,45 @@
+<table>
+  <tr>
+    <td>
+      <p class="lede">
+        <%= Spree.t('order_mailer.cancel_email.dear_customer') %>
+      </p>
+      <p>
+        <%= Spree.t('order_mailer.cancel_email.instructions') %>
+      </p>
+      <p>
+        <%= Spree.t('order_mailer.cancel_email.order_summary_canceled') %>
+      </p>
+      <table>
+        <% @order.line_items.each do |item| %>
+          <tr>
+            <td><%= item.variant.sku %></td>
+            <td>
+              <%= raw(item.variant.product.name) %>
+              <%= raw(item.variant.options_text) -%>
+            </td>
+            <td>(<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %></td>
+          </tr>
+        <% end %>
+        <tr>
+          <td></td>
+          <td><%= Spree.t('order_mailer.cancel_email.subtotal') %></td>
+          <td><%= @order.display_item_total %></td>
+        </tr>
+        <% @order.adjustments.eligible.each do |adjustment| %>
+          <tr>
+            <td></td>
+            <td><%= raw(adjustment.label) %></td>
+            <td><%= adjustment.display_amount %></td>
+          </tr>
+        <% end %>
+        <tr>
+          <td></td>
+          <td><%= Spree.t('order_mailer.cancel_email.total') %></td>
+          <td><%= @order.display_total %></td>
+        </tr>
+      </table>
+    </td>
+    <td class="expander"></td>
+  </tr>
+</table>

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -9,8 +9,8 @@
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
-<%= Spree.t('order_mailer.cancel_email.subtotal', :subtotal => @order.display_item_total) %>
+<%= Spree.t('order_mailer.cancel_email.subtotal') %> <%= @order.display_item_total %>
 <% @order.adjustments.eligible.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
 <% end %>
-<%= Spree.t('order_mailer.cancel_email.total', :total => @order.display_total) %>
+<%= Spree.t('order_mailer.cancel_email.total') %> <%= @order.display_total %>

data/app/views/spree/order_mailer/confirm_email.html.erb

@@ -0,0 +1,84 @@
+<table>
+  <tr>
+    <td>
+      <p class="lede">
+        <%= Spree.t('order_mailer.confirm_email.dear_customer') %>
+      </p>
+      <p>
+        <%= Spree.t('order_mailer.confirm_email.instructions') %>
+      </p>
+      <p>
+        <%= Spree.t('order_mailer.confirm_email.order_summary') %>
+      </p>
+      <table>
+        <% @order.line_items.each do |item| %>
+          <tr>
+            <td><%= item.variant.sku %></td>
+            <td>
+              <%= raw(item.variant.product.name) %>
+              <%= raw(item.variant.options_text) -%>
+            </td>
+            <td>(<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %></td>
+          </tr>
+        <% end %>
+        <tr>
+          <td></td>
+          <td>
+            <%= Spree.t('order_mailer.confirm_email.subtotal') %>
+          </td>
+          <td>
+            <%= @order.display_item_total %>
+          </td>
+        </tr>
+        <% if @order.line_item_adjustments.exists? %>
+          <% if @order.all_adjustments.promotion.eligible.exists? %>
+            <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+              <tr>
+                <td></td>
+                <td><%= Spree.t(:promotion) %> <%= label %>:</td>
+                <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %></td>
+              </tr>
+            <% end %>
+          <% end %>
+        <% end %>
+        <% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
+          <tr>
+            <td></td>
+            <td><%= Spree.t(:shipping) %> <%= name %>:</td>
+            <td><%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %></td>
+          </tr>
+        <% end %>
+        <% if @order.all_adjustments.eligible.tax.exists? %>
+          <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
+            <tr>
+              <td></td>
+              <td><%= Spree.t(:tax) %> <%= label %>:</td>
+              <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %></td>
+            </tr>
+          <% end %>
+        <% end %>
+        <% @order.adjustments.eligible.each do |adjustment| %>
+          <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
+          <tr>
+            <td></td>
+            <td><%= adjustment.label %>:</td>
+            <td><%= adjustment.display_amount %></td>
+          </tr>
+        <% end %>
+        <tr>
+          <td></td>
+          <td>
+            <%= Spree.t('order_mailer.confirm_email.total') %>
+          </td>
+          <td>
+            <%= @order.display_total %>
+          </td>
+        </tr>
+      </table>
+      <p>
+        <%= Spree.t('order_mailer.confirm_email.thanks') %>
+      </p>
+    </td>
+    <td class="expander"></td>
+  </tr>
+</table>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -9,7 +9,7 @@
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
-<%= Spree.t('order_mailer.confirm_email.subtotal', :subtotal => @order.display_item_total) %>
+<%= Spree.t('order_mailer.confirm_email.subtotal') %> <%= @order.display_item_total %>
 <% if @order.line_item_adjustments.exists? %>
   <% if @order.all_adjustments.promotion.eligible.exists? %>
     <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
@@ -33,6 +33,6 @@
 <%= adjustment.label %> <%= adjustment.display_amount %>
 <% end %>
 ============================================================
-<%= Spree.t('order_mailer.confirm_email.total', :total => @order.display_total) %>
+<%= Spree.t('order_mailer.confirm_email.total') %> <%= @order.display_total %>
 
 <%= Spree.t('order_mailer.confirm_email.thanks') %>

data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb

@@ -0,0 +1,22 @@
+<%= Spree.t('reimbursement_mailer.reimbursement_email.dear_customer') %>
+
+<%= Spree.t('reimbursement_mailer.reimbursement_email.instructions') %>
+
+============================================================
+<%= Spree.t('reimbursement_mailer.reimbursement_email.refund_summary') %>
+============================================================
+<%= Spree.t('reimbursement_mailer.reimbursement_email.total_refunded', total: @reimbursement.display_total) %>
+
+<% if @reimbursement.return_items.exchange_requested.present? %>
+============================================================
+<%= Spree.t('reimbursement_mailer.reimbursement_email.exchange_summary') %>
+============================================================
+<% @reimbursement.return_items.exchange_requested.each do |return_item| %>
+<%= return_item.variant.sku %> <%= raw(return_item.variant.product.name) %> <%= "(#{raw(return_item.variant.options_text)})" if return_item.variant.options_text.present? -%> -> <%= return_item.exchange_variant.sku %> <%= raw(return_item.exchange_variant.product.name) if return_item.exchange_variant.options_text.present? %> <%= "(#{raw(return_item.exchange_variant.options_text)})" -%>
+<% end %>
+
+
+<% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
+<%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
+<% end %>
+<% end %>

data/app/views/spree/shared/_base_mailer_footer.html.erb

@@ -0,0 +1,20 @@
+<!-- You can override this template to design your own footer.
+<table class="row footer">
+  <tr>
+    <td class="wrapper last">
+
+      <table class="twelve columns">
+        <tr>
+          <td align="center">
+            <center>
+              <p style="text-align:center;"><a href="#">Terms</a> | <a href="#">Privacy</a> | <a href="#">Unsubscribe</a></p>
+            </center>
+          </td>
+          <td class="expander"></td>
+        </tr>
+      </table>
+
+    </td>
+  </tr>
+</table>
+-->

data/app/views/spree/shared/_base_mailer_header.html.erb

@@ -0,0 +1,31 @@
+<!-- You can override this template to design your own header.
+<table class="row header">
+  <tr>
+    <td class="center" align="center">
+      <center>
+
+        <table class="container">
+          <tr>
+            <td class="wrapper last">
+
+              <table class="twelve columns">
+                <tr>
+                  <td class="six sub-columns">
+                    <%= image_tag(Spree::Config.logo) %>
+                  </td>
+                  <td class="six sub-columns last" style="text-align:right; vertical-align:middle;">
+                    <span class="template-label"><%= Spree::Store.current.name %></span>
+                  </td>
+                  <td class="expander"></td>
+                </tr>
+              </table>
+
+            </td>
+          </tr>
+        </table>
+
+      </center>
+    </td>
+  </tr>
+</table>
+-->

data/app/views/spree/shipment_mailer/shipped_email.html.erb

@@ -0,0 +1,34 @@
+<table>
+  <tr>
+    <td>
+      <p class="lede">
+        <%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
+      </p>
+      <p>
+        <%= Spree.t('shipment_mailer.shipped_email.instructions') %>
+      </p>
+      <p>
+        <%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
+      </p>
+      <table>
+        <% @shipment.manifest.each do |item| %>
+          <tr>
+            <td><%= item.variant.sku %></td>
+            <td><%= item.variant.product.name %></td>
+            <td><%= item.variant.options_text %></td>
+          </tr>
+        <% end %>
+      </table>
+      <p>
+        <%= Spree.t('shipment_mailer.shipped_email.track_information', :tracking => @shipment.tracking)     if @shipment.tracking %>
+      </p>
+      <p>
+        <%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @shipment.tracking_url) if @shipment.tracking_url %>
+      </p>
+      <p>
+        <%= Spree.t('shipment_mailer.shipped_email.thanks') %>
+      </p>
+    </td>
+    <td class="expander"></td>
+  </tr>
+</table>

data/app/views/spree/test_mailer/test_email.html.erb

@@ -0,0 +1,40 @@
+<table>
+  <tr>
+    <td>
+
+      <center>
+        <h1 class="center">
+          <%= Spree.t('test_mailer.test_email.greeting') %>
+        </h1>
+      </center>
+
+    </td>
+    <td class="expander"></td>
+  </tr>
+</table>
+
+<table>
+  <tr>
+    <td>
+
+      <p class="lede">
+        <%= Spree.t('test_mailer.test_email.message') %>
+      </p>
+
+      <p>
+        Please remember to configure all of the emails that Spree has provided to your needs.
+        Spree comes shipped with <a href="http://zurb.com/ink/" target="_blank"> Ink </a>
+        prepackaged, but you can use your own version. Ink is not placed in the asset pipeline.
+      </p>
+
+      <p>
+        Also take note that Gmail does not support <code>&lt;style&gt;</code> tags.
+        Therefore, you will need a gem that will be able to remove your <code>&lt;style&gt;</code>
+        tags and place them inline. Gmail only supports inline styles. We use
+        <a href="https://github.com/fphilipe/premailer-rails" target="_blank">Premailer for Rails</a> by default.
+      </p>
+
+    </td>
+    <td class="expander"></td>
+  </tr>
+</table>

data/app/views/spree/test_mailer/test_email.text.erb

@@ -1,4 +1,4 @@
-<%= t('test_mailer.test_email.greeting') %>
+<%= Spree.t('test_mailer.test_email.greeting') %>
 ================
 
-<%= t('test_mailer.test_email.message') %>
+<%= Spree.t('test_mailer.test_email.message') %>

data/config/initializers/friendly_id.rb

@@ -0,0 +1,88 @@
+# FriendlyId Global Configuration
+#
+# Use this to set up shared configuration options for your entire application.
+# Any of the configuration options shown here can also be applied to single
+# models by passing arguments to the `friendly_id` class method or defining
+# methods in your model.
+#
+# To learn more, check out the guide:
+#
+# http://norman.github.io/friendly_id/file.Guide.html
+
+FriendlyId.defaults do |config|
+  # ## Reserved Words
+  #
+  # Some words could conflict with Rails's routes when used as slugs, or are
+  # undesirable to allow as slugs. Edit this list as needed for your app.
+  config.use :reserved
+
+  config.reserved_words = %w(new edit index session login logout users admin
+    stylesheets assets javascripts images)
+
+  #  ## Friendly Finders
+  #
+  # Uncomment this to use friendly finders in all models. By default, if
+  # you wish to find a record by its friendly id, you must do:
+  #
+  #    MyModel.friendly.find('foo')
+  #
+  # If you uncomment this, you can do:
+  #
+  #    MyModel.find('foo')
+  #
+  # This is significantly more convenient but may not be appropriate for
+  # all applications, so you must explicity opt-in to this behavior. You can
+  # always also configure it on a per-model basis if you prefer.
+  #
+  # Something else to consider is that using the :finders addon boosts
+  # performance because it will avoid Rails-internal code that makes runtime
+  # calls to `Module.extend`.
+  #
+  # config.use :finders
+  #
+  # ## Slugs
+  #
+  # Most applications will use the :slugged module everywhere. If you wish
+  # to do so, uncomment the following line.
+  #
+  # config.use :slugged
+  #
+  # By default, FriendlyId's :slugged addon expects the slug column to be named
+  # 'slug', but you can change it if you wish.
+  #
+  # config.slug_column = 'slug'
+  #
+  # When FriendlyId can not generate a unique ID from your base method, it appends
+  # a UUID, separated by a single dash. You can configure the character used as the
+  # separator. If you're upgrading from FriendlyId 4, you may wish to replace this
+  # with two dashes.
+  #
+  # config.sequence_separator = '-'
+  #
+  #  ## Tips and Tricks
+  #
+  #  ### Controlling when slugs are generated
+  #
+  # As of FriendlyId 5.0, new slugs are generated only when the slug field is
+  # nil, but if you're using a column as your base method can change this
+  # behavior by overriding the `should_generate_new_friendly_id` method that
+  # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
+  # more like 4.0.
+  #
+  # config.use Module.new {
+  #   def should_generate_new_friendly_id?
+  #     slug.blank? || <your_column_name_here>_changed?
+  #   end
+  # }
+  #
+  # FriendlyId uses Rails's `parameterize` method to generate slugs, but for
+  # languages that don't use the Roman alphabet, that's not usually suffient. Here
+  # we use the Babosa library to transliterate Russian Cyrillic slugs to ASCII. If
+  # you use this, don't forget to add "babosa" to your Gemfile.
+  #
+  # config.use Module.new {
+  #   def normalize_friendly_id(text)
+  #     text.to_slug.normalize! :transliterations => [:russian, :latin]
+  #   end
+  # }
+end

data/config/initializers/premailer_assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w( ink.css )

data/config/initializers/user_class_extensions.rb

@@ -2,38 +2,25 @@ Spree::Core::Engine.config.to_prepare do
   if Spree.user_class
     Spree.user_class.class_eval do
 
-      include Spree::UserApiAuthentication
       include Spree::UserReporting
-
+      include Spree::UserApiAuthentication
       has_and_belongs_to_many :spree_roles,
-                              join_table: 'spree_roles_users',
-                              foreign_key: "user_id",
-                              class_name: "Spree::Role"
+                              :join_table => 'spree_roles_users',
+                              :foreign_key => "user_id",
+                              :class_name => "Spree::Role"
 
-      has_many :spree_orders, foreign_key: "user_id", class_name: "Spree::Order"
+      has_many :spree_orders, :foreign_key => "user_id", :class_name => "Spree::Order"
 
-      belongs_to :ship_address, class_name: 'Spree::Address'
-      belongs_to :bill_address, class_name: 'Spree::Address'
-
-      def self.ransackable_associations(auth_object=nil)
-        %w[bill_address ship_address]
-      end
-
-      def self.ransackable_attributes(auth_object=nil)
-        %w[id email]
-      end
+      belongs_to :ship_address, :class_name => 'Spree::Address'
+      belongs_to :bill_address, :class_name => 'Spree::Address'
 
       # has_spree_role? simply needs to return true or false whether a user has a role or not.
       def has_spree_role?(role_in_question)
-        spree_roles.where(name: role_in_question.to_s).any?
+        spree_roles.where(:name => role_in_question.to_s).any?
       end
 
       def last_incomplete_spree_order
-        spree_orders.incomplete.where(user_id: self.id).order('created_at DESC').first
-      end
-
-      def analytics_id
-        id
+        spree_orders.incomplete.where(:created_by_id => self.id).order('created_at DESC').first
       end
     end
   end