solidus_backend 2.5.2 → 2.6.0.rc1

data/app/views/spree/admin/promotion_codes/index.csv.ruby

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 CSV.generate do |csv|
   csv << ['Code']
   @promotion_codes.order(:id).pluck(:value).each do |value|

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to t('spree.download_promotion_code_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv) %>
+    <%= link_to t('spree.download_promotion_code_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv), class: 'btn btn-primary' %>
   </li>
 <% end %>
 

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

@@ -10,7 +10,7 @@
           <%= select_tag 'action_type', options, include_blank: t(:choose_promotion_action, scope: 'spree'), class: 'custom-select fullwidth' %>
         </div>
         <div class="filter-actions actions">
-          <%= button t('spree.actions.add') %>
+          <%= button_tag t('spree.actions.add'), class: 'btn btn-primary' %>
         </div>
       <% end %>
     </fieldset>
@@ -28,7 +28,7 @@
     </div>
     <% if can?(:update, @promotion) %>
       <div class="filter-actions actions promotion-update">
-        <%= button t('spree.actions.update') %>
+        <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
       </div>
     <% end %>
   <% end %>

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

@@ -49,6 +49,10 @@
           <%= batch.label :number_of_codes, class: "required" %>
           <%= batch.number_field :number_of_codes, class: "fullwidth", min: 1, required: true %>
         </div>
+        <div class="field">
+          <%= batch.label :join_characters %>
+          <%= batch.text_field :join_characters, class: "fullwidth" %>
+        </div>
         <div class="field">
           <%= f.label :per_code_usage_limit %>
           <%= f.text_field :per_code_usage_limit, class: "fullwidth" %>

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

@@ -10,7 +10,7 @@
           <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), include_blank: t(:choose_promotion_rule, scope: 'spree'), class: 'custom-select fullwidth') %>
         </div>
         <div class="filter-actions actions">
-          <%= button t('spree.actions.add') %>
+          <%= button_tag t('spree.actions.add'), class: 'btn btn-primary' %>
         </div>
       <% end %>
     </fieldset>
@@ -43,7 +43,7 @@
 
         <% if can?(:update, @promotion) %>
           <div class="promotion-update filter-actions actions">
-            <%= button t('spree.actions.update') %>
+            <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
           </div>
         <% end %>
       </fieldset>

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

@@ -4,5 +4,8 @@
   <%= number_field_tag field_name, promotion_action.preferred_group_size, class: "fullwidth", min: 1 %>
 </div>
 
-<%= render "spree/admin/promotions/actions/create_item_adjustments",
-  promotion_action: promotion_action, param_prefix: param_prefix %>
+<%= render "spree/admin/promotions/actions/promotion_calculators_with_custom_fields",
+  calculators: Rails.application.config.spree.calculators.promotion_actions_create_quantity_adjustments,
+  promotion_action: promotion_action,
+  param_prefix: param_prefix
+%>

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

@@ -6,11 +6,11 @@
 <% content_for :page_actions do %>
   <li>
     <% if can?(:display, Spree::PromotionCode) %>
-      <%= button_link_to t('spree.download_promotion_code_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv) %>
+      <%= link_to t('spree.download_promotion_code_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv), class: 'btn btn-primary' %>
     <% end %>
 
     <% if can?(:display, Spree::PromotionCodeBatch) %>
-      <%= button_link_to plural_resource_name(Spree::PromotionCodeBatch), admin_promotion_promotion_code_batches_path(promotion_id: @promotion.id) %>
+      <%= link_to plural_resource_name(Spree::PromotionCodeBatch), admin_promotion_promotion_code_batches_path(promotion_id: @promotion.id), class: 'btn btn-primary' %>
     <% end %>
   </li>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% content_for :page_actions do %>
   <% if can? :create, Spree::Promotion %>
     <li>
-      <%= button_link_to t('spree.new_promotion'), spree.new_admin_promotion_path %>
+      <%= link_to t('spree.new_promotion'), spree.new_admin_promotion_path, class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>
@@ -49,7 +49,7 @@
 
       <div class="actions filter-actions">
         <div data-hook="admin_promotions_index_search_buttons">
-          <%= button t('spree.filter_results') %>
+          <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
         </div>
       </div>
     <% end %>

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

@@ -0,0 +1,6 @@
+<div class="field">
+  <label><%= t("spree.store_rule.choose_stores" ) %></label>
+  <%= select_tag "#{param_prefix}[store_ids][]",
+    options_from_collection_for_select(Spree::Store.all, :id, :name, promotion_rule.store_ids),
+    multiple: true, class: "select2 fullwidth" %>
+</div>

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

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Property) %>
     <li id="new_property_link">
-      <%= button_link_to t('spree.new_property'), new_admin_property_url, { remote: true, id: 'new_property_link' } %>
+      <%= link_to t('spree.new_property'), new_admin_property_url, remote: true, id: 'new_property_link', class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>
@@ -35,7 +35,7 @@
         <div class="clear"></div>
 
         <div class="form-buttons actions filter-actions" data-hook="admin_pproperties_index_search_buttons">
-          <%= button t('spree.search') %>
+          <%= button_tag t('spree.search'), class: 'btn btn-primary' %>
         </div>
     <% end %>
   </div>

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

@@ -9,7 +9,7 @@
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::RefundReason) %>
       <li>
-        <%= button_link_to t('spree.new_refund_reason'), new_object_url, { id: 'admin_new_named_type' } %>
+        <%= link_to t('spree.new_refund_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
       </li>
     <% end %>
   </ul>

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

@@ -22,8 +22,8 @@
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button t('spree.actions.save') %>
-      <%= button_link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order) %>
+      <%= button_tag t('spree.actions.save'), class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order), class: 'btn btn-primary' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -35,8 +35,8 @@
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree::Refund.model_name.human %>
-      <%= button_link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order) %>
+      <%= button_tag Spree::Refund.model_name.human, class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order), class: 'btn btn-primary' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -4,7 +4,7 @@
 
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to t('spree.back_to_customer_return'), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li>
+  <li><%= link_to t('spree.back_to_customer_return'), url_for([:edit, :admin, @order, @reimbursement.customer_return]), class: 'btn btn-primary' %></li>
 <% end %>
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @reimbursement } %>
@@ -100,7 +100,7 @@
       <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button', method: 'post' } do %>
         <%= t('spree.reimburse') %>
       <% end %>
-      <%= button_link_to t('spree.actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]) %>
+      <%= link_to t('spree.actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), class: 'btn btn-primary' %>
     <% end %>
   </div>
 </fieldset>

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

@@ -3,7 +3,7 @@
 <% admin_breadcrumb(plural_resource_name(Spree::Reimbursement)) %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to t('spree.back_to_customer_return_list'), spree.admin_order_customer_returns_url(@order) %></li>
+  <li><%= link_to t('spree.back_to_customer_return_list'), spree.admin_order_customer_returns_url(@order), class: 'btn btn-primary' %></li>
 <% end %>
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @customer_return } %>

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

@@ -4,7 +4,7 @@
 
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to t('spree.back_to_customer_return'), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li>
+  <li><%= link_to t('spree.back_to_customer_return'), url_for([:edit, :admin, @order, @reimbursement.customer_return]), class: 'btn btn-primary' %></li>
 <% end %>
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @reimbursement } %>

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

@@ -1,7 +1,7 @@
 <% content_for :page_actions do %>
   <% if @return_authorization.can_cancel? %>
     <li>
-      <%= button_link_to t('spree.actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: t('spree.are_you_sure') } %>
+      <%= button_to t('spree.actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: t('spree.are_you_sure') } %>
     </li>
   <% end %>
 <% end %>
@@ -27,8 +27,8 @@
 	    <%= render partial: 'form', locals: { f: f } %>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button t('spree.actions.update') %>
-        <%= button_link_to t('spree.actions.cancel'), admin_order_return_authorizations_url(@order) %>
+        <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
+        <%= link_to t('spree.actions.cancel'), admin_order_return_authorizations_url(@order), class: 'btn btn-primary' %>
       </div>
     </fieldset>
 	<% end %>

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

@@ -4,7 +4,7 @@
   <% if @order.shipments.any? &:shipped? %>
     <li>
       <% if can? :create, Spree::ReturnAuthorization %>
-        <%= button_link_to t('spree.new_return_authorization'), new_admin_order_return_authorization_url(@order) %>
+        <%= link_to t('spree.new_return_authorization'), new_admin_order_return_authorization_url(@order), class: 'btn btn-primary' %>
       <% end %>
     </li>
   <% end %>

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

@@ -13,8 +13,8 @@
     <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button t('spree.actions.create') %>
-      <%= button_link_to t('spree.actions.cancel'), admin_order_return_authorizations_url(@order) %>
+      <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), admin_order_return_authorizations_url(@order), class: 'btn btn-primary' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/search/products.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.products(@products) do |product|
   json.id product.id
   json.name product.name

data/app/views/spree/admin/search/users.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.array!(@users) do |user|
   json.id user.id
   json.email user.email

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

@@ -0,0 +1,8 @@
+<div class="input-group">
+  <div class="input-group-prepend">
+    <span class="input-group-text">
+      <%= solidus_icon('fa fa-calendar') %>
+    </span>
+  </div>
+  <%= f.text_field date_attr, value: datepicker_field_value(f.object.public_send(date_attr)), class: 'form-control datepicker' %>
+</div>

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

@@ -1,4 +1,4 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button t('spree.actions.update') %>
-  <%= button_link_to t('spree.actions.cancel'), collection_url %>
+  <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
+  <%= link_to t('spree.actions.cancel'), collection_url, class: 'btn btn-primary' %>
 </div>

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

@@ -0,0 +1,15 @@
+<% available_locales = Spree.i18n_available_locales %>
+<% if available_locales.size > 1 %>
+  <div class="admin-locale-selection">
+    <select class="js-locale-selection custom-select fullwidth">
+      <%=
+        options_for_select(
+          available_locales.map do |locale|
+            [I18n.t('spree.i18n.this_file_language', locale: locale, default: locale.to_s, fallback: false), locale]
+          end.sort,
+          selected: I18n.locale,
+        )
+      %>
+    </select>
+  </div>
+<% end %>

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

@@ -3,6 +3,7 @@
   <div class="admin-nav-sticky">
     <%= render partial: 'spree/admin/shared/menu' %>
     <div class="admin-nav-footer">
+      <%= render partial: 'spree/admin/shared/locale_selection' %>
       <%= render partial: 'spree/admin/shared/navigation_footer' %>
     </div>
   </div>

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

@@ -1,4 +1,4 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button t('spree.actions.create') %>
+  <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
   <%= link_to t('spree.actions.cancel'), collection_url, class: 'button' %>
 </div>

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

@@ -1,4 +1,4 @@
 <%= t('spree.no_resource', resource: plural_resource_name(resource)) %>
-<% if can? :create, resource %>
+<% if can? :create, resource and local_assigns[:new_resource_url] %>
   <%= link_to t('spree.create_one'), new_resource_url %>
 <% end %>

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

@@ -61,7 +61,7 @@
 
     <% if @order.canceled? && @order.canceler && @order.canceled_at %>
       <dt><%= Spree::Order.human_attribute_name(:canceler) %></dt>
-      <dd><%= @order.canceler.email %></td>
+      <dd><%= @order.canceler.email %></dd>
       <dt><%= Spree::Order.human_attribute_name(:canceled_at) %></dt>
       <dd><%= pretty_time(@order.canceled_at) %></dd>
     <% end %>

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

@@ -18,7 +18,7 @@
         <td><%= pretty_time(refund.created_at) %></td>
         <td><%= refund.payment.number %></td>
         <td class="amount"><%= refund.display_amount %></td>
-        <td><%= payment_method_name(refund.payment) %></td>
+        <td><%= refund.payment.payment_method.name %></td>
         <td><%= refund.transaction_id %></td>
         <td><%= truncate(refund.reason.name, length: 100) %></td>
         <% if show_actions %>

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

@@ -14,6 +14,6 @@
   </div>
 
   <div class="actions filter-actions">
-    <%= button t('spree.search')  %>
+    <%= button_tag t('spree.search'), class: 'btn btn-primary' %>
   </div>
 <% end %>

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

@@ -19,7 +19,7 @@
 
     <div class="actions filter-actions">
       <div data-hook="admin_orders_index_search_buttons">
-        <%= button t('spree.filter_results') %>
+        <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
       </div>
     </div>
   <% end %>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -9,7 +9,7 @@
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::ReturnReason) %>
       <li>
-        <%= button_link_to new_button_text, new_object_url, { id: 'admin_new_named_type' } %>
+        <%= link_to new_button_text, new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
       </li>
     <% end %>
   </ul>

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

@@ -8,7 +8,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::ShippingCategory) %>
     <li>
-      <%= button_link_to t('spree.new_shipping_category'), new_object_url %>
+      <%= link_to t('spree.new_shipping_category'), new_object_url, class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>

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

@@ -39,6 +39,14 @@
     <% end %>
   </div>
 
+  <div class="col-5">
+    <%= f.field_container :store_ids do %>
+      <%= f.label :store_ids, plural_resource_name(Spree::Store) %>
+      <%= f.collection_select :store_ids, Spree::Store.all, :id, :name, {}, multiple: true, class: "select2 fullwidth" %>
+      <%= error_message_on :shipping_method, :store_ids %>
+    <% end %>
+  </div>
+
   <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-10">
     <%= f.field_container :tracking_url do %>
       <%= f.label :tracking_url %><br />

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

@@ -8,7 +8,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::ShippingMethod) %>
     <li>
-      <%= button_link_to t('spree.new_shipping_method'), new_object_url, id: 'admin_new_shipping_method_link' %>
+      <%= link_to t('spree.new_shipping_method'), new_object_url, id: 'admin_new_shipping_method_link', class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>

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

@@ -107,7 +107,7 @@
 
     <%= f.field_container :country_id do %>
       <%= f.label :country_id %>
-      <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, { include_blank: true }, { class: 'custom-select js-country_id fullwidth' } %></span>
+      <span id="country"><%= f.collection_select :country_id, available_countries(restrict_to_zone: nil), :id, :name, { include_blank: true }, { class: 'custom-select js-country_id fullwidth' } %></span>
     <% end %>
 
     <%= f.field_container :state do %>

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

@@ -7,6 +7,13 @@
 
 
 <% content_for :page_actions do %>
+  <ul class="actions inline-menu">
+    <% if can?(:display, Spree::StockMovement) %>
+      <li>
+        <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(@stock_location.id), class: 'btn btn-primary'  %>
+      </li>
+    <% end %>
+  </ul>
 <% end %>
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @stock_location } %>

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

@@ -9,7 +9,7 @@
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::StockLocation) %>
       <li>
-        <%= button_link_to t('spree.new_stock_location'), new_object_url, { id: 'admin_new_stock_location' } %>
+        <%= link_to t('spree.new_stock_location'), new_object_url, id: 'admin_new_stock_location', class: 'btn btn-primary' %>
       </li>
     <% end %>
   </ul>