Merge pull request solidusio#6381 from mamhoff/fix-percent-with-cap-ui

Promotions: Fix default calculator fields partial bug and make PercentWithCap calculator available in the UI

Author: tvdeyen

promotions/config/locales/en.yml

@@ -195,6 +195,7 @@ en:
       solidus_promotions/benefits/adjust_line_item_quantity_groups: Discount matching line items based on quantity groups
       solidus_promotions/calculators/distributed_amount: Distributed Amount
       solidus_promotions/calculators/percent: Percent
+      solidus_promotions/calculators/percent_with_cap: Distributed Percent with cap
       solidus_promotions/calculators/flat_rate: Flat Rate
       solidus_promotions/calculators/flexi_rate: Flexible Rate
       solidus_promotions/calculators/tiered_flat_rate: Tiered Flat Rate

promotions/lib/solidus_promotions/configuration.rb

@@ -81,6 +81,7 @@ class Configuration < Spree::Preferences::Configuration
         "SolidusPromotions::Calculators::FlatRate",
         "SolidusPromotions::Calculators::FlexiRate",
         "SolidusPromotions::Calculators::Percent",
+        "SolidusPromotions::Calculators::PercentWithCap",
         "SolidusPromotions::Calculators::TieredFlatRate",
         "SolidusPromotions::Calculators::TieredPercent",
         "SolidusPromotions::Calculators::TieredPercentOnEligibleItemQuantity"

promotions/lib/views/backend/solidus_promotions/admin/calculator_fields/_default_fields.html.erb

@@ -2,5 +2,5 @@
   <%= render "solidus_promotions/admin/shared/preference_fields/#{calculator.preference_type(name)}",
     name: "#{prefix}[calculator_attributes][preferred_#{name}]",
     value: calculator.get_preference(name),
-    label: calculator.class.human_attribute_name("preferred_#{name}", default: I18n.t(name, scope: :spree, default: name.humanize)) %>
+    label: calculator.class.human_attribute_name("preferred_#{name}", default: I18n.t(name, scope: :spree, default: name.to_s.humanize)) %>
 <% end %>

promotions/spec/system/solidus_promotions/backend/promotions_spec.rb

@@ -185,4 +185,15 @@
       expect(page).to have_content("Condition has been successfully updated!")
     end
   end
+
+  describe "Rendering the promotion edit page with the PercentWithCap calculator" do
+    let(:promotion) { create(:solidus_promotion, name: "My capped promotion", benefits: [benefit]) }
+    let(:benefit) { SolidusPromotions::Benefits::AdjustLineItem.new(calculator:) }
+    let(:calculator) { SolidusPromotions::Calculators::PercentWithCap.new(preferred_percent: 10, preferred_max_amount: 100) }
+
+    it "renders without errors" do
+      visit solidus_promotions.edit_admin_promotion_path(promotion)
+      expect(page).to have_content("My capped promotion")
+    end
+  end
 end