solidus_backend 2.2.2 → 2.3.0.beta1

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -7,7 +7,7 @@
       <% if can?(:update, @promotion) %>
         <div class="field">
           <%= label_tag :promotion_rule_type, Spree.t(:add_rule_of_type) %>
-          <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), class: 'select2 fullwidth') %>
+          <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), class: 'custom-select fullwidth') %>
         </div>
         <div class="filter-actions actions">
           <%= button Spree.t('actions.add') %>

data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb

@@ -1,2 +1,6 @@
-<%= render partial: 'spree/admin/promotions/actions/promotion_calculators_with_custom_fields',
-           locals: { calculators: Spree::Promotion::Actions::CreateItemAdjustments.calculators, promotion_action: promotion_action, param_prefix: param_prefix } %>
+<%= render(
+  "spree/admin/promotions/actions/promotion_calculators_with_custom_fields",
+  calculators: Spree::Promotion::Actions::CreateItemAdjustments.calculators,
+  promotion_action: promotion_action,
+  param_prefix: param_prefix
+) %>

data/app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb

@@ -7,7 +7,7 @@
         <%= label_tag field_name, Spree::Calculator.model_name.human %>
         <%= select_tag field_name,
                       options_from_collection_for_select(calculators, :to_s, :description, promotion_action.calculator.type),
-                      class: 'type-select js-calculator-type select2 fullwidth' %>
+                      class: 'type-select js-calculator-type custom-select fullwidth' %>
       </div>
     </div>
 

data/app/views/spree/admin/promotions/calculators/distributed_amount/_fields.html.erb

@@ -0,0 +1,54 @@
+<%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
+  <%= f.label :preferred_amount %>
+  <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :preferred_amount, currency_attr: :preferred_currency %>
+<% end %>
+
+<div class="field">
+  <p>
+    <%= admin_hint(
+      calculator.model_name.human,
+      """
+        <p>
+          This amount will be distributed to line items weighted relative to
+          their price. More expensive line items will receive a greater share
+          of the adjustment.
+        </p>
+
+        <p>
+          For example, with three line items and a preferred amount of $15 we
+          would end up with the following distribution:
+        </p>
+
+        <table>
+          <thead>
+            <tr>
+              <th></th>
+              <th>Price</th>
+              <th>Weighted Adj.</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>Socks</td>
+              <td>$5</td>
+              <td>-$1.5</td>
+            </tr>
+            <tr>
+              <td>Shoes</td>
+              <td>$30</td>
+              <td>-$9</td>
+            </tr>
+            <tr>
+              <td>Slippers</td>
+              <td>$15</td>
+              <td>-$4.5</td>
+            </tr>
+          </tbody>
+        </table>
+      """
+    ) %>
+
+    This amount will be the <strong>total</strong> discount spread amongst all
+    of the line items.
+  </p>
+</div>

data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -1,16 +1,35 @@
-<%= label_tag "#{prefix}[calculator_attributes][preferred_base_amount]",
-  Spree.t(:base_amount) %>
-<%= preference_field_tag(
-  "#{prefix}[calculator_attributes][preferred_base_amount]",
-  calculator.preferred_base_amount,
-  type: calculator.preference_type(:base_amount)) %>
+<div class="field">
+  <%= label_tag "#{prefix}[calculator_attributes][preferred_base_amount]",
+    Spree.t(:base_amount) %>
+  <%= preference_field_tag(
+    "#{prefix}[calculator_attributes][preferred_base_amount]",
+    calculator.preferred_base_amount,
+    type: calculator.preference_type(:base_amount)) %>
+</div>
+
+<div class="field">
+  <%= label_tag(
+    "#{prefix}[calculator_attributes][preferred_currency]",
+    Spree.t(:currency)
+  ) %>
+  <%= select_tag(
+    "#{prefix}[calculator_attributes][preferred_currency]",
+    options_for_select(
+      Money::Currency.all,
+      calculator.preferred_currency || Spree::Config[:currency]
+    ),
+    { class: 'custom-select fullwidth' }
+  ) %>
+</div>
 
-<%= label_tag nil, Spree.t(:tiers) %>
-<div class="js-tiered-calculator">
-  <%= content_tag :div, nil, class: "js-tiers", data: {
-    'original-tiers' => Hash[calculator.preferred_tiers.sort],
-    'form-prefix' => prefix,
-    'calculator' => 'tiered_flat_rate'
-  } %>
-  <button class="button js-add-tier"><%= Spree.t('actions.add') %></button>
+<div class="field">
+  <%= label_tag nil, Spree.t(:tiers) %>
+  <div class="js-tiered-calculator">
+    <%= content_tag :div, nil, class: "js-tiers", data: {
+      'original-tiers' => Hash[calculator.preferred_tiers.sort],
+      'form-prefix' => prefix,
+      'calculator' => 'tiered_flat_rate'
+    } %>
+    <button class="button js-add-tier"><%= Spree.t('actions.add') %></button>
+  </div>
 </div>

data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb

@@ -1,16 +1,35 @@
-<%= label_tag "#{prefix}[calculator_attributes][preferred_base_percent]",
-  Spree.t(:base_percent) %>
-<%= preference_field_tag(
-  "#{prefix}[calculator_attributes][preferred_base_percent]",
-  calculator.preferred_base_percent,
-  type: calculator.preference_type(:base_percent)) %>
+<div class="field">
+  <%= label_tag "#{prefix}[calculator_attributes][preferred_base_percent]",
+    Spree.t(:base_percent) %>
+  <%= preference_field_tag(
+    "#{prefix}[calculator_attributes][preferred_base_percent]",
+    calculator.preferred_base_percent,
+    type: calculator.preference_type(:base_percent)) %>
+</div>
+
+<div class="field">
+  <%= label_tag(
+    "#{prefix}[calculator_attributes][preferred_currency]",
+    Spree.t(:currency)
+  ) %>
+  <%= select_tag(
+    "#{prefix}[calculator_attributes][preferred_currency]",
+    options_for_select(
+      Money::Currency.all,
+      calculator.preferred_currency || Spree::Config[:currency]
+    ),
+    { class: 'custom-select fullwidth' }
+  ) %>
+</div>
 
-<%= label_tag nil, Spree.t(:tiers) %>
-<div class="js-tiered-calculator">
-  <%= content_tag :div, nil, class: "js-tiers", data: {
-    'original-tiers' => Hash[calculator.preferred_tiers.sort],
-    'form-prefix' => prefix,
-    'calculator' => 'tiered_percent'
-  } %>
-  <button class="button js-add-tier"><%= Spree.t('actions.add') %></button>
+<div class="field">
+  <%= label_tag nil, Spree.t(:tiers) %>
+  <div class="js-tiered-calculator">
+    <%= content_tag :div, nil, class: "js-tiers", data: {
+      'original-tiers' => Hash[calculator.preferred_tiers.sort],
+      'form-prefix' => prefix,
+      'calculator' => 'tiered_percent'
+    } %>
+    <button class="button js-add-tier"><%= Spree.t('actions.add') %></button>
+  </div>
 </div>

data/app/views/spree/admin/promotions/index.html.erb

@@ -40,7 +40,7 @@
         <div class="col-3">
           <div class="field">
             <%= label_tag :q_promotion_category_id_eq, Spree::PromotionCategory.model_name.human %><br>
-            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.all') }, { class: 'select2 fullwidth' }) %>
+            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.all') }, { class: 'custom-select fullwidth' }) %>
           </div>
         </div>
       </div>

data/app/views/spree/admin/promotions/rules/_first_repeat_purchase_since.html.erb

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-6">
     <div class="field">
-      <%= Spree.t(:form_text, scope: "promotion_rule_types.first_repeat_purchase_since")  %>
+      <%= Spree::Promotion::Rules::FirstRepeatPurchaseSince.human_attribute_name(:form_text) %>
     </div>
   </div>
 

data/app/views/spree/admin/promotions/rules/_item_total.html.erb

@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col-6">
       <div class="field">
-        <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator), {class: 'select2 select_item_total fullwidth'} %>
+        <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator), {class: 'custom-select select_item_total fullwidth'} %>
       </div>
     </div>
     <div class="col-6">

data/app/views/spree/admin/promotions/rules/_landing_page.html.erb

@@ -1,6 +1,6 @@
 <div class="col-12">
   <div class="field">
-    <label for="<%= "#{param_prefix}_preferred_path" %>"><%= Spree.t('promotion_rule_types.landing_page.description') %>:</label>  
+    <label for="<%= "#{param_prefix}_preferred_path" %>"><%= Spree::Promotion::Rules::LandingPage.human_attribute_name(:description) %>:</label>
     <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, class: 'fullwidth' %>  
     <span class="info"><%= Spree.t('landing_page_rule.must_have_visited_path') %></span>
   </div>

data/app/views/spree/admin/promotions/rules/_nth_order.html.erb

@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col-6">
       <div class="field">
-        <%= Spree.t(:form_text, scope: "promotion_rule_types.nth_order")  %>
+        <%= Spree::Promotion::Rules::NthOrder.human_attribute_name(:form_text) %>
       </div>
     </div>
     <div class="col-6">

data/app/views/spree/admin/promotions/rules/_product.html.erb

@@ -7,7 +7,7 @@
 <div class="col-12">
   <div class="field">
     <label>
-      <%= Spree.t('product_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [Spree.t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_product select2'})).html_safe %>
+      <%= Spree.t('product_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [Spree.t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_product custom-select'})).html_safe %>
     </label>
   </div>
 </div>

data/app/views/spree/admin/promotions/rules/_taxon.html.erb

@@ -8,7 +8,7 @@
     <div class="col-12">
       <div class="field">
         <label>
-          <%= Spree.t('taxon_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Taxon::MATCH_POLICIES.map{|s| [Spree.t("taxon_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_taxon select2'})).html_safe %>
+          <%= Spree.t('taxon_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Taxon::MATCH_POLICIES.map{|s| [Spree.t("taxon_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_taxon custom-select'})).html_safe %>
         </label>
       </div>
     </div>

data/app/views/spree/admin/promotions/rules/_user_role.html.erb

@@ -3,10 +3,10 @@
   <%= select_tag "#{param_prefix}[preferred_role_ids]",
     options_from_collection_for_select(
       Spree::Role.all, :id, :name, promotion_rule.preferred_role_ids
-    ), class: 'select2 fullwidth', multiple: true %>
+    ), class: 'custom-select fullwidth', multiple: true %>
 </div>
 <div class="field alpha omega eight columns">
   <label>
-    <%= Spree.t('user_role_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::UserRole::MATCH_POLICIES.map{ |s| [Spree.t("user_role_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), { class: 'select2'})).html_safe %>
+    <%= Spree.t('user_role_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::UserRole::MATCH_POLICIES.map{ |s| [Spree.t("user_role_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), { class: 'custom-select'})).html_safe %>
   </label>
 </div>

data/app/views/spree/admin/refunds/edit.html.erb

@@ -16,7 +16,7 @@
       <div class="col-3">
         <div class="field">
           <%= f.label :refund_reason_id %><br/>
-          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'select2 fullwidth'}) %>
+          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'custom-select fullwidth'}) %>
         </div>
       </div>
     </div>

data/app/views/spree/admin/refunds/new.html.erb

@@ -29,7 +29,7 @@
       <div class="col-3">
         <div class="field">
           <%= f.label :refund_reason_id %><br/>
-          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2 fullwidth'}) %>
+          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'custom-select fullwidth'}) %>
         </div>
       </div>
     </div>

data/app/views/spree/admin/reimbursements/edit.html.erb

@@ -39,7 +39,7 @@
               <%= item_fields.select(:override_reimbursement_type_id,
                 reimbursement_types.collect { |r| [r.name.humanize, r.id] },
                 {include_blank: true},
-                {class: 'select2 fullwidth'}
+                {class: 'custom-select fullwidth'}
               ) %>
             </td>
             <td class="align-center">
@@ -52,7 +52,7 @@
               <% if return_item.exchange_processed? %>
                 <%= return_item.exchange_variant.exchange_name %>
               <% else %>
-                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants(@stock_locations), :id, :exchange_name, { include_blank: true }, { class: "select2 fullwidth return-item-exchange-selection" } %>
+                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants(@stock_locations), :id, :exchange_name, { include_blank: true }, { class: "custom-select fullwidth return-item-exchange-selection" } %>
               <% end %>
             </td>
           </tr>

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -10,7 +10,7 @@
 <% end %>
 
 <% content_for :table_filter do %>
-  <%= render partial: 'spree/admin/shared/report_order_criteria', locals: {} %>
+  <%= render partial: 'spree/admin/shared/report_order_criteria', locals: { action: :sales_total } %>
 <% end %>
 
 <table class="admin-report" data-hook="sales_total">

data/app/views/spree/admin/return_authorizations/_form.html.erb

@@ -47,21 +47,21 @@
           </td>
           <td class="return-item-reimbursement-type">
             <% if editable %>
-              <%= item_fields.select :preferred_reimbursement_type_id, @reimbursement_types.collect{|r|[r.name.humanize, r.id]}, {include_blank: true}, {class: 'select2 fullwidth'} %>
+              <%= item_fields.select :preferred_reimbursement_type_id, @reimbursement_types.collect{|r|[r.name.humanize, r.id]}, {include_blank: true}, {class: 'custom-select fullwidth'} %>
             <% else %>
               <%= return_item.preferred_reimbursement_type.try(:name) %>
             <% end %>
           </td>
           <td class="return-item-exchange-for align-center">
             <% if editable %>
-              <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants(@stock_locations), :id, :exchange_name, { include_blank: true }, { class: "select2 fullwidth return-item-exchange-selection" } %>
+              <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants(@stock_locations), :id, :exchange_name, { include_blank: true }, { class: "custom-select fullwidth return-item-exchange-selection" } %>
             <% elsif return_item.exchange_processed? %>
               <%= return_item.exchange_variant.exchange_name %>
             <% end %>
           </td>
           <td class="return-item-reason">
             <% if editable %>
-              <%= item_fields.select :return_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2 fullwidth'} %>
+              <%= item_fields.select :return_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'custom-select fullwidth'} %>
             <% else %>
               <%= return_item.return_reason.try(:name) %>
             <% end %>
@@ -77,7 +77,7 @@
 
   <%= f.field_container :stock_location do %>
     <%= f.label :stock_location_id, Spree::StockLocation.model_name.human %>
-    <%= f.select :stock_location_id, @stock_locations.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
+    <%= f.select :stock_location_id, @stock_locations.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'custom-select fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
     <%= f.error_message_on :stock_location_id %>
   <% end %>
 

data/app/views/spree/admin/shared/_address_form.html.erb

@@ -41,7 +41,7 @@
   <div class="field <%= "#{type}-row" %>">
     <%= f.label :country_id, Spree::Country.model_name.human %>
     <span id="<%= s_or_b %>country">
-      <%= f.collection_select :country_id, available_countries, :id, :name, {}, {class: 'select2 fullwidth js-country_id'} %>
+      <%= f.collection_select :country_id, available_countries, :id, :name, {}, {class: 'custom-select fullwidth js-country_id'} %>
     </span>
   </div>
 
@@ -51,7 +51,7 @@
       <%= f.text_field :state_name,
             style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };",
            disabled: !f.object.country.states.empty?, class: 'fullwidth state_name js-state_name' %>
-      <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {include_blank: true}, {class: 'select2 fullwidth js-state_id', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
+      <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {include_blank: true}, {class: 'custom-select fullwidth js-state_id', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
     </span>
   </div>
 

data/app/views/spree/admin/shared/_calculator_fields.html.erb

@@ -4,7 +4,7 @@
   <div id="preference-settings">
     <div class="field">
       <%= f.label(:calculator_type, Spree::Calculator.model_name.human) %>
-      <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {class: 'select2 fullwidth js-calculator-type'}) %>
+      <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {class: 'custom-select fullwidth js-calculator-type'}) %>
     </div>
 
     <% @calculators.each do |calculator_class| %>

data/app/views/spree/admin/shared/_product_tabs.html.erb

@@ -9,19 +9,19 @@
       <% end if can?(:admin, Spree::Product) %>
       <%= content_tag :li, class: ('active' if current == 'Images') do %>
         <%= link_to Spree.t(:images), spree.admin_product_images_url(@product) %>
-      <% end if can?(:admin, Spree::Image) %>
+      <% end if can?(:admin, Spree::Image) && !@product.deleted? %>
       <%= content_tag :li, class: ('active' if current == 'Variants') do %>
         <%= link_to plural_resource_name(Spree::Variant), spree.admin_product_variants_url(@product) %>
       <% end if can?(:admin, Spree::Variant) %>
       <%= content_tag :li, class: ('active' if current == 'Prices') do %>
         <%= link_to plural_resource_name(Spree::Price), spree.admin_product_prices_url(@product) %>
-      <% end if can?(:admin, Spree::Price) %>
+      <% end if can?(:admin, Spree::Price) && !@product.deleted? %>
       <%= content_tag :li, class: ('active' if current == 'Product Properties') do %>
         <%= link_to plural_resource_name(Spree::ProductProperty), spree.admin_product_product_properties_url(@product) %>
-      <% end if can?(:admin, Spree::ProductProperty) %>
+      <% end if can?(:admin, Spree::ProductProperty) && !@product.deleted? %>
       <%= content_tag :li, class: ('active' if current == 'Stock Management') do %>
         <%= link_to Spree.t(:stock_management), spree.admin_product_stock_url(@product) %>
-      <% end if can?(:admin, Spree::StockItem) %>
+      <% end if can?(:admin, Spree::StockItem) && !@product.deleted? %>
     </ul>
   </nav>
 <% end %>

data/app/views/spree/admin/shared/_report_order_criteria.html.erb

@@ -1,4 +1,4 @@
-<%= search_form_for @search, url: spree.sales_total_admin_reports_path  do |s| %>
+<%= search_form_for @search, url: spree.url_for(controller: 'admin/reports', action: action)  do |s| %>
   <div class="date-range-filter field">
     <div class="date-range-fields input-group">
       <%= s.text_field :completed_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_value(params[:q][:completed_at_gt]), placeholder: Spree.t(:start) %>

data/app/views/spree/admin/shared/_variant_search.html.erb

@@ -4,7 +4,7 @@
       <div class="field-block col-3">
         <div class="field">
           <%= label_tag nil, Spree::StockLocation.model_name.human %>
-          <%= select_tag :stock_location_id, options_from_collection_for_select(stock_locations, :id, :name, params[:stock_location_id]), { include_blank: true, class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location) } %>
+          <%= select_tag :stock_location_id, options_from_collection_for_select(stock_locations, :id, :name, params[:stock_location_id]), { include_blank: true, class: 'custom-select fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location) } %>
         </div>
       </div>
       <div class="<%= if content_for?(:sidebar) then 'col-6' else 'col-9' end %>">

data/app/views/spree/admin/shipping_methods/_form.html.erb

@@ -96,7 +96,7 @@
       <fieldset class="tax_categories no-border-bottom">
         <legend align="center"><%= Spree::TaxCategory.model_name.human %></legend>
           <%= f.field_container :tax_categories do %>
-            <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {include_blank: true}, class: "select2 fullwidth" %>
+            <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {include_blank: true}, class: "custom-select fullwidth" %>
             <%= error_message_on :shipping_method, :tax_category_id %>
           <% end %>
       </fieldset>

data/app/views/spree/admin/states/index.html.erb

@@ -17,7 +17,7 @@
   <div class="col-12">
     <div data-hook="country" class="field">
       <%= label_tag :country, Spree::Country.model_name.human %>
-      <select id="country" class='observe_field select2 fullwidth' data-base-url="<%=admin_states_path(format: :js) %>?country_id=" data-update="#state-list">
+      <select id="country" class='observe_field custom-select fullwidth' data-base-url="<%=admin_states_path(format: :js) %>?country_id=" data-update="#state-list">
       <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
       </select>
     </div>