solidus_friendly_promotions 1.0.0.rc.3 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb47848b0ee568a1116d827ac87f0071afd5790eff84d501860c0ed68eb37ac1
-  data.tar.gz: fd5c9d4ac486641ab72f87129cfbf7a7a44ea5b3c1a18970c479794f410dcd9f
+  metadata.gz: a6735f8983491ab3b703bc8c095f8331efb28e58b9a59fde2e74a338dc60c03f
+  data.tar.gz: 4f4ecb6904c2aba33880b6601bd3a1efb3d72c283f6c1a6aab3167bc2739767d
 SHA512:
-  metadata.gz: 71269bc48e02192efa3d41c83fe461bed7b3b0c8b1d123cfa555671ee5baea159f7e49521d203124ec1c23e2bedecc641e2a6b44ff5b18ad013438c2255fee50
-  data.tar.gz: 91b12062bff9c7324c9efdce8398ce6eac5ffd50b353848b1249c9a4146411b137c8354fee594861d03f490db9e4a05d0556f5bade2160596d04c56a7e3c452b
+  metadata.gz: b6a4ae6ae4f22709c40865d60e125f07ac55bd58cf944415f41c6431d8260da20d16f4b33b78d2a0219366c58d13441d5701bc935d09760751a413fceed487e2
+  data.tar.gz: 640c4da14f4f8d70fb7f8d9fce147f0344a4812384f44a5da379e61c55a5cafacb0b8ff161f752930523c0ad198dadfd1fd047c577976f1818e28938b5631277

data/.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
   lint:
     executor:
       name: solidusio_extensions/sqlite-memory
-      ruby_version: '3.0'
+      ruby_version: '3.1'
     steps:
       - checkout
       - solidusio_extensions/test-branch:
@@ -15,33 +15,33 @@ jobs:
   run-specs-with-mysql:
     executor:
       name: solidusio_extensions/mysql
-      ruby_version: '3.1'
+      ruby_version: '3.2'
     steps:
       - browser-tools/install-chrome
       - checkout
       - solidusio_extensions/dependencies
       - solidusio_extensions/run-tests-solidus-current
-      # - solidusio_extensions/run-tests-solidus-main
+      - solidusio_extensions/run-tests-solidus-main
   run-specs-with-postgres:
     executor:
       name: solidusio_extensions/postgres
-      ruby_version: '3.2'
+      ruby_version: '3.3'
     steps:
       - browser-tools/install-chrome
       - checkout
       - solidusio_extensions/dependencies
       - solidusio_extensions/run-tests-solidus-current
-      # - solidusio_extensions/run-tests-solidus-main
+      - solidusio_extensions/run-tests-solidus-main
   run-specs-with-sqlite:
     executor:
       name: solidusio_extensions/sqlite
-      ruby_version: '3.0'
+      ruby_version: '3.1'
     steps:
       - browser-tools/install-chrome
       - checkout
       - solidusio_extensions/dependencies
       - solidusio_extensions/run-tests-solidus-current
-      # - solidusio_extensions/run-tests-solidus-main
+      - solidusio_extensions/run-tests-solidus-main
 workflows:
   Run specs on supported Solidus versions:
     jobs:

data/CHANGELOG.md

@@ -1,8 +1,49 @@
 # Changelog
 
-## [Unreleased](https://github.com/FriendlyCart/solidus_friendly_promotions/tree/HEAD)
+## [v1.0.1](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.0.1) (2024-05-07)
 
-## [v1.0.0.rc.2](https://github.com/FriendlyCart/solidus_friendly_promotions/tree/v1.0.0.rc.3) (2024-01-16)
+[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.0.0...v1.0.1)
+
+**Closed issues:**
+
+- Ransack scope missing [\#105](https://github.com/friendlycart/solidus_friendly_promotions/issues/105)
+
+**Merged pull requests:**
+
+- Fix selenium path [\#108](https://github.com/friendlycart/solidus_friendly_promotions/pull/108) ([mamhoff](https://github.com/mamhoff))
+- Restrict SQLite to "~\> 1.3" [\#107](https://github.com/friendlycart/solidus_friendly_promotions/pull/107) ([mamhoff](https://github.com/mamhoff))
+- Fix ShippingRateDiscount\#promotion\_action [\#106](https://github.com/friendlycart/solidus_friendly_promotions/pull/106) ([mamhoff](https://github.com/mamhoff))
+- Fix specs [\#104](https://github.com/friendlycart/solidus_friendly_promotions/pull/104) ([mamhoff](https://github.com/mamhoff))
+- Fix Promotion Rule Unique per promotion validation [\#103](https://github.com/friendlycart/solidus_friendly_promotions/pull/103) ([mamhoff](https://github.com/mamhoff))
+
+## [v1.0.0](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.0.0) (2024-01-25)
+
+[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.0.0.rc.3...v1.0.0)
+
+**Implemented enhancements:**
+
+- Implement better soft-delete [\#30](https://github.com/friendlycart/solidus_friendly_promotions/issues/30)
+
+**Closed issues:**
+
+- Cannot delete promotion with promotion code [\#94](https://github.com/friendlycart/solidus_friendly_promotions/issues/94)
+- Missing action for button: Promotion code batch [\#93](https://github.com/friendlycart/solidus_friendly_promotions/issues/93)
+
+**Merged pull requests:**
+
+- Improve soft-deletion faculty [\#102](https://github.com/friendlycart/solidus_friendly_promotions/pull/102) ([mamhoff](https://github.com/mamhoff))
+- Add missing association between promo codes and order promotions [\#101](https://github.com/friendlycart/solidus_friendly_promotions/pull/101) ([mamhoff](https://github.com/mamhoff))
+- Revert "Temporarily disable running specs for Solidus main" [\#100](https://github.com/friendlycart/solidus_friendly_promotions/pull/100) ([mamhoff](https://github.com/mamhoff))
+- Add admin UI for promotion code batches [\#99](https://github.com/friendlycart/solidus_friendly_promotions/pull/99) ([mamhoff](https://github.com/mamhoff))
+- Define SolidusFriendlyPromotions.table\_name\_prefix early [\#98](https://github.com/friendlycart/solidus_friendly_promotions/pull/98) ([mamhoff](https://github.com/mamhoff))
+
+## [v1.0.0.rc.3](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.0.0.rc.3) (2024-01-16)
+
+[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.0.0.rc.2...v1.0.0.rc.3)
+
+**Closed issues:**
+
+- Provide Integration Instructions for Starter Frontend [\#90](https://github.com/friendlycart/solidus_friendly_promotions/issues/90)
 
 **Merged pull requests:**
 
@@ -13,9 +54,9 @@
 - Fix typo [\#89](https://github.com/friendlycart/solidus_friendly_promotions/pull/89) ([jarednorman](https://github.com/jarednorman))
 - Pass untranslated strings through i18n [\#88](https://github.com/friendlycart/solidus_friendly_promotions/pull/88) ([mamhoff](https://github.com/mamhoff))
 
-## [v1.0.0.rc.2](https://github.com/FriendlyCart/solidus_friendly_promotions/tree/v1.0.0.rc.2) (2023-11-11)
+## [v1.0.0.rc.2](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.0.0.rc.2) (2023-11-11)
 
-[Full Changelog](https://github.com/FriendlyCart/solidus_friendly_promotions/compare/v1.0.0.rc.1...v1.0.0.rc.2)
+[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.0.0.rc.1...v1.0.0.rc.2)
 
 **Merged pull requests:**
 
@@ -28,18 +69,35 @@
 - Promotions index improvements [\#79](https://github.com/friendlycart/solidus_friendly_promotions/pull/79) ([mamhoff](https://github.com/mamhoff))
 - Lint: Fix standardrb error [\#78](https://github.com/friendlycart/solidus_friendly_promotions/pull/78) ([mamhoff](https://github.com/mamhoff))
 
-## [v1.0.0.rc.1](https://github.com/FriendlyCart/solidus_friendly_promotions/tree/v1.0.0.rc.1) (2023-11-07)
+## [v1.0.0.rc.1](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.0.0.rc.1) (2023-11-07)
+
+[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.0.0.pre...v1.0.0.rc.1)
+
+**Implemented enhancements:**
 
-[Full Changelog](https://github.com/FriendlyCart/solidus_friendly_promotions/compare/v1.0.0.pre...v1.0.0.rc.1)
+- Implement  Free items [\#31](https://github.com/friendlycart/solidus_friendly_promotions/issues/31)
 
 **Merged pull requests:**
 
 - Goodies! [\#75](https://github.com/friendlycart/solidus_friendly_promotions/pull/75) ([mamhoff](https://github.com/mamhoff))
 - Add a null promotion handler [\#71](https://github.com/friendlycart/solidus_friendly_promotions/pull/71) ([mamhoff](https://github.com/mamhoff))
 
-## [v1.0.0.pre](https://github.com/FriendlyCart/solidus_friendly_promotions/tree/v1.0.0.pre) (2023-11-07)
+## [v1.0.0.pre](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.0.0.pre) (2023-11-07)
+
+[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/e14802957fdb55d7f4e2730341e4cbb118ebf993...v1.0.0.pre)
+
+**Implemented enhancements:**
+
+- Migrator: Copy promotion codes [\#34](https://github.com/friendlycart/solidus_friendly_promotions/issues/34)
+- Add original\_promotion\_{action\_}id on promotions and promotion actions [\#33](https://github.com/friendlycart/solidus_friendly_promotions/issues/33)
+
+**Fixed bugs:**
+
+- Migrator: Add support for promotion categories [\#37](https://github.com/friendlycart/solidus_friendly_promotions/issues/37)
+
+**Closed issues:**
 
-[Full Changelog](https://github.com/FriendlyCart/solidus_friendly_promotions/compare/e14802957fdb55d7f4e2730341e4cbb118ebf993...v1.0.0.pre)
+- Document DB tables [\#35](https://github.com/friendlycart/solidus_friendly_promotions/issues/35)
 
 **Merged pull requests:**
 

data/Gemfile

@@ -24,14 +24,9 @@ when "mysql"
 when "postgresql"
   gem "pg"
 else
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.3"
 end
 
-# While we still support Ruby < 3 we need to workaround a limitation in
-# the 'async' gem that relies on the latest ruby, since RubyGems doesn't
-# resolve gems based on the required ruby version.
-gem "async", "< 3" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3")
-
 gemspec
 
 # Use a local Gemfile to include development dependencies that might not be

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

@@ -49,6 +49,10 @@ module SolidusFriendlyPromotions
       def routes_proxy
         solidus_friendly_promotions
       end
+
+      def parent_model_name
+        self.class.parent_data[:model_name].gsub("solidus_friendly_promotions/", "")
+      end
     end
   end
 end

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

@@ -53,7 +53,7 @@ module SolidusFriendlyPromotions
 
       def destroy
         @promotion_action = @promotion.actions.find(params[:id])
-        if @promotion_action.discard
+        if @promotion_action.destroy
           flash[:success] =
             t("spree.successfully_removed", resource: SolidusFriendlyPromotions::PromotionAction.model_name.human)
         end

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

@@ -25,6 +25,18 @@ module SolidusFriendlyPromotions
       def build_promotion_code_batch
         @promotion_code_batch.process
       end
+
+      def model_class
+        SolidusFriendlyPromotions::PromotionCodeBatch
+      end
+
+      def collection
+        parent.code_batches
+      end
+
+      def build_resource
+        parent.code_batches.build
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module SolidusFriendlyPromotions
   module Admin
     class PromotionRulesController < Spree::Admin::BaseController
-      helper "spree/promotion_rules"
+      helper "solidus_friendly_promotions/admin/promotion_rules"
 
       before_action :validate_level, only: [:new, :create]
       before_action :load_promotion, only: [:create, :destroy, :update, :new]

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

@@ -7,6 +7,7 @@ module SolidusFriendlyPromotions
 
       helper "solidus_friendly_promotions/admin/promotion_rules"
       helper "solidus_friendly_promotions/admin/promotion_actions"
+      helper "solidus_friendly_promotions/admin/promotions"
 
       def create
         @promotion = model_class.new(permitted_resource_params)

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module SolidusFriendlyPromotions
+  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/models/solidus_friendly_promotions/promotion.rb

@@ -2,11 +2,13 @@
 
 module SolidusFriendlyPromotions
   class Promotion < Spree::Base
+    include Spree::SoftDeletable
+
     belongs_to :category, class_name: "SolidusFriendlyPromotions::PromotionCategory",
       foreign_key: :promotion_category_id, optional: true
     belongs_to :original_promotion, class_name: "Spree::Promotion", optional: true
     has_many :rules, class_name: "SolidusFriendlyPromotions::PromotionRule", dependent: :destroy
-    has_many :actions, class_name: "SolidusFriendlyPromotions::PromotionAction", dependent: :nullify
+    has_many :actions, class_name: "SolidusFriendlyPromotions::PromotionAction", dependent: :destroy
     has_many :codes, class_name: "SolidusFriendlyPromotions::PromotionCode", dependent: :destroy
     has_many :code_batches, class_name: "SolidusFriendlyPromotions::PromotionCodeBatch", dependent: :destroy
     has_many :order_promotions, class_name: "SolidusFriendlyPromotions::OrderPromotion", dependent: :destroy
@@ -17,6 +19,9 @@ module SolidusFriendlyPromotions
     validates :per_code_usage_limit, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
     validates :description, length: {maximum: 255}
     validate :apply_automatically_disallowed_with_paths
+    validate :apply_automatically_disallowed_with_promotion_codes
+
+    before_save :normalize_blank_values
 
     scope :active, ->(time = Time.current) { has_actions.started_and_unexpired(time) }
     scope :advertised, -> { where(advertise: true) }
@@ -49,7 +54,7 @@ module SolidusFriendlyPromotions
 
     self.allowed_ransackable_associations = ["codes"]
     self.allowed_ransackable_attributes = %w[name customer_label path promotion_category_id lane updated_at]
-    self.allowed_ransackable_scopes = %i[active]
+    self.allowed_ransackable_scopes = %i[active with_discarded]
 
     # All orders that have been discounted using this promotion
     def discounted_orders
@@ -163,10 +168,20 @@ module SolidusFriendlyPromotions
 
     private
 
+    def normalize_blank_values
+      self[:path] = nil if self[:path].blank?
+    end
+
     def apply_automatically_disallowed_with_paths
       return unless apply_automatically
 
       errors.add(:apply_automatically, :disallowed_with_path) if path.present?
     end
+
+    def apply_automatically_disallowed_with_promotion_codes
+      return unless apply_automatically
+
+      errors.add(:apply_automatically, :disallowed_with_promotion_codes) if codes.present?
+    end
   end
 end

data/app/models/solidus_friendly_promotions/promotion_action.rb

@@ -9,13 +9,15 @@ module SolidusFriendlyPromotions
   # by an event and determined to be eligible.
   class PromotionAction < Spree::Base
     include Spree::Preferences::Persistable
-    include Spree::SoftDeletable
     include Spree::CalculatedAdjustments
     include Spree::AdjustmentSource
+    before_destroy :remove_adjustments_from_incomplete_orders
+    before_destroy :raise_for_adjustments_for_completed_orders
 
     belongs_to :promotion, inverse_of: :actions
     belongs_to :original_promotion_action, class_name: "Spree::PromotionAction", optional: true
     has_many :adjustments, class_name: "Spree::Adjustment", as: :source
+    has_many :shipping_rate_discounts, class_name: "SolidusFriendlyPromotions::ShippingRateDiscount", inverse_of: :promotion_action
 
     scope :of_type, ->(type) { where(type: Array.wrap(type).map(&:to_s)) }
 
@@ -69,5 +71,14 @@ module SolidusFriendlyPromotions
     def available_calculators
       SolidusFriendlyPromotions.config.promotion_calculators[self.class] || (raise NotImplementedError)
     end
+
+    private
+
+    def raise_for_adjustments_for_completed_orders
+      if adjustments.joins(:order).merge(Spree::Order.complete).any?
+        errors.add(:base, :cannot_destroy_if_order_completed)
+        throw(:abort)
+      end
+    end
   end
 end

data/app/models/solidus_friendly_promotions/promotion_code.rb

@@ -4,6 +4,8 @@ module SolidusFriendlyPromotions
   class PromotionCode < Spree::Base
     belongs_to :promotion, inverse_of: :codes
     belongs_to :promotion_code_batch, inverse_of: :promotion_codes, optional: true
+
+    has_many :order_promotions, class_name: "SolidusFriendlyPromotions::OrderPromotion", dependent: :destroy
     has_many :adjustments, class_name: "Spree::Adjustment"
 
     before_validation :normalize_code

data/app/models/solidus_friendly_promotions/promotion_rule.rb

@@ -45,7 +45,7 @@ module SolidusFriendlyPromotions
     def unique_per_promotion
       return unless self.class.exists?(promotion_id: promotion_id, type: self.class.name)
 
-      errors[:base] << "Promotion already contains this rule type"
+      errors.add(:promotion, :already_contains_rule_type)
     end
 
     def eligibility_error_message(key, options = {})

data/app/models/solidus_friendly_promotions/shipping_rate_discount.rb

@@ -3,7 +3,7 @@
 module SolidusFriendlyPromotions
   class ShippingRateDiscount < Spree::Base
     belongs_to :shipping_rate, inverse_of: :discounts, class_name: "Spree::ShippingRate"
-    belongs_to :promotion_action, -> { with_discarded }, inverse_of: false
+    belongs_to :promotion_action, inverse_of: :shipping_rate_discounts
 
     extend Spree::DisplayMoney
     money_methods :amount

data/app/views/solidus_friendly_promotions/admin/promotion_code_batches/_form_fields.html.erb

@@ -0,0 +1,22 @@
+<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/solidus_friendly_promotions/admin/promotion_code_batches/download.csv.ruby

@@ -0,0 +1,8 @@
+# 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/solidus_friendly_promotions/admin/promotion_code_batches/index.html.erb

@@ -0,0 +1,65 @@
+<% admin_breadcrumb(link_to plural_resource_name(SolidusFriendlyPromotions::Promotion), solidus_friendly_promotions.admin_promotions_path) %>
+<% admin_breadcrumb(link_to @promotion.name, solidus_friendly_promotions.edit_admin_promotion_path(@promotion.id)) %>
+<% admin_breadcrumb(plural_resource_name(SolidusFriendlyPromotions::PromotionCodeBatch)) %>
+
+<% content_for :page_actions do %>
+  <li>
+    <% if can?(:create, SolidusFriendlyPromotions::PromotionCodeBatch) %>
+      <%= link_to t('solidus_friendly_promotions.new_promotion_code_batch'), new_object_url, class: 'btn btn-primary' %>
+    <% end %>
+  </li>
+<% end %>
+
+<% if @promotion_code_batches.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= SolidusFriendlyPromotions::PromotionCodeBatch.human_attribute_name(:base_code) %></th>
+        <th><%= SolidusFriendlyPromotions::PromotionCodeBatch.human_attribute_name(:total_codes) %></th>
+        <th><%= SolidusFriendlyPromotions::PromotionCodeBatch.human_attribute_name(:status) %></th>
+        <th><%= SolidusFriendlyPromotions::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(
+                "solidus_friendly_promotions.promotion_code_batches.errored",
+                error: promotion_code_batch.error
+              ) %>
+            <% elsif promotion_code_batch.finished? %>
+              <%= t(
+                "solidus_friendly_promotions.promotion_code_batches.finished",
+                number_of_codes: promotion_code_batch.number_of_codes
+              ) %>
+              <%= link_to(
+                t('solidus_friendly_promotions.download_promotion_codes_list'),
+                admin_promotion_promotion_code_batch_download_path(
+                  promotion_code_batch_id: promotion_code_batch.id,
+                  format: :csv
+                )
+              ) %>
+            <% else %>
+              <%= t(
+                "solidus_friendly_promotions.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: SolidusFriendlyPromotions::PromotionCodeBatch,
+                 new_resource_url: new_object_url %>
+  </div>
+<% end %>

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

@@ -0,0 +1,8 @@
+<% admin_breadcrumb(link_to plural_resource_name(SolidusFriendlyPromotions::Promotion), solidus_friendly_promotions.admin_promotions_path) %>
+<% admin_breadcrumb(link_to @promotion.name, solidus_friendly_promotions.admin_promotion_path(@promotion.id)) %>
+<% admin_breadcrumb(plural_resource_name(SolidusFriendlyPromotions::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/solidus_friendly_promotions/admin/promotions/_form.html.erb

@@ -85,12 +85,40 @@
   </div>
 </fieldset>
 
-<fieldset class="form-group no-border-bottom">
+<fieldset class="form-group row no-border-bottom">
   <legend><%= t '.activation' %></legend>
 
-  <% if @promotion.new_record? %>
-    <%= render 'spree/admin/promotions/activations_new', f: f %>
-  <% else %>
-    <%= render 'spree/admin/promotions/activations_edit', f: f %>
+  <div class="col-4">
+    <%= f.field_container :apply_automatically do %>
+      <%= f.label :apply_automatically do %>
+        <%= f.check_box :apply_automatically, disabled: f.object.codes.any? || f.object.path.present? %>
+        <%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:apply_automatically) %>
+        <%= f.field_hint :promo_code_will_be_disabled %>
+      <% end %>
+    <% end %>
+  </div>
+
+  <% if f.object.new_record? || f.object.present? %>
+    <div class="col-4">
+      <%= f.field_container :path do %>
+        <%= f.label :path %>
+        <%= f.text_field :path, class: "fullwidth", disabled: f.object.apply_automatically || f.object.codes.present? %>
+      <% end %>
+    </div>
   <% end %>
+
+    <div class="col-4">
+      <% if f.object.new_record? %>
+        <div id="promotion_single_code" class="field">
+          <%= label_tag :single_code, SolidusFriendlyPromotions::PromotionCode.model_name.human %>
+          <%= text_field_tag :single_code, @promotion.codes.first.try!(:value), class: "fullwidth", disabled: f.object.apply_automatically || f.object.path.present? %>
+        </div>
+      <% else %>
+        <div class="codes-present">
+          <p>
+            <%= t('.codes_present') %>
+          </p>
+        </div>
+      <% end %>
+    </div>
 </fieldset>

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

@@ -14,7 +14,7 @@
   </thead>
   <tbody>
     <% promotions.each do |promotion| %>
-      <tr id="<%= spree_dom_id promotion %>">
+      <tr class="<%= 'deleted' if promotion.discarded? %>" 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) %>
@@ -43,10 +43,10 @@
           <%= l(promotion.updated_at, format: :short) %>
         </td>
         <td class="actions">
-          <% if can?(:edit, promotion) %>
+          <% if can?(:edit, promotion) && !promotion.discarded? %>
             <%= link_to_edit promotion, no_text: true %>
           <% end %>
-          <% if can?(:destroy, promotion) %>
+          <% if can?(:destroy, promotion) && !promotion.discarded? %>
             <%= link_to_delete promotion, no_text: true %>
           <% end %>
         </td>

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

@@ -43,6 +43,15 @@
           </div>
         </div>
 
+        <div class="col-2">
+          <div class="field checkbox">
+            <label>
+              <%= f.check_box :with_discarded, { checked: params[:q][:with_discarded] == 'true', class: 'js-with-discarded-input' }, 'true', 'false' %>
+              <%= t('spree.show_deleted') %>
+            </label>
+          </div>
+        </div>
+
         <div class="col-2">
           <div class="field">
             <%= label_tag :q_promotion_category_id_eq, SolidusFriendlyPromotions::PromotionCategory.model_name.human %><br>

data/bin/sandbox

@@ -65,6 +65,7 @@ unbundled bundle exec rake db:drop db:create
 
 unbundled bin/rails generate solidus:install \
   --auto-accept \
+  --admin_preview=false \
   $@
 
 unbundled bundle exec rails generate solidus:auth:install --auto-run-migrations

data/config/locales/en.yml

@@ -9,6 +9,13 @@ en:
         promotion_categories: Promotion Categories
         legacy_promotions: Legacy Promotions
         legacy_promotion_categories: Legacy Promotion Categories
+    hints:
+      solidus_friendly_promotions/calculator:
+        promotions: This is used to determine the promotional discount to be applied to an order, an item, or shipping charges.
+      solidus_friendly_promotions/promotion:
+        expires_at: This determines when the promotion expires. <br> If no value is specified, the promotion will never expire.
+        promo_code_will_be_disabled: Selecting this option, promo codes will be disabled for this promotion because all its rules / actions will be applied automatically to all orders.
+        starts_at: This determines when the promotion can be applied to orders. <br> If no value is specified, the promotion will be immediately available.
   solidus_friendly_promotions:
     actions: Actions
     adjustment_labels:
@@ -39,6 +46,9 @@ en:
     no_rules_added: No Rules Added
     promotion_successfully_created: Promotion has been successfully created!
     promotion_total_changed_before_complete: One or more of the promotions on your order have become ineligible and were removed. Please check the new order amounts and try again.
+    promotion_code_batches:
+      finished: Finished
+      errored: Errored
     view_promotion_codes_list: View codes list
     promotion_rules:
       line_item_product:
@@ -49,9 +59,6 @@ en:
         match_policies:
           include: Line item's product has one of the chosen taxons
           exclude: Line item's product does not have one of the chosen taxons
-    hints:
-      solidus_friendly_promotions/calculator:
-        promotions: This is used to determine the promotional discount to be applied to an order, an item, or shipping charges.
     coupon_code: Coupon code
     eligibility_results:
       coupon_code_applied: The coupon code was successfully applied to your order.
@@ -144,6 +151,7 @@ en:
           expires_at_placeholder: Never
           general: General
           starts_at_placeholder: Immediately
+          codes_present: This promotion has promotion codes defined. You cannot select the apply automatically option.
         edit:
           order_rules: Order Rules
         calculator:
@@ -190,6 +198,9 @@ en:
       solidus_friendly_promotions/rules/user: User
       solidus_friendly_promotions/rules/user_logged_in: User Logged In
       solidus_friendly_promotions/rules/user_role: User Role(s)
+      solidus_friendly_promotions/promotion_code_batch:
+        one: Code batch
+        other: Code batches
     attributes:
       solidus_friendly_promotions/promotion:
         active: Active
@@ -308,6 +319,14 @@ en:
 
     errors:
       models:
+        solidus_friendly_promotions/promotion_action:
+          attributes:
+            base:
+              cannot_destroy_if_order_completed: Action has been applied to complete orders. It cannot be destroyed.
+        solidus_friendly_promotions/promotion_rule:
+          attributes:
+            promotion:
+              already_contains_rule_type: already contains this rule type
         solidus_friendly_promotions/promotion_code:
           attributes:
             base:
@@ -316,3 +335,8 @@ en:
           attributes:
             quantity:
               cannot_be_changed_for_automated_items: cannot be changed on a line item managed by a promotion action
+        solidus_friendly_promotions/promotion:
+          attributes:
+            apply_automatically:
+              disallowed_with_path: cannot be set to true when path is present
+              disallowed_with_promotion_codes: cannot be set to true when promotion code is present

data/db/migrate/20240124104855_add_deleted_at_to_promotions.rb

@@ -0,0 +1,6 @@
+class AddDeletedAtToPromotions < ActiveRecord::Migration[7.0]
+  def change
+    add_column :friendly_promotions, :deleted_at, :datetime
+    add_index :friendly_promotions, :deleted_at
+  end
+end

data/db/migrate/20240125102050_drop_deleted_at_from_promotion_actions.rb

@@ -0,0 +1,5 @@
+class DropDeletedAtFromPromotionActions < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :friendly_promotion_actions, :deleted_at, :datetime, null: true
+  end
+end

data/lib/solidus_friendly_promotions/version.rb

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

data/lib/solidus_friendly_promotions.rb

@@ -7,13 +7,18 @@ 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"
-require "solidus_friendly_promotions/engine"
 
 module SolidusFriendlyPromotions
+  def self.table_name_prefix
+    "friendly_"
+  end
+
   # JS Importmap instance
   singleton_class.attr_accessor :importmap
   self.importmap = Importmap::Map.new
 end
+
+require "solidus_friendly_promotions/nested_class_set"
+require "solidus_friendly_promotions/configuration"
+require "solidus_friendly_promotions/version"
+require "solidus_friendly_promotions/engine"

data/solidus_friendly_promotions.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.license = "BSD-3-Clause"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/solidusio-contrib/solidus_friendly_promotions"
-  spec.metadata["changelog_uri"] = "https://github.com/solidusio-contrib/solidus_friendly_promotions/blob/master/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://github.com/friendlycart/solidus_friendly_promotions"
+  spec.metadata["changelog_uri"] = "https://github.com/friendlycart/solidus_friendly_promotions/blob/master/CHANGELOG.md"
 
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5", "< 4")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_friendly_promotions
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.3
+  version: 1.0.1
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -193,6 +193,7 @@ files:
 - app/decorators/models/solidus_friendly_promotions/shipping_rate_decorator.rb
 - app/helpers/solidus_friendly_promotions/admin/promotion_actions_helper.rb
 - app/helpers/solidus_friendly_promotions/admin/promotion_rules_helper.rb
+- app/helpers/solidus_friendly_promotions/admin/promotions_helper.rb
 - app/javascript/solidus_friendly_promotions.js
 - app/javascript/solidus_friendly_promotions/controllers/application.js
 - app/javascript/solidus_friendly_promotions/controllers/calculator_tiers_controller.js
@@ -209,7 +210,6 @@ files:
 - app/models/concerns/solidus_friendly_promotions/rules/line_item_level_rule.rb
 - app/models/concerns/solidus_friendly_promotions/rules/order_level_rule.rb
 - app/models/concerns/solidus_friendly_promotions/rules/shipment_level_rule.rb
-- app/models/solidus_friendly_promotions.rb
 - app/models/solidus_friendly_promotions/actions/adjust_line_item.rb
 - app/models/solidus_friendly_promotions/actions/adjust_line_item_quantity_groups.rb
 - app/models/solidus_friendly_promotions/actions/adjust_shipment.rb
@@ -291,6 +291,10 @@ files:
 - app/views/solidus_friendly_promotions/admin/promotion_categories/edit.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_categories/index.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_categories/new.html.erb
+- app/views/solidus_friendly_promotions/admin/promotion_code_batches/_form_fields.html.erb
+- app/views/solidus_friendly_promotions/admin/promotion_code_batches/download.csv.ruby
+- app/views/solidus_friendly_promotions/admin/promotion_code_batches/index.html.erb
+- app/views/solidus_friendly_promotions/admin/promotion_code_batches/new.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_codes/index.csv.ruby
 - app/views/solidus_friendly_promotions/admin/promotion_codes/index.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_codes/new.html.erb
@@ -315,8 +319,6 @@ files:
 - app/views/solidus_friendly_promotions/admin/promotion_rules/rules/_user_logged_in.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_rules/rules/_user_role.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_rules/rules/line_item_option_value/_option_value_fields.html.erb
-- 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
@@ -335,7 +337,6 @@ files:
 - bin/sandbox
 - bin/setup
 - config/importmap.rb
-- config/initializers/solidus_friendly_promotions.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20230703101637_create_promotions.rb
@@ -363,6 +364,8 @@ files:
 - db/migrate/20231012120928_add_db_comments_to_friendly_promotion_categories.rb
 - db/migrate/20231013181921_add_original_promotion_ids.rb
 - db/migrate/20231104135812_add_managed_by_order_action_to_line_items.rb
+- db/migrate/20240124104855_add_deleted_at_to_promotions.rb
+- db/migrate/20240125102050_drop_deleted_at_from_promotion_actions.rb
 - lib/generators/solidus_friendly_promotions/install/install_generator.rb
 - lib/generators/solidus_friendly_promotions/install/templates/initializer.rb
 - lib/solidus_friendly_promotions.rb
@@ -390,8 +393,8 @@ licenses:
 - BSD-3-Clause
 metadata:
   homepage_uri: https://github.com/solidusio-contrib/solidus_friendly_promotions#readme
-  source_code_uri: https://github.com/solidusio-contrib/solidus_friendly_promotions
-  changelog_uri: https://github.com/solidusio-contrib/solidus_friendly_promotions/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/friendlycart/solidus_friendly_promotions
+  changelog_uri: https://github.com/friendlycart/solidus_friendly_promotions/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -406,9 +409,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.20
 signing_key:

data/app/models/solidus_friendly_promotions.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusFriendlyPromotions
-  def self.table_name_prefix
-    "friendly_"
-  end
-end

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

@@ -1,22 +0,0 @@
-<% if @promotion.apply_automatically? %>
-  <p>
-    <%= t('.auto') %>
-  </p>
-<% end %>
-
-<% if @promotion.codes.count == 1 %>
-  <p>
-    <%= t('.single_code_html', code: @promotion.codes.first.value) %>
-  </p>
-<% elsif @promotion.codes.count > 1 %>
-  <p>
-    <%= t('.multiple_codes_html', count: @promotion.codes.count) %>
-  </p>
-<% end %>
-
-<% if @promotion.path %>
-  <div class="field">
-    <%= f.label :path %>
-    <%= f.text_field :path, class: "fullwidth" %>
-  </div>
-<% end %>

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

@@ -1,43 +0,0 @@
-<% activation_type = params[:activation_type] || 'single_code' %>
-<div class="row" id="js_promotion_activation">
-  <div class="col-3">
-    <div class="form-check">
-      <label class="form-check-label">
-        <%= radio_button_tag('activation_type', 'auto', activation_type == 'auto') %>
-        <%= t('.auto') %> <%= f.field_hint :promo_code_will_be_disabled %>
-      </label>
-    </div>
-    <div class="form-check">
-      <label class="form-check-label">
-        <%= radio_button_tag('activation_type', 'single_code', activation_type == 'single_code') %>
-        <%= t('.single_code') %>
-      </label>
-    </div>
-    <div class="form-check">
-      <label class="form-check-label">
-        <%= radio_button_tag('activation_type', 'multiple_codes', activation_type == 'multiple_codes') %>
-        <%= t('.multiple_codes') %>
-      </label>
-    </div>
-  </div>
-  <div class="col-9">
-    <input name="promotion[apply_automatically]" type="hidden" value="0">
-    <div data-activation-type="auto">
-      <input name="promotion[apply_automatically]" type="hidden" value="1">
-    </div>
-
-    <div data-activation-type="single_code">
-      <div class="field">
-        <%= label_tag :single_code, SolidusFriendlyPromotions::PromotionCode.model_name.human, class: "required" %>
-        <%= text_field_tag :single_code, @promotion.codes.first.try!(:value), class: "fullwidth", required: true %>
-      </div>
-    </div>
-
-    <div data-activation-type="multiple_codes">
-      <%= fields_for :promotion_code_batch, @promotion_code_batch do |batch| %>
-        <%= render partial: 'spree/admin/promotion_code_batches/form_fields', locals: {f: f, batch: batch, promotion_id: params[:promotion_id]} %>
-      <% end %>
-    </div>
-
-  </div>
-</div>

data/config/initializers/solidus_friendly_promotions.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_relative SolidusFriendlyPromotions::Engine.root.join("app/models/solidus_friendly_promotions.rb")