solidus_legacy_promotions 4.4.1 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7e25a87b32de8febdd67d28fa5a558d26c5128875d06b637b8ed52bfa0a2dc9
-  data.tar.gz: 98d7ff2153ecc29358483226092aa7001aa4f1e4e3a64ed0db8d97c662ad9786
+  metadata.gz: 9a55daf802efdf77185de8109a5214de29a6a0eecabb6630a7fbe9cd86deb526
+  data.tar.gz: 84674636a0a129b192d70ebabf17be810c0dc36790a7ed03f0edccc4a6521dee
 SHA512:
-  metadata.gz: f71034d931089916518921d45a125ec90a345d1db2fe1579eabfb0fe39afa3e0ec55c6d548929a7b25ac48359a3b8330b5cb87e90293e98d63c567b3ec5ed649
-  data.tar.gz: 690f0d2397d6fbe4d1bc144aef2b4f8f49fc7a7ea061be32b249452f30b7ca72c6382c91f8a882960887d16f9b0da2bbe82160855210b9f0cc2035fe3b2e83fc
+  metadata.gz: e68e598172fd94f4eedc72b1d35b325fa3d248ca209d70ddda8b9c235cc4c000a08fe5b1418b0e2dbde9b20c9a7319f10b2117003aca4a99a55db5934f30366d
+  data.tar.gz: 363c73e69b24eb4790233c0454b2649f85dba023e97310c42e8b2b6372834625b2ec41d179ea59cfdc2e0afb66deb79344bb2c667a5581c61817d209aa050bcb

data/app/models/spree/promotion_code_batch.rb

@@ -14,5 +14,14 @@ module Spree
     def finished?
       state == "completed"
     end
+
+    def process
+      if state == "pending"
+        update!(state: "processing")
+        PromotionCodeBatchJob.perform_later(self)
+      else
+        raise CantProcessStartedBatch.new("Batch #{id} already started")
+      end
+    end
   end
 end

data/app/{decorators/solidus_legacy_promotions/controllers/solidus_admin/solidus_admin_adjustments_controller_decorator.rb → patches/controllers/solidus_legacy_promotions/solidus_admin_adjustments_controller_patch.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusLegacyPromotions
-  module SolidusAdminAdjustmentsControllerDecorator
+  module SolidusAdminAdjustmentsControllerPatch
     private
 
     def load_adjustments

data/app/{decorators/solidus_legacy_promotions/lib/spree_order_state_machine_decorator.rb → patches/lib/solidus_legacy_promotions/spree_order_state_machine_patch.rb}

@@ -3,7 +3,7 @@
 require_dependency "spree/core/state_machines/order"
 
 module SolidusLegacyPromotions
-  module SpreeOrderStateMachineDecorator
+  module SpreeOrderStateMachinePatch
     def define_state_machine!
       super
       state_machine do

data/app/{decorators/solidus_legacy_promotions/models/spree_adjustment_decorator.rb → patches/models/solidus_legacy_promotions/spree_adjustment_patch.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusLegacyPromotions
-  module SpreeAdjustmentDecorator
+  module SpreeAdjustmentPatch
     def self.prepended(base)
       base.belongs_to :promotion_code, class_name: 'Spree::PromotionCode', optional: true
       base.validates :promotion_code, presence: true, if: :require_promotion_code?

data/app/{decorators/solidus_legacy_promotions/models/spree_calculator_returns_default_refund_amount_decorator.rb → patches/models/solidus_legacy_promotions/spree_calculator_returns_default_refund_amount_patch.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusLegacyPromotions
-  module SpreeCalculatorReturnsDefaultRefundAmountDecorator
+  module SpreeCalculatorReturnsDefaultRefundAmountPatch
     private
 
     def weighted_order_adjustment_amount(inventory_unit)

data/app/{decorators/solidus_legacy_promotions/models/spree_line_item_decorator.rb → patches/models/solidus_legacy_promotions/spree_line_item_patch.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusLegacyPromotions
-  module SpreeLineItemDecorator
+  module SpreeLineItemPatch
     def self.prepended(base)
       base.has_many :line_item_actions, dependent: :destroy
       base.has_many :actions, through: :line_item_actions

data/app/{decorators/solidus_legacy_promotions/models/spree_order_decorator.rb → patches/models/solidus_legacy_promotions/spree_order_patch.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusLegacyPromotions
-  module SpreeOrderDecorator
+  module SpreeOrderPatch
     module ClassMethods
       def allowed_ransackable_associations
         super + ["promotions", "order_promotions"]

data/app/{decorators/solidus_legacy_promotions/models/spree_order_updater_decorator.rb → patches/models/solidus_legacy_promotions/spree_order_updater_patch.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusLegacyPromotions
-  module SpreeOrderUpdaterDecorator
+  module SpreeOrderUpdaterPatch
     def update_adjustment_total
       recalculate_adjustments
 
@@ -17,8 +17,14 @@ module SolidusLegacyPromotions
 
     def update_item_totals
       [*line_items, *shipments].each do |item|
+        Spree::ItemTotal.new(item).recalculate!
+
         # The cancellation_total isn't persisted anywhere but is included in
-        # the adjustment_total
+        # the adjustment_total.
+        #
+        # Core doesn't have "eligible" adjustments anymore, so we need to
+        # override the adjustment_total calculation to exclude them for legacy
+        # promotions.
         item.adjustment_total = item.adjustments.
           select(&:eligible?).
           reject(&:included?).

data/app/{decorators/solidus_legacy_promotions/models/spree_product_decorator.rb → patches/models/solidus_legacy_promotions/spree_product_patch.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusLegacyPromotions
-  module SpreeProductDecorator
+  module SpreeProductPatch
     def self.prepended(base)
       base.has_many :product_promotion_rules, dependent: :destroy
       base.has_many :promotion_rules, through: :product_promotion_rules

data/app/{decorators/solidus_legacy_promotions/models/spree_shipment_decorator.rb → patches/models/solidus_legacy_promotions/spree_shipment_patch.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusLegacyPromotions
-  module SpreeShipmentDecorator
+  module SpreeShipmentPatch
     # @return [BigDecimal] the amount of this item, taking into consideration
     #   all non-tax eligible adjustments.
     def total_before_tax

data/config/locales/promotion_categories.en.yml

@@ -2,5 +2,9 @@ en:
   solidus_admin:
     promotion_categories:
       title: "Promotion Categories"
+      create:
+        success: "Promotion category was successfully created."
+      update:
+        success: "Promotion category was successfully updated."
       destroy:
-        success: "Promotion Categories were successfully removed."
+        success: "Promotion categories were successfully removed."

data/config/routes.rb

@@ -23,6 +23,6 @@ if SolidusSupport.admin_available?
     extend SolidusAdmin::AdminResources
 
     admin_resources :promotions, only: [:index, :destroy]
-    admin_resources :promotion_categories, only: [:index, :destroy]
+    admin_resources :promotion_categories, except: [:show]
   end
 end

data/lib/components/admin/solidus_admin/promotion_categories/edit/component.html.erb

@@ -0,0 +1,16 @@
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @promotion_category, url: form_url, html: { id: form_id } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
+        <%= render component("ui/forms/field").text_field(f, :code, class: "required") %>
+      </div>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
+        </form>
+        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/lib/components/admin/solidus_admin/promotion_categories/edit/component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::PromotionCategories::Edit::Component < SolidusAdmin::Resources::Edit::Component
+end

data/lib/components/admin/solidus_admin/promotion_categories/edit/component.yml

@@ -0,0 +1,4 @@
+en:
+  title: "Edit Promotion Category"
+  cancel: "Cancel"
+  submit: "Update Promotion Category"

data/lib/components/admin/solidus_admin/promotion_categories/index/component.rb

@@ -5,15 +5,24 @@ class SolidusAdmin::PromotionCategories::Index::Component < SolidusAdmin::UI::Pa
     Spree::PromotionCategory
   end
 
-  def row_url(promotion_category)
-    spree.edit_admin_promotion_category_path(promotion_category)
+  def title
+    t('solidus_admin.promotion_categories.title')
+  end
+
+  def edit_path(record)
+    solidus_admin.edit_promotion_category_path(record, **search_filter_params)
+  end
+
+  def turbo_frames
+    %w[resource_modal]
   end
 
   def page_actions
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
-      href: spree.new_admin_promotion_category_path,
+      href: solidus_admin.new_promotion_category_path(**search_filter_params),
+      data: { turbo_frame: :resource_modal },
       icon: "add-line",
     )
   end
@@ -22,7 +31,7 @@ class SolidusAdmin::PromotionCategories::Index::Component < SolidusAdmin::UI::Pa
     [
       {
         label: t('.batch_actions.delete'),
-        action: solidus_admin.promotion_categories_path,
+        action: solidus_admin.promotion_categories_path(**search_filter_params),
         method: :delete,
         icon: 'delete-bin-7-line',
       },
@@ -39,8 +48,10 @@ class SolidusAdmin::PromotionCategories::Index::Component < SolidusAdmin::UI::Pa
   def name_column
     {
       header: :name,
-      data: ->(promotion_category) do
-        content_tag :div, promotion_category.name
+      data: ->(record) do
+        link_to record.name, edit_path(record),
+          data: { turbo_frame: :resource_modal },
+          class: 'body-link'
       end
     }
   end
@@ -48,8 +59,10 @@ class SolidusAdmin::PromotionCategories::Index::Component < SolidusAdmin::UI::Pa
   def code_column
     {
       header: :code,
-      data: ->(promotion_category) do
-        content_tag :div, promotion_category.code
+      data: ->(record) do
+        link_to record.code, edit_path(record),
+          data: { turbo_frame: :resource_modal },
+          class: 'body-link'
       end
     }
   end

data/lib/components/admin/solidus_admin/promotion_categories/new/component.html.erb

@@ -0,0 +1,16 @@
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @promotion_category, url: form_url, html: { id: form_id } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
+        <%= render component("ui/forms/field").text_field(f, :code, class: "required") %>
+      </div>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
+        </form>
+        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/lib/components/admin/solidus_admin/promotion_categories/new/component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::PromotionCategories::New::Component < SolidusAdmin::Resources::New::Component
+end

data/lib/components/admin/solidus_admin/promotion_categories/new/component.yml

@@ -0,0 +1,4 @@
+en:
+  title: "New Promotion Category"
+  cancel: "Cancel"
+  submit: "Add Promotion Category"

data/lib/controllers/admin/solidus_admin/promotion_categories_controller.rb

@@ -1,29 +1,15 @@
 # frozen_string_literal: true
 
 module SolidusAdmin
-  class PromotionCategoriesController < SolidusAdmin::BaseController
-    include SolidusAdmin::ControllerHelpers::Search
+  class PromotionCategoriesController < SolidusAdmin::ResourcesController
+    private
 
-    def index
-      promotion_categories = apply_search_to(
-        Spree::PromotionCategory.all,
-        param: :q,
-      )
+    def resource_class = Spree::PromotionCategory
 
-      set_page_and_extract_portion_from(promotion_categories)
-
-      respond_to do |format|
-        format.html { render component('promotion_categories/index').new(page: @page) }
-      end
+    def permitted_resource_params
+      params.require(:promotion_category).permit(:name, :code)
     end
 
-    def destroy
-      @promotion_categories = Spree::PromotionCategory.where(id: params[:id])
-
-      Spree::PromotionCategory.transaction { @promotion_categories.destroy_all }
-
-      flash[:notice] = t('.success')
-      redirect_back_or_to promotion_categories_path, status: :see_other
-    end
+    def resources_collection = Spree::PromotionCategory.unscoped
   end
 end

data/lib/solidus_legacy_promotions/engine.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require 'solidus_legacy_promotions'
-
+require 'flickwerk'
 module SolidusLegacyPromotions
   class Engine < ::Rails::Engine
     include SolidusSupport::EngineExtensions
 
+    include Flickwerk
+
     initializer "solidus_legacy_promotions.add_backend_menu_item" do
       if SolidusSupport.backend_available?
         promotions_menu_item = Spree::BackendConfiguration::MenuItem.new(
@@ -100,12 +102,17 @@ module SolidusLegacyPromotions
     end
 
     initializer "solidus_legacy_promotions", after: "spree.load_config_initializers" do
-      Spree::Config.order_contents_class = "Spree::OrderContents"
-      Spree::Config.promotions = SolidusLegacyPromotions::Configuration.new
-      Spree::Config.adjustment_promotion_source_types << "Spree::PromotionAction"
+      # Only set these if there is no promotion configuration set. In this case,
+      # we're running on a store without the new `solidus_promotions` gem and we
+      # need to set the configuration to the legacy one.
+      if Spree::Config.promotions.is_a?(Spree::Core::NullPromotionConfiguration)
+        Spree::Config.order_contents_class = "Spree::OrderContents"
+        Spree::Config.promotions = SolidusLegacyPromotions::Configuration.new
+      end
 
       Spree::Api::Config.adjustment_attributes << :promotion_code_id
       Spree::Api::Config.adjustment_attributes << :eligible
+      Spree::Config.adjustment_promotion_source_types << "Spree::PromotionAction"
     end
   end
 end

data/solidus_legacy_promotions.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.1.0'
   s.required_rubygems_version = '>= 1.8.23'
 
+  s.add_dependency 'csv', '~> 3.0'
   s.add_dependency 'solidus_api', s.version
   s.add_dependency 'solidus_core', s.version
-  s.add_dependency 'solidus_support'
+  s.add_dependency 'solidus_support', '>= 0.13.1', '< 1'
 end

metadata

@@ -1,57 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: solidus_legacy_promotions
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.5.0
 platform: ruby
 authors:
 - Solidus Team
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: solidus_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Legacy Solidus promotion system
 email: contact@solidus.io
 executables: []
@@ -74,16 +93,6 @@ files:
 - app/assets/stylesheets/solidus_legacy_promotions/promotions.scss
 - app/assets/stylesheets/solidus_legacy_promotions/promotions/_edit.scss
 - app/assets/stylesheets/spree/backend/sections/_adjustments.scss
-- app/decorators/solidus_legacy_promotions/controllers/solidus_admin/solidus_admin_adjustments_controller_decorator.rb
-- app/decorators/solidus_legacy_promotions/lib/spree_order_state_machine_decorator.rb
-- app/decorators/solidus_legacy_promotions/models/spree_adjustment_decorator.rb
-- app/decorators/solidus_legacy_promotions/models/spree_calculator_returns_default_refund_amount_decorator.rb
-- app/decorators/solidus_legacy_promotions/models/spree_line_item_decorator.rb
-- app/decorators/solidus_legacy_promotions/models/spree_order_decorator.rb
-- app/decorators/solidus_legacy_promotions/models/spree_order_updater_decorator.rb
-- app/decorators/solidus_legacy_promotions/models/spree_product_decorator.rb
-- app/decorators/solidus_legacy_promotions/models/spree_promotion_code_batch_decorator.rb
-- app/decorators/solidus_legacy_promotions/models/spree_shipment_decorator.rb
 - app/helpers/spree/admin/promotions_helper.rb
 - app/helpers/spree/promotion_rules_helper.rb
 - app/jobs/spree/promotion_code_batch_job.rb
@@ -134,6 +143,15 @@ files:
 - app/models/spree/promotion_rule_store.rb
 - app/models/spree/promotion_rule_taxon.rb
 - app/models/spree/promotion_rule_user.rb
+- app/patches/controllers/solidus_legacy_promotions/solidus_admin_adjustments_controller_patch.rb
+- app/patches/lib/solidus_legacy_promotions/spree_order_state_machine_patch.rb
+- app/patches/models/solidus_legacy_promotions/spree_adjustment_patch.rb
+- app/patches/models/solidus_legacy_promotions/spree_calculator_returns_default_refund_amount_patch.rb
+- app/patches/models/solidus_legacy_promotions/spree_line_item_patch.rb
+- app/patches/models/solidus_legacy_promotions/spree_order_patch.rb
+- app/patches/models/solidus_legacy_promotions/spree_order_updater_patch.rb
+- app/patches/models/solidus_legacy_promotions/spree_product_patch.rb
+- app/patches/models/solidus_legacy_promotions/spree_shipment_patch.rb
 - app/subscribers/spree/order_promotion_subscriber.rb
 - app/views/spree/order_mailer/cancel_email.html.erb
 - app/views/spree/order_mailer/cancel_email.text.erb
@@ -157,7 +175,13 @@ files:
 - db/migrate/20240621100123_add_promotion_code_id_to_spree_adjustments.rb
 - db/migrate/20240622113334_move_adjustment_eligible_to_legacy_promotions.rb
 - lib/components/admin/solidus_admin/orders/show/adjustments/index/source/spree_promotion_action/component.rb
+- lib/components/admin/solidus_admin/promotion_categories/edit/component.html.erb
+- lib/components/admin/solidus_admin/promotion_categories/edit/component.rb
+- lib/components/admin/solidus_admin/promotion_categories/edit/component.yml
 - lib/components/admin/solidus_admin/promotion_categories/index/component.rb
+- lib/components/admin/solidus_admin/promotion_categories/new/component.html.erb
+- lib/components/admin/solidus_admin/promotion_categories/new/component.rb
+- lib/components/admin/solidus_admin/promotion_categories/new/component.yml
 - lib/components/admin/solidus_admin/promotions/index/component.rb
 - lib/components/admin/solidus_admin/promotions/index/component.yml
 - lib/components/admin/solidus_legacy_promotions/orders/index/component.rb
@@ -240,7 +264,6 @@ licenses:
 - BSD-3-Clause
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -255,8 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Legacy Solidus promotion system
 test_files: []

data/app/decorators/solidus_legacy_promotions/models/spree_promotion_code_batch_decorator.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusLegacyPromotions
-  module SpreePromotionCodeBatchDecorator
-    def process
-      if state == "pending"
-        update!(state: "processing")
-        Spree::PromotionCodeBatchJob.perform_later(self)
-      else
-        raise Spree::PromotionCodeBatch::CantProcessStartedBatch.new("Batch #{id} already started")
-      end
-    end
-
-    Spree::PromotionCodeBatch.prepend(self)
-  end
-end