solidus_friendly_promotions 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cc3437f15c2341c8a233e48b1443996b09e923cf84727fb834baa766dd1bee7
-  data.tar.gz: 9c534dc4a7ce6f3a09bb6c14d046ea8d6c9e313dbea3c5f1e6767000d8eb0cca
+  metadata.gz: a6735f8983491ab3b703bc8c095f8331efb28e58b9a59fde2e74a338dc60c03f
+  data.tar.gz: 4f4ecb6904c2aba33880b6601bd3a1efb3d72c283f6c1a6aab3167bc2739767d
 SHA512:
-  metadata.gz: c345c4dbd052db90957b5a2c886c39c7a328452b616822ce326b2b4170d6b2232be827dc43f7374a33e116fc50b2f9229c5d0b34c46ca3d2a09e26a486319143
-  data.tar.gz: 9a2ef29fa7045ae95d884903fe80beadacfc6e89f5fa096f61c5c53709f836f3cf76b6483e11fc488d9140ad1720dee41cdd7cb78f22c1649b1bb107540ef609
+  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,7 +15,7 @@ jobs:
   run-specs-with-mysql:
     executor:
       name: solidusio_extensions/mysql
-      ruby_version: '3.1'
+      ruby_version: '3.2'
     steps:
       - browser-tools/install-chrome
       - checkout
@@ -25,7 +25,7 @@ jobs:
   run-specs-with-postgres:
     executor:
       name: solidusio_extensions/postgres
-      ruby_version: '3.2'
+      ruby_version: '3.3'
     steps:
       - browser-tools/install-chrome
       - checkout
@@ -35,7 +35,7 @@ jobs:
   run-specs-with-sqlite:
     executor:
       name: solidusio_extensions/sqlite
-      ruby_version: '3.0'
+      ruby_version: '3.1'
     steps:
       - browser-tools/install-chrome
       - checkout

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [v1.0.1](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.0.1) (2024-05-07)
+
+[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)

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/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

@@ -19,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) }
@@ -165,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

@@ -17,6 +17,7 @@ module SolidusFriendlyPromotions
     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)) }
 

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/new.html.erb

@@ -1,6 +1,6 @@
-<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
-<% admin_breadcrumb(link_to @promotion.name, spree.admin_promotion_path(@promotion.id)) %>
-<% admin_breadcrumb(plural_resource_name(Spree::PromotionCodeBatch)) %>
+<% 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]} %>

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/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:
@@ -52,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.
@@ -147,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:
@@ -318,6 +323,10 @@ en:
           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:
@@ -326,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/lib/solidus_friendly_promotions/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_friendly_promotions
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-25 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
@@ -318,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

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>