spree_backend 3.2.9 → 3.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e296c87d77b2d45d2cf919aba665ec7fe0b2a36
-  data.tar.gz: 13874762b73257402229a4d83bdd5c2025374514
+  metadata.gz: 43eb9d10aad328c6c7d69260f137280e3739c869
+  data.tar.gz: 2c4ddb4edbaebfc4972b3bd264db35ed0867858e
 SHA512:
-  metadata.gz: 78787a7c315d20d3af652c496a9a36482f218299a212fba853b8fa94d51e52c63974b495fa1e975392cd30c8c328f727dd814f88c99c5b8bac42f7f981e26b7b
-  data.tar.gz: 684ae3dc78c492629f7b576b0aba88dbb665c6eb6f1fe6445939a04ddd825f9393d1710f0eaf9e5b2b587c9c2fa601ad4f8aaa88f0b234a6aa1c81c2f587686e
+  metadata.gz: f2665aa69f0f9225880a43233890c36b530429a9e692b4ce7080698db87856a68d9eb95dce77fb535825145207aa8f81376bc55dfd57d3ce28775fa5e2fcd814
+  data.tar.gz: c7458d63d7a180a1a5295b104545c33bcc4cad2fb438088453ecd9c8191b27ce382011e5dff9765c9d57ad6b0d461559ce329d83de17fb3a651f23d215a565c9

data/app/assets/javascripts/spree/backend/admin.js

@@ -28,24 +28,25 @@ jQuery(function($) {
 
   // Sidebar nav toggle functionality
   var sidebar_toggle = $('#sidebar-toggle');
-
-  sidebar_toggle.on('click', function(){
+  sidebar_toggle.on('click', function() {
     var wrapper = $('#wrapper');
     var main    = $('#main-part');
+    var sidebar = $('#main-sidebar');
 
-    if(wrapper.hasClass('sidebar-minimized')){
-      wrapper.removeClass('sidebar-minimized');
-      main
-        .removeClass('col-sm-12 col-md-12 sidebar-collapsed')
-        .addClass('col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2');
-      $.cookie('sidebar-minimized', 'false', { path: '/admin' });
-    }
-    else {
-      wrapper.addClass('sidebar-minimized');
-      main
-        .removeClass('col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2')
-        .addClass('col-sm-12 col-md-12 sidebar-collapsed');
+    // these should match `spree/backend/app/helpers/spree/admin/navigation_helper.rb#main_part_classes`
+    var mainWrapperCollapsedClasses = 'col-xs-12 sidebar-collapsed';
+    var mainWrapperExpandedClasses = 'col-xs-9 col-xs-offset-3 col-md-10 col-md-offset-2';
+
+    wrapper.toggleClass('sidebar-minimized');
+    sidebar.toggleClass('hidden-xs');
+    main
+      .toggleClass(mainWrapperCollapsedClasses)
+      .toggleClass(mainWrapperExpandedClasses);
+
+    if (wrapper.hasClass('sidebar-minimized')) {
       $.cookie('sidebar-minimized', 'true', { path: '/admin' });
+    } else {
+      $.cookie('sidebar-minimized', 'false', { path: '/admin' });
     }
   });
 
@@ -336,7 +337,7 @@ $(document).ready(function(){
             reg = /spree_(\w+_?)+_(\d+)/;
             parts = reg.exec($(obj).prop('id'));
             if (parts) {
-              positions['positions['+parts[2]+']'] = position;
+              positions['positions['+parts[2]+']'] = position+1;
             }
           });
           $.ajax({

data/app/assets/javascripts/spree/backend/checkouts/edit.js

@@ -1,4 +1,14 @@
 //= require_self
+
+var clear_address_fields = function() {
+  var fields = ['firstname', 'lastname', 'company', 'address1', 'address2',
+            'city', 'zipcode', 'state_id', 'country_id', 'phone'];
+  $.each(fields, function(i, field) {
+    $('#order_bill_address_attributes_' + field).val('');
+    $('#order_ship_address_attributes_' + field).val('');
+  });
+};
+
 $(document).ready(function() {
   if ($('#customer_autocomplete_template').length > 0) {
     window.customerTemplate = Handlebars.compile($('#customer_autocomplete_template').text());
@@ -12,8 +22,8 @@ $(document).ready(function() {
     })
   }
 
-  if ($("#customer_search").length > 0) {
-    $("#customer_search").select2({
+  if ($('#customer_search').length > 0) {
+    $('#customer_search').select2({
       placeholder: Spree.translations.choose_a_customer,
       ajax: {
         url: Spree.routes.users_api,
@@ -21,14 +31,7 @@ $(document).ready(function() {
         cache: true,
         data: function(term, page) {
           return {
-            q: {
-              'm': 'or',
-              'email_start': term,
-              'ship_address_firstname_start': term,
-              'ship_address_lastname_start': term,
-              'bill_address_firstname_start': term,
-              'bill_address_lastname_start': term
-            },
+            q: term,
             token: Spree.api_key
           }
         },
@@ -40,10 +43,10 @@ $(document).ready(function() {
       formatResult: formatCustomerResult,
       formatSelection: function (customer) {
         $('#order_email').val(customer.email);
-        $('#user_id').val(customer.id);
-        $('#guest_checkout_true').prop("checked", false);
-        $('#guest_checkout_false').prop("checked", true);
-        $('#guest_checkout_false').prop("disabled", false);
+        $('#order_user_id').val(customer.id);
+        $('#guest_checkout_true').prop('checked', false);
+        $('#guest_checkout_false').prop('checked', true);
+        $('#guest_checkout_false').prop('disabled', false);
 
         var billAddress = customer.bill_address;
         if(billAddress) {
@@ -55,11 +58,13 @@ $(document).ready(function() {
           $('#order_bill_address_attributes_zipcode').val(billAddress.zipcode);
           $('#order_bill_address_attributes_phone').val(billAddress.phone);
 
-          $('#order_bill_address_attributes_country_id').select2("val", billAddress.country_id).promise().done(function () {
+          $('#order_bill_address_attributes_country_id').select2('val', billAddress.country_id).promise().done(function () {
             update_state('b', function () {
-              $('#order_bill_address_attributes_state_id').select2("val", billAddress.state_id);
+              $('#order_bill_address_attributes_state_id').select2('val', billAddress.state_id);
             });
           });
+        } else {
+          clear_address_fields();
         }
         return Select2.util.escapeMarkup(customer.email);
       }
@@ -83,15 +88,9 @@ $(document).ready(function() {
   order_use_billing();
 
   $('#guest_checkout_true').change(function() {
-    $('#customer_search').val("");
-    $('#user_id').val("");
-    $('#checkout_email').val("");
-
-    var fields = ["firstname", "lastname", "company", "address1", "address2",
-              "city", "zipcode", "state_id", "country_id", "phone"]
-    $.each(fields, function(i, field) {
-      $('#order_bill_address_attributes' + field).val("");
-      $('#order_ship_address_attributes' + field).val("");
-    })
+    $('#customer_search').val('');
+    $('#order_user_id').val('');
+    $('#order_email').val('');
+    clear_address_fields();
   });
 });

data/app/assets/javascripts/spree/backend/general_settings.js.coffee

@@ -1,15 +1,13 @@
 $(@).ready( ->
   $('[data-hook=general_settings_clear_cache] #clear_cache').click ->
-    response = confirm(Spree.translations.are_you_sure)
-    if response
-      $.ajax
-        type: 'POST'
-        url: Spree.routes.clear_cache
-        success: ->
-          show_flash 'success', "Cache was flushed."
-        error: (msg) ->
-          if msg.responseJSON["error"]
-            show_flash 'error', msg.responseJSON["error"]
-          else
-            show_flash 'error', "There was a problem while flushing cache."
+    $.ajax
+      type: 'POST'
+      url: Spree.routes.clear_cache
+      success: ->
+        show_flash 'success', "Cache was flushed."
+      error: (msg) ->
+        if msg.responseJSON["error"]
+          show_flash 'error', msg.responseJSON["error"]
+        else
+          show_flash 'error', "There was a problem while flushing cache."
 )

data/app/assets/javascripts/spree/backend/payments/edit.js.coffee

@@ -2,10 +2,11 @@ jQuery ($) ->
   # Payment model
   order_id = $('#payments').data('order-id')
   class Payment
-    constructor: (id) ->
-      @url  = Spree.url("#{Spree.routes.payments_api(order_id)}/#{id}.json" + '?token=' + Spree.api_key)
+    constructor: (number) ->
+      @url  = Spree.url("#{Spree.routes.payments_api(order_id)}/#{number}.json" + '?token=' + Spree.api_key)
       @json = $.getJSON @url.toString(), (data) =>
         @data = data
+      @updating = false
 
     if_editable: (callback) ->
       @json.done (data) ->
@@ -128,9 +129,6 @@ jQuery ($) ->
       $('<input />')
         .prop(id: 'amount', value: amount)
         .width(width)
-        .one
-          blur: =>
-            @save()
         .css('text-align': 'right')
 
     $input: ->
@@ -143,5 +141,5 @@ jQuery ($) ->
   # Attach ShowPaymentView to each editable payment in the table
   $('.admin tr[data-hook=payments_row]').each ->
     $el = $(@)
-    payment = new Payment($el.prop('id').match(/\d+$/))
+    payment = new Payment($el.attr('data-number'))
     payment.if_editable -> new ShowPaymentView($el, payment)

data/app/assets/javascripts/spree/backend/returns/return_item_selection.js

@@ -12,7 +12,12 @@ $(document).ready(function() {
       var totalPretaxRefund = 0;
       var checkedItems = formFields.find('input.add-item:checked');
       $.each(checkedItems, function(i, checkbox) {
-        totalPretaxRefund += parseFloat($(checkbox).parents('tr').find('.refund-amount-input').val());
+        var returnItemRow  = $(checkbox).parents('tr'), returnQuantity, amount, purchasedQuantity;
+        returnQuantity = parseInt(returnItemRow.find('.refund-quantity-input').val(), 10);
+        purchasedQuantity = parseInt(returnItemRow.find('.purchased-quantity').text(), 10);
+        amount = (returnQuantity / purchasedQuantity) * parseFloat(returnItemRow.find('.charged-amount').data('chargedAmount'));
+        returnItemRow.find('.refund-amount-input').val(amount.toFixed(2));
+        totalPretaxRefund += amount;
       });
 
       var displayTotal = isNaN(totalPretaxRefund) ? '' : totalPretaxRefund.toFixed(2);
@@ -29,6 +34,7 @@ $(document).ready(function() {
 
     formFields.find('input.add-item').on('change', updateSuggestedAmount);
     formFields.find('.refund-amount-input').on('keyup', updateSuggestedAmount);
+    formFields.find('.refund-quantity-input').on('keyup', updateSuggestedAmount);
 
     formFields.find('input, select').not('.add-item').on('change', checkAddItemBox);
   }

data/app/assets/javascripts/spree/backend/stock_transfer.js.coffee

@@ -97,7 +97,10 @@ $ ->
         'variant_product_name_or_variant_sku_cont')
 
     format_variant_result: (result) ->
-      "#{result.name} - #{result.sku}"
+      if !!result.options_text
+        "#{result.name} - #{result.sku} (#{result.options_text})"
+      else
+        "#{result.name} - #{result.sku}"
 
     build_select: (url, query) ->
       $('#transfer_variant').select2

data/app/assets/javascripts/spree/backend/user_picker.js

@@ -21,7 +21,9 @@ $.fn.userAutocomplete = function () {
       datatype: 'json',
       data: function (term) {
         return {
-          q: term,
+          q: {
+            email_cont: term
+          },
           token: Spree.api_key
         };
       },

data/app/assets/javascripts/spree/backend.js

@@ -5,9 +5,9 @@
 //= require jquery.cookie
 //= require jquery.jstree/jquery.jstree
 //= require jquery_ujs
-//= require jquery-ui/datepicker
-//= require jquery-ui/sortable
-//= require jquery-ui/autocomplete
+//= require jquery-ui/widgets/datepicker
+//= require jquery-ui/widgets/sortable
+//= require jquery-ui/widgets/autocomplete
 //= require select2
 //= require underscore-min.js
 //= require velocity

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

@@ -2,6 +2,7 @@ module Spree
   module Admin
     class CountriesController < ResourceController
 
+      private
         def collection
           super.order(:name)
         end

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

@@ -11,8 +11,8 @@ module Spree
       private
 
       def find_order_and_payment
-        @order = Spree::Order.friendly.find(params[:order_id])
-        @payment = @order.payments.friendly.find(params[:payment_id])
+        @order = Spree::Order.find_by!(number: params[:order_id])
+        @payment = @order.payments.find_by!(number: params[:payment_id])
       end
     end
   end

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -22,8 +22,8 @@ module Spree
         def update
           if @order.update_attributes(order_params)
             @order.associate_user!(@user, @order.email.blank?) unless guest_checkout?
-            @order.next unless @order.complete?
-            @order.refresh_shipment_rates(Spree::ShippingMethod::DISPLAY_ON_FRONT_AND_BACK_END)
+            @order.next if @order.address?
+            @order.refresh_shipment_rates(Spree::ShippingMethod::DISPLAY_ON_BACK_END)
 
             if @order.errors.empty?
               flash[:success] = Spree.t('customer_details_updated')
@@ -40,15 +40,14 @@ module Spree
 
         def order_params
           params.require(:order).permit(
-            :email,
-            :use_billing,
+            :email, :user_id, :use_billing,
             bill_address_attributes: permitted_address_attributes,
             ship_address_attributes: permitted_address_attributes
           )
         end
 
         def load_order
-          @order = Order.includes(:adjustments).friendly.find(params[:order_id])
+          @order = Order.includes(:adjustments).find_by!(number: params[:order_id])
         end
 
         def model_class
@@ -56,7 +55,7 @@ module Spree
         end
 
         def load_user
-          @user = (Spree.user_class.find_by(id: params[:user_id]) ||
+          @user = (Spree.user_class.find_by(id: order_params[:user_id]) ||
             Spree.user_class.find_by(email: order_params[:email]))
 
           unless @user

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

@@ -34,7 +34,7 @@ module Spree
           params[:q][:completed_at_lt] = params[:q].delete(:created_at_lt)
         end
 
-        @search = Order.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
+        @search = Spree::Order.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
 
         # lazy loading other models here (via includes) may result in an invalid query
         # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
@@ -49,14 +49,14 @@ module Spree
       end
 
       def new
-        @order = Order.create(order_params)
+        @order = Spree::Order.create(order_params)
         redirect_to cart_admin_order_url(@order)
       end
 
       def edit
         can_not_transition_without_customer_info
 
-        @order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_FRONT_AND_BACK_END)
+        @order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_BACK_END)
       end
 
       def cart
@@ -130,7 +130,7 @@ module Spree
         end
 
         def load_order
-          @order = Order.includes(:adjustments).friendly.find(params[:id])
+          @order = Spree::Order.includes(:adjustments).find_by!(number: params[:id])
           authorize! action, @order
         end
 

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

@@ -24,22 +24,32 @@ module Spree
 
       def create
         invoke_callbacks(:create, :before)
-        @payment ||= @order.payments.build(object_params)
-        if @payment.payment_method.source_required? && params[:card].present? and params[:card] != 'new'
-          @payment.source = @payment.payment_method.payment_source_class.find_by_id(params[:card])
-        end
 
         begin
-          if @payment.save
+          if @payment_method.store_credit?
+            payments = @order.add_store_credit_payments
+          else
+            @payment ||= @order.payments.build(object_params)
+            if @payment.payment_method.source_required? && params[:card].present? && params[:card] != 'new'
+              @payment.source = @payment.payment_method.payment_source_class.find_by_id(params[:card])
+            end
+            @payment.save
+            payments = [@payment]
+          end
+
+          if payments && (saved_payments = payments.select &:persisted?).any?
             invoke_callbacks(:create, :after)
+
             # Transition order as far as it will go.
             while @order.next; end
             # If "@order.next" didn't trigger payment processing already (e.g. if the order was
             # already complete) then trigger it manually now
-            @payment.process! if @order.completed? && @payment.checkout?
-            flash[:success] = flash_message_for(@payment, :successfully_created)
+
+            saved_payments.each { |payment| payment.process! if payment.reload.checkout? && @order.complete? }
+            flash[:success] = flash_message_for(saved_payments.first, :successfully_created)
             redirect_to admin_order_payments_path(@order)
           else
+            @payment ||= @order.payments.build(object_params)
             invoke_callbacks(:create, :fails)
             flash[:error] = Spree.t(:payment_could_not_be_created)
             render :new
@@ -83,18 +93,19 @@ module Spree
         if @payment and @payment.payment_method
           @payment_method = @payment.payment_method
         else
-          @payment_method = @payment_methods.first
+          @payment_method = @payment_methods.find_by(id: params[:payment][:payment_method_id]) if params[:payment]
+          @payment_method ||= @payment_methods.first
         end
       end
 
       def load_order
-        @order = Order.friendly.find(params[:order_id])
+        @order = Order.find_by!(number: params[:order_id])
         authorize! action, @order
         @order
       end
 
       def load_payment
-        @payment = Payment.friendly.find(params[:id])
+        @payment = Payment.find_by!(number: params[:id])
       end
 
       def model_class

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

@@ -72,6 +72,11 @@ module Spree
         end
 
         redirect_to edit_admin_product_url(@new)
+
+      rescue ActiveRecord::RecordInvalid
+        # Handle error on uniqueness validation on product fields
+        flash[:error] = Spree.t('notice_messages.product_not_cloned')
+        redirect_to admin_products_url
       end
 
       def stock

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

@@ -5,11 +5,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
   before_action :validate_promotion_rule_type, only: :create
 
   def create
-    # Remove type key from this hash so that we don't attempt
-    # to set it when creating a new record, as this is raises
-    # an error in ActiveRecord 3.2.
-    promotion_rule_type = params[:promotion_rule].delete(:type)
-    @promotion_rule = promotion_rule_type.constantize.new(params[:promotion_rule])
+    @promotion_rule = @promotion_rule_type.new(promotion_rule_params)
     @promotion_rule.promotion = @promotion
     if @promotion_rule.save
       flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:promotion_rule))
@@ -38,8 +34,12 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
   end
 
   def validate_promotion_rule_type
-    valid_promotion_rule_types = Rails.application.config.spree.promotions.rules.map(&:to_s)
-    if !valid_promotion_rule_types.include?(params[:promotion_rule][:type])
+    requested_type = params[:promotion_rule].delete(:type)
+    promotion_rule_types = Rails.application.config.spree.promotions.rules
+    @promotion_rule_type = promotion_rule_types.detect do |klass|
+      klass.name == requested_type
+    end
+    if !@promotion_rule_type
       flash[:error] = Spree.t(:invalid_promotion_rule)
       respond_to do |format|
         format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
@@ -47,4 +47,8 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
       end
     end
   end
+
+  def promotion_rule_params
+    params[:promotion_rule].permit!
+  end
 end

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

@@ -13,7 +13,7 @@ module Spree
       end
 
       def show
-        @stock_transfer = StockTransfer.friendly.find(params[:id])
+        @stock_transfer = StockTransfer.find_by!(number: params[:id])
       end
 
       def new; end

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

@@ -4,6 +4,7 @@ module Spree
 
       before_action :load_taxonomy, only: [:create, :edit, :update]
       before_action :load_taxon, only: [:edit, :update]
+      before_action :set_permalink_part, only: [:edit, :update]
       respond_to :html, :js
 
       def index
@@ -24,45 +25,52 @@ module Spree
       end
 
       def edit
-        @permalink_part = @taxon.permalink.split("/").last
       end
 
       def update
-        parent_id = params[:taxon][:parent_id]
-        set_position
-        set_parent(parent_id)
+        successful = @taxon.transaction do
 
-        @taxon.save!
+          parent_id = params[:taxon][:parent_id]
+          set_position
+          set_parent(parent_id)
 
-        # regenerate permalink
-        regenerate_permalink if parent_id
+          @taxon.save!
 
-        set_permalink_params
+          # regenerate permalink
+          regenerate_permalink if parent_id
 
-        #check if we need to rename child taxons if parent name or permalink changes
-        @update_children = true if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
+          set_permalink_params
 
-        if @taxon.update_attributes(taxon_params)
-          flash[:success] = flash_message_for(@taxon, :successfully_updated)
-        end
+          #check if we need to rename child taxons if parent name or permalink changes
+          @update_children = true if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
 
-        #rename child taxons
-        rename_child_taxons if @update_children
+          @taxon.update_attributes(taxon_params)
 
-        respond_with(@taxon) do |format|
-          format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
-          format.json { render json: @taxon.to_json }
         end
-      end
+        if successful
+          flash[:success] = flash_message_for(@taxon, :successfully_updated)
 
-      def destroy
-        @taxon = Taxon.find(params[:id])
-        @taxon.destroy
-        respond_with(@taxon) { |format| format.json { render json: '' } }
+          #rename child taxons
+          rename_child_taxons if @update_children
+
+          respond_with(@taxon) do |format|
+            format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
+            format.json { render json: @taxon.to_json }
+          end
+        else
+          respond_with(@taxon) do |format|
+            format.html { render :edit }
+            format.json { render json: @taxon.errors.full_messages.to_sentence, status: 422 }
+          end
+        end
       end
 
       private
 
+      def set_permalink_part
+        @permalink_part = @taxon.permalink.split('/').last
+      end
+
       def taxon_params
         params.require(:taxon).permit(permitted_taxon_attributes)
       end

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

@@ -11,7 +11,7 @@ module Spree
           flash_class = "info" if flash[:notice]
           flash_class = "success" if flash[:success]
           flash_div = content_tag(:div, (close_button + message), class: "alert alert-#{flash_class} alert-auto-disappear")
-          content_tag(:div, flash_div, class: 'col-md-12')
+          content_tag(:div, flash_div, class: 'col-xs-12')
         end
       end
 

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

@@ -210,17 +210,23 @@ module Spree
 
       def main_part_classes
         if cookies['sidebar-minimized'] == 'true'
-          return 'col-sm-12 col-md-12 sidebar-collapsed'
+          'col-xs-12 sidebar-collapsed'
         else
-          return 'col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2'
+          'col-xs-9 col-xs-offset-3 col-md-10 col-md-offset-2'
         end
       end
 
-      def wrapper_classes
+      def main_sidebar_classes
         if cookies['sidebar-minimized'] == 'true'
-          return 'sidebar-minimized'
+          'col-xs-3 col-md-2 hidden-xs sidebar'
+        else
+          'col-xs-3 col-md-2 sidebar'
         end
       end
+
+      def wrapper_classes
+        'sidebar-minimized' if cookies['sidebar-minimized'] == 'true'
+      end
     end
   end
 end

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

@@ -20,10 +20,10 @@
 <% if can?(:edit, Spree::Adjustment) %>
   <div class="panel-footer">
     <div class="row text-center">
-      <div class="col-md-6">
+      <div class="col-xs-12 col-md-6">
         <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :get, class: "btn btn-success" %>
       </div>
-      <div class="col-md-6">
+      <div class="col-xs-12 col-md-6">
         <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), method: :get, class: "btn btn-danger" %>
       </div>
     </div>