solidus_friendly_promotions 1.0.1 → 1.9.0

data/app/views/solidus_friendly_promotions/admin/condition_fields/_store.html.erb

@@ -0,0 +1,9 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<div class="form-group">
+  <%= label_tag "#{param_prefix}[store_ids][]", Spree::Store.model_name.human(count: :other) %>
+  <%= select_tag "#{param_prefix}[store_ids][]",
+    options_from_collection_for_select(Spree::Store.all, :id, :name, condition.store_ids),
+    multiple: true, is: "select-two", class: "fullwidth" %>
+</div>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_taxon.html.erb

@@ -0,0 +1,28 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<%= fields_for param_prefix, condition do |form| %>
+  <div class="field taxons_condition_taxons">
+    <%= form.label :taxon_ids_string, t('solidus_friendly_promotions.taxon_condition.choose_taxons') %>
+    <%= form.hidden_field :taxon_ids_string, value: condition.taxon_ids.join(","), is: "taxon-picker", class: "fullwidth" %>
+  </div>
+
+  <div class="form-group">
+    <%
+      match_policy_options = options_for_select(
+        SolidusFriendlyPromotions::Conditions::Taxon::MATCH_POLICIES.map { |s| [t("solidus_friendly_promotions.taxon_condition.match_#{s}"),s] },
+        condition.preferred_match_policy
+      )
+    %>
+    <% select = form.select :preferred_match_policy, match_policy_options %>
+    <%= form.label :preferred_match_policy, t('solidus_friendly_promotions.taxon_condition.label', select: select).html_safe %>
+    </label>
+  </div>
+
+  <div class="form-group">
+    <%= form.label :preferred_line_item_applicable do %>
+      <%= form.check_box :preferred_line_item_applicable %>
+      <%= condition.class.human_attribute_name(:preferred_line_item_applicable) %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_user.html.erb

@@ -0,0 +1,7 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<div class="form-group">
+  <label><%= t('solidus_friendly_promotions.user_condition.choose_users') %></label><br>
+  <input type='hidden' name='<%= param_prefix %>[user_ids_string]' is="user-picker" class='fullwidth' value='<%= condition.user_ids.join(",") %>'>
+</div>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_user_logged_in.html.erb

@@ -0,0 +1,3 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_user_role.html.erb

@@ -0,0 +1,15 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<div class="form-group">
+  <%= label_tag "#{param_prefix}_preferred_role_ids", t('solidus_friendly_promotions.user_role_condition.choose_roles') %>
+  <%= select_tag "#{param_prefix}[preferred_role_ids]",
+    options_from_collection_for_select(
+      Spree::Role.all, :id, :name, condition.preferred_role_ids
+    ), class: 'fullwidth', is: 'select-two', multiple: true %>
+</div>
+<div class="form-group">
+  <label>
+    <%= t('solidus_friendly_promotions.user_role_condition.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(SolidusFriendlyPromotions::Conditions::UserRole::MATCH_POLICIES.map{ |s| [t("solidus_friendly_promotions.user_role_condition.match_#{s}"),s] }, condition.preferred_match_policy), { class: 'custom-select'})).html_safe %>
+  </label>
+</div>

data/app/views/solidus_friendly_promotions/admin/condition_fields/line_item_option_value/_option_value_fields.html.erb

@@ -0,0 +1,21 @@
+<div class="fullwidth promo-condition-option-value d-flex align-content-stretch mb-3">
+  <div class="mr-2" style="flex-grow: 1;">
+    <input
+      is="product-picker"
+      class="w-100"
+      data-action="select2Change->product-option-values#propagate_product_id_to_value_input"
+      type="hidden"
+      value="<%= product_option_values[0] %>"
+    >
+  </div>
+  <div class="mr-2 ml-2" style="flex-grow: 1;">
+    <input
+      is="option-value-picker"
+      class="fullwidth"
+      name="<%= form.object_name %>[preferred_eligible_values][<%= product_option_values[0] %>]"
+      type="hidden"
+      value="<%= product_option_values[1].join(",") %>"
+    >
+  </div>
+  <a class="fa fa-trash remove p-2" data-action="click->product-option-values#remove_row"></a>
+</div>

data/app/views/solidus_friendly_promotions/admin/conditions/_condition.html.erb

@@ -0,0 +1,26 @@
+<div class="card bg-light mb-3 ">
+  <div class="card-header">
+    <%= condition.class.model_name.human %>
+    <span class="float-right">
+      <% if can?(:destroy, condition) %>
+        <%= link_to_with_icon 'trash', '', solidus_friendly_promotions.admin_promotion_benefit_condition_path(@promotion, condition.benefit, condition), method: :delete, class: 'delete' %>
+      <% end %>
+    </span>
+  </div>
+  <div class="card-body">
+    <%= form_with model: condition, scope: :condition, url: solidus_friendly_promotions.admin_promotion_benefit_condition_path(@promotion, condition.benefit, condition), method: :patch do |form| %>
+      <% param_prefix = "promotion[conditions_attributes][#{condition.id}]" %>
+      <%= hidden_field_tag "#{param_prefix}[id]", condition.id %>
+      <%= render partial: "spree/shared/error_messages", locals: { target: condition } %>
+      <%= render condition, condition: condition, param_prefix: "condition", form: form %>
+
+      <% if condition.updateable? %>
+        <div class="row">
+          <div class="col-12">
+            <%= form.submit(t(:update, scope: [:solidus_friendly_promotions, :crud]), class: "btn btn-secondary float-right") %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/solidus_friendly_promotions/admin/conditions/_new_condition.html.erb

@@ -0,0 +1,26 @@
+<%= turbo_frame_tag condition.benefit, "new_condition" do %>
+<div class="card bg-light mb-3">
+  <div class="card-header">
+    <%= t(:add_condition, scope: :solidus_friendly_promotions) %>
+  </div>
+  <div class="card-body">
+    <%= render 'solidus_friendly_promotions/admin/conditions/type_select', benefit: condition.benefit %>
+    <% flash.each do |severity, message| %>
+      <%= content_tag(:div, "", data: { controller: :flash, severity: severity, message: message }) %>
+    <% end %>
+    <% if condition.valid? %>
+      <%= form_with model: condition, scope: "condition", url: solidus_friendly_promotions.admin_promotion_benefit_conditions_path(@promotion, condition.benefit), data: { turbo: false } do |form| %>
+        <%= hidden_field_tag "condition[type]", condition.class.name %>
+        <%= render condition, condition: condition, param_prefix: "condition", form: form %>
+
+        <div class="row">
+          <div class="col-12">
+            <%= form.submit(t(:add, scope: [:solidus_friendly_promotions, :crud]), class: "btn btn-secondary float-right") %>
+          </div>
+        </div>
+
+      <% end %>
+    <% end %>
+  </div>
+</div>
+<% end %>

data/app/views/solidus_friendly_promotions/admin/conditions/_type_select.html.erb

@@ -0,0 +1,20 @@
+<%= form_with(
+    model: @condition || benefit.conditions.build,
+    scope: :condition,
+    url: solidus_friendly_promotions.new_admin_promotion_benefit_condition_path(@promotion, benefit),
+    method: :get,
+    class: "mb-3"
+  ) do |form| %>
+  <%= form.label :type %>
+  <%= admin_hint SolidusFriendlyPromotions::Condition.human_attribute_name(:type), t(:conditions, scope: [:solidus_friendly_promotions, :hints, "solidus_friendly_promotions/benefit"]) %>
+  <%=
+    form.select :type,
+      options_for_condition_types(benefit, @condition),
+      {
+        include_blank: t(:choose_condition, scope: 'solidus_friendly_promotions')
+      },
+      class: 'custom-select fullwidth',
+      onchange: 'this.form.requestSubmit()',
+      required: true
+  %>
+<% end %>

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

@@ -0,0 +1 @@
+<%= render "new_condition", condition: @condition %>

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

@@ -1,22 +1,22 @@
-<div class="field">
+<div class="form-group">
   <%= batch.label :base_code, class: "required" %>
   <%= batch.text_field :base_code, class: "fullwidth", required: true %>
 </div>
-<div class="field">
+<div class="form-group">
   <%= batch.label :number_of_codes, class: "required" %>
   <%= batch.number_field :number_of_codes, class: "fullwidth", min: 1, required: true %>
 </div>
-<div class="field">
+<div class="form-group">
   <%= batch.label :join_characters %>
   <%= batch.text_field :join_characters, class: "fullwidth" %>
 </div>
 <% unless promotion_id %>
-  <div class="field">
+  <div class="form-group">
     <%= f.label :per_code_usage_limit %>
     <%= f.text_field :per_code_usage_limit, class: "fullwidth" %>
   </div>
 <% end %>
-<div class="field">
+<div class="form-group">
   <%= batch.label :email %>
   <%= batch.text_field :email, class: "fullwidth" %>
 </div>

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

@@ -49,7 +49,7 @@
         <% end %>
       <% end %>
 
-      <div id="starts_at_field" class="field">
+      <div id="starts_at_field" class="form-group">
         <%= f.label :starts_at %>
         <%= f.field_hint :starts_at %>
         <%=
@@ -61,7 +61,7 @@
         %>
       </div>
 
-      <div id="expires_at_field" class="field">
+      <div id="expires_at_field" class="form-group">
         <%= f.label :expires_at %>
         <%= f.field_hint :expires_at %>
         <%=
@@ -73,7 +73,7 @@
           data: { :'enable-time' => true, :'default-hour' => 0 }
         %>
       </div>
-      <div class="field">
+      <div class="form-group">
         <%= f.field_container :lane do %>
           <%= f.label :lane %><br>
           <%=
@@ -109,7 +109,7 @@
 
     <div class="col-4">
       <% if f.object.new_record? %>
-        <div id="promotion_single_code" class="field">
+        <div id="promotion_single_code" class="form-group">
           <%= 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>

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

@@ -7,28 +7,28 @@
     <%= search_form_for [:admin, search] do |f| %>
       <div class="row">
         <div class="col-4">
-          <div class="field">
+          <div class="form-group">
             <%= 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">
+          <div class="form-group">
             <%= 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">
+          <div class="form-group">
             <%= 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">
+          <div class="form-group">
             <%= label_tag :q_path_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:path) %>
             <%= f.text_field :path_cont, tabindex: 1 %>
           </div>
@@ -53,14 +53,14 @@
         </div>
 
         <div class="col-2">
-          <div class="field">
+          <div class="form-group">
             <%= 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">
+          <div class="form-group">
             <%= 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>

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

@@ -5,6 +5,7 @@
 
 <%= content_for :head do %>
   <%= javascript_importmap_tags "solidus_friendly_promotions", importmap: SolidusFriendlyPromotions.importmap %>
+  <%#= stylesheet_link_tag 'solidus_friendly_promotions/promotions' %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -28,48 +29,13 @@
   <% end %>
 <% end %>
 
-
 <fieldset>
-  <legend align="center"><%= t(:order_rules, scope: :solidus_friendly_promotions) %></legend>
-
-  <%= render partial: 'solidus_friendly_promotions/admin/promotion_rules/promotion_rule', collection: promotion_rules_by_level(@promotion, :order), locals: { level: :order } %>
-
-  <%= turbo_frame_tag @promotion, "new_order_promotion_rule" do %>
-    <%= link_to t(:add_rule, scope: :solidus_friendly_promotions), solidus_friendly_promotions.new_admin_promotion_promotion_rule_path(@promotion, level: :order), class: 'btn btn-secondary' %>
-  <% end %>
-</fieldset>
-
-<div class="row">
-  <div class="col-12">
-    <%= turbo_frame_tag @promotion, "new_promotion_action" do %>
-      <%= link_to t(:add_action, scope: :solidus_friendly_promotions), solidus_friendly_promotions.new_admin_promotion_promotion_action_path(@promotion), class: 'btn btn-secondary' %>
+  <legend align="center"><%= t("benefits", scope: :solidus_friendly_promotions) %></legend>
+    <% if @promotion.benefits.any? %>
+      <%= render partial: 'solidus_friendly_promotions/admin/benefits/benefit', collection: @promotion.benefits %>
     <% end %>
-  </div>
-</div>
 
-<div class="row">
-  <% [:order, :line_item, :shipment].each do |level| %>
-    <% if promotion_actions_by_level(@promotion, level).any? %>
-      <div class="col-<%= level == :order ? 12 : 6 %>">
-        <fieldset>
-          <legend align="center"><%= t("#{level}_actions", scope: :solidus_friendly_promotions) %></legend>
-
-          <%= render partial: 'solidus_friendly_promotions/admin/promotion_actions/promotion_action', collection: promotion_actions_by_level(@promotion, level), locals: {} %>
-        </fieldset>
-      </div>
-      <% if level != :order %>
-        <div class="col-6">
-          <fieldset>
-            <legend align="center"><%= t("#{level}_rules", scope: :solidus_friendly_promotions) %></legend>
-
-            <%= render partial: 'solidus_friendly_promotions/admin/promotion_rules/promotion_rule', collection: promotion_rules_by_level(@promotion, level), locals: { level: level } %>
-
-            <%= turbo_frame_tag @promotion, "new_#{level}_promotion_rule" do %>
-              <%= link_to t(:add_rule, scope: :solidus_friendly_promotions), solidus_friendly_promotions.new_admin_promotion_promotion_rule_path(@promotion, level: level), class: 'btn btn-secondary' %>
-            <% end %>
-          </fieldset>
-        </div>
-      <% end %>
+    <%= turbo_frame_tag @promotion, "new_benefit" do %>
+      <%= link_to t(:add_benefit, scope: :solidus_friendly_promotions), solidus_friendly_promotions.new_admin_promotion_benefit_path(@promotion), class: 'btn btn-secondary' %>
     <% end %>
-  <% end %>
-</div>
+</fieldset>

data/app/views/solidus_friendly_promotions/admin/shared/_number_with_currency.html.erb

@@ -0,0 +1,20 @@
+<% amount_attr ||= :amount %>
+<% currency_attr ||= :currency %>
+<% currency ||= nil %>
+<% required ||= nil %>
+
+<number-with-currency class="input-group number-with-currency <%= "number-with-currency-with-select" unless currency %>">
+  <div class="input-group-prepend">
+    <span class="input-group-text number-with-currency-symbol"></span>
+  </div>
+  <%= f.text_field amount_attr, value: number_to_currency(f.object.public_send(amount_attr), unit: '', delimiter: ''), class: 'form-control number-with-currency-amount', required: required %>
+  <% if currency %>
+    <div class="input-group-append">
+      <span class="input-group-text number-with-currency-addon" data-currency="<%= currency %>">
+        <%= ::Money::Currency.find(currency).iso_code %>
+      </span>
+    </div>
+  <% else %>
+    <%= f.select currency_attr, Spree::Config.available_currencies.map(&:iso_code), {selected: f.object.send(currency_attr) || Spree::Config.currency}, {required: required, class: 'number-with-currency-select'} %>
+  <% end %>
+</number-with-currency>

data/app/views/solidus_friendly_promotions/admin/shared/preference_fields/_boolean.html.erb

@@ -0,0 +1,14 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = local_assigns[:html_options] || {} %>
+
+<div class="form-group">
+  <label>
+    <% if local_assigns[:form] %>
+      <%= form.check_box attribute, html_options %>
+    <% else %>
+      <%= hidden_field_tag name, 0 %>
+      <%= check_box_tag name, 1, value, html_options %>
+    <% end %>
+    <%= label || form.object.class.human_attribute_name(attribute) %>
+  </label>
+</div>

data/app/views/solidus_friendly_promotions/admin/shared/preference_fields/_decimal.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'input_decimal fullwidth'}.update(local_assigns[:html_options] || {}) %>
+
+<div class="form-group">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.text_field attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= text_field_tag name, value, html_options %>
+  <% end %>
+</div>

data/app/views/solidus_friendly_promotions/admin/shared/preference_fields/_encrypted_string.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'input_string fullwidth'}.merge(local_assigns[:html_options] || {}) %>
+
+<div class="form-group">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.text_field attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= text_field_tag name, value, html_options %>
+  <% end %>
+</div>

data/app/views/solidus_friendly_promotions/admin/shared/preference_fields/_integer.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'input_integer fullwidth'}.update(local_assigns[:html_options] || {}) %>
+
+<div class="form-group">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.number_field attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= number_field_tag name, value, html_options %>
+  <% end %>
+</div>

data/app/views/solidus_friendly_promotions/admin/shared/preference_fields/_password.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'password_string fullwidth'}.update(local_assigns[:html_options] || {}) %>
+
+<div class="form-group">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.password_field attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= password_field_tag name, value, html_options %>
+  <% end %>
+</div>

data/app/views/solidus_friendly_promotions/admin/shared/preference_fields/_string.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'input_string fullwidth'}.update(local_assigns[:html_options] || {}) %>
+
+<div class="form-group">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.text_field attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= text_field_tag name, value, html_options %>
+  <% end %>
+</div>

data/app/views/solidus_friendly_promotions/admin/shared/preference_fields/_text.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {cols: 85, rows: 15}.update(local_assigns[:html_options] || {}) %>
+
+<div class="form-group">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.text_area attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= text_area_tag name, value, html_options %>
+  <% end %>
+</div>

data/bin/sandbox

@@ -43,12 +43,13 @@ if [ ! -d "sandbox" ]; then
   exit 1
 fi
 
-echo "~~~> Adding solidus (with i18n and authentication) and your gem to the Gemfile"
+echo "~~~> Adding solidus (with i18n) to the Gemfile"
 cd ./sandbox
 cat <<RUBY >> Gemfile
 gem 'solidus', github: 'solidusio/solidus', branch: '$SOLIDUS_BRANCH'
 gem 'rails-i18n'
 gem 'solidus_i18n'
+gem 'solidus_auth_devise'
 
 gem '$extension_name', path: '..'
 
@@ -63,9 +64,8 @@ unbundled bundle install --gemfile Gemfile
 
 unbundled bundle exec rake db:drop db:create
 
-unbundled bin/rails generate solidus:install \
+unbundled bundle exec rails generate solidus:install \
   --auto-accept \
-  --admin_preview=false \
   $@
 
 unbundled bundle exec rails generate solidus:auth:install --auto-run-migrations

data/config/importmap.rb

@@ -8,5 +8,7 @@ pin_all_from SolidusFriendlyPromotions::Engine.root.join("app/javascript/solidus
   under: "solidus_friendly_promotions/controllers"
 pin_all_from SolidusFriendlyPromotions::Engine.root.join("app/javascript/solidus_friendly_promotions/jquery"),
   under: "solidus_friendly_promotions/jquery"
+pin_all_from SolidusFriendlyPromotions::Engine.root.join("app/javascript/solidus_friendly_promotions/web_components"),
+  under: "solidus_friendly_promotions/web_components"
 
 pin "solidus_friendly_promotions", to: "solidus_friendly_promotions.js", preload: true