solidus_backend 2.5.2 → 2.6.0.rc1

data/app/controllers/spree/admin/reimbursement_types_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ReimbursementTypesController < ResourceController

data/app/controllers/spree/admin/reimbursements_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ReimbursementsController < ResourceController

data/app/controllers/spree/admin/reports_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ReportsController < Spree::Admin::BaseController

data/app/controllers/spree/admin/resource_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Spree::Admin::ResourceController < Spree::Admin::BaseController
   include Spree::Backend::Callbacks
 

data/app/controllers/spree/admin/return_authorizations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ReturnAuthorizationsController < ResourceController

data/app/controllers/spree/admin/return_items_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ReturnItemsController < ResourceController

data/app/controllers/spree/admin/return_reasons_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ReturnReasonsController < ResourceController

data/app/controllers/spree/admin/root_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class RootController < Spree::Admin::BaseController

data/app/controllers/spree/admin/search_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class SearchController < Spree::Admin::BaseController

data/app/controllers/spree/admin/shipping_categories_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ShippingCategoriesController < ResourceController

data/app/controllers/spree/admin/shipping_methods_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ShippingMethodsController < ResourceController

data/app/controllers/spree/admin/stock_items_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class StockItemsController < ResourceController

data/app/controllers/spree/admin/stock_locations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class StockLocationsController < ResourceController
@@ -7,7 +9,6 @@ module Spree
 
       def set_country
         @stock_location.country = Spree::Country.default
-
       rescue ActiveRecord::RecordNotFound
         flash[:error] = t('spree.stock_locations_need_a_default_country')
         redirect_to(admin_stock_locations_path) && return

data/app/controllers/spree/admin/stock_movements_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class StockMovementsController < ResourceController

data/app/controllers/spree/admin/store_credits_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class StoreCreditsController < ResourceController

data/app/controllers/spree/admin/stores_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class StoresController < Spree::Admin::ResourceController

data/app/controllers/spree/admin/style_guide_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class StyleGuideController < Spree::Admin::BaseController

data/app/controllers/spree/admin/tax_categories_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class TaxCategoriesController < ResourceController

data/app/controllers/spree/admin/tax_rates_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class TaxRatesController < ResourceController

data/app/controllers/spree/admin/taxonomies_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class TaxonomiesController < ResourceController

data/app/controllers/spree/admin/taxons_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class TaxonsController < Spree::Admin::BaseController

data/app/controllers/spree/admin/users_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class UsersController < ResourceController
@@ -72,7 +74,8 @@ module Spree
         @search = Spree::Order.includes(
           line_items: {
             variant: [:product, { option_values: :option_type }]
-          }).ransack(params[:q].merge(user_id_eq: @user.id))
+          }
+).ransack(params[:q].merge(user_id_eq: @user.id))
         @orders = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
       end
 

data/app/controllers/spree/admin/variant_property_rule_values_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class VariantPropertyRuleValuesController < ResourceController

data/app/controllers/spree/admin/variants_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class VariantsController < ResourceController

data/app/controllers/spree/admin/variants_including_master_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class VariantsIncludingMasterController < VariantsController

data/app/controllers/spree/admin/zones_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ZonesController < ResourceController

data/app/helpers/spree/admin/adjustments_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module AdjustmentsHelper

data/app/helpers/spree/admin/base_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module BaseHelper
@@ -114,12 +116,13 @@ module Spree
       end
 
       # renders hidden field and link to remove record using nested_attributes
-      def link_to_remove_fields(name, f, options = {})
+      def link_to_remove_fields(name, form, options = {})
         name = '' if options[:no_text]
         options[:class] = '' unless options[:class]
         options[:class] += 'no-text with-tip' if options[:no_text]
-        url = f.object.persisted? ? [:admin, f.object] : '#'
-        link_to_with_icon('trash', name, url, class: "spree_remove_fields #{options[:class]}", data: { action: 'remove' }, title: t('spree.actions.remove')) + f.hidden_field(:_destroy)
+        url = form.object.persisted? ? [:admin, form.object] : '#'
+        link_to_with_icon('trash', name, url, class: "spree_remove_fields #{options[:class]}", data: { action: 'remove' }, title: t('spree.actions.remove')) +
+          form.hidden_field(:_destroy)
       end
 
       def spree_dom_id(record)

data/app/helpers/spree/admin/customer_returns_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module CustomerReturnsHelper

data/app/helpers/spree/admin/navigation_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module NavigationHelper
@@ -18,9 +20,10 @@ module Spree
         end
 
         content_tag :ol, class: 'breadcrumb' do
-          safe_join admin_breadcrumbs.map { |level|
+          segments = admin_breadcrumbs.map do |level|
             content_tag(:li, level, class: "breadcrumb-item #{level == admin_breadcrumbs.last ? 'active' : ''}")
-          }
+          end
+          safe_join(segments)
         end
       end
 
@@ -125,27 +128,29 @@ module Spree
       deprecate icon: :solidus_icon, deprecator: Spree::Deprecation
 
       def button(text, icon_name = nil, button_type = 'submit', options = {})
+        Spree::Deprecation.warn "button helper is deprecated. Instead use button_tag"
         class_names = "button"
         if icon_name
           Spree::Deprecation.warn "Using icon_name arg is deprecated. Icons could not be visible in future versions.", caller
-          class_names.prepend "fa fa-#{icon_name} "
+          class_names = "fa fa-#{icon_name} #{class_names}"
         end
         button_tag(text, options.merge(type: button_type, class: class_names))
       end
 
       def button_link_to(text, url, html_options = {})
+        Spree::Deprecation.warn "Passing button_link_to is deprecated. Use either link_to or button_to instead.", caller
         html_options = { class: '' }.merge(html_options)
         if html_options[:method] &&
-           html_options[:method].to_s.downcase != 'get' &&
+           !html_options[:method].to_s.casecmp('get').zero? &&
            !html_options[:remote]
           form_tag(url, method: html_options.delete(:method)) do
-            button(text, html_options.delete(:icon), nil, html_options)
+            html_options.delete(:icon)
+            button_tag(text, html_options)
           end
         else
           html_options[:class] += ' button'
 
           if html_options[:icon]
-            Spree::Deprecation.warn "Using :icon option is deprecated. Icons could not be visible in future versions.", caller
             html_options[:class] += " fa fa-#{html_options[:icon]}"
           end
           link_to(text, url, html_options)
@@ -181,7 +186,6 @@ module Spree
           link_to(link_text, url)
         end
       end
-
     end
   end
 end

data/app/helpers/spree/admin/orders_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module OrdersHelper
@@ -6,9 +8,9 @@ module Spree
         links = []
         @order_events.sort.each do |event|
           next unless @order.send("can_#{event}?")
-          links << button_link_to(t(event, scope: 'spree'), [event, :admin, @order],
-                                  method: :put,
-                                  data: { confirm: t('spree.order_sure_want_to', event: t(event, scope: 'spree')) })
+          links << button_to(t(event, scope: 'spree'), [event, :admin, @order],
+                             method: :put,
+                             data: { confirm: t('spree.order_sure_want_to', event: t(event, scope: 'spree')) })
         end
         safe_join(links, '&nbsp;'.html_safe)
       end

data/app/helpers/spree/admin/payments_helper.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module PaymentsHelper
       def payment_method_name(payment)
-        # HACK: to allow us to retrieve the name of a "deleted" payment method
-        id = payment.payment_method_id
-        Spree::PaymentMethod.find_with_destroyed(id).name
+        Spree::Deprecation.warn "payment_method_name(payment) is deprecated. Instead use payment.payment_method.name"
+        payment.payment_method.name
       end
     end
   end

data/app/helpers/spree/admin/products_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module ProductsHelper

data/app/helpers/spree/admin/reimbursement_type_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module ReimbursementTypeHelper

data/app/helpers/spree/admin/stock_locations_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module StockLocationsHelper

data/app/helpers/spree/admin/stock_movements_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module StockMovementsHelper

data/app/helpers/spree/admin/store_credit_events_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree::Admin::StoreCreditEventsHelper
   mattr_accessor :originator_links
   self.originator_links = {

data/app/helpers/spree/promotion_rules_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module PromotionRulesHelper
     def options_for_promotion_rule_types(promotion)

data/app/models/spree/backend_configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class BackendConfiguration < Preferences::Configuration
     preference :locale, :string, default: Rails.application.config.i18n.default_locale

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

@@ -7,7 +7,7 @@
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <li>
-      <%= button_link_to t('spree.new_adjustment_reason'), new_object_url, { id: 'admin_new_named_type' } %>
+      <%= link_to t('spree.new_adjustment_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
     </li>
   </ul>
 <% end %>

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

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

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

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <% if can? :create, Spree::Adjustment %>
     <li>
-      <%= button_link_to t('spree.new_adjustment'), new_admin_order_adjustment_url(@order) %>
+      <%= link_to t('spree.new_adjustment'), new_admin_order_adjustment_url(@order), class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>
@@ -15,7 +15,7 @@
 <% if @order.can_add_coupon? %>
   <div data-hook="adjustments_new_coupon_code">
     <%= text_field_tag "coupon_code", "", placeholder: t('spree.coupon_code') %>
-    <%= button t('spree.add_coupon_code'), nil, 'submit', id: "add_coupon_code" %>
+    <%= button_tag t('spree.add_coupon_code'), id: "add_coupon_code", class: 'btn btn-primary' %>
   </div>
 <% end %>
 <%= javascript_tag do -%>

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

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

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

@@ -3,7 +3,7 @@
 <% content_for :page_actions do %>
   <% if can? :create, Spree::CustomerReturn %>
     <li>
-      <%= button_link_to t('spree.new_customer_return'), spree.new_admin_order_customer_return_path(@order) %>
+      <%= link_to t('spree.new_customer_return'), spree.new_admin_order_customer_return_path(@order), class: 'btn btn-primary' %>
     </li>
   <% end %>
 <% end %>