solidus_backend 4.3.5 → 4.4.1

data/app/assets/stylesheets/spree/backend/sections/_promotions.scss

@@ -1,138 +0,0 @@
-#general_fields, #expiry_fields {
-  border-bottom: none;
-  margin-bottom: 0;
-  padding-bottom: 0;
-}
-
-#rules_container, #actions_container {
-  position: relative;
-
-  fieldset {
-    position: static !important;
-  }
-}
-
-.promotion-block {
-  padding: 0 1.25rem 0.5rem;
-  background-color: lighten($color-border, 5);
-  border: 1px solid $color-border;
-  border-radius: 3px;
-  margin-bottom: 15px;
-  position: relative;
-
-  .row {
-    margin-bottom: 0;
-  }
-
-  // Fix the padding added by the .fa icon rule
-  .fa:before {
-    padding-right: 0;
-  }
-
-  .promo-rule-option-value {
-    position: relative;
-    padding-bottom: 10px;
-
-    .remove {
-      cursor: pointer;
-      position: absolute;
-      right: 0;
-      top: 10px;
-
-      &:hover {
-        color: $color-red;
-      }
-    }
-  }
-
-  .tier {
-    position: relative;
-    padding-bottom: 10px;
-
-    > .row {
-      margin-left: 10px;
-    }
-
-    .remove {
-      position: absolute;
-      cursor: pointer;
-      left: 0;
-      top: 10px;
-
-      &:hover {
-        color: $color-red;
-      }
-    }
-  }
-
-  .right-align {
-    text-align: right;
-  }
-
-  .calculator-fields {
-    padding-bottom: 10px;
-  }
-
-  .field {
-    &.alpha {
-      margin-left: -1px;
-      padding-left: 11px;
-    }
-
-    &.omega {
-      margin-right: -1px;
-      padding-right: 11px;
-    }
-  }
-
-  &.action-remove {
-    background-color: lighten($color-red, 50);
-    border-color: lighten($color-red, 45);
-    text-decoration: line-through;
-
-    .promotion-title, input[type="text"], input[type="number"],
-    .token-input-list {
-      border-color: lighten($color-red, 45);
-    }
-  }
-
-  .add-line-item {
-    #add_quantity {
-      width: 50px;
-      margin-top: 15px;
-    }
-    button.add {
-      min-width: 80px;
-      margin-top: 30px;
-
-      &:before {
-        padding-right: 5px;
-      }
-    }
-  }
-
-  a.delete {
-    position: absolute;
-    top: 1.25rem;
-    right: 1.25rem;
-    cursor: pointer;
-
-    &:hover {
-      color: theme-color("danger");
-    }
-  }
-}
-
-.promotion-title {
-  text-align: left;
-  font-size: 1rem;
-  border-bottom: 1px solid $color-border;
-  padding: 0.75rem 0;
-  margin-bottom: 0.75rem;
-
-  &.no-text {
-    border: none;
-    padding-bottom: 0;
-    margin-bottom: 0.25rem;
-  }
-}

data/app/controllers/spree/admin/promotion_actions_controller.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
-  before_action :load_promotion, only: [:create, :destroy]
-  before_action :validate_promotion_action_type, only: :create
-
-  def create
-    @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
-    @promotion_action = @promotion_action_type.new(params[:promotion_action])
-    @promotion_action.promotion = @promotion
-    if @promotion_action.save
-      flash[:success] = t('spree.successfully_created', resource: t('spree.promotion_action'))
-    end
-    respond_to do |format|
-      format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
-      format.js   { render layout: false }
-    end
-  end
-
-  def destroy
-    @promotion_action = @promotion.promotion_actions.find(params[:id])
-    if @promotion_action.discard
-      flash[:success] = t('spree.successfully_removed', resource: t('spree.promotion_action'))
-    end
-    respond_to do |format|
-      format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
-      format.js   { render layout: false }
-    end
-  end
-
-  private
-
-  def load_promotion
-    @promotion = Spree::Promotion.find(params[:promotion_id])
-  end
-
-  def validate_promotion_action_type
-    requested_type = params[:action_type]
-    promotion_action_types = Rails.application.config.spree.promotions.actions
-    @promotion_action_type = promotion_action_types.detect do |klass|
-      klass.name == requested_type
-    end
-    if !@promotion_action_type
-      flash[:error] = t('spree.invalid_promotion_action')
-      respond_to do |format|
-        format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
-        format.js   { render layout: false }
-      end
-    end
-  end
-end

data/app/controllers/spree/admin/promotion_categories_controller.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Admin
-    class PromotionCategoriesController < ResourceController
-    end
-  end
-end

data/app/controllers/spree/admin/promotion_code_batches_controller.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Admin
-    class PromotionCodeBatchesController < ResourceController
-      belongs_to 'spree/promotion'
-
-      create.after :build_promotion_code_batch
-
-      def download
-        require "csv"
-
-        @promotion_code_batch = Spree::PromotionCodeBatch.find(
-          params[:promotion_code_batch_id]
-        )
-
-        send_data(
-          render_to_string,
-          filename: "promotion-code-batch-list-#{@promotion_code_batch.id}.csv"
-        )
-      end
-
-      private
-
-      def build_promotion_code_batch
-        @promotion_code_batch.process
-      end
-    end
-  end
-end

data/app/controllers/spree/admin/promotion_codes_controller.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require 'csv'
-
-module Spree
-  module Admin
-    class PromotionCodesController < Spree::Admin::ResourceController
-      def index
-        @promotion = Spree::Promotion.accessible_by(current_ability, :show).find(params[:promotion_id])
-        @promotion_codes = @promotion.promotion_codes.order(:value)
-
-        respond_to do |format|
-          format.html do
-            @promotion_codes = @promotion_codes.page(params[:page]).per(50)
-          end
-          format.csv do
-            filename = "promotion-code-list-#{@promotion.id}.csv"
-            headers["Content-Type"] = "text/csv"
-            headers["Content-disposition"] = "attachment; filename=\"#{filename}\""
-          end
-        end
-      end
-
-      def new
-        @promotion = Spree::Promotion.accessible_by(current_ability, :show).find(params[:promotion_id])
-        if @promotion.apply_automatically
-          flash[:error] = t('activerecord.errors.models.spree/promotion_code.attributes.base.disallowed_with_apply_automatically')
-          redirect_to admin_promotion_promotion_codes_url(@promotion)
-        else
-          @promotion_code = @promotion.promotion_codes.build
-        end
-      end
-
-      def create
-        @promotion = Spree::Promotion.accessible_by(current_ability, :show).find(params[:promotion_id])
-        @promotion_code = @promotion.promotion_codes.build(value: params[:promotion_code][:value])
-
-        if @promotion_code.save
-          flash[:success] = flash_message_for(@promotion_code, :successfully_created)
-          redirect_to admin_promotion_promotion_codes_url(@promotion)
-        else
-          flash.now[:error] = @promotion_code.errors.full_messages.to_sentence
-          render_after_create_error
-        end
-      end
-    end
-  end
-end

data/app/controllers/spree/admin/promotion_rules_controller.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
-  helper 'spree/promotion_rules'
-
-  before_action :load_promotion, only: [:create, :destroy]
-  before_action :validate_promotion_rule_type, only: :create
-
-  def create
-    @promotion_rule = @promotion_rule_type.new(promotion_rule_params)
-    @promotion_rule.promotion = @promotion
-    if @promotion_rule.save
-      flash[:success] = t('spree.successfully_created', resource: t('spree.promotion_rule'))
-    end
-    respond_to do |format|
-      format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
-      format.js   { render layout: false }
-    end
-  end
-
-  def destroy
-    @promotion_rule = @promotion.promotion_rules.find(params[:id])
-    if @promotion_rule.destroy
-      flash[:success] = t('spree.successfully_removed', resource: t('spree.promotion_rule'))
-    end
-    respond_to do |format|
-      format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
-      format.js   { render layout: false }
-    end
-  end
-
-  private
-
-  def load_promotion
-    @promotion = Spree::Promotion.find(params[:promotion_id])
-  end
-
-  def model_class
-    Spree::PromotionRule
-  end
-
-  def validate_promotion_rule_type
-    requested_type = params[:promotion_rule].delete(:type)
-    promotion_rule_types = Rails.application.config.spree.promotions.rules
-    @promotion_rule_type = promotion_rule_types.detect do |klass|
-      klass.name == requested_type
-    end
-    if !@promotion_rule_type
-      flash[:error] = t('spree.invalid_promotion_rule')
-      respond_to do |format|
-        format.html { redirect_to spree.edit_admin_promotion_path(@promotion) }
-        format.js   { render layout: false }
-      end
-    end
-  end
-
-  def promotion_rule_params
-    params[:promotion_rule].permit!
-  end
-end

data/app/controllers/spree/admin/promotions_controller.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Admin
-    class PromotionsController < ResourceController
-      before_action :load_data
-
-      helper 'spree/promotion_rules'
-
-      def show
-        redirect_to action: :edit
-      end
-
-      def create
-        @promotion = Spree::Promotion.new(permitted_resource_params)
-        @promotion.codes.new(value: params[:single_code]) if params[:single_code].present?
-
-        if params[:promotion_code_batch]
-          @promotion_code_batch = @promotion.promotion_code_batches.new(promotion_code_batch_params)
-        end
-
-        if @promotion.save
-          @promotion_code_batch.process if @promotion_code_batch
-          flash[:success] = t('spree.promotion_successfully_created')
-          redirect_to location_after_save
-        else
-          flash[:error] = @promotion.errors.full_messages.to_sentence
-          render action: 'new'
-        end
-      end
-
-      private
-
-      def location_after_save
-        spree.edit_admin_promotion_url(@promotion)
-      end
-
-      def load_data
-        @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
-        @promotion_categories = Spree::PromotionCategory.order(:name)
-      end
-
-      def collection
-        return @collection if @collection
-        params[:q] ||= HashWithIndifferentAccess.new
-        params[:q][:s] ||= 'id desc'
-
-        @collection = super
-        @search = @collection.ransack(params[:q])
-        @collection = @search.result(distinct: true).
-          includes(promotion_includes).
-          page(params[:page]).
-          per(params[:per_page] || Spree::Config[:promotions_per_page])
-
-        @collection
-      end
-
-      def promotion_code_batch_params
-        params.require(:promotion_code_batch).permit!
-      end
-
-      def promotion_includes
-        [:promotion_actions]
-      end
-    end
-  end
-end

data/app/helpers/spree/admin/promotions_helper.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Admin
-    module PromotionsHelper
-      def admin_promotion_status(promotion)
-        return :active if promotion.active?
-        return :not_started if promotion.not_started?
-        return :expired if promotion.expired?
-
-        :inactive
-      end
-    end
-  end
-end

data/app/helpers/spree/promotion_rules_helper.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module PromotionRulesHelper
-    def options_for_promotion_rule_types(promotion)
-      existing = promotion.rules.map { |rule| rule.class.name }
-      rules = Rails.application.config.spree.promotions.rules.reject { |rule| existing.include? rule.name }
-      options = rules.map { |rule| [rule.model_name.human, rule.name] }
-      options_for_select(options)
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-$('#actions').append('<%= escape_javascript( render(partial: 'spree/admin/promotions/promotion_action', object: @promotion_action) ) %>');
-$('#actions .no-objects-found').hide();
-$(".variant_autocomplete").variantAutocomplete();
-
-initPromotionActions();
-
-
-$('#<%= dom_id @promotion_action %>').hide();
-$('#<%= dom_id @promotion_action %>').fadeIn();
-new Spree.CalculatorEditView({el: $('#<%= dom_id @promotion_action %> .js-calculator-fields')});

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

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

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

@@ -1,14 +0,0 @@
-<%= render partial: 'spree/shared/error_messages', locals: { target: @promotion_category } %>
-
-<div class='row'>
-  <div class='col-4'>
-    <%= f.field_container :name do %>
-      <%= f.label :name %>
-      <%= f.text_field :name, class: 'fullwidth' %>
-    <% end %>
-    <%= f.field_container :code do %>
-      <%= f.label :code %>
-      <%= f.text_field :code, class: 'fullwidth' %>
-    <% end %>
-  </div>
-</div>

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

@@ -1,10 +0,0 @@
-<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
-<% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %>
-<% admin_breadcrumb(@promotion_category.name) %>
-
-<%= form_for @promotion_category, 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 %>

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

@@ -1,47 +0,0 @@
-<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
-<% admin_breadcrumb(plural_resource_name(Spree::PromotionCategory)) %>
-
-<% content_for :page_actions do %>
-  <% if can?(:create, Spree::PromotionCategory) %>
-    <li>
-      <%= link_to t('spree.new_promotion_category'), spree.new_admin_promotion_category_path, class: 'btn btn-primary' %>
-    </li>
-  <% end %>
-<% end %>
-
-<% if @promotion_categories.any? %>
-  <table class="index">
-    <colgroup>
-      <col style="width: 40%">
-      <col style="width: 40%">
-      <col style="width: 20%">
-    </colgroup>
-    <thead>
-      <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
-      <th><%= Spree::PromotionCategory.human_attribute_name :code %></th>
-      <th class='actions'></th>
-    </thead>
-    <tbody>
-      <% @promotion_categories.each do |promotion_category| %>
-        <tr>
-          <td><%= promotion_category.name %></td>
-          <td><%= promotion_category.code %></td>
-          <td class="actions">
-            <% if can?(:update, promotion_category) %>
-              <%= link_to_edit promotion_category, no_text: true %>
-            <% end %>
-            <% if can?(:destroy, promotion_category) %>
-              <%= link_to_delete promotion_category, no_text: true %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% else %>
-    <div class="no-objects-found">
-    <%= render 'spree/admin/shared/no_objects_found',
-                 resource: Spree::PromotionCategory,
-                 new_resource_url: new_object_url %>
-  </div>
-<% end %>

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

@@ -1,10 +0,0 @@
-<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
-<% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %>
-<% admin_breadcrumb(t('spree.new_promotion_category')) %>
-
-<%= form_for :promotion_category, 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/promotion_code_batches/_form_fields.html.erb

@@ -1,22 +0,0 @@
-<div class="field">
-  <%= batch.label :base_code, class: "required" %>
-  <%= batch.text_field :base_code, class: "fullwidth", required: true %>
-</div>
-<div class="field">
-  <%= batch.label :number_of_codes, class: "required" %>
-  <%= batch.number_field :number_of_codes, class: "fullwidth", min: 1, required: true %>
-</div>
-<div class="field">
-  <%= batch.label :join_characters %>
-  <%= batch.text_field :join_characters, class: "fullwidth" %>
-</div>
-<% unless promotion_id %>
-  <div class="field">
-    <%= f.label :per_code_usage_limit %>
-    <%= f.text_field :per_code_usage_limit, class: "fullwidth" %>
-  </div>
-<% end %>
-<div class="field">
-  <%= batch.label :email %>
-  <%= batch.text_field :email, class: "fullwidth" %>
-</div>

data/app/views/spree/admin/promotion_code_batches/download.csv.ruby

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-CSV.generate do |csv|
-  csv << ['Code']
-  @promotion_code_batch.promotion_codes.order(:id).pluck(:value).each do |value|
-    csv << [value]
-  end
-end

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

@@ -1,65 +0,0 @@
-<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
-<% admin_breadcrumb(link_to @promotion.name, spree.edit_admin_promotion_path(@promotion.id)) %>
-<% admin_breadcrumb(plural_resource_name(Spree::PromotionCodeBatch)) %>
-
-<% content_for :page_actions do %>
-  <li>
-    <% if can?(:create, Spree::PromotionCodeBatch) %>
-      <%= link_to t('spree.new_promotion_code_batch'), new_object_url, class: 'btn btn-primary' %>
-    <% end %>
-  </li>
-<% end %>
-
-<% if @promotion_code_batches.any? %>
-  <table>
-    <thead>
-      <tr>
-        <th><%= Spree::PromotionCodeBatch.human_attribute_name(:base_code) %></th>
-        <th><%= Spree::PromotionCodeBatch.human_attribute_name(:total_codes) %></th>
-        <th><%= Spree::PromotionCodeBatch.human_attribute_name(:status) %></th>
-        <th><%= Spree::PromotionCodeBatch.human_attribute_name(:email) %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @promotion_code_batches.each do |promotion_code_batch| %>
-        <tr>
-          <td><%= promotion_code_batch.base_code %></td>
-          <td><%= promotion_code_batch.number_of_codes %></td>
-          <td>
-            <% if promotion_code_batch.error.present? %>
-              <%= t(
-                "spree.promotion_code_batches.errored",
-                error: promotion_code_batch.error
-              ) %>
-            <% elsif promotion_code_batch.finished? %>
-              <%= t(
-                "spree.promotion_code_batches.finished",
-                number_of_codes: promotion_code_batch.number_of_codes
-              ) %>
-              <%= link_to(
-                t('spree.download_promotion_codes_list'),
-                admin_promotion_promotion_code_batch_download_path(
-                  promotion_code_batch_id: promotion_code_batch.id,
-                  format: :csv
-                )
-              ) %>
-            <% else %>
-              <%= t(
-                "spree.promotion_code_batches.processing",
-                number_of_codes: promotion_code_batch.number_of_codes,
-                number_of_codes_processed: promotion_code_batch.promotion_codes.count
-              ) %>
-            <% end %>
-          </td>
-          <td><%= promotion_code_batch.email %></td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% else %>
-  <div class="no-objects-found">
-    <%= render 'spree/admin/shared/no_objects_found',
-                 resource: Spree::PromotionCodeBatch,
-                 new_resource_url: new_object_url %>
-  </div>
-<% end %>

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

@@ -1,8 +0,0 @@
-<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
-<% admin_breadcrumb(link_to @promotion.name, spree.admin_promotion_path(@promotion.id)) %>
-<% admin_breadcrumb(plural_resource_name(Spree::PromotionCodeBatch)) %>
-<%= form_for :promotion_code_batch, url: collection_url do |batch| %>
-  <%= batch.hidden_field :promotion_id, value: params[:promotion_id] %>
-  <%= render partial: 'form_fields', locals: {batch: batch, promotion_id: params[:promotion_id]} %>
-  <%= batch.submit t('spree.actions.create'), class: 'btn btn-primary' %>
-<% end %>

data/app/views/spree/admin/promotion_codes/index.csv.ruby

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-CSV.generate do |csv|
-  csv << ['Code']
-  @promotion_codes.order(:id).pluck(:value).each do |value|
-    csv << [value]
-  end
-end