spree_frontend 3.7.13 → 4.0.0.beta

data/app/controllers/concerns/spree/checkout/address_book.rb

@@ -0,0 +1,53 @@
+# https://github.com/spree-contrib/spree_address_book/blob/master/app/controllers/spree/checkout_controller_decorator.rb
+module Spree
+  module Checkout
+    module AddressBook
+      extend ActiveSupport::Concern
+
+      included do
+        after_action :normalize_addresses, only: :update
+        before_action :set_addresses, only: :update
+      end
+
+      protected
+
+      def set_addresses
+        return unless params[:order] && params[:state] == 'address'
+
+        if params[:order][:ship_address_id].to_i > 0
+          params[:order].delete(:ship_address_attributes)
+
+          Spree::Address.find(params[:order][:ship_address_id]).user_id != try_spree_current_user&.id && raise('Frontend address forging')
+        else
+          params[:order].delete(:ship_address_id)
+        end
+
+        if params[:order][:bill_address_id].to_i > 0
+          params[:order].delete(:bill_address_attributes)
+
+          Spree::Address.find(params[:order][:bill_address_id]).user_id != try_spree_current_user&.id && raise('Frontend address forging')
+        else
+          params[:order].delete(:bill_address_id)
+        end
+      end
+
+      def normalize_addresses
+        return unless params[:state] == 'address' && @order.bill_address_id && @order.ship_address_id
+
+        # ensure that there is no validation errors and addresses were saved
+        return unless @order.bill_address && @order.ship_address
+
+        bill_address = @order.bill_address
+        ship_address = @order.ship_address
+        if @order.bill_address_id != @order.ship_address_id && bill_address == ship_address
+          @order.update_column(:bill_address_id, ship_address.id)
+          bill_address.destroy
+        else
+          bill_address.update_attribute(:user_id, try_spree_current_user&.id)
+        end
+
+        ship_address.update_attribute(:user_id, try_spree_current_user&.id)
+      end
+    end
+  end
+end

data/app/controllers/spree/addresses_controller.rb

@@ -0,0 +1,72 @@
+# https://github.com/spree-contrib/spree_address_book/blob/master/app/controllers/spree/addresses_controller.rb
+module Spree
+  class AddressesController < Spree::StoreController
+    helper Spree::AddressesHelper
+    load_and_authorize_resource class: Spree::Address
+
+    def index
+      @addresses = spree_current_user.addresses
+    end
+
+    def create
+      @address = spree_current_user.addresses.build(address_params)
+      if @address.save
+        flash[:notice] = Spree.t(:successfully_created, scope: :address_book)
+        redirect_to :index
+      else
+        render :new
+      end
+    end
+
+    def edit
+      session['spree_user_return_to'] = request.env['HTTP_REFERER']
+    end
+
+    def new
+      @address = Spree::Address.default
+    end
+
+    def update
+      if @address.editable?
+        if @address.update_attributes(address_params)
+          flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)
+          redirect_back_or_default(addresses_path)
+        else
+          render :edit
+        end
+      else
+        new_address = @address.clone
+        new_address.attributes = address_params
+        @address.update_attribute(:deleted_at, Time.current)
+        if new_address.save
+          flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)
+          redirect_back_or_default(addresses_path)
+        else
+          render :edit
+        end
+      end
+    end
+
+    def destroy
+      @address.destroy
+
+      flash[:notice] = Spree.t(:successfully_removed, scope: :address_book)
+      redirect_to(request.env['HTTP_REFERER'] || addresses_path) unless request.xhr?
+    end
+
+    private
+
+    def address_params
+      params[:address].permit(:address,
+                              :firstname,
+                              :lastname,
+                              :address1,
+                              :address2,
+                              :city,
+                              :state_id,
+                              :zipcode,
+                              :country_id,
+                              :phone)
+    end
+  end
+end

data/app/controllers/spree/checkout_controller.rb

@@ -4,6 +4,8 @@ module Spree
   # checkout which has nothing to do with updating an order that this approach
   # is waranted.
   class CheckoutController < Spree::StoreController
+    include Spree::Checkout::AddressBook
+
     before_action :set_cache_header, only: [:edit]
     before_action :load_order_with_lock
     before_action :ensure_valid_state_lock_version, only: [:update]

data/app/controllers/spree/orders_controller.rb

@@ -6,7 +6,6 @@ module Spree
     respond_to :html
 
     before_action :assign_order_with_lock, only: :update
-    skip_before_action :verify_authenticity_token, only: [:populate]
 
     def show
       @order = Order.includes(line_items: [variant: [:option_values, :images, :product]], bill_address: :state, ship_address: :state).find_by!(number: params[:id])
@@ -38,60 +37,6 @@ module Spree
       associate_user
     end
 
-    # Adds a new item to the order (creating a new order if none already exists)
-    def populate
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-        OrdersController#populate is deprecated and will be removed in Spree 4.0.
-        Please use `/api/v2/storefront/cart/add_item` endpoint instead.
-        See documentation: https://github.com/spree/spree/blob/master/api/docs/v2/storefront/index.yaml#L42
-      DEPRECATION
-
-      order    = current_order(create_order_if_necessary: true)
-      variant  = Spree::Variant.find(params[:variant_id])
-      quantity = params[:quantity].to_i
-      options  = params[:options] || {}
-
-      # 2,147,483,647 is crazy. See issue #2695.
-      if quantity.between?(1, 2_147_483_647)
-        begin
-          result = cart_add_item_service.call(order: order,
-                                              variant: variant,
-                                              quantity: quantity,
-                                              options: options)
-          if result.failure?
-            error = result.value.errors.full_messages.join(', ')
-          else
-            order.update_line_item_prices!
-            order.create_tax_charge!
-            order.update_with_updater!
-          end
-        rescue ActiveRecord::RecordInvalid => e
-          error = e.record.errors.full_messages.join(', ')
-        end
-      else
-        error = Spree.t(:please_enter_reasonable_quantity)
-      end
-
-      if error
-        flash[:error] = error
-        redirect_back_or_default(spree.root_path)
-      else
-        respond_with(order) do |format|
-          format.html { redirect_to(cart_path(variant_id: variant.id)) }
-        end
-      end
-    end
-
-    def populate_redirect
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-        OrdersController#populate is deprecated and will be removed in Spree 4.0.
-        Please use `/api/v2/storefront/cart/add_item` endpoint instead.
-        See documentation: https://github.com/spree/spree/blob/master/api/docs/v2/storefront/index.yaml#L42
-      DEPRECATION
-      flash[:error] = Spree.t(:populate_get_error)
-      redirect_to cart_path
-    end
-
     def empty
       current_order.try(:empty!)
 

data/app/controllers/spree/products_controller.rb

@@ -11,7 +11,7 @@ module Spree
       @searcher = build_searcher(params.merge(include_images: true))
       @products = @searcher.retrieve_products
       @products = @products.includes(:possible_promotions) if @products.respond_to?(:includes)
-      @taxonomies = Spree::Taxonomy.includes(root: :children)
+      @taxonomies = load_taxonomies
     end
 
     def show
@@ -58,5 +58,9 @@ module Spree
         redirect_to url_for(params), status: :moved_permanently
       end
     end
+
+    def load_taxonomies
+      Spree::Taxonomy.includes(root: :children)
+    end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -3,7 +3,7 @@ module Spree
     include Spree::Core::ControllerHelpers::Order
 
     skip_before_action :set_current_order, only: :cart_link
-    skip_before_action :verify_authenticity_token, only: :ensure_cart, raise: false
+    skip_before_action :verify_authenticity_token, only: :ensure_cart
 
     def forbidden
       render 'spree/shared/forbidden', layout: Spree::Config[:layout], status: 403

data/app/helpers/spree/addresses_helper.rb

@@ -0,0 +1,36 @@
+# https://github.com/spree-contrib/spree_address_book/blob/master/app/helpers/spree/addresses_helper.rb
+module Spree
+  module AddressesHelper
+    def address_field(form, method, address_id = 'b', &handler)
+      content_tag :div, id: [address_id, method].join, class: 'form-group' do
+        if handler
+          yield
+        else
+          is_required = Spree::Address.required_fields.include?(method)
+          separator = is_required ? '<span class="required">*</span><br />' : '<br />'
+          form.label(method) + separator.html_safe +
+            form.text_field(method, class: [is_required ? 'required' : nil, 'form-control'].compact, required: is_required)
+        end
+      end
+    end
+
+    def address_state(form, country, _address_id = 'b')
+      country ||= Spree::Country.find(Spree::Config[:default_country_id])
+      have_states = country.states.any?
+      state_elements = [
+        form.collection_select(:state_id, country.states.order(:name),
+                              :id, :name,
+                              { include_blank: true },
+                               class: have_states ? 'form-control' : 'hidden',
+                               disabled: !have_states) +
+          form.text_field(:state_name,
+                          class: !have_states ? 'form-control' : 'hidden',
+                          disabled: have_states)
+      ].join.tr('"', "'").delete("\n")
+
+      form.label(:state, Spree.t(:state)) + '<span class="req">*</span><br />'.html_safe +
+        content_tag(:noscript, form.text_field(:state_name, class: 'required form-control')) +
+        javascript_tag("document.write(\"#{state_elements.html_safe}\");")
+    end
+  end
+end

data/app/helpers/spree/frontend_helper.rb

@@ -5,20 +5,20 @@ module Spree
       @body_class
     end
 
-    def spree_breadcrumbs(taxon, separator = ' ')
+    def spree_breadcrumbs(taxon, separator = '')
       return '' if current_page?('/') || taxon.nil?
 
       separator = raw(separator)
-      crumbs = [content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:home), itemprop: 'name'), spree.root_path, itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')]
+      crumbs = [content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:home), itemprop: 'name'), spree.root_path, itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement', class: 'breadcrumb-item')]
       if taxon
-        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:products), itemprop: 'name'), spree.products_path, itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')
-        crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, content_tag(:span, link_to(content_tag(:span, ancestor.name, itemprop: 'name'), seo_url(ancestor), itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement') } unless taxon.ancestors.empty?
-        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, taxon.name, itemprop: 'name'), seo_url(taxon), itemprop: 'url'), itemprop: 'item'), class: 'active', itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')
+        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:products), itemprop: 'name'), spree.products_path, itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement', class: 'breadcrumb-item')
+        crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, content_tag(:span, link_to(content_tag(:span, ancestor.name, itemprop: 'name'), seo_url(ancestor), itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement', class: 'breadcrumb-item') } unless taxon.ancestors.empty?
+        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, taxon.name, itemprop: 'name'), seo_url(taxon), itemprop: 'url'), itemprop: 'item'), class: 'active breadcrumb-item', itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')
       else
         crumbs << content_tag(:li, content_tag(:span, Spree.t(:products), itemprop: 'item'), class: 'active', itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')
       end
       crumb_list = content_tag(:ol, raw(crumbs.flatten.map(&:mb_chars).join), class: 'breadcrumb', itemscope: 'itemscope', itemtype: 'https://schema.org/BreadcrumbList')
-      content_tag(:nav, crumb_list, id: 'breadcrumbs', class: 'col-md-12')
+      content_tag(:nav, crumb_list, id: 'breadcrumbs', class: 'col-12 mt-4', aria: { label: 'breadcrumb' })
     end
 
     def checkout_progress(numbers: false)
@@ -27,13 +27,13 @@ module Spree
         text = Spree.t("order_state.#{state}").titleize
         text.prepend("#{i.succ}. ") if numbers
 
-        css_classes = []
+        css_classes = ['nav-item']
         current_index = states.index(@order.state)
         state_index = states.index(state)
 
         if state_index < current_index
           css_classes << 'completed'
-          text = link_to text, checkout_state_path(state)
+          text = link_to text, checkout_state_path(state), class: 'nav-link'
         end
 
         css_classes << 'next' if state_index == current_index + 1
@@ -45,10 +45,10 @@ module Spree
         if state_index < current_index
           content_tag('li', text, class: css_classes.join(' '))
         else
-          content_tag('li', content_tag('a', text), class: css_classes.join(' '))
+          content_tag('li', content_tag('a', text, class: "nav-link #{'active text-white' if state == @order.state}"), class: css_classes.join(' '))
         end
       end
-      content_tag('ul', raw(items.join("\n")), class: 'progress-steps nav nav-pills nav-justified', id: "checkout-step-#{@order.state}")
+      content_tag('ul', raw(items.join("\n")), class: 'progress-steps nav nav-pills nav-justified flex-column flex-md-row', id: "checkout-step-#{@order.state}")
     end
 
     def flash_messages(opts = {})
@@ -68,11 +68,12 @@ module Spree
         text = "<span class='glyphicon glyphicon-shopping-cart'></span> #{text}: (#{Spree.t('empty')})"
         css_class = 'empty'
       else
-        text = "<span class='glyphicon glyphicon-shopping-cart'></span> #{text}: (#{simple_current_order.item_count})  <span class='amount'>#{simple_current_order.display_total.to_html}</span>"
+        text = "<span class='glyphicon glyphicon-shopping-cart'></span> #{text}: (#{simple_current_order.item_count})
+                <span class='amount'>#{simple_current_order.display_total.to_html}</span>"
         css_class = 'full'
       end
 
-      link_to text.html_safe, spree.cart_path, class: "cart-info #{css_class}"
+      link_to text.html_safe, spree.cart_path, class: "cart-info nav-link #{css_class}"
     end
 
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
@@ -80,15 +81,15 @@ module Spree
 
       content_tag :div, class: 'list-group' do
         taxons = root_taxon.children.map do |taxon|
-          css_class = current_taxon&.self_and_ancestors&.include?(taxon) ? 'list-group-item active' : 'list-group-item'
+          css_class = current_taxon&.self_and_ancestors&.include?(taxon) ? 'list-group-item list-group-item-action active' : 'list-group-item list-group-item-action'
           link_to(taxon.name, seo_url(taxon), class: css_class) + taxons_tree(taxon, current_taxon, max_level - 1)
         end
         safe_join(taxons, "\n")
       end
     end
 
-    def set_image_alt(image, size)
-      image.alt.present? ? image.alt : image_alt(main_app.url_for(image.url(size)))
+    def set_image_alt(image)
+      return image.alt if image.alt.present?
     end
   end
 end

data/app/views/kaminari/{twitter-bootstrap-3 → twitter-bootstrap-4}/_first_page.html.erb

@@ -7,7 +7,7 @@
     remote:        data-remote
 -%>
 <% unless current_page.first? %>
-  <li class="first">
-    <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote %>
+  <li class="first page-item">
+    <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote, class: 'page-link' %>
   </li>
 <% end %>

data/app/views/kaminari/{twitter-bootstrap-3 → twitter-bootstrap-4}/_gap.html.erb

@@ -5,4 +5,8 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="page gap disabled"><a href="#" onclick="return false;"><%= raw(t 'views.pagination.truncate') %></a></li>
+<li class="page gap disabled page-item">
+  <a href="#" onclick="return false;" class="page-link">
+    <%= raw(t 'views.pagination.truncate') %>
+  </a>
+</li>

data/app/views/kaminari/{twitter-bootstrap-3 → twitter-bootstrap-4}/_last_page.html.erb

@@ -7,7 +7,7 @@
     remote:        data-remote
 -%>
 <% unless current_page.last? %>
-  <li class="last next"><%# "next" class present for border styling in twitter bootstrap %>
-    <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {remote: remote} %>
+  <li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
+    <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, remote: remote, class: 'page-link' %>
   </li>
 <% end %>

data/app/views/kaminari/{twitter-bootstrap-3 → twitter-bootstrap-4}/_next_page.html.erb

@@ -7,7 +7,7 @@
     remote:        data-remote
 -%>
 <% unless current_page.last? %>
-  <li class="next_page">
-    <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote %>
+  <li class="next_page page-item">
+    <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: 'page-link' %>
   </li>
 <% end %>

data/app/views/kaminari/{twitter-bootstrap-3 → twitter-bootstrap-4}/_page.html.erb

@@ -7,6 +7,12 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="page<%= ' active' if page.current? %>">
-  <%= link_to page, url, opts = {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+<li class="page<%= ' active' if page.current? %> page-item">
+  <%= link_to page,
+    url,
+    opts = {
+      remote: remote,
+      rel: page.next? ? 'next' : page.prev? ? 'prev' : nil,
+      class: 'page-link'
+    } %>
 </li>

data/app/views/kaminari/{twitter-bootstrap-3 → twitter-bootstrap-4}/_paginator.html.erb

@@ -9,7 +9,7 @@
 <% pagination_class ||= '' %>
 
 <%= paginator.render do %>
-  <ul class="pagination <%= pagination_class %>">
+  <ul class="pagination mt-4 <%= pagination_class %>">
     <%= first_page_tag unless current_page.first? %>
     <%= prev_page_tag unless current_page.first? %>
     <% each_page do |page| %>

data/app/views/kaminari/{twitter-bootstrap-3 → twitter-bootstrap-4}/_prev_page.html.erb

@@ -7,7 +7,7 @@
     remote:        data-remote
 -%>
 <% unless current_page.first? %>
-  <li class="prev">
-    <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote %>
+  <li class="prev page-item">
+    <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: 'page-link' %>
   </li>
 <% end %>

data/app/views/spree/address/_form.html.erb

@@ -1,51 +1,52 @@
 <% address_id = address_type.chars.first %>
 
 <div class="inner" data-hook=<%="#{address_type}_inner" %>>
-  <p class="form-group" id=<%="#{address_id}firstname" %>>
+  <div class="form-group" id=<%="#{address_id}firstname" %>>
     <%= form.label :firstname do %>
       <%= Spree.t(:first_name) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :firstname, class: 'form-control', required: true %>
-  </p>
-  <p class="form-group" id=<%="#{address_id}lastname" %>>
+  </div>
+  <div class="form-group" id=<%="#{address_id}lastname" %>>
     <%= form.label :lastname do %>
       <%= Spree.t(:last_name) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :lastname, class: 'form-control', required: true %>
-  </p>
+  </div>
   <% if Spree::Config[:company] %>
-    <p class="form-group" id=<%="#{address_id}company" %>>
+    <div class="form-group" id=<%="#{address_id}company" %>>
       <%= form.label :company, Spree.t(:company) %>
       <%= form.text_field :company, class: 'form-control' %>
-    </p>
+    </div>
   <% end %>
-  <p class="form-group" id=<%="#{address_id}address1" %>>
+  <div class="form-group" id=<%="#{address_id}address1" %>>
     <%= form.label :address1 do %>
       <%= Spree.t(:street_address) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :address1, class: 'form-control required' %>
-  </p>
-  <p class="form-group" id=<%="#{address_id}address2" %>>
+  </div>
+  <div class="form-group" id=<%="#{address_id}address2" %>>
     <%= form.label :address2, Spree.t(:street_address_2) %>
     <%= form.text_field :address2, class: 'form-control' %>
-  </p>
-  <p class="form-group" id=<%="#{address_id}city" %>>
+  </div>
+  <div class="form-group" id=<%="#{address_id}city" %>>
     <%= form.label :city do %>
       <%= Spree.t(:city) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :city, class: 'form-control', required: true %>
-  </p>
-  <p class="form-group" id=<%="#{address_id}country" %>>
+  </div>
+
+  <div class="form-group" id=<%="#{address_id}country" %>>
     <%= form.label :country_id do %>
       <%= Spree.t(:country) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <span id=<%="#{address_id}country-selection" %>>
       <%= form.collection_select :country_id, available_countries, :id, :name, {}, { class: 'form-control', required: true } %>
     </span>
-  </p>
+  </div>
 
   <% if Spree::Config[:address_requires_state] %>
-    <p class="form-group" id=<%="#{address_id}state" %>>
+    <div class="form-group" id=<%="#{address_id}state" %>>
       <% have_states = !address.country.states.empty? %>
       <%= form.label :state do %>
         <%= Spree.t(:state) %><abbr class='required' title="required" id=<%="#{address_id}state-required"%>>*</abbr>
@@ -55,37 +56,39 @@
          form.collection_select(:state_id, address.country.states,
                             :id, :name,
                             {include_blank: true},
-                            {class: have_states ? 'form-control' : 'form-control hidden',
+                            {class: have_states ? 'form-control' : 'hidden',
                             required: have_states,
                             disabled: !have_states}) +
          form.text_field(:state_name,
-                            class: !have_states ? 'form-control' : 'form-control hidden',
+                            class: !have_states ? 'form-control' : 'hidden',
                             required: !have_states,
                             disabled: have_states)
          ].join.gsub('"', "'").gsub("\n", "")
       %>
-    </p>
+    </div>
       <noscript>
         <%= form.text_field :state_name, class: 'form-control', required: true %>
       </noscript>
   <% end %>
 
-  <p class="form-group" id=<%="#{address_id}zipcode" %>>
+  <div class="form-group" id=<%="#{address_id}zipcode" %>>
     <%= form.label :zipcode do %>
       <%= Spree.t(:zip) %><% if address.require_zipcode? %><abbr class="required" title="required">*</abbr><% end %>
     <% end %>
     <%= form.text_field :zipcode, class: 'form-control', required: address.require_zipcode? %>
-  </p>
-  <p class="form-group" id=<%="#{address_id}phone" %>>
+  </div>
+
+
+  <div class="form-group" id=<%="#{address_id}phone" %>>
     <%= form.label :phone do %>
       <%= Spree.t(:phone) %><% if address.require_phone? %><abbr class="required" title="required">*</abbr><% end %>
     <% end %>
     <%= form.phone_field :phone, class: 'form-control', required: address.require_phone? %>
-  </p>
+  </div>
   <% if Spree::Config[:alternative_shipping_phone] %>
-    <p class="form-group" id=<%="#{address_id}altphone" %>>
+    <div class="form-group" id=<%="#{address_id}altphone" %>>
       <%= form.label :alternative_phone, Spree.t(:alternative_phone) %>
       <%= form.phone_field :alternative_phone, class: 'form-control' %>
-    </p>
+    </div>
   <% end %>
 </div>