solidus_backend 2.5.2 → 2.6.0.rc1

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

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

data/app/views/spree/admin/images/_image_row.html.erb

@@ -38,7 +38,7 @@
 
   <td class="actions">
     <% if can?(:update, image) %>
-      <%= link_to_with_icon 'check', t('spree.actions.save'), api_variant_image_path(@product, image), no_text: true, data: {action: 'save'} %>
+      <%= link_to_with_icon 'check', t('spree.actions.save'), api_product_image_path(@product, image), no_text: true, data: {action: 'save'} %>
 
       <%= link_to_with_icon 'cancel', t('spree.actions.cancel'), nil, no_text: true, data: {action: 'cancel'} %>
 

data/app/views/spree/admin/images/_new.html.erb

@@ -5,7 +5,7 @@
       <%= render partial: 'form', locals: { f: f } %>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button t('spree.actions.update') %>
+        <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
         <%= link_to t('spree.actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button' %>
       </div>
   </fieldset>

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

@@ -7,7 +7,7 @@
 
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to t('spree.back_to_images_list'), admin_product_images_url(@product) %></li>
+  <li><%= link_to t('spree.back_to_images_list'), admin_product_images_url(@product), class: 'btn btn-primary' %></li>
 <% end %>
 
 <%= form_for [:admin, @product, @image], html: { multipart: true } do |f| %>
@@ -26,7 +26,7 @@
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button t('spree.actions.update') %>
+      <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
       <%= link_to t('spree.actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button' %>
     </div>
   </fieldset>

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

@@ -4,8 +4,8 @@
 <% admin_breadcrumb(plural_resource_name(Spree::LogEntry)) %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment) %></li>
-  <li><%= button_link_to t('spree.back_to_payment'), spree.admin_order_payment_url(@order, @payment) %></li>
+  <li><%= link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment), class: 'btn btn-primary' %></li>
+  <li><%= link_to t('spree.back_to_payment'), spree.admin_order_payment_url(@order, @payment), class: 'btn btn-primary' %></li>
 <% end %>
 
 <table class='index' id='listing_log_entries'>

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

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::OptionType) %>
     <li id="new_ot_link">
-      <%= button_link_to t('spree.new_option_type'), new_admin_option_type_url, { remote: true, id: 'new_option_type_link' } %>
+      <%= link_to t('spree.new_option_type'), new_admin_option_type_url, remote: true, id: 'new_option_type_link', class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>

data/app/views/spree/admin/orders/_carton_manifest.html.erb

@@ -4,7 +4,7 @@
       <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
     </td>
     <td class="item-name">
-      <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+      <%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
       <% if item.variant.sku.present? %>
         <strong><%= Spree::Variant.human_attribute_name(:sku) %>:</strong>
         <%= item.variant.sku %>

data/app/views/spree/admin/orders/_shipment_manifest.html.erb

@@ -7,7 +7,7 @@
       <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
     </td>
     <td class="item-name">
-      <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+      <%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
       <% if item.variant.sku.present? %>
         <strong><%= Spree::Variant.human_attribute_name(:sku) %>:</strong> <%= item.variant.sku %>
       <% end %>

data/app/views/spree/admin/orders/cart.html.erb

@@ -1,9 +1,9 @@
 <% content_for :page_actions do %>
     <% if can?(:fire, @order) %>
-        <li><%= event_links %></li>
+      <li><%= event_links %></li>
     <% end %>
     <% if can?(:resend, @order) && @order.completed? %>
-        <li><%= button_link_to t('spree.resend'), resend_admin_order_url(@order), method: :post %></li>
+      <li><%= button_to t('spree.resend'), resend_admin_order_url(@order), method: :post %></li>
     <% end %>
 <% end %>
 

data/app/views/spree/admin/orders/confirm/_payments.html.erb

@@ -24,7 +24,7 @@
             <%= payment.display_amount.to_html %>
           </td>
           <td>
-            <%= payment_method_name(payment) %>
+            <%= payment.payment_method.name %>
           </td>
           <td>
             <%= payment.transaction_id %>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -80,6 +80,6 @@
   <div class="clear"></div>
 
   <div class="form-buttons filter-actions actions" data-hook="buttons">
-    <%= button t('spree.actions.update') %>
+    <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
   </div>
 </fieldset>

data/app/views/spree/admin/orders/customer_details/show.html.erb

@@ -4,7 +4,7 @@
 
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to t('spree.back_to_orders_list'), admin_orders_path %></li>
+  <li><%= link_to t('spree.back_to_orders_list'), admin_orders_path, class: 'btn btn-primary' %></li>
 <% end %>
 
 

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

@@ -3,7 +3,7 @@
     <li><%= event_links %></li>
   <% end %>
   <% if can?(:resend, @order) && @order.completed? %>
-    <li><%= button_link_to t('spree.resend'), resend_admin_order_url(@order), method: :post %></li>
+    <li><%= button_to t('spree.resend'), resend_admin_order_url(@order), method: :post, class: 'btn btn-primary' %></li>
   <% end %>
 <% end %>
 

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

@@ -5,7 +5,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order' %>
+    <%= link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order', class: 'btn btn-primary' %>
   </li>
 <% end if can? :create, Spree::Order %>
 
@@ -106,7 +106,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/payment_methods/edit.html.erb

@@ -14,7 +14,7 @@
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
     <div data-hook="buttons" class="filter-actions actions">
-      <%= button t('spree.actions.update') %>
+      <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
     </div>
   </fieldset>
 

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

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

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

@@ -15,7 +15,7 @@
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
     <div data-hook="buttons" class="filter-actions actions">
-      <%= button t('spree.actions.create') %>
+      <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/payments/_list.html.erb

@@ -1,4 +1,4 @@
-<table class="index" id='payments' data-order-id='<%= @order.number %>'>
+<table class="index table-responsive" id='payments' data-order-id='<%= @order.number %>'>
   <colgroup>
     <col style="width: 15%"/>
     <col style="width: 15%"/>
@@ -24,7 +24,7 @@
       <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="payment vertical-middle" data-payment-id="<%= payment.id %>">
         <td><%= link_to payment.number, spree.admin_order_payment_path(@order, payment) %></td>
         <td><%= l(payment.created_at, format: :short) %></td>
-        <td><%= payment_method_name(payment) %></td>
+        <td><%= payment.payment_method.name %></td>
         <td><%= payment.transaction_id %></td>
         <td>
           <span class="pill pill-<%= payment.state %>">

data/app/views/spree/admin/payments/credit.html.erb

@@ -12,7 +12,7 @@
       <%= text_field_tag :amount, @payment.amount %>
     </p>
     <p class="form-buttons">
-      <%= button t('spree.make_refund') %>
+      <%= button_tag t('spree.make_refund'), class: 'btn btn-primary' %>
     </p>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% content_for :page_actions do %>
   <% if @order.outstanding_balance? %>
     <li id="new_payment_section">
-      <%= button_link_to t('spree.new_payment'), new_admin_order_payment_url(@order) %>
+      <%= link_to t('spree.new_payment'), new_admin_order_payment_url(@order), class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>

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

@@ -15,7 +15,7 @@
       <%= render partial: 'form', locals: { f: f } %>
 
       <div class="filter-actions actions" data-hook="buttons">
-        <%= button @order.cart? ? t('spree.actions.continue') : t('spree.actions.update') %>
+        <%= button_tag @order.cart? ? t('spree.actions.continue') : t('spree.actions.update'), class: 'btn btn-primary' %>
       </div>
     </fieldset>
   <% end %>

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

@@ -2,7 +2,7 @@
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
 <% admin_breadcrumb do %>
-  <%= payment_method_name(@payment) %>
+  <%= @payment.payment_method.name %>
   <span class="pill pill-<%= @payment.state %>">
     <%= t(@payment.state, scope: 'spree.payment_states') %>
   </span>
@@ -10,7 +10,7 @@
 
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment) %></li>
+  <li><%= link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment), class: 'btn btn-primary' %></li>
 <% end %>
 
 <%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.partial_name}", locals: { payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>

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

@@ -15,7 +15,7 @@
         <%= f.field_container :country do %>
           <%= f.label :country %>
           <%= f.field_hint :country %>
-          <%= f.collection_select :country_iso, available_countries, :iso, :name,
+          <%= f.collection_select :country_iso, available_countries(restrict_to_zone: nil), :iso, :name,
                                   {
                                     include_blank: t(:any_country, scope: [:spree, :admin, :prices])
                                   },

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

@@ -3,7 +3,7 @@
 
 <% content_for :page_actions do %>
   <li id="new_price_link">
-    <%= button_link_to t(".new_price"), new_object_url %>
+    <%= link_to t(".new_price"), new_object_url, class: 'btn btn-primary' %>
   </li>
 <% end if can?(:create, Spree::Product) %>
 
@@ -64,7 +64,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>
 

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

@@ -53,7 +53,7 @@
         </div>
       <% end %>
       <div class="form-buttons filter-actions actions">
-        <%= button t('spree.filter_results') %>
+        <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
         <% if @option_value_ids.present? %>
           <%= link_to_add_fields t('spree.add_variant_properties'), 'tbody#variant_property_values', class: 'plus button' %>
         <% end %>

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

@@ -64,8 +64,11 @@
       <div data-hook="admin_product_form_available_on">
         <%= f.field_container :available_on do %>
           <%= f.label :available_on %>
+          <%= f.field_hint :available_on %>
+
+          <%= render "spree/admin/shared/datepicker", f: f, date_attr: :available_on %>
+
           <%= f.error_message_on :available_on %>
-          <%= f.text_field :available_on, value: datepicker_field_value(@product.available_on), class: 'datepicker' %>
         <% end %>
       </div>
 

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

@@ -1,7 +1,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Product) %>
     <li id="new_product_link">
-      <%= button_link_to t('spree.new_product'), new_object_url, { id: 'admin_new_product' } %>
+      <%= link_to t('spree.new_product'), new_object_url, id: 'admin_new_product', class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to t('spree.new_product'), new_object_url %>
+    <%= link_to t('spree.new_product'), new_object_url, class: 'btn btn-primary' %>
   </li>
 <% end if can?(:create, Spree::Product) %>
 
@@ -42,7 +42,7 @@
         </div>
 
         <div class="actions filter-actions" data-hook="admin_products_index_search_buttons">
-          <%= button t('spree.search') %>
+          <%= button_tag t('spree.search'), class: 'btn btn-primary' %>
         </div>
     <% end %>
   </div>

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

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/shared/error_messages', locals: { target: @promotion } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @promotion_category } %>
 
 <div class='row'>
   <div class='col-4'>

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

@@ -5,36 +5,44 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::PromotionCategory) %>
     <li>
-      <%= button_link_to t('spree.new_promotion_category'), spree.new_admin_promotion_category_path %>
+      <%= link_to t('spree.new_promotion_category'), spree.new_admin_promotion_category_path, class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>
 
-<table>
-  <colgroup>
-    <col style="width: 40%">
-    <col style="width: 40%">
-    <col style="width: 20%">
-  </colgroup>
-  <thead>
-    <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
-    <th><%= Spree::PromotionCategory.human_attribute_name :code %></th>
-    <th class='actions'></th>
-  </thead>
-  <tbody>
-    <% @promotion_categories.each do |promotion_category| %>
-      <tr>
-        <td><%= promotion_category.name %></td>
-        <td><%= promotion_category.code%></td>
-        <td class="actions">
-          <% if can?(:update, promotion_category) %>
-            <%= link_to_edit promotion_category, no_text: true %>
-          <% end %>
-          <% if can?(:destroy, promotion_category) %>
-            <%= link_to_delete promotion_category, no_text: true %>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<% if @promotion_categories.any? %>
+  <table class="index">
+    <colgroup>
+      <col style="width: 40%">
+      <col style="width: 40%">
+      <col style="width: 20%">
+    </colgroup>
+    <thead>
+      <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
+      <th><%= Spree::PromotionCategory.human_attribute_name :code %></th>
+      <th class='actions'></th>
+    </thead>
+    <tbody>
+      <% @promotion_categories.each do |promotion_category| %>
+        <tr>
+          <td><%= promotion_category.name %></td>
+          <td><%= promotion_category.code %></td>
+          <td class="actions">
+            <% if can?(:update, promotion_category) %>
+              <%= link_to_edit promotion_category, no_text: true %>
+            <% end %>
+            <% if can?(:destroy, promotion_category) %>
+              <%= link_to_delete promotion_category, no_text: true %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+    <div class="no-objects-found">
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::PromotionCategory,
+                 new_resource_url: new_object_url %>
+  </div>
+<% end %>

data/app/views/spree/admin/promotion_code_batches/download.csv.ruby

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

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

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

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

@@ -10,6 +10,11 @@
     <%= f.text_field :base_code, class: "fullwidth" %>
   <% end %>
 
+  <%= f.field_container :join_characters do %>
+    <%= f.label :join_characters %>
+    <%= f.text_field :join_characters, class: "fullwidth" %>
+  <% end %>
+
   <%= f.field_container :number_of_codes do %>
     <%= f.label :number_of_codes %>
     <%= f.text_field :number_of_codes, class: "fullwidth" %>
@@ -19,5 +24,5 @@
     <%= f.label :email %>
     <%= f.text_field :email, class: "fullwidth", value: spree_current_user.email %>
   <% end %>
-  <%= button t('spree.actions.create') %>
+  <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
 <% end %>