solidus_backend 2.2.0.beta1 → 2.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f80d171de4d00d83aaab31e8a5bf414441b3865
-  data.tar.gz: b76fb58babd20d169eb08cd4c77ee2b4c4d1ada6
+  metadata.gz: 2969081da681633c7dce7e1676d7afcd84a2e42d
+  data.tar.gz: ef72fedc9a55167bf7049a8e0fe8e0e7a5c4df5b
 SHA512:
-  metadata.gz: ba210fac2ddf64b2a27a254fe37f58f83eaf0a250bea67000031ea992b639fa96bdb9433aca11001b98b29243444671e0a227b1bcf71d7ba926fdcdeda0fd450
-  data.tar.gz: 95ae582a3e69cdfdbe8da3c4e3ef68c0e2c3a74b3159de70a30f99737e94db51eee75e6bf43256e555c899befee32ee483bd89fabca3a1d53311e9e7faee0582
+  metadata.gz: 2349ac38e3b884ed73c1581492fa4c0419dbcbb73e386bcb7b585e8aa666a9358de0bdf7a14c5f4539b736048f85b1d531dfe4cd62b47d3c5ea23d78deea4fef
+  data.tar.gz: c8b9346af0a568d128df9af94a98d9a7606bad333aa6fb9b0028c54c5a288a15c26d20bfd76ddf8628ef8677ec56999b65947d9a2f5520ea15b262c3272613ce

data/app/assets/stylesheets/spree/backend/components/_sidebar.scss

@@ -1,13 +1,13 @@
 body:not(.new-layout) #sidebar {
   overflow: visible;
-  border-top: 1px solid $color-border;
-  margin-top: 17px;
+  margin-top: 1.5rem;
 
   .sidebar-title {
     color: $color-2;
     text-align: center;
     font-size: 16px;
     font-weight: $font-weight-bold;
+    border-top: 1px solid $color-border;
 
     > span {
       display: inline;

data/app/assets/stylesheets/spree/backend/components/_table-filter.scss

@@ -1,6 +1,10 @@
 #table-filter {
 
-  .field {
+  /* This is needed to avoid overriding the bootstrap's styles for
+   * .input-group, which sets the form-control's width to 1%.
+   * Without this, the date range overflows its container on firefox.
+   */
+  .field:not(.date-range-filter) {
     input[type="text"], input[type="phone"],
     input[type="email"], input[type="number"],
     input[type="url"] {

data/app/assets/stylesheets/spree/backend/shared/_typography.scss

@@ -62,7 +62,6 @@ dl {
     float: left;
     line-height: 16px;
     padding: 5px;
-    text-align: justify;
   }
 
   dt {

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

@@ -98,7 +98,7 @@ module Spree
         else
           @order.contents.advance
 
-          if @order.confirm?
+          if @order.can_complete?
             flash[:success] = Spree.t('order_ready_for_confirm')
           else
             flash[:error] = @order.errors.full_messages
@@ -111,7 +111,7 @@ module Spree
       def confirm
         if @order.completed?
           redirect_to edit_admin_order_url(@order)
-        elsif !@order.confirm?
+        elsif !@order.can_complete?
           render template: 'spree/admin/orders/confirm_advance'
         end
       end

data/app/views/kaminari/solidus_admin/_paginator.html.erb

@@ -1,6 +1,6 @@
 <%= paginator.render do %>
-  <nav class="text-xs-center">
-    <ul class="pagination">
+  <nav>
+    <ul class="pagination justify-content-center">
       <%= first_page_tag unless current_page.first? %>
       <%= prev_page_tag unless current_page.first? %>
       <% each_page do |page| %>

data/spec/controllers/spree/admin/orders_controller_spec.rb

@@ -163,7 +163,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         end
 
         context 'when successful' do
-          before { allow(order).to receive(:confirm?).and_return(true) }
+          before { allow(order).to receive(:can_complete?).and_return(true) }
 
           it 'messages and redirects' do
             subject
@@ -174,7 +174,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
         context 'when unsuccessful' do
           before do
-            allow(order).to receive(:confirm?).and_return(false)
+            allow(order).to receive(:can_complete?).and_return(false)
             allow(order).to receive(:errors).and_return(double(full_messages: ['failed']))
           end
 
@@ -203,7 +203,7 @@ describe Spree::Admin::OrdersController, type: :controller do
       end
 
       context 'when in confirm' do
-        before { allow(order).to receive_messages completed?: false, confirm?: true }
+        before { allow(order).to receive_messages completed?: false, can_complete?: true }
 
         it 'renders the confirm page' do
           subject
@@ -213,7 +213,7 @@ describe Spree::Admin::OrdersController, type: :controller do
       end
 
       context 'when before confirm' do
-        before { allow(order).to receive_messages completed?: false, confirm?: false }
+        before { allow(order).to receive_messages completed?: false, can_complete?: false }
 
         it 'renders the confirm_advance template (to allow refreshing of the order)' do
           subject

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.2.0.beta1
+  version: 2.2.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0.beta1
+        version: 2.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0.beta1
+        version: 2.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0.beta1
+        version: 2.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0.beta1
+        version: 2.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement