solidus_friendly_promotions 1.0.0.rc.1 → 1.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac98e07030bf9f63775dafdffc94d3a6be02b8050664037469f57a32dc71da43
-  data.tar.gz: fdd1d7e3fbbfc92cb347af92c28c5f518d91724a330408a576d47449c6e8f201
+  metadata.gz: 84ea9571f3d2a4a2dfe9e789c0f3887a0aca2d9559a68004806cd67c395fc959
+  data.tar.gz: 929a14c4f917aad08c6bf7faa7f93c7be071dc43ad72641ddf0394cf336022db
 SHA512:
-  metadata.gz: c9eb24c1fabf89ee0b61731b8541e1459dfe9d508ffc2721f8f1384df382c1653b94f407c04438a2047ebf0fc868e4849fc5f88b821ab141eac44b21bde910b9
-  data.tar.gz: 1e89490f9daf5ad6480b37bc47581bb7ba4a948bb1af7aa7b9539b3c094c6549db4055132b53155e3fc419f881b71d64c81577ba447d188e704eda176bd5b808
+  metadata.gz: 9e49887ad42376b60165ab1d5a8067942adde8d9861681e165b0617155eb74f42a5ea97f2bd94ce929ee5627156ab249ab392b5259e775ecdb53414444bb94be
+  data.tar.gz: cc68b4daf7520de18dbe22bd0b74a73e1a4b009d031d8703b86f7e6d5ad11cfd5999159b48cdb0bfc7801235fe8587bc5c7cfe56a76fb18eee3fef7b48c903a4

data/MIGRATING.md

@@ -90,7 +90,7 @@ end
 would become:
 
 ```rb
-class MyNewRule < SolidusFriendlyShipping::PromotionRule
+class MyNewRule < SolidusFriendlyPromotions::PromotionRule
   include LineItemLevelRule
   def eligible?(promotable)
     promotable.quantity > 3

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

@@ -32,7 +32,7 @@ module SolidusFriendlyPromotions
         return @collection if @collection
 
         params[:q] ||= HashWithIndifferentAccess.new
-        params[:q][:s] ||= "id desc"
+        params[:q][:s] ||= "updated_at desc"
 
         @collection = super
         @search = @collection.ransack(params[:q])

data/app/decorators/models/solidus_friendly_promotions/line_item_decorator.rb

@@ -3,18 +3,24 @@
 module SolidusFriendlyPromotions
   module LineItemDecorator
     def self.prepended(base)
+      base.attr_accessor :quantity_setter
       base.belongs_to :managed_by_order_action, class_name: "SolidusFriendlyPromotions::PromotionAction", optional: true
       base.validate :validate_managed_quantity_same, on: :update
+      base.after_save :reset_quantity_setter
     end
 
     private
 
     def validate_managed_quantity_same
-      if managed_by_order_action && quantity_changed?
+      if managed_by_order_action && quantity_changed? && quantity_setter != managed_by_order_action
         errors.add(:quantity, :cannot_be_changed_for_automated_items)
       end
     end
 
+    def reset_quantity_setter
+      @quantity_setter = nil
+    end
+
     Spree::LineItem.prepend self
     Spree::LineItem.prepend SolidusFriendlyPromotions::DiscountableAmount
   end

data/app/models/concerns/solidus_friendly_promotions/calculators/promotion_calculator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidusFriendlyPromotions
+  module Calculators
+    module PromotionCalculator
+      def description
+        self.class.human_attribute_name(:description)
+      end
+    end
+  end
+end

data/app/models/solidus_friendly_promotions/actions/adjust_line_item_quantity_groups.rb

@@ -58,7 +58,7 @@ module SolidusFriendlyPromotions
         adjustment_amount = adjustment_amount.abs
 
         order = line_item.order
-        line_items = actionable_line_items(order)
+        line_items = promotion.applicable_line_items(order)
 
         item_units = line_items.sort_by do |line_item|
           [-line_item.quantity, line_item.id]
@@ -78,14 +78,6 @@ module SolidusFriendlyPromotions
 
       private
 
-      def actionable_line_items(order)
-        order.discountable_line_items.select do |item|
-          promotion.rules.select do |rule|
-            rule.applicable?(item)
-          end.all? { |rule| rule.eligible?(item) }
-        end
-      end
-
       ##
       # Used specifically for PercentOnLineItem calculator. That calculator uses
       # `line_item.amount`, however we might not necessarily want to discount the

data/app/models/solidus_friendly_promotions/actions/create_discounted_item.rb

@@ -6,9 +6,11 @@ module SolidusFriendlyPromotions
       include OrderLevelAction
       preference :variant_id, :integer
       preference :quantity, :integer, default: 1
+      preference :necessary_quantity, :integer, default: 1
 
       def perform(order)
         line_item = find_item(order) || create_item(order)
+        set_quantity(line_item, determine_item_quantity(order))
         line_item.current_discounts << discount(line_item)
       end
 
@@ -24,7 +26,20 @@ module SolidusFriendlyPromotions
       end
 
       def create_item(order)
-        order.line_items.create!(quantity: preferred_quantity, variant: variant, managed_by_order_action: self)
+        order.line_items.create!(quantity: determine_item_quantity(order), variant: variant, managed_by_order_action: self)
+      end
+
+      def determine_item_quantity(order)
+        applicable_line_items = promotion.applicable_line_items(order)
+        # Integer division will floor automatically, which is what we want here:
+        # 1 Item, 2 needed: 1 * 1 / 2 => 0
+        # 5 items, 2 preferred, 2 needed: 5 / 2 * 2 => 4
+        applicable_line_items.sum(&:quantity) / preferred_necessary_quantity * preferred_quantity
+      end
+
+      def set_quantity(line_item, quantity)
+        line_item.quantity_setter = self
+        line_item.quantity = quantity
       end
 
       def variant

data/app/models/solidus_friendly_promotions/calculators/distributed_amount.rb

@@ -9,6 +9,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class DistributedAmount < Spree::Calculator
+      include PromotionCalculator
+
       preference :amount, :decimal, default: 0
       preference :currency, :string, default: -> { Spree::Config[:currency] }
 
@@ -16,7 +18,7 @@ module SolidusFriendlyPromotions
         return 0 unless line_item
         return 0 unless preferred_currency.casecmp(line_item.currency).zero?
 
-        distributable_line_items = eligible_line_items(line_item.order)
+        distributable_line_items = calculable.promotion.applicable_line_items(line_item.order)
         return 0 unless line_item.in?(distributable_line_items)
 
         DistributedAmountsHandler.new(
@@ -24,14 +26,6 @@ module SolidusFriendlyPromotions
           preferred_amount
         ).amount(line_item)
       end
-
-      private
-
-      def eligible_line_items(order)
-        order.discountable_line_items.select do |line_item|
-          calculable.promotion.eligible_by_applicable_rules?(line_item)
-        end
-      end
     end
   end
 end

data/app/models/solidus_friendly_promotions/calculators/flat_rate.rb

@@ -5,6 +5,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class FlatRate < Spree::Calculator
+      include PromotionCalculator
+
       preference :amount, :decimal, default: 0
       preference :currency, :string, default: -> { Spree::Config[:currency] }
 

data/app/models/solidus_friendly_promotions/calculators/flexi_rate.rb

@@ -5,6 +5,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class FlexiRate < Spree::Calculator
+      include PromotionCalculator
+
       preference :first_item, :decimal, default: 0
       preference :additional_item, :decimal, default: 0
       preference :max_items, :integer, default: 0

data/app/models/solidus_friendly_promotions/calculators/percent.rb

@@ -5,6 +5,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class Percent < Spree::Calculator
+      include PromotionCalculator
+
       preference :percent, :decimal, default: 0
 
       def compute(object)

data/app/models/solidus_friendly_promotions/calculators/tiered_flat_rate.rb

@@ -5,6 +5,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class TieredFlatRate < Spree::Calculator
+      include PromotionCalculator
+
       preference :base_amount, :decimal, default: 0
       preference :tiers, :hash, default: {}
       preference :currency, :string, default: -> { Spree::Config[:currency] }

data/app/models/solidus_friendly_promotions/calculators/tiered_percent.rb

@@ -5,6 +5,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class TieredPercent < Spree::Calculator
+      include PromotionCalculator
+
       preference :base_percent, :decimal, default: 0
       preference :tiers, :hash, default: {}
       preference :currency, :string, default: -> { Spree::Config[:currency] }

data/app/models/solidus_friendly_promotions/calculators/tiered_percent_on_eligible_item_quantity.rb

@@ -0,0 +1,36 @@
+require_dependency "spree/calculator"
+
+module SolidusFriendlyPromotions
+  module Calculators
+    class TieredPercentOnEligibleItemQuantity < SolidusFriendlyPromotions::Calculators::TieredPercent
+      before_validation do
+        # Convert tier values to decimals. Strings don't do us much good.
+        if preferred_tiers.is_a?(Hash)
+          self.preferred_tiers = preferred_tiers.map do |key, value|
+            [cast_to_d(key.to_i), cast_to_d(value.to_s)]
+          end.to_h
+        end
+      end
+
+      def compute_line_item(line_item)
+        order = line_item.order
+
+        _base, percent = preferred_tiers.sort.reverse.detect do |value, _|
+          eligible_line_items_quantity_total(order) >= value
+        end
+        if preferred_currency.casecmp(order.currency).zero?
+          currency_exponent = ::Money::Currency.find(preferred_currency).exponent
+          (line_item.discountable_amount * (percent || preferred_base_percent) / 100).round(currency_exponent)
+        else
+          0
+        end
+      end
+
+      private
+
+      def eligible_line_items_quantity_total(order)
+        calculable.promotion.applicable_line_items(order).sum(&:quantity)
+      end
+    end
+  end
+end

data/app/models/solidus_friendly_promotions/promotion.rb

@@ -48,7 +48,7 @@ module SolidusFriendlyPromotions
     end
 
     self.allowed_ransackable_associations = ["codes"]
-    self.allowed_ransackable_attributes = %w[name path promotion_category_id]
+    self.allowed_ransackable_attributes = %w[name customer_label path promotion_category_id lane updated_at]
     self.allowed_ransackable_scopes = %i[active]
 
     # All orders that have been discounted using this promotion
@@ -155,6 +155,12 @@ module SolidusFriendlyPromotions
       end.all?
     end
 
+    def applicable_line_items(order)
+      order.discountable_line_items.select do |line_item|
+        eligible_by_applicable_rules?(line_item)
+      end
+    end
+
     private
 
     def apply_automatically_disallowed_with_paths

data/app/models/solidus_friendly_promotions/promotion_rule.rb

@@ -49,7 +49,7 @@ module SolidusFriendlyPromotions
     end
 
     def eligibility_error_message(key, options = {})
-      I18n.t(key, **{scope: [:solidus_friendly_promotions, :eligibility_errors, self.class.name.underscore]}.merge(options))
+      I18n.t(key, scope: [:solidus_friendly_promotions, :eligibility_errors, self.class.name.underscore], **options)
     end
   end
 end

data/app/models/solidus_friendly_promotions/rules/minimum_quantity.rb

@@ -27,13 +27,7 @@ module SolidusFriendlyPromotions
       # @param order [Spree::Order] the order we want to check eligibility on
       # @return [Boolean] true if promotion is eligible, false otherwise
       def eligible?(order)
-        applicable_line_items = order.line_items.select do |line_item|
-          promotion.rules.select do |rule|
-            rule.applicable?(line_item)
-          end.all? { _1.eligible?(line_item) }
-        end
-
-        if applicable_line_items.sum(&:quantity) < preferred_minimum_quantity
+        if promotion.applicable_line_items(order).sum(&:quantity) < preferred_minimum_quantity
           eligibility_errors.add(
             :base,
             eligibility_error_message(:quantity_less_than_minimum, count: preferred_minimum_quantity),

data/app/views/solidus_friendly_promotions/admin/promotion_actions/actions/_calculator_fields.erb

@@ -1,6 +1,7 @@
 
 <% calculator = promotion_action.calculator %>
 <% type_name = calculator.type.demodulize.underscore %>
+<%= calculator.description %>
 <% if lookup_context.exists?("fields",  ["solidus_friendly_promotions/admin/promotion_actions/calculators/#{type_name}"], true) %>
   <%= render "solidus_friendly_promotions/admin/promotion_actions/calculators/#{type_name}/fields", calculator: calculator, prefix: param_prefix, form: form %>
 <% else %>

data/app/views/solidus_friendly_promotions/admin/promotion_actions/actions/_create_discounted_item.html.erb

@@ -5,6 +5,10 @@
     <%= form.label :preferred_quantity %>
     <%= form.number_field :preferred_quantity, class: "fullwidth" %>
   </div>
+  <div class="field">
+    <%= form.label :preferred_necessary_quantity %>
+    <%= form.number_field :preferred_necessary_quantity, class: "fullwidth" %>
+  </div>
 <% end %>
 
 <%= render(

data/app/views/solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_flat_rate/_fields.html.erb

@@ -28,7 +28,7 @@
       <%= render "solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_flat_rate/tier_fields", tier: tier, form: form %>
     <% end %>
     <div class="mb-3" data-calculator-tiers-target="links">
-      <%= link_to "Add Tier", "#", class: "btn btn-outline-primary", data: { action: "click->calculator-tiers#add_association" } %>
+      <%= link_to t(:add_tier, scope: [:solidus_friendly_promotions, :admin, :promotions, :calculator]), "#", class: "btn btn-outline-primary", data: { action: "click->calculator-tiers#add_association" } %>
     </div>
   </div>
 </div>

data/app/views/solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent/_fields.html.erb

@@ -28,7 +28,7 @@
       <%= render "solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent/tier_fields", tier: tier, form: form %>
     <% end %>
     <div class="mb-3" data-calculator-tiers-target="links">
-      <%= link_to "Add Tier", "#", class: "btn btn-outline-primary", data: { action: "click->calculator-tiers#add_association" } %>
+      <%= link_to t(:add_tier, scope: [:solidus_friendly_promotions, :admin, :promotions, :calculator]), "#", class: "btn btn-outline-primary", data: { action: "click->calculator-tiers#add_association" } %>
     </div>
   </div>
 </div>

data/app/views/solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent_on_eligible_item_quantity/_fields.html.erb

@@ -0,0 +1,34 @@
+<%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(:base_percent)}",
+  name: "#{prefix}[calculator_attributes][preferred_base_percent]",
+  value: calculator.preferred_base_percent,
+  label: calculator.class.human_attribute_name(:preferred_base_percent) %>
+
+<div class="field">
+  <%= label_tag(
+    "#{prefix}[calculator_attributes][preferred_currency]",
+    t('spree.currency')
+  ) %>
+  <%= select_tag(
+    "#{prefix}[calculator_attributes][preferred_currency]",
+    options_for_select(
+      Spree::Config.available_currencies,
+      calculator.preferred_currency || Spree::Config[:currency]
+    ),
+    { class: 'custom-select fullwidth' }
+  ) %>
+</div>
+
+<div class="field">
+  <%= label_tag nil, calculator.class.human_attribute_name(:tiers)  %>
+  <div data-controller="calculator-tiers">
+    <template data-calculator-tiers-target="template">
+      <%= render "solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent/tier_fields", tier: [nil, nil], form: form %>
+    </template>
+    <% form.object.calculator.preferred_tiers.each do |tier| %>
+      <%= render "solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent/tier_fields", tier: tier, form: form %>
+    <% end %>
+    <div class="mb-3" data-calculator-tiers-target="links">
+      <%= link_to t(:add_tier, scope: [:solidus_friendly_promotions, :admin, :promotions, :calculator]), "#", class: "btn btn-outline-primary", data: { action: "click->calculator-tiers#add_association" } %>
+    </div>
+  </div>
+</div>

data/app/views/solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent_on_eligible_item_quantity/_tier_fields.html.erb

@@ -0,0 +1,27 @@
+<div class="fullwidth tier calculator-tiers">
+  <a class="fa fa-trash remove" data-action="click->calculator-tiers#remove_association"></a>
+  <div class="row">
+    <div class="col-6">
+      <input
+        class="js-base-input form-control"
+        data-action="calculator-tiers#propagate_base_to_value_input"
+        type="text"
+        value="<%= tier[0] %>"
+      >
+    </div>
+    <div class="col-6">
+      <div class="input-group">
+        <input
+          class="js-value-input form-control right-align"
+          name="<%= form.object_name %>[calculator_attributes][preferred_tiers][<%= tier[0] %>]"
+          type="text"
+          value="<%= tier[1] %>"
+        >
+        <div class="input-group-append">
+          <span class="input-group-text">%</span>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="clear"></div>
+</div>

data/app/views/solidus_friendly_promotions/admin/promotions/_table.html.erb

@@ -0,0 +1,56 @@
+<table class="index">
+  <thead>
+    <tr>
+      <th><%= sort_link @search, :name %></th>
+      <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:code) %></th>
+      <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:status) %></th>
+      <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:usage) %></th>
+      <th><%= sort_link @search, :starts_at %></th>
+      <th><%= sort_link @search, :expires_at %></th>
+      <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:lane) %></th>
+      <th><%= sort_link @search, :updated_at %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% promotions.each do |promotion| %>
+      <tr id="<%= spree_dom_id promotion %>">
+        <td><%= promotion.name %></td>
+        <td>
+          <%= (promotion.codes.size == 1) ? promotion.codes.pluck(:value).first : t('solidus_friendly_promotions.number_of_codes', count: promotion.codes.size) %>
+        </td>
+        <td>
+          <span class="pill pill-<%= promotion.active? ? 'active' : 'inactive' %>">
+            <%= t(admin_promotion_status(promotion), scope: 'solidus_friendly_promotions.admin.promotion_status') %>
+          </span>
+        </td>
+        <td>
+          <% if promotion.usage_limit.nil? %>
+            <%= promotion.discounted_orders.exists? ? t(:say_yes, scope: :spree) : t(:say_no, scope: :spree) %>
+          <% else %>
+            <%= promotion.usage_count %> / <%= promotion.usage_limit %>
+          <% end %>
+        <td>
+          <%= l(promotion.starts_at, format: :short) if promotion.starts_at %>
+        </td>
+        <td>
+          <%= l(promotion.expires_at, format: :short) if promotion.expires_at %>
+        </td>
+        <td>
+          <%= SolidusFriendlyPromotions::Promotion.human_enum_name(:lane, promotion.lane) %>
+        </td>
+        <td>
+          <%= l(promotion.updated_at, format: :short) %>
+        </td>
+        <td class="actions">
+          <% if can?(:edit, promotion) %>
+            <%= link_to_edit promotion, no_text: true %>
+          <% end %>
+          <% if can?(:destroy, promotion) %>
+            <%= link_to_delete promotion, no_text: true %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/solidus_friendly_promotions/admin/promotions/_table_filter.html.erb

@@ -0,0 +1,69 @@
+<% content_for :table_filter_title do %>
+  <%= t('spree.search') %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_promotions_index_search">
+    <%= search_form_for [:admin, search] do |f| %>
+      <div class="row">
+        <div class="col-4">
+          <div class="field">
+            <%= label_tag :q_name_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:name) %>
+            <%= f.text_field :name_cont, tabindex: 1 %>
+          </div>
+        </div>
+
+        <div class="col-4">
+          <div class="field">
+            <%= label_tag :q_customer_label_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:customer_label) %>
+            <%= f.text_field :customer_label_cont, tabindex: 1 %>
+          </div>
+        </div>
+
+        <div class="col-2">
+          <div class="field">
+            <%= label_tag :q_codes_value_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:code) %>
+            <%= f.text_field :codes_value_cont, tabindex: 1 %>
+          </div>
+        </div>
+
+        <div class="col-2">
+          <div class="field">
+            <%= label_tag :q_path_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:path) %>
+            <%= f.text_field :path_cont, tabindex: 1 %>
+          </div>
+        </div>
+
+        <div class="col-2">
+          <div class="date-range-filter field">
+            <%= label_tag :q_active, SolidusFriendlyPromotions::Promotion.human_attribute_name(:active) %>
+            <%= f.text_field :active, value: params[:q][:active],
+                             class: 'datepicker datepicker-from fullwidth',
+                             data: { :'enable-time' => true, :'default-hour' => 0 } %>
+          </div>
+        </div>
+
+        <div class="col-2">
+          <div class="field">
+            <%= label_tag :q_promotion_category_id_eq, SolidusFriendlyPromotions::PromotionCategory.model_name.human %><br>
+            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { include_blank: t(:all, scope: :spree) }, { class: 'custom-select fullwidth' }) %>
+          </div>
+        </div>
+
+        <div class="col-2">
+          <div class="field">
+            <%= label_tag :q_lane_eq, SolidusFriendlyPromotions::Promotion.human_attribute_name(:lane) %><br>
+            <%= f.select(:lane_eq, SolidusFriendlyPromotions::Promotion.lane_options, { include_blank: t(:all, scope: :spree) }, { class: 'custom-select fullwidth' }) %>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="actions filter-actions">
+        <div data-hook="admin_promotions_index_search_buttons">
+          <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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

@@ -8,113 +8,12 @@
   <% end %>
 <% end %>
 
-<% content_for :table_filter_title do %>
-  <%= t('spree.search') %>
-<% end %>
-
-<% content_for :table_filter do %>
-  <div data-hook="admin_promotions_index_search">
-    <%= search_form_for [:admin, @search] do |f| %>
-      <div class="row">
-        <div class="col-4">
-          <div class="field">
-            <%= label_tag :q_name_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:name) %>
-            <%= f.text_field :name_cont, tabindex: 1 %>
-          </div>
-        </div>
-
-        <div class="col-2">
-          <div class="field">
-            <%= label_tag :q_codes_value_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:code) %>
-            <%= f.text_field :codes_value_cont, tabindex: 1 %>
-          </div>
-        </div>
-
-        <div class="col-2">
-          <div class="field">
-            <%= label_tag :q_path_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:path) %>
-            <%= f.text_field :path_cont, tabindex: 1 %>
-          </div>
-        </div>
-
-        <div class="col-2">
-          <div class="field">
-            <%= label_tag :q_promotion_category_id_eq, SolidusFriendlyPromotions::PromotionCategory.model_name.human %><br>
-            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { include_blank: t('solidus_friendly_promotions.match_choices.all') }, { class: 'custom-select fullwidth' }) %>
-          </div>
-        </div>
-
-        <div class="col-2">
-          <div class="field">
-            <%= label_tag :active, SolidusFriendlyPromotions::Promotion.human_attribute_name(:active) %><br>
-            <%= f.check_box :active, label: false, as: :boolean, checked_value: true %>
-          </div>
-        </div>
-      </div>
-
-      <div class="clearfix"></div>
-
-      <div class="actions filter-actions">
-        <div data-hook="admin_promotions_index_search_buttons">
-          <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-<% end %>
+<%= render "table_filter", search: @search %>
 
 <%= paginate @promotions, theme: "solidus_admin" %>
 
 <% if @promotions.length > 0 %>
-  <table class="index">
-    <thead>
-      <tr>
-        <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:name) %></th>
-        <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:code) %></th>
-        <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:status) %></th>
-        <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:usage_limit) %></th>
-        <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:uses) %></th>
-        <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:starts_at) %></th>
-        <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:expires_at) %></th>
-        <th class="actions"></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @promotions.each do |promotion| %>
-        <tr id="<%= spree_dom_id promotion %>">
-          <td><%= promotion.name %></td>
-          <td>
-            <%= (promotion.codes.size == 1) ? promotion.codes.pluck(:value).first : t('solidus_friendly_promotions.number_of_codes', count: promotion.codes.size) %>
-          </td>
-          <td>
-            <span class="pill pill-<%= promotion.active? ? 'active' : 'inactive' %>">
-              <%= t(admin_promotion_status(promotion), scope: 'solidus_friendly_promotions.admin.promotion_status') %>
-            </span>
-          </td>
-          <td>
-            <%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit %>
-          </td>
-          <td>
-            <%= promotion.usage_count %>
-          </td>
-          <td>
-            <%= promotion.starts_at.to_fs(:long) if promotion.starts_at %>
-          </td>
-          <td>
-            <%= promotion.expires_at.to_fs(:long) if promotion.expires_at %>
-          </td>
-          <td class="actions">
-            <% if can?(:edit, promotion) %>
-              <%= link_to_edit promotion, no_text: true %>
-            <% end %>
-            <% if can?(:destroy, promotion) %>
-              <%= link_to_delete promotion, no_text: true %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+  <%= render "table", promotions: @promotions %>
 <% else %>
   <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',

data/config/locales/en.yml

@@ -34,7 +34,7 @@ en:
     new_promotion: New Promotion
     new_promotion_category: New Promotion Category
     new_promotion_code_batch: New Promotion Code Batch
-    number_of_codes: Number of codes
+    number_of_codes: "%{count} codes"
     legacy_promotions: Legacy Promotions
     no_rules_added: No Rules Added
     promotion_successfully_created: Promotion has been successfully created!
@@ -146,6 +146,8 @@ en:
           starts_at_placeholder: Immediately
         edit:
           order_rules: Order Rules
+        calculator:
+          add_tier: Add tier
       promotion_status:
         active: Active
         expired: Expired
@@ -170,6 +172,7 @@ en:
       solidus_friendly_promotions/calculators/flexi_rate: Flexible Rate
       solidus_friendly_promotions/calculators/tiered_flat_rate: Tiered Flat Rate
       solidus_friendly_promotions/calculators/tiered_percent: Tiered Percent
+      solidus_friendly_promotions/calculators/tiered_percent_on_eligible_item_quantity: Tiered Percent based on eligible item quantity
       solidus_friendly_promotions/rules/first_order: First Order
       solidus_friendly_promotions/rules/first_repeat_purchase_since: First Repeat Purchase Since
       solidus_friendly_promotions/rules/item_total: Item Total
@@ -191,6 +194,7 @@ en:
       solidus_friendly_promotions/promotion:
         active: Active
         customer_label: Customer-facing label
+        usage: Usage
         lanes:
           pre: Pre
           default: Default
@@ -202,7 +206,9 @@ en:
       solidus_friendly_promotions/actions/adjust_shipment:
         description: Creates a promotion credit on matching shipments
       solidus_friendly_promotions/actions/create_discounted_item:
-        description: Creates a discounted item
+        description: Creates a discounted item with the quantity the applicable line items.
+        preferred_quantity: Quantity per applicable line item quantity
+        preferred_necessary_quantity: Number of items needed for a discounted item
       solidus_friendly_promotions/rules/first_order:
         description: Must be the customer's first order
       solidus_friendly_promotions/rules/first_repeat_purchase_since:
@@ -246,11 +252,24 @@ en:
       solidus_friendly_promotions/rules/user_role:
         description: Order includes User with specified Role(s)
       solidus_friendly_promotions/calculators/tiered_flat_rate:
+        description: Flat Rate in tiers based on item amount
         preferred_base_amount: Base Amount
         tiers: Tiers
       solidus_friendly_promotions/calculators/tiered_percent:
+        description: Tiered percentage based on order's item total
         preferred_base_percent: Base Percent
         tiers: Tiers
+      solidus_friendly_promotions/calculators/tiered_percent_on_eligible_item_quantity:
+        description: Tiered percentage based on eligible item quantity
+        preferred_base_percent: Base Percent
+        tiers: Tiers
+      solidus_friendly_promotions/calculators/flat_rate:
+        description: Provides a flat rate discount
+      solidus_friendly_promotions/calculators/percent:
+        description: Provides a discount calculated by percent of the discountable amount of the item being discounted
+      solidus_friendly_promotions/calculators/distributed_amount:
+        description: Distributed the configured amount among all eligible line items of the order
+
     errors:
       models:
         solidus_friendly_promotions/promotion_code:

data/lib/generators/solidus_friendly_promotions/install/templates/initializer.rb

@@ -17,7 +17,7 @@ Spree::Backend::Config.configure do |config|
     if item.respond_to?(:children)
       Spree::BackendConfiguration::MenuItem.new(
         label: :promotions,
-        icon: "bullhorn",
+        icon: config.admin_updated_navbar ? "ri-megaphone-line" : "bullhorn",
         condition: -> { can?(:admin, SolidusFriendlyPromotions::Promotion) },
         url: -> { SolidusFriendlyPromotions::Engine.routes.url_helpers.admin_promotions_path },
         data_hook: :admin_promotion_sub_tabs,
@@ -73,7 +73,8 @@ SolidusFriendlyPromotions.configure do |config|
       "SolidusFriendlyPromotions::Calculators::FlexiRate",
       "SolidusFriendlyPromotions::Calculators::Percent",
       "SolidusFriendlyPromotions::Calculators::TieredFlatRate",
-      "SolidusFriendlyPromotions::Calculators::TieredPercent"
+      "SolidusFriendlyPromotions::Calculators::TieredPercent",
+      "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
     ],
     "SolidusFriendlyPromotions::Actions::AdjustLineItem" => [
       "SolidusFriendlyPromotions::Calculators::DistributedAmount",
@@ -81,15 +82,18 @@ SolidusFriendlyPromotions.configure do |config|
       "SolidusFriendlyPromotions::Calculators::FlexiRate",
       "SolidusFriendlyPromotions::Calculators::Percent",
       "SolidusFriendlyPromotions::Calculators::TieredFlatRate",
-      "SolidusFriendlyPromotions::Calculators::TieredPercent"
+      "SolidusFriendlyPromotions::Calculators::TieredPercent",
+      "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
     ],
     "SolidusFriendlyPromotions::Actions::AdjustLineItemQuantityGroups" => [
       "SolidusFriendlyPromotions::Calculators::FlatRate",
-      "SolidusFriendlyPromotions::Calculators::Percent"
+      "SolidusFriendlyPromotions::Calculators::Percent",
+      "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
     ],
     "SolidusFriendlyPromotions::Actions::CreateDiscountedItem" => [
       "SolidusFriendlyPromotions::Calculators::FlatRate",
-      "SolidusFriendlyPromotions::Calculators::Percent"
+      "SolidusFriendlyPromotions::Calculators::Percent",
+      "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
     ]
   )
 

data/lib/solidus_friendly_promotions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusFriendlyPromotions
-  VERSION = "1.0.0.rc.1"
+  VERSION = "1.0.0.rc.2"
 end

data/lib/solidus_friendly_promotions.rb

@@ -6,6 +6,7 @@ require "solidus_support"
 require "turbo-rails"
 require "importmap-rails"
 require "stimulus-rails"
+require "ransack-enum"
 require "solidus_friendly_promotions/nested_class_set"
 require "solidus_friendly_promotions/configuration"
 require "solidus_friendly_promotions/version"

data/solidus_friendly_promotions.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "turbo-rails", "~> 1.4"
   spec.add_dependency "stimulus-rails", "~> 1.2"
   spec.add_dependency "importmap-rails", "~> 1.2"
+  spec.add_dependency "ransack-enum", "~> 1.0"
   spec.add_development_dependency "rspec-activemodel-mocks", "~> 1.0"
   spec.add_development_dependency "shoulda-matchers", "~> 5.3"
   spec.add_development_dependency "solidus_dev_support", "~> 2.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_friendly_promotions
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.1
+  version: 1.0.0.rc.2
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2023-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -86,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: ransack-enum
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +203,7 @@ files:
 - app/jobs/solidus_friendly_promotions/promotion_code_batch_job.rb
 - app/mailers/solidus_friendly_promotions/promotion_code_batch_mailer.rb
 - app/models/concerns/solidus_friendly_promotions/actions/order_level_action.rb
+- app/models/concerns/solidus_friendly_promotions/calculators/promotion_calculator.rb
 - app/models/concerns/solidus_friendly_promotions/discountable_amount.rb
 - app/models/concerns/solidus_friendly_promotions/rules/line_item_applicable_order_rule.rb
 - app/models/concerns/solidus_friendly_promotions/rules/line_item_level_rule.rb
@@ -205,6 +220,7 @@ files:
 - app/models/solidus_friendly_promotions/calculators/percent.rb
 - app/models/solidus_friendly_promotions/calculators/tiered_flat_rate.rb
 - app/models/solidus_friendly_promotions/calculators/tiered_percent.rb
+- app/models/solidus_friendly_promotions/calculators/tiered_percent_on_eligible_item_quantity.rb
 - app/models/solidus_friendly_promotions/distributed_amounts_handler.rb
 - app/models/solidus_friendly_promotions/eligibility_result.rb
 - app/models/solidus_friendly_promotions/eligibility_results.rb
@@ -267,6 +283,8 @@ files:
 - app/views/solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_flat_rate/_tier_fields.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent/_fields.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent/_tier_fields.html.erb
+- app/views/solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent_on_eligible_item_quantity/_fields.html.erb
+- app/views/solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent_on_eligible_item_quantity/_tier_fields.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_actions/edit.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_actions/new.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_categories/_form.html.erb
@@ -300,6 +318,8 @@ files:
 - app/views/solidus_friendly_promotions/admin/promotions/_activations_edit.html.erb
 - app/views/solidus_friendly_promotions/admin/promotions/_activations_new.html.erb
 - app/views/solidus_friendly_promotions/admin/promotions/_form.html.erb
+- app/views/solidus_friendly_promotions/admin/promotions/_table.html.erb
+- app/views/solidus_friendly_promotions/admin/promotions/_table_filter.html.erb
 - app/views/solidus_friendly_promotions/admin/promotions/edit.html.erb
 - app/views/solidus_friendly_promotions/admin/promotions/index.html.erb
 - app/views/solidus_friendly_promotions/admin/promotions/new.html.erb