spree_core 6.0.0.beta4 → 6.0.0.rc2

data/app/services/spree/payments/create.rb

@@ -1,92 +0,0 @@
-module Spree
-  module Payments
-    # @deprecated Unused since 6.0 and removed in 7.0. Nothing in Spree
-    #   calls this: the storefront creates payments through the Store API
-    #   controller, store credit through Spree::Checkout::AddStoreCredit,
-    #   gift cards through Spree::GiftCards::Apply, and a partial capture's
-    #   remainder through Spree::Payment#split_uncaptured_amount.
-    #
-    #   It also cannot serve those callers as written — it resolves the
-    #   payment method from +params[:payment_method_id]+ against the
-    #   storefront-visible list and builds a source from client attributes,
-    #   while they already hold both (the gift card flow creates its payment
-    #   method by type when the store has none).
-    class Create
-      prepend Spree::ServiceModule::Base
-
-      def call(order:, params: {})
-        ApplicationRecord.transaction do
-          run :prepare_payment_attributes
-          run :find_or_create_payment_source
-          run :save_payment
-        end
-        # Gateway I/O — after the transaction, on the in-memory graph (some
-        # gateways need the raw card number, which never persists).
-        run :store_gateway_profile
-      end
-
-      protected
-
-      def prepare_payment_attributes(order:, params:)
-        payment_method = order.payment_methods.find { |pm| pm.id.to_s == params[:payment_method_id]&.to_s }
-
-        payment_attributes = {
-          amount: params[:amount] || order.order_total_after_store_credit,
-          payment_method: payment_method
-        }
-
-        return failure(nil, :payment_method_not_found) if payment_method.blank?
-
-        success(order: order, params: params, payment_attributes: payment_attributes)
-      end
-
-      def find_or_create_payment_source(order:, params:, payment_attributes:)
-        payment_method = payment_attributes[:payment_method]
-
-        if payment_method&.source_required?
-          if order.customer.present? && params[:source_id].present?
-            source = payment_method.payment_source_class.find_by(id: params[:source_id], customer: order.customer)
-
-            return failure(nil, :source_not_found) if source.nil?
-          else
-            result = Wallet::CreatePaymentSource.call(
-              payment_method: payment_method,
-              params: params.delete(:source_attributes),
-              user: order.customer
-            )
-
-            return failure(nil, result.error.value) if result.failure?
-
-            source = result.value
-          end
-
-          payment_attributes[:source] = source
-        end
-
-        success(order: order, payment_attributes: payment_attributes)
-      end
-
-      def save_payment(order:, payment_attributes:)
-        payment = order.payments.new(payment_attributes)
-
-        if payment.save
-          success(payment: payment)
-        else
-          failure(payment)
-        end
-      end
-
-      # A payment that cannot be profiled must not linger half-created — the
-      # old after_save callback rolled the whole save back on gateway failure.
-      def store_gateway_profile(payment:)
-        return success(payment) unless payment.profiles_supported?
-
-        payment.create_payment_profile
-        success(payment)
-      rescue Spree::Core::GatewayError => e
-        payment.destroy
-        failure(payment, e.message)
-      end
-    end
-  end
-end

data/app/validators/spree/url_validator.rb

@@ -1,23 +0,0 @@
-module Spree
-  class UrlValidator < ActiveModel::EachValidator
-    def validate_each(record, attribute, value)
-      unless url_valid?(value)
-        record.errors.add(attribute, (options[:message] || ERROR_MESSAGE))
-      end
-    end
-
-    private
-
-    ERROR_MESSAGE = 'must be a valid URL'
-    private_constant :ERROR_MESSAGE
-
-    def url_valid?(url)
-      uri = begin
-        URI.parse(url)
-      rescue URI::InvalidURIError
-        return false
-      end
-      uri.host.present? && uri.is_a?(URI::HTTP)
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-<figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
-  <% if blob.representable? %>
-    <%= spree_image_tag(blob, width: local_assigns[:in_gallery] ? 400 : 512, height: local_assigns[:in_gallery] ? 300 : 400) %>
-  <% 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/spree/admin_user_mailer/password_reset_email.html.erb

@@ -1,8 +0,0 @@
-<%= render layout: 'spree/shared/mailer_hero' do %>
-  <h1><%= Spree.t('admin_user_mailer.password_reset_email.action') %></h1>
-  <p class="greeting"><%= Spree.t('admin_user_mailer.password_reset_email.greeting', name: @user.first_name.presence || @user.email) %></p>
-  <p><%= Spree.t('admin_user_mailer.password_reset_email.instructions', store_name: @current_store.name) %></p>
-  <%= render 'spree/shared/mailer_button', url: @reset_url, label: Spree.t('admin_user_mailer.password_reset_email.action') %>
-  <p class="sub"><%= Spree.t('admin_user_mailer.password_reset_email.expiry_notice') %></p>
-  <p class="sub"><%= Spree.t('admin_user_mailer.password_reset_email.ignore_notice') %></p>
-<% end %>

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

@@ -1,7 +0,0 @@
-<%= render layout: 'spree/shared/mailer_hero' do %>
-  <h1><%= Spree.t('export_mailer.greeting', user_name: @export.user&.first_name) %></h1>
-  <p><%= Spree.t('export_mailer.export_done.message') %></p>
-  <% if @export.results_url.present? %>
-    <%= render 'spree/shared/mailer_button', url: @export.results_url, label: @export.attachment.filename %>
-  <% end %>
-<% end %>

data/app/views/spree/import_mailer/import_done.html.erb

@@ -1,12 +0,0 @@
-<%= render layout: 'spree/shared/mailer_hero' do %>
-  <h1><%= Spree.t('import_mailer.greeting', user_name: @import.user&.first_name) %></h1>
-  <p><%= Spree.t('import_mailer.import_done.message', completed_count: @import.rows_status_counts['completed'] || 0) %></p>
-  <% failed_count = @import.rows_status_counts['failed'] || 0 %>
-  <% if failed_count > 0 %>
-    <p><strong><%= Spree.t('import_mailer.import_done.failed_message', failed_count: failed_count) %></strong></p>
-  <% end %>
-  <% results_url = @import.results_page_url %>
-  <% if results_url.present? %>
-    <%= render 'spree/shared/mailer_button', url: results_url, label: Spree.t('import_mailer.import_done.view_results') %>
-  <% end %>
-<% end %>

data/app/views/spree/invitation_mailer/invitation_accepted.html.erb

@@ -1,4 +0,0 @@
-<%= render layout: 'spree/shared/mailer_hero' do %>
-  <h1><%= Spree.t('invitation_mailer.greeting', user_name: @invitation.inviter.first_name) %></h1>
-  <p><%= Spree.t('invitation_mailer.invitation_accepted.body', invitee_name: @invitation.invitee&.name, resource_name: @invitation.resource.name) %></p>
-<% end %>

data/app/views/spree/invitation_mailer/invitation_email.html.erb

@@ -1,12 +0,0 @@
-<%= render layout: 'spree/shared/mailer_hero' do %>
-  <h1><%= Spree.t('invitation_mailer.invitation_email.subject', resource_name: @invitation.resource.name) %></h1>
-  <p class="greeting"><%= Spree.t('invitation_mailer.greeting', user_name: @invitation.invitee&.first_name || @invitation.email) %></p>
-  <p><%= Spree.t('invitation_mailer.invitation_email.body', inviter_name: @invitation.inviter.name, resource_name: @invitation.resource.name) %></p>
-  <p><%= Spree.t('invitation_mailer.invitation_email.link_description') %></p>
-  <% accept_url = if spree.respond_to?(:admin_invitation_url)
-                    spree.admin_invitation_url(@invitation, token: @invitation.token, host: @invitation.store.formatted_url)
-                  else
-                    main_app.admin_invitation_acceptance_url(@invitation)
-                  end %>
-  <%= render 'spree/shared/mailer_button', url: accept_url, label: Spree.t(:accept) %>
-<% end %>

data/app/views/spree/seller_user_mailer/password_reset_email.html.erb

@@ -1,8 +0,0 @@
-<%= render layout: 'spree/shared/mailer_hero' do %>
-  <h1><%= Spree.t('seller_user_mailer.password_reset_email.action') %></h1>
-  <p class="greeting"><%= Spree.t('seller_user_mailer.password_reset_email.greeting', name: @user.first_name.presence || @user.email) %></p>
-  <p><%= Spree.t('seller_user_mailer.password_reset_email.instructions', store_name: @current_store.name) %></p>
-  <%= render 'spree/shared/mailer_button', url: @reset_url, label: Spree.t('seller_user_mailer.password_reset_email.action') %>
-  <p class="sub"><%= Spree.t('seller_user_mailer.password_reset_email.expiry_notice') %></p>
-  <p class="sub"><%= Spree.t('seller_user_mailer.password_reset_email.ignore_notice') %></p>
-<% end %>

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

@@ -1,19 +0,0 @@
-<!-- You can override this template to design your own footer. -->
-<table width="100%" cellpadding="0" cellspacing="0" role="presentation">
-  <tr>
-    <td align="center">
-      <div class="footer_content f-fallback">
-        <p class="footer_brand">
-          <%= link_to current_store.name, current_store.storefront_url %>
-        </p>
-        <% if current_store.address.present? %>
-          <p class="footer_meta"><%= current_store.address %></p>
-        <% end %>
-        <% if current_store.customer_support_email.present? %>
-          <p class="footer_meta"><%= mail_to current_store.customer_support_email %></p>
-        <% end %>
-        <p class="footer_note">&copy; <%= Time.current.year %> <%= current_store.name %></p>
-      </div>
-    </td>
-  </tr>
-</table>

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

@@ -1,8 +0,0 @@
-<!-- You can override this template to design your own header. -->
-<table width="100%" cellpadding="0" cellspacing="0" role="presentation">
-  <tr>
-    <td class="email-masthead" align="center">
-      <%= render 'spree/shared/mailer_logo', logo: current_store.mailer_logo.attached? ? current_store.mailer_logo : current_store.logo, height: 32 %>
-    </td>
-  </tr>
-</table>

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

@@ -1,399 +0,0 @@
-<style type="text/css" rel="stylesheet" media="all">
-  /* Fonts ------------------------------ */
-  /* Same files the react-email Studio templates load; Gmail strips these and falls back to Arial. */
-
-  @font-face {
-    font-family: "Geist";
-    font-style: normal;
-    font-weight: 500;
-    src: url("https://fonts.gstatic.com/s/geist/v4/gyByhwUxId8gMEwcGFU.woff2") format("woff2");
-  }
-
-  @font-face {
-    font-family: "Geist";
-    font-style: normal;
-    font-weight: 600;
-    src: url("https://fonts.gstatic.com/s/geist/v4/gyByhwUxId8gMEwcGFU.woff2") format("woff2");
-  }
-
-  @font-face {
-    font-family: "Geist";
-    font-style: normal;
-    font-weight: 700;
-    src: url("https://fonts.gstatic.com/s/geist/v4/gyByhwUxId8gMEwcGFU.woff2") format("woff2");
-  }
-
-  @font-face {
-    font-family: "Inter";
-    font-style: normal;
-    font-weight: 400;
-    src: url("https://fonts.gstatic.com/s/inter/v20/UcCO3FwrK3iLTeHuS_nVMrMxCp50SjIw2boKoduKmMEVuOKfMZg.ttf") format("truetype");
-  }
-
-  @font-face {
-    font-family: "Inter";
-    font-style: normal;
-    font-weight: 450;
-    src: url("https://fonts.gstatic.com/s/inter/v20/UcCO3FwrK3iLTeHuS_nVMrMxCp50SjIw2boKoduKmMEVuOKfMZg.ttf") format("truetype");
-  }
-
-  @font-face {
-    font-family: "Inter";
-    font-style: normal;
-    font-weight: 500;
-    src: url("https://fonts.gstatic.com/s/inter/v20/UcCO3FwrK3iLTeHuS_nVMrMxCp50SjIw2boKoduKmMEVuI6fMZg.ttf") format("truetype");
-  }
-
-  @font-face {
-    font-family: "Inter";
-    font-style: normal;
-    font-weight: 600;
-    src: url("https://fonts.gstatic.com/s/inter/v20/UcCO3FwrK3iLTeHuS_nVMrMxCp50SjIw2boKoduKmMEVuGKYMZg.ttf") format("truetype");
-  }
-
-  /* Base ------------------------------ */
-
-  body {
-    width: 100% !important;
-    height: 100%;
-    margin: 0;
-    -webkit-text-size-adjust: none;
-    background-color: #FFFFFF;
-    color: #726A6A;
-  }
-
-  a {
-    color: #332C2C;
-  }
-
-  a img {
-    border: none;
-  }
-
-  td {
-    word-break: break-word;
-  }
-
-  .preheader {
-    display: none !important;
-    visibility: hidden;
-    mso-hide: all;
-    font-size: 1px;
-    line-height: 1px;
-    max-height: 0;
-    max-width: 0;
-    opacity: 0;
-    overflow: hidden;
-  }
-
-  /* Type ------------------------------ */
-
-  body,
-  td,
-  th {
-    font-family: "Inter", Helvetica, Arial, sans-serif;
-  }
-
-  h1 {
-    margin: 0 0 24px;
-    font-family: "Geist", "Inter", Helvetica, Arial, sans-serif;
-    color: #332C2C;
-    font-size: 40px;
-    line-height: 1.2;
-    letter-spacing: -0.8px;
-    font-weight: 700;
-    text-align: center;
-  }
-
-  h2 {
-    margin: 0 0 16px;
-    font-family: "Geist", "Inter", Helvetica, Arial, sans-serif;
-    color: #332C2C;
-    font-size: 22px;
-    line-height: 1.4;
-    letter-spacing: -0.18px;
-    font-weight: 500;
-    text-align: center;
-  }
-
-  h3 {
-    margin: 0 0 16px;
-    font-family: "Geist", "Inter", Helvetica, Arial, sans-serif;
-    color: #726A6A;
-    font-size: 16px;
-    line-height: 1.5;
-    letter-spacing: -0.16px;
-    font-weight: 500;
-    text-align: left;
-  }
-
-  td,
-  th {
-    font-size: 14px;
-  }
-
-  p,
-  ul,
-  ol,
-  blockquote {
-    margin: 0 0 16px;
-    font-size: 14px;
-    line-height: 1.6;
-    letter-spacing: -0.042px;
-    font-weight: 450;
-    color: #726A6A;
-  }
-
-  p.sub {
-    font-size: 13px;
-    color: #726A6A;
-  }
-
-  p.sub a {
-    color: #726A6A;
-    word-break: break-all;
-  }
-
-  p.strong {
-    margin: 0;
-    font-weight: 500;
-    color: #332C2C;
-  }
-
-  /* Utilities ------------------------------ */
-
-  .align-right {
-    text-align: right;
-  }
-
-  .align-left {
-    text-align: left;
-  }
-
-  .align-center {
-    text-align: center;
-  }
-
-  /* Buttons ------------------------------ */
-
-  .button {
-    display: inline-block;
-    background-color: #FFFFFF;
-    border: 1px solid #E8E9E9;
-    border-radius: 8px;
-    padding: 12px 20px;
-    font-size: 15px;
-    line-height: 1.6;
-    font-weight: 500;
-    color: #1F2222 !important;
-    text-decoration: none;
-    -webkit-text-size-adjust: none;
-    box-sizing: border-box;
-  }
-
-  .button--green {
-    background-color: #22BC66;
-    border-color: #22BC66;
-    color: #FFFFFF !important;
-  }
-
-  .button--red {
-    background-color: #FF6136;
-    border-color: #FF6136;
-    color: #FFFFFF !important;
-  }
-
-  @media only screen and (max-width: 500px) {
-    .button {
-      width: 100% !important;
-      text-align: center !important;
-    }
-  }
-
-  /* Hero ------------------------------ */
-
-  .hero {
-    width: 100%;
-    text-align: center;
-  }
-
-  .hero_content {
-    max-width: 420px;
-    margin: 0 auto;
-  }
-
-  .hero h1 {
-    margin: 0;
-  }
-
-  .hero p {
-    margin: 12px 0 0;
-  }
-
-  .hero .greeting {
-    margin: 24px 0 0;
-    font-size: 15px;
-    font-weight: 500;
-    color: #332C2C;
-  }
-
-  .hero .sub {
-    margin: 24px 0 0;
-  }
-
-  .hero .sub + .sub {
-    margin: 16px 0 0;
-  }
-
-  /* Sections ------------------------------ */
-
-  .section {
-    width: 100%;
-    margin: 48px 0 0;
-    text-align: left;
-  }
-
-  .section .sub {
-    margin: 16px 0 0;
-  }
-
-  /* Structure ------------------------------ */
-
-  .email-wrapper {
-    width: 100%;
-    margin: 0;
-    padding: 0;
-    background-color: #FFFFFF;
-  }
-
-  .email-content {
-    width: 100%;
-    max-width: 640px;
-    margin: 0 auto;
-    padding: 0;
-  }
-
-  /* Masthead ----------------------- */
-
-  .email-masthead {
-    padding: 0 0 32px;
-    text-align: center;
-  }
-
-  /* Body ------------------------------ */
-
-  .email-card {
-    background-color: #F6F6F6;
-    padding: 56px 24px;
-  }
-
-  .email-footer {
-    padding: 64px 24px;
-    text-align: center;
-  }
-
-  .email-footer p {
-    color: #726A6A;
-  }
-
-  .footer_content {
-    max-width: 320px;
-    margin: 0 auto;
-  }
-
-  .footer_brand {
-    margin: 0;
-    font-size: 13px;
-    line-height: 1.5;
-    letter-spacing: -0.13px;
-  }
-
-  .footer_brand a {
-    color: #726A6A;
-    font-weight: 500;
-    text-decoration: none;
-  }
-
-  .footer_meta {
-    margin: 12px 0 0;
-    font-size: 11px;
-    line-height: 1.5;
-    letter-spacing: -0.11px;
-  }
-
-  .footer_meta a {
-    color: #726A6A;
-  }
-
-  .footer_note {
-    margin: 20px 0 0;
-    font-size: 11px;
-    line-height: 1.5;
-    letter-spacing: -0.11px;
-    color: #726A6A;
-  }
-
-  .body-action {
-    width: 100%;
-    margin: 32px auto 0;
-    padding: 0;
-    text-align: center;
-  }
-
-  /* Legacy class hooks ------------------------------ */
-  /* Kept for host apps and extensions that override mailer templates with
-     pre-5.6 markup; nothing in Spree itself uses these anymore. */
-
-  .purchase,
-  .purchase_content {
-    width: 100%;
-    margin: 0;
-  }
-
-  .purchase_item {
-    padding: 10px 4px;
-    color: #726A6A;
-    font-size: 14px;
-    line-height: 1.6;
-  }
-
-  .purchase_item--additional {
-    font-size: 13px;
-    color: #726A6A;
-  }
-
-  .purchase_total {
-    margin: 0;
-    text-align: right;
-    font-weight: 500;
-    color: #332C2C;
-  }
-
-  .purchase_total--name {
-    margin: 0;
-    text-align: right;
-    color: #726A6A;
-  }
-
-  /* Media Queries ------------------------------ */
-
-  @media only screen and (max-width: 600px) {
-    .email-card {
-      padding: 40px 16px !important;
-    }
-    .email-footer {
-      padding: 48px 16px !important;
-    }
-    h1 {
-      font-size: 32px !important;
-      letter-spacing: -0.64px !important;
-    }
-  }
-</style>
-<!--[if mso]>
-<style type="text/css">
-  .f-fallback {
-    font-family: Arial, sans-serif;
-  }
-</style>
-<![endif]-->

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

@@ -1,41 +0,0 @@
-<% logo ||= current_store.mailer_logo.attached? ? current_store.mailer_logo : current_store.logo %>
-<% height ||= 64 %>
-<% logo_css ||= '' %>
-
-<%= link_to current_store.storefront_url, id: 'site-logo', style: "text-decoration: none;" do %>
-  <span style="display: none;"><%= current_store.name %></span>
-  <% if logo.present? && logo.attached? && logo.variable? %>
-    <% aspect_ratio = spree_asset_aspect_ratio(logo) %>
-    <% logo_style = "aspect-ratio: #{aspect_ratio};" %>
-
-    <% if aspect_ratio.to_f > 10 %>
-      <% logo_height = 16 %>
-    <% elsif aspect_ratio.to_f > 5 %>
-      <% logo_height = 25 %>
-    <% elsif aspect_ratio.to_f < 3 %>
-      <% logo_height = 32 %>
-    <% else %>
-      <% logo_height = 32 %>
-    <% end %>
-
-    <% if defined?(height) && height > 0 %>
-      <% logo_style += "height: #{height}px;" %>
-      <% cdn_height = height %>
-    <% elsif aspect_ratio.to_f < 3 %>
-      <% cdn_height = 64 %>
-      <% logo_style += "height: 64px;" %>
-    <% else %>
-      <% cdn_height = 32 %>
-      <% logo_style += "height: 32px;" %>
-    <% end %>
-
-    <% variant_options = spree_image_variant_options(resize_to_fit: [nil, cdn_height * 3]) %>
-
-    <%= image_tag main_app.cdn_image_url(logo.variant(variant_options)), 
-          style: "#{logo_style} width: auto;", 
-          alt: current_store.name,
-          height: cdn_height %>
-  <% else %>
-    <h1 style="margin: 0; font-size: 22px; font-weight: bold; text-align: center; text-transform: uppercase;"><%= current_store.name %></h1>
-  <% end %>
-<% end %>