spree_core 4.10.1 → 5.0.0.rc1

data/app/sorters/spree/classifications/sort.rb

@@ -0,0 +1,68 @@
+module Spree
+  module Classifications
+    class Sort < ::Spree::BaseSorter
+      def initialize(scope, current_currency, params = {}, allowed_sort_attributes = [])
+        super(scope.reorder(''), params, allowed_sort_attributes)
+
+        @currency = params[:currency] || current_currency
+      end
+
+      def call
+        classifications = by_manual(scope)
+        classifications = by_best_selling(classifications)
+        classifications = by_param_attributes(classifications)
+        by_price(classifications)
+      end
+
+      private
+
+      attr_reader :sort, :scope, :currency, :allowed_sort_attributes
+
+      def by_manual(scope)
+        return scope unless sort_by?('manual')
+
+        scope.order(position: :asc)
+      end
+
+      def by_best_selling(scope)
+        return scope unless (value = sort_by?('best_selling'))
+
+        scope.by_best_selling(value[1])
+      end
+
+      def by_param_attributes(scope)
+        return scope if sort.empty?
+
+        sort.each do |value, order|
+          next if value.blank? || Spree::Product.column_names.exclude?(value)
+
+          table_name = if Spree.use_translations?
+                         translatable_fields = Spree::Product::TRANSLATABLE_FIELDS
+                         value.to_sym.in?(translatable_fields) ? Spree::Product.translation_table_alias : Spree::Product.table_name
+                       else
+                         Spree::Product.table_name
+                       end
+
+          scope = scope.order("#{table_name}.#{value}": order)
+        end
+
+        scope
+      end
+
+      def by_price(scope)
+        return scope unless (value = sort_by?('price'))
+
+        scope.joins(product: { variants_including_master: :prices }).
+          select("#{Spree::Classification.table_name}.*, min(#{Spree::Price.table_name}.amount)").
+          distinct.
+          where(spree_prices: { currency: currency }).
+          order("min(#{Spree::Price.table_name}.amount) #{value[1]}").
+          group("#{Spree::Classification.table_name}.id")
+      end
+
+      def sort_by?(field)
+        sort.detect { |s| s[0] == field }
+      end
+    end
+  end
+end

data/app/sorters/spree/products/sort.rb

@@ -23,10 +23,10 @@ module Spree
       def by_price(scope)
         return scope unless (value = sort_by?('price'))
 
-        scope.joins(master: :prices).
+        scope.joins(variants_including_master: :prices).
           select("#{Spree::Product.table_name}.*, #{Spree::Price.table_name}.amount").
           distinct.
-          where(spree_prices: { currency: currency }).
+          where("#{Spree::Price.table_name}.currency": currency).
           order("#{Spree::Price.table_name}.amount #{value[1]}")
       end
 
@@ -41,7 +41,6 @@ module Spree
 
         scope.joins(:master).
           select("#{select_product_attributes}#{Spree::Variant.table_name}.sku").
-          where(Spree::Variant.table_name.to_s => { is_master: true }).
           order("#{Spree::Variant.table_name}.sku #{value[1]}")
       end
 

data/app/views/action_text/video_embeds/_thumbnail.html.erb

@@ -0,0 +1 @@
+<%= image_tag video_embed.thumbnail_url %>

data/app/views/action_text/video_embeds/_video_embed.html.erb

@@ -0,0 +1,3 @@
+<div class="video-embed-container mt-4 mb-4">
+  <%= video_embed.raw_html.html_safe %>
+</div>

data/app/views/active_storage/blobs/_blob.html.erb

@@ -0,0 +1,20 @@
+<figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
+  <% if blob.representable? %>
+    <%= image_tag main_app.cdn_image_url(
+      blob.variant(
+        spree_image_variant_options(
+          resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]
+        )
+      )
+    ) %>
+  <% end %>
+
+  <figcaption class="attachment__caption">
+    <% if caption = blob.try(:caption) %>
+      <%= caption %>
+    <% else %>
+      <span class="attachment__name"><%= blob.filename %></span>
+      <span class="attachment__size"><%= number_to_human_size blob.byte_size %></span>
+    <% end %>
+  </figcaption>
+</figure>

data/app/views/layouts/action_text/contents/_content.html.erb

@@ -0,0 +1,3 @@
+<div class="trix-content">
+  <%= yield -%>
+</div>

data/app/views/layouts/spree/base_mailer.html.erb

@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta name="x-apple-disable-message-reformatting"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+
+    <%= render partial: 'spree/shared/base_mailer_stylesheets' %>
+  </head>
+  <body>
+    <table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+      <tr>
+        <td align="center">
+          <table class="email-content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+            <%= render partial: 'spree/shared/base_mailer_header' %>
+            <!-- Email Body -->
+            <tr>
+              <td class="email-body" width="570" cellpadding="0" cellspacing="0">
+                <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
+                  <!-- Body content -->
+                  <tbody>
+                  <tr>
+                    <td class="content-cell">
+                      <div class="f-fallback">
+                        <%= yield %>
+                      </div>
+                    </td>
+                  </tr>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <%= render partial: 'spree/shared/base_mailer_footer' %>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="60px">&nbsp;</td>
+      </tr>
+    </table>
+  </body>
+</html>

data/app/views/spree/addresses/_form.html.erb

@@ -0,0 +1,58 @@
+<% address_id = address_type.chars.first %>
+<% address ||= address_form.object %>
+
+<div class="inner"
+     data-controller="address-form address-autocomplete"
+     data-address-form-countries-value="<%= available_countries.to_json %>"
+     data-address-form-states-value="<%= available_states.to_json %>"
+     data-address-form-current-state-id-value="<%= address.state_id %>"
+>
+  <div id="<%= "#{address_id}country" %>">
+    <div class="form-group mb-0">
+      <div id="<%= "#{address_id}country-selection" %>">
+        <%= address_form.label(Spree.t(:country), Spree.t(:country), class: 'block text-xs text-neutral-600 mb-1') %>
+        <%= address_form.select :country_id, options_for_select(available_countries.map { |c| [c.name, c.id, data: { iso: c.iso }] }, address_form.object.country_id || current_store.default_country_id),
+                                            {  },
+                                            { class: 'w-full select-input mb-4',
+                                              data: {
+                                                'address-form-target': 'country',
+                                                'action': "change->address-form#changeCountry",
+                                                'address-autocomplete-target': 'country'
+                                              },
+                                              aria: { label: Spree.t(:country) } } %>
+      </div>
+    </div>
+  </div>
+  <% if address.require_name? %>
+    <div class="grid grid-cols-2 gap-4">
+      <div>
+        <%= address_field(address_form, :firstname, address_id, true) %>
+      </div>
+      <div>
+        <%= address_field(address_form, :lastname, address_id, true) %>
+      </div>
+    </div>
+  <% end %>
+  <%= address_field(address_form, :company, address_id, address.require_company?) if address.show_company_address_field? %>
+  <div class="mb-4 flex flex-col space-y-2" data-address-autocomplete-target="autocompleteInputContainer" tabindex="-1" >
+    <div class="relative">
+      <div id="<%= address_id %>address1">
+        <% method_name = I18n.t("activerecord.attributes.spree/address.address1") %>
+        <%= address_form.label(method_name, method_name, class: 'block text-xs text-neutral-600 mb-1') %>
+        <%= address_form.text_field :address1, class: 'text-input w-full', placeholder: method_name, required: true, data: {address_autocomplete_target: "address1"}, autocorrect: "off", autocomplete: "shipping-address-line1", aria: {label: method_name, autocomplete: "list", controls: "suggestions-box-options", owns: "suggestions-box-options", haspopup: "listbox", role: "combobox", expanded: "false"} %>
+      </div>
+      <%= render "spree/addresses/suggestions_box" %>
+    </div>
+    <span class="text-sm space-x-2 items-center hidden alert alert-info mt-2 align-items-center" data-address-autocomplete-target="addressWarning">
+      <%= heroicon "exclamation-circle", variant: :outline if defined?(heroicon) %>
+      <%= Spree.t('address_book.add_house_number') %>
+    </span>
+  </div>
+  <%= address_field(address_form, :address2, address_id) %>
+  <div class="grid grid-cols-3 gap-4 address-form max-w-full d-flex row mb-4">
+    <%= address_field(address_form, :city, address_id, true, text_field_attributes: {data: {address_autocomplete_target: "city"}}) %>
+    <%= address_field(address_form, :state, address_id) { address_state(address_form, address.country, address_id) } if Spree::Config[:address_requires_state] %>
+    <%= address_field(address_form, :zipcode, address_id) { address_zipcode(address_form, address.country, address_id) } %>
+  </div>
+  <%= address_field(address_form, :phone, address_id, address.require_phone?) %>
+</div>

data/app/views/spree/addresses/_suggestions_box.erb

@@ -0,0 +1,14 @@
+<div class="absolute position-absolute top-full z-10 z-index-9999 bg-white bg-input-bg w-full w-auto border rounded-md rounded shadow-lg hidden" data-address-autocomplete-target="suggestionsBoxContainer" aria-label="suggestions">
+  <template data-address-autocomplete-target="suggestionsOptionTemplate">
+    <li class="list-group-item list-group-item-action text-input-text opacity-80 hover:bg-sidebar px-4 py-2 suggestions-option-container cursor-pointer aria-selected:bg-accent" role="option" aria-selected="false">
+      <mark class="bg-transparent suggestions-option-marked-text">
+      </mark>
+    </li>
+  </template>
+  <ul class="flex flex-col flex-grow opacity-80 list-group" data-address-autocomplete-target="suggestionsBoxList" role="listbox" id="suggestions-box-options">
+  </ul>
+  <div class="bg-accent px-4 py-2 overflow-hidden text-dark">
+    <%= Spree.t(:powered_by) %>
+    <%= image_tag 'google_on_white_hdpi.png', title: 'Powered by Google', style: 'height: 1rem;' %>
+  </div>
+</div>

data/app/views/spree/export_mailer/export_done.html.erb

@@ -0,0 +1,15 @@
+<h1>
+  <%= Spree.t('export_mailer.greeting', user_name: @export.user&.first_name) %>
+</h1>
+<p>
+  <%= Spree.t('export_mailer.export_done.message') %>
+</p>
+<% if spree.respond_to?(:admin_export_url) %>
+  <p>
+    <%= link_to @export.attachment.filename, spree.admin_export_url(@export, host: @current_store.formatted_url) %>
+  </p>
+<% end %>
+<p>
+  <%= Spree.t('export_mailer.thanks') %><br />
+  <%= "#{current_store.name}" %>
+</p>

data/app/views/spree/report_mailer/report_done.html.erb

@@ -0,0 +1,15 @@
+<h1>
+  <%= Spree.t('report_mailer.greeting', user_name: @report.user&.first_name) %>
+</h1>
+<p>
+  <%= Spree.t('report_mailer.report_done.message') %>
+</p>
+<% if spree.respond_to?(:admin_report_url) %>
+  <p>
+    <%= link_to @report.attachment.filename, spree.admin_report_url(@report, host: @current_store.formatted_url) %>
+  </p>
+<% end %>
+<p>
+  <%= Spree.t('report_mailer.thanks') %><br />
+  <%= "#{current_store.name}" %>
+</p>

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

@@ -0,0 +1,12 @@
+<!-- You can override this template to design your own footer.
+<table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
+  <tr>
+    <td class="content-cell" align="center">
+      <p class="f-fallback sub align-center">
+        <a href="#">Terms</a> | <a href="#">Privacy</a> |
+        <a href="#">Unsubscribe</a>
+      </p>
+    </td>
+  </tr>
+</table>
+-->

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

@@ -0,0 +1,6 @@
+<!-- You can override this template to design your own header. -->
+<tr>
+  <td class="email-masthead">
+    <%= render 'spree/shared/mailer_logo', logo: current_store.mailer_logo.attached? ? current_store.mailer_logo : current_store.logo %>
+  </td>
+</tr>