spree_backend 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4307b9a5d9803f47da229c9b15ccc2bd097a40b9
-  data.tar.gz: d53b9091c889a46815fa84f88ab148095d3da717
+  metadata.gz: 6ba5bab4d770851c4e9134b7f4ecd4ff23a54bce
+  data.tar.gz: c41549ba7100b30cae6efabb761555aae093b410
 SHA512:
-  metadata.gz: 595ece8ed48f4cb64117eb78ce6697694a58b18582e4314f0a6f0bdcf0928c1336755fd4b856a5ee86ab1b5d4b602e84f098551b1642f783538884e17b5b9aa3
-  data.tar.gz: ce44aa72986db2cd3a2a340b80ff19975c0ecd7700e59f027ebc2bea55c2bca9231f144428e4e16b037076f30534fb444ff9deff161b6441262e3ee4fbb99226
+  metadata.gz: 4f8cebf50ed8fee414dd856543fd757f0da4794a0b8c767788c55d2570c862aa225e63174f7822368c9e15ca4d27f38312819408e2403e8a9c64b72d528c2321
+  data.tar.gz: ef952c1ff8004b19e6cfa0ef11bd394d6bb839709353b328f6e4fc1238744156f0ab37397c3a09a47acae6f054c322c92c4b7f23730800a802f7ebe7774876e9

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

@@ -56,9 +56,7 @@ module Spree
       def edit
         can_not_transition_without_customer_info
 
-        unless @order.completed?
-          @order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_FRONT_AND_BACK_END)
-        end
+        @order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_FRONT_AND_BACK_END)
       end
 
       def cart

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

@@ -105,7 +105,7 @@ module Spree
         return @collection if @collection.present?
         params[:q] ||= {}
         params[:q][:deleted_at_null] ||= "1"
-        params[:q][:discontinue_on_null] ||= "1"
+        params[:q][:not_discontinued] ||= "1"
 
         params[:q][:s] ||= "name asc"
         @collection = super

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

@@ -69,6 +69,14 @@
         <% end %>
       </div>
 
+      <div data-hook="admin_product_form_promotionable">
+        <%= f.field_container :promotionable, class: ['form-group'] do %>
+          <%= f.label :promotionable, Spree.t(:promotionable) %>
+          <%= f.error_message_on :promotionable %>
+          <%= f.check_box :promotionable, class: 'form-control' %>
+        <% end %>
+      </div>
+
       <% if @product.has_variants? %>
         <div data-hook="admin_product_form_multiple_variants" class="well">
           <%= f.label :skus, Spree.t(:sku).pluralize %>
@@ -99,14 +107,6 @@
           <% end %>
         </div>
 
-        <div data-hook="admin_product_form_promotionable">
-          <%= f.field_container :promotionable, class: ['form-group'] do %>
-              <%= f.label :promotionable, Spree.t(:promotionable) %>
-              <%= f.error_message_on :promotionable %>
-              <%= f.check_box :promotionable, class: 'form-control' %>
-          <% end %>
-        </div>
-
         <div id="shipping_specs" class="row">
           <div class="col-md-6">
             <div id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="form-group">

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

@@ -34,7 +34,7 @@
 
           <div class="field checkbox">
             <label>
-              <%= f.check_box :discontinue_on_null, {:checked => params[:q][:discontinue_on_null] == '0'}, '0', '1' %>
+              <%= f.check_box :not_discontinued, {checked: params[:q][:not_discontinued] == '0'}, '0', '1' %>
               <%= Spree.t(:show_discontinued ) %>
             </label>
           </div>

data/app/views/spree/admin/shared/_product_tabs.html.erb

@@ -10,15 +10,15 @@
     <% end if can?(:admin, Spree::Product) %>
     <%= content_tag :li, class: ('active' if current == :images) do %>
       <%= link_to_with_icon 'picture', Spree.t(:images), spree.admin_product_images_url(@product) %>
-    <% end if can?(:admin, Spree::Image) %>
+    <% end if can?(:admin, Spree::Image) && !@product.deleted? %>
     <%= content_tag :li, class: ('active' if current == :variants) do %>
       <%= link_to_with_icon 'th-large', Spree.t(:variants),  spree.admin_product_variants_url(@product) %>
-    <% end if can?(:admin, Spree::Variant) %>
+    <% end if can?(:admin, Spree::Variant) && !@product.deleted? %>
     <%= content_tag :li, class: ('active' if current == :properties) do %>
       <%= link_to_with_icon 'list-alt', Spree.t(:properties), spree.admin_product_product_properties_url(@product) %>
-    <% end if can?(:admin, Spree::ProductProperty) %>
+    <% end if can?(:admin, Spree::ProductProperty) && !@product.deleted? %>
     <%= content_tag :li, class: ('active' if current == :stock) do %>
       <%= link_to_with_icon 'home', Spree.t(:stock), stock_admin_product_url(@product) %>
-    <% end if can?(:admin, Spree::Stock) %>
+    <% end if can?(:admin, Spree::Stock) && !@product.deleted? %>
   </ul>
 <% end %>

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

@@ -11,7 +11,7 @@
 
   <div class="form-actions" data-hook="buttons">
     <%= button Spree.t('actions.update'), 'save' %>
-    <%= Spree.t(:or) %>
+    <span class="or"><%= Spree.t(:or) %></span>
     <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), icon: "remove" %>
   </div>
 <% end %>

data/spree_backend.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.license     = 'BSD-3'
   s.rubyforge_project = 'spree_backend'
 
-  s.files        = `git ls-files`.split("\n")
+  s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) }
   s.require_path = 'lib'
   s.requirements << 'none'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.1.6
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.1.6
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -512,97 +512,6 @@ files:
 - lib/spree/backend/engine.rb
 - lib/spree_backend.rb
 - script/rails
-- spec/controllers/spree/admin/base_controller_spec.rb
-- spec/controllers/spree/admin/customer_returns_controller_spec.rb
-- spec/controllers/spree/admin/general_settings_controller_spec.rb
-- spec/controllers/spree/admin/missing_products_controller_spec.rb
-- spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
-- spec/controllers/spree/admin/orders_controller_spec.rb
-- spec/controllers/spree/admin/payment_methods_controller_spec.rb
-- spec/controllers/spree/admin/payments_controller_spec.rb
-- spec/controllers/spree/admin/products_controller_spec.rb
-- spec/controllers/spree/admin/promotion_actions_controller_spec.rb
-- spec/controllers/spree/admin/promotion_rules_controller_spec.rb
-- spec/controllers/spree/admin/promotions_controller_spec.rb
-- spec/controllers/spree/admin/refunds_controller_spec.rb
-- spec/controllers/spree/admin/reimbursements_controller_spec.rb
-- spec/controllers/spree/admin/reports_controller_spec.rb
-- spec/controllers/spree/admin/resource_controller_spec.rb
-- spec/controllers/spree/admin/return_authorizations_controller_spec.rb
-- spec/controllers/spree/admin/return_index_controller_spec.rb
-- spec/controllers/spree/admin/return_items_controller_spec.rb
-- spec/controllers/spree/admin/root_controller_spec.rb
-- spec/controllers/spree/admin/search_controller_spec.rb
-- spec/controllers/spree/admin/shipping_methods_controller_spec.rb
-- spec/controllers/spree/admin/stock_items_controller_spec.rb
-- spec/controllers/spree/admin/stock_locations_controller_spec.rb
-- spec/controllers/spree/admin/stock_transfers_controller_spec.rb
-- spec/controllers/spree/admin/tax_categories_controller_spec.rb
-- spec/controllers/spree/admin/users_controller_spec.rb
-- spec/controllers/spree/admin/variants_controller_spec.rb
-- spec/features/admin/configuration/analytics_tracker_spec.rb
-- spec/features/admin/configuration/countries_spec.rb
-- spec/features/admin/configuration/general_settings_spec.rb
-- spec/features/admin/configuration/payment_methods_spec.rb
-- spec/features/admin/configuration/roles_spec.rb
-- spec/features/admin/configuration/shipping_methods_spec.rb
-- spec/features/admin/configuration/states_spec.rb
-- spec/features/admin/configuration/stock_locations_spec.rb
-- spec/features/admin/configuration/store_credit_categories_spec.rb
-- spec/features/admin/configuration/tax_categories_spec.rb
-- spec/features/admin/configuration/tax_rates_spec.rb
-- spec/features/admin/configuration/zones_spec.rb
-- spec/features/admin/homepage_spec.rb
-- spec/features/admin/locale_spec.rb
-- spec/features/admin/orders/adjustments_promotions_spec.rb
-- spec/features/admin/orders/adjustments_spec.rb
-- spec/features/admin/orders/cancelling_and_resuming_spec.rb
-- spec/features/admin/orders/customer_details_spec.rb
-- spec/features/admin/orders/line_items_spec.rb
-- spec/features/admin/orders/listing_spec.rb
-- spec/features/admin/orders/log_entries_spec.rb
-- spec/features/admin/orders/new_order_spec.rb
-- spec/features/admin/orders/order_details_spec.rb
-- spec/features/admin/orders/payments_spec.rb
-- spec/features/admin/orders/risk_analysis_spec.rb
-- spec/features/admin/orders/shipments_spec.rb
-- spec/features/admin/orders/state_changes_spec.rb
-- spec/features/admin/products/edit/images_spec.rb
-- spec/features/admin/products/edit/products_spec.rb
-- spec/features/admin/products/edit/taxons_spec.rb
-- spec/features/admin/products/edit/variants_spec.rb
-- spec/features/admin/products/option_types_spec.rb
-- spec/features/admin/products/products_spec.rb
-- spec/features/admin/products/properties_spec.rb
-- spec/features/admin/products/prototypes_spec.rb
-- spec/features/admin/products/stock_management_spec.rb
-- spec/features/admin/products/taxonomies_spec.rb
-- spec/features/admin/products/variant_spec.rb
-- spec/features/admin/promotions/adjustments_spec.rb
-- spec/features/admin/promotions/option_value_rule_spec.rb
-- spec/features/admin/promotions/tiered_calculator_spec.rb
-- spec/features/admin/refund_reasons/refund_reasons_spec.rb
-- spec/features/admin/reports_spec.rb
-- spec/features/admin/return_authorization_reasons/return_authorization_reasons_spec.rb
-- spec/features/admin/returns/customer_returns_spec.rb
-- spec/features/admin/returns/return_authorizations_spec.rb
-- spec/features/admin/stock_transfer_spec.rb
-- spec/features/admin/store_credits_spec.rb
-- spec/features/admin/taxons_spec.rb
-- spec/features/admin/users_spec.rb
-- spec/helpers/admin/base_helper_spec.rb
-- spec/helpers/admin/navigation_helper_spec.rb
-- spec/helpers/admin/stock_movements_helper_spec.rb
-- spec/helpers/promotion_rules_helper_spec.rb
-- spec/models/spree/resource_spec.rb
-- spec/routing/admin_path_spec.rb
-- spec/spec_helper.rb
-- spec/support/appear_before_matcher.rb
-- spec/support/ror_ringer.jpeg
-- spec/test_views/spree/admin/submodule/posts/edit.html.erb
-- spec/test_views/spree/admin/submodule/posts/new.html.erb
-- spec/test_views/spree/admin/widgets/edit.html.erb
-- spec/test_views/spree/admin/widgets/new.html.erb
 - spree_backend.gemspec
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png
@@ -649,7 +558,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.

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

@@ -1,46 +0,0 @@
-# Spree's rpsec controller tests get the Spree::ControllerHacks
-# we don't need those for the anonymous controller here, so
-# we call process directly instead of get
-require 'spec_helper'
-
-describe Spree::Admin::BaseController, type: :controller do
-  controller(Spree::Admin::BaseController) do
-    def index
-      authorize! :update, Spree::Order
-      render text: 'test'
-    end
-  end
-
-  context "unauthorized request" do
-    before do
-      allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
-    end
-
-    it "redirects to root" do
-      allow(controller).to receive_message_chain(:spree, :root_path).and_return('/root')
-      get :index
-      expect(response).to redirect_to '/root'
-    end
-  end
-
-  context "#generate_api_key" do
-    let(:user) { mock_model(Spree.user_class, has_spree_role?: true) }
-
-    before do
-      allow(controller).to receive(:authorize_admin) { true }
-      allow(controller).to receive(:try_spree_current_user) { user }
-    end
-
-    it "generates the API key for a user when they visit" do
-      expect(user).to receive(:spree_api_key).and_return(nil)
-      expect(user).to receive(:generate_spree_api_key!)
-      get :index
-    end
-
-    it "does not attempt to regenerate the API key if the key is already set" do
-      expect(user).to receive(:spree_api_key).and_return('fake')
-      expect(user).not_to receive(:generate_spree_api_key!)
-      get :index
-    end
-  end
-end

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

@@ -1,185 +0,0 @@
-require 'spec_helper'
-
-module Spree
-  module Admin
-    describe CustomerReturnsController, :type => :controller do
-      stub_authorization!
-
-      describe "#index" do
-        let(:order)           { customer_return.order }
-        let(:customer_return) { create(:customer_return) }
-
-        subject do
-          spree_get :index, { order_id: customer_return.order.to_param }
-        end
-
-        before { subject }
-
-        it "loads the order" do
-          expect(assigns(:order)).to eq order
-        end
-
-        it "loads the customer return" do
-          expect(assigns(:customer_returns)).to include(customer_return)
-        end
-      end
-
-      describe "#new" do
-        let(:order) { create(:shipped_order, line_items_count: 1) }
-        let!(:rma) { create :return_authorization, order: order, return_items: [create(:return_item, inventory_unit: order.inventory_units.first)] }
-        let!(:inactive_reimbursement_type)      { create(:reimbursement_type, active: false) }
-        let!(:first_active_reimbursement_type)  { create(:reimbursement_type) }
-        let!(:second_active_reimbursement_type) { create(:reimbursement_type) }
-
-        subject do
-          spree_get :new, { order_id: order.to_param }
-        end
-
-        it "loads the order" do
-          subject
-          expect(assigns(:order)).to eq order
-        end
-
-        it "creates a new customer return" do
-          subject
-          expect(assigns(:customer_return)).to_not be_persisted
-        end
-
-        context "with previous customer return" do
-          let(:order) { create(:shipped_order, line_items_count: 4) }
-          let(:rma) { create(:return_authorization, order: order) }
-
-          let!(:rma_return_item) { create(:return_item, return_authorization: rma, inventory_unit: order.inventory_units.first) }
-          let!(:customer_return_return_item) { create(:return_item, return_authorization: rma, inventory_unit: order.inventory_units.last) }
-
-          context "there is a return item associated with an rma but not a customer return" do
-            let!(:previous_customer_return) { create(:customer_return_without_return_items, return_items: [customer_return_return_item]) }
-
-            before do
-              subject
-            end
-
-            it "loads the persisted rma return items" do
-              expect(assigns(:rma_return_items).all? { |return_item| return_item.persisted? }).to eq true
-            end
-
-            it "has one rma return item" do
-              expect(assigns(:rma_return_items)).to include(rma_return_item)
-            end
-          end
-        end
-      end
-
-      describe "#edit" do
-        let(:order)           { customer_return.order }
-        let(:customer_return) { create(:customer_return, line_items_count: 3) }
-
-        let!(:accepted_return_item)            { customer_return.return_items.order('id').first.tap(&:accept!) }
-        let!(:rejected_return_item)            { customer_return.return_items.order('id').second.tap(&:reject!)}
-        let!(:manual_intervention_return_item) { customer_return.return_items.order('id').third.tap(&:require_manual_intervention!) }
-
-        subject do
-          spree_get :edit, { order_id: order.to_param, id: customer_return.to_param }
-        end
-
-        before do
-          subject
-        end
-
-        it "loads the order" do
-          expect(assigns(:order)).to eq order
-        end
-
-        it "loads the customer return" do
-          expect(assigns(:customer_return)).to eq customer_return
-        end
-
-        it "loads the accepted return items" do
-          expect(assigns(:accepted_return_items)).to eq [accepted_return_item]
-        end
-
-        it "loads the rejected return items" do
-          expect(assigns(:rejected_return_items)).to eq [rejected_return_item]
-        end
-
-        it "loads the return items that require manual intervention" do
-          expect(assigns(:manual_intervention_return_items)).to eq [manual_intervention_return_item]
-        end
-
-        it "loads the return items that are still pending" do
-          expect(assigns(:pending_return_items)).to eq []
-        end
-
-        it "loads the reimbursements that are still pending" do
-          expect(assigns(:pending_reimbursements)).to eq []
-        end
-      end
-
-      describe "#create" do
-        let(:order) { create(:shipped_order, line_items_count: 1) }
-        let!(:return_authorization) { create :return_authorization, order: order, return_items: [create(:return_item, inventory_unit: order.inventory_units.shipped.last)] }
-
-        subject do
-          spree_post :create, customer_return_params
-        end
-
-        context "valid customer return" do
-          let(:stock_location) { order.shipments.last.stock_location }
-
-          let!(:customer_return_params) do
-            {
-              order_id: order.to_param,
-              customer_return: {
-                stock_location_id: stock_location.id,
-                return_items_attributes: {
-                  "0" => {
-                    id: return_authorization.return_items.first.id,
-                    returned: "1",
-                    "pre_tax_amount"=>"15.99",
-                    inventory_unit_id: order.inventory_units.shipped.last.id
-                  }
-                }
-              }
-            }
-          end
-
-          it "creates a customer return" do
-            expect{ subject }.to change { Spree::CustomerReturn.count }.by(1)
-          end
-
-          it "redirects to the index page" do
-            subject
-            expect(response).to redirect_to(spree.edit_admin_order_customer_return_path(order, assigns(:customer_return)))
-          end
-        end
-
-        context "invalid customer return" do
-          let!(:customer_return_params) do
-            {
-              order_id: order.to_param,
-              customer_return: {
-                stock_location_id: "",
-                return_items_attributes: {
-                  "0" => {
-                    returned: "1",
-                    "pre_tax_amount"=>"15.99",
-                    inventory_unit_id: order.inventory_units.shipped.last.id
-                  }
-                }
-              }
-            }
-          end
-
-          it "doesn't create a customer return" do
-            expect{ subject }.to_not change { Spree::CustomerReturn.count }
-          end
-
-          it "renders the new page" do
-            subject
-            expect(response).to render_template(:new)
-          end
-        end
-      end
-    end
-  end
-end