spree_core 3.3.0.rc1 → 3.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c9fdf952e713bfe4540fa0cc02c50e0b0d1d463
-  data.tar.gz: fe6f1d0bc7723acc565b94ea5b846ede4836c3bc
+  metadata.gz: 233dee0431dd5bf0e9ed17b562f2cdc4319ed57b
+  data.tar.gz: 7d4f772e323db20a0a0f786c493047ba6af720dc
 SHA512:
-  metadata.gz: d08fd7351e39b0bf4201ddcb1203bbd79cd793d4c9b65a5af2f42e3455f9e5a3019fcc9cb2d67cb5d9022b6b903e6c261cb5a10a6e5928e462d19e07a864cef1
-  data.tar.gz: ed488419461ff914b3175e55e99857c8776e9359495f7c69c935cabd13ef491e9752a8cb01daccd083e9252eba222afcf1b9000705be1d0cb21c616878bfaf1a
+  metadata.gz: 9bb2478b50519381c872f5ff3954edf622e6ee16a289c1570dc413341f683b85d87819a7cccb393481d4471544be96b9ee19fe2f7221bf05dc945938d1a343a5
+  data.tar.gz: 4dcb5617c69eada1bb9a869237643316a3fc1c349f05a966b38c7199464287f7f288088b594807ddf0fe01e58e236132d02a053f21155717f1a87e7ac96ee7e5

data/app/helpers/spree/base_helper.rb

@@ -34,7 +34,7 @@ module Spree
     end
 
     def logo(image_path=Spree::Config[:logo])
-      link_to image_tag(image_path), spree.root_path
+      link_to image_tag(image_path), spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
     end
 
     def meta_data

data/app/mailers/spree/base_mailer.rb

@@ -9,6 +9,11 @@ module Spree
     end
     helper_method :money
 
+    def frontend_available?
+      Spree::Core::Engine.frontend_available?
+    end
+    helper_method :frontend_available?
+
     def mail(headers = {}, &block)
       ensure_default_action_mailer_url_host
       super if Spree::Config[:send_core_emails]

data/app/models/spree/ability.rb

@@ -43,9 +43,12 @@ module Spree
         can :display, OptionType
         can :display, OptionValue
         can :create, Order
-        can [:read, :update], Order do |order, token|
+        can :read, Order do |order, token|
           order.user == user || order.guest_token && token == order.guest_token
         end
+        can :update, Order do |order, token|
+          !order.completed? && (order.user == user || order.guest_token && token == order.guest_token)
+        end
         can :display, CreditCard, user_id: user.id
         can :display, Product
         can :display, ProductProperty

data/app/models/spree/image.rb

@@ -2,6 +2,10 @@ module Spree
   class Image < Asset
     validate :no_attachment_errors
 
+    def self.accepted_image_types
+      %w(image/jpeg image/jpg image/png image/gif)
+    end
+
     has_attached_file :attachment,
                       styles: { mini: '48x48>', small: '100x100>', product: '240x240>', large: '600x600>' },
                       default_style: :product,
@@ -10,11 +14,11 @@ module Spree
                       convert_options: { all: '-strip -auto-orient -colorspace sRGB' }
     validates_attachment :attachment,
       presence: true,
-      content_type: { content_type: %w(image/jpeg image/jpg image/png image/gif) }
+      content_type: { content_type: accepted_image_types }
 
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet
-    before_save :find_dimensions, if: :saved_change_to_attachment_updated_at?
+    before_save :find_dimensions, if: :attachment_updated_at_changed?
 
     #used by admin products autocomplete
     def mini_url

data/app/models/spree/order.rb

@@ -12,7 +12,7 @@ module Spree
     include Spree::Order::StoreCredit
     include Spree::Core::NumberGenerator.new(prefix: 'R')
     include Spree::Core::TokenGenerator
-    
+
     include NumberAsParam
 
     extend Spree::DisplayMoney
@@ -184,7 +184,7 @@ module Spree
     end
 
     def shipping_discount
-      shipment_adjustments.eligible.sum(:amount) * - 1
+      shipment_adjustments.non_tax.eligible.sum(:amount) * - 1
     end
 
     def completed?
@@ -324,13 +324,10 @@ module Spree
     def outstanding_balance
       if canceled?
         -1 * payment_total
-      elsif !reimbursements.includes(:refunds).empty?
-        reimbursed = reimbursements.includes(:refunds).inject(0) do |sum, reimbursement|
-          sum + reimbursement.refunds.sum(:amount)
-        end
-        # If reimbursement has happened add it back to total to prevent balance_due payment state
-        # See: https://github.com/spree/spree/issues/6229
-        total - (payment_total + reimbursed)
+      elsif refunds.exists?
+        # If refund has happened add it back to total to prevent balance_due payment state
+        # See: https://github.com/spree/spree/issues/6229 & https://github.com/spree/spree/issues/8136
+        total - (payment_total + refunds.sum(:amount))
       else
         total - payment_total
       end
@@ -607,6 +604,10 @@ module Spree
         payments.offset_payment.exists? # how old versions of spree stored refunds
     end
 
+    def collect_backend_payment_methods
+      PaymentMethod.available_on_back_end.select { |pm| pm.available_for_order?(self) }
+    end
+
     # determines whether the inventory is fully discounted
     #
     # Returns

data/app/models/spree/order/payments.rb

@@ -52,7 +52,7 @@ module Spree
 
             payment.public_send(method)
 
-            if payment.completed?
+            if payment.completed? && payment_total != total
               self.payment_total += payment.amount
             end
           end

data/app/models/spree/payment_method/store_credit.rb

@@ -93,6 +93,10 @@ module Spree
       true
     end
 
+    def available_for_order?(order)
+      order.could_use_store_credit?
+    end
+
     private
 
     def handle_action_call(store_credit, action, action_name, auth_code = nil)

data/app/models/spree/shipment.rb

@@ -126,6 +126,7 @@ module Spree
     alias discounted_amount discounted_cost
 
     def editable_by?(_user)
+      warn "`Spree::Shipment#editable_by?` is deprecated. You should use cancancan `can?` method for cheks like this."
       !shipped?
     end
 
@@ -400,6 +401,7 @@ module Spree
     end
 
     def send_shipped_email
+      warn "Shipment#send_shipped_email is deprecated, please use ShipmentHandler#send_shipped_email"
       ShipmentMailer.shipped_email(id).deliver_later
     end
 

data/app/views/spree/shared/_base_mailer_header.html.erb

@@ -11,7 +11,11 @@
               <table class="twelve columns">
                 <tr>
                   <td class="twelve sub-columns last">
-                    <%= link_to spree.root_url, class: 'template-label' do %>
+                    <% if frontend_available? %>
+                      <%= link_to spree.root_url, class: 'template-label' do %>
+                        <%= image_tag Spree::Config.logo, class: 'logo', alt: Spree::Store.current.name, title: Spree::Store.current.name %>
+                      <% end %>
+                    <% else %>
                       <%= image_tag Spree::Config.logo, class: 'logo', alt: Spree::Store.current.name, title: Spree::Store.current.name %>
                     <% end %>
                   </td>

data/app/views/spree/shared/_mailer_line_item.html.erb

@@ -1,7 +1,11 @@
 <tr>
   <td class="six sub-columns">
     <strong>
-      <%= link_to raw(line_item.variant.product.name), spree.product_url(line_item.variant.product) %>
+      <% if frontend_available? %>
+        <%= link_to raw(line_item.variant.product.name), spree.product_url(line_item.variant.product) %>
+      <% else %>
+        <%= raw(line_item.variant.product.name) %>
+      <% end %>
     </strong>
     <%= raw(line_item.variant.options_text) -%>
     (<%= line_item.variant.sku %>)

data/config/routes.rb

@@ -1,8 +1,5 @@
 Spree::Core::Engine.add_routes do
   get '/forbidden', to: 'home#forbidden', as: :forbidden
-  # those routes are needed for mailers
-  root to: 'home#index'
-  resources :products, only: [:index, :show]
 end
 
 Spree::Core::Engine.draw_routes

data/lib/spree/core/components.rb

@@ -0,0 +1,17 @@
+module Spree
+  module Core
+    class Engine < ::Rails::Engine
+      def self.api_available?
+        @@api_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Api::Engine')
+      end
+
+      def self.backend_available?
+        @@backend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Backend::Engine')
+      end
+
+      def self.frontend_available?
+        @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Frontend::Engine')
+      end
+    end
+  end
+end

data/lib/spree/core/controller_helpers/auth.rb

@@ -72,8 +72,10 @@ module Spree
             store_location
             if respond_to?(:spree_login_path)
               redirect_to spree_login_path
+            elsif spree.respond_to?(:root_path)
+              redirect_to spree.root_path
             else
-              redirect_to spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
+              redirect_to main_app.respond_to?(:root_path) ? main_app.root_path : '/'
             end
           end
         end

data/lib/spree/core/engine.rb

@@ -133,3 +133,4 @@ module Spree
 end
 
 require 'spree/core/routes'
+require 'spree/core/components'

data/lib/spree/core/validators/email.rb

@@ -1,10 +1,6 @@
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    unless value =~ %r{\A(([A-Za-z0-9]+_+)|
-                          ([A-Za-z0-9]+\-+)|
-                          ([A-Za-z0-9]+\.+)|
-                          ([A-Za-z0-9]+\++))*[A-Za-z0-9_]+@((\w+\-+)|
-                          (\w+\.))*\w{1,63}\.[a-zA-Z]{2,15}\z}xi
+    unless value =~ /\A[^@\s]+@[^@\s]+\z/
       record.errors.add(attribute, :invalid, { value: value }.merge!(options))
     end
   end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.3.0.rc1"
+    "3.3.0.rc2"
   end
 end

data/spree_core.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://spreecommerce.com'
   s.license     = 'BSD-3-Clause'
 
-  s.files        = `git ls-files`.split("\n")
+  s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) }
   s.require_path = 'lib'
 
   s.add_dependency 'activemerchant', '~> 1.67'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc1
+  version: 3.3.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -855,6 +855,7 @@ files:
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
 - lib/spree/core.rb
+- lib/spree/core/components.rb
 - lib/spree/core/controller_helpers/auth.rb
 - lib/spree/core/controller_helpers/common.rb
 - lib/spree/core/controller_helpers/order.rb
@@ -953,213 +954,12 @@ files:
 - lib/spree/testing_support/microdata.rb
 - lib/spree/testing_support/order_walkthrough.rb
 - lib/spree/testing_support/preferences.rb
-- lib/spree/testing_support/shoulda_matcher_configuration.rb
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree_core.rb
 - lib/tasks/core.rake
 - lib/tasks/email.rake
 - lib/tasks/exchanges.rake
 - script/rails
-- spec/fixtures/thinking-cat.jpg
-- spec/helpers/base_helper_spec.rb
-- spec/helpers/products_helper_spec.rb
-- spec/lib/calculated_adjustments_spec.rb
-- spec/lib/i18n_spec.rb
-- spec/lib/search/base_spec.rb
-- spec/lib/spree/core/controller_helpers/auth_spec.rb
-- spec/lib/spree/core/controller_helpers/order_spec.rb
-- spec/lib/spree/core/controller_helpers/search_spec.rb
-- spec/lib/spree/core/controller_helpers/store_spec.rb
-- spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb
-- spec/lib/spree/core/delegate_belongs_to_spec.rb
-- spec/lib/spree/core/importer/order_spec.rb
-- spec/lib/spree/core/number_generator_spec.rb
-- spec/lib/spree/core/token_generator_spec.rb
-- spec/lib/spree/core/validators/email_spec.rb
-- spec/lib/spree/core_spec.rb
-- spec/lib/spree/localized_number_spec.rb
-- spec/lib/spree/migrations_spec.rb
-- spec/lib/spree/money_spec.rb
-- spec/lib/tasks/exchanges_spec.rb
-- spec/mailers/order_mailer_spec.rb
-- spec/mailers/reimbursement_mailer_spec.rb
-- spec/mailers/shipment_mailer_spec.rb
-- spec/mailers/test_mailer_spec.rb
-- spec/models/spree/ability_spec.rb
-- spec/models/spree/address_spec.rb
-- spec/models/spree/adjustable/adjuster/base_spec.rb
-- spec/models/spree/adjustable/adjuster/promotion_spec.rb
-- spec/models/spree/adjustable/adjuster/tax_spec.rb
-- spec/models/spree/adjustable/adjustments_updater_spec.rb
-- spec/models/spree/adjustment_spec.rb
-- spec/models/spree/app_configuration_spec.rb
-- spec/models/spree/asset_spec.rb
-- spec/models/spree/calculator/default_tax_spec.rb
-- spec/models/spree/calculator/flat_percent_item_total_spec.rb
-- spec/models/spree/calculator/flat_rate_spec.rb
-- spec/models/spree/calculator/flexi_rate_spec.rb
-- spec/models/spree/calculator/percent_on_line_item_spec.rb
-- spec/models/spree/calculator/price_sack_spec.rb
-- spec/models/spree/calculator/refunds/default_refund_amount_spec.rb
-- spec/models/spree/calculator/shipping.rb
-- spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb
-- spec/models/spree/calculator/shipping/flat_rate_spec.rb
-- spec/models/spree/calculator/shipping/flexi_rate_spec.rb
-- spec/models/spree/calculator/shipping/per_item_spec.rb
-- spec/models/spree/calculator/shipping/price_sack_spec.rb
-- spec/models/spree/calculator/tiered_flat_rate_spec.rb
-- spec/models/spree/calculator/tiered_percent_spec.rb
-- spec/models/spree/calculator_spec.rb
-- spec/models/spree/classification_spec.rb
-- spec/models/spree/concerns/display_money_spec.rb
-- spec/models/spree/concerns/user_methods_spec.rb
-- spec/models/spree/concerns/vat_price_calculation_spec.rb
-- spec/models/spree/country_spec.rb
-- spec/models/spree/credit_card_spec.rb
-- spec/models/spree/customer_return_spec.rb
-- spec/models/spree/exchange_spec.rb
-- spec/models/spree/gateway/bogus_simple.rb
-- spec/models/spree/gateway/bogus_spec.rb
-- spec/models/spree/gateway_spec.rb
-- spec/models/spree/image_spec.rb
-- spec/models/spree/inventory_unit_spec.rb
-- spec/models/spree/line_item_spec.rb
-- spec/models/spree/option_type_prototype_spec.rb
-- spec/models/spree/option_type_spec.rb
-- spec/models/spree/option_value_spec.rb
-- spec/models/spree/order/address_spec.rb
-- spec/models/spree/order/adjustments_spec.rb
-- spec/models/spree/order/callbacks_spec.rb
-- spec/models/spree/order/checkout_spec.rb
-- spec/models/spree/order/currency_updater_spec.rb
-- spec/models/spree/order/finalizing_spec.rb
-- spec/models/spree/order/helpers_spec.rb
-- spec/models/spree/order/payment_spec.rb
-- spec/models/spree/order/risk_assessment_spec.rb
-- spec/models/spree/order/shipments_spec.rb
-- spec/models/spree/order/state_machine_spec.rb
-- spec/models/spree/order/store_credit_spec.rb
-- spec/models/spree/order/tax_spec.rb
-- spec/models/spree/order/totals_spec.rb
-- spec/models/spree/order/updating_spec.rb
-- spec/models/spree/order/validations_spec.rb
-- spec/models/spree/order_contents_spec.rb
-- spec/models/spree/order_inventory_spec.rb
-- spec/models/spree/order_merger_spec.rb
-- spec/models/spree/order_spec.rb
-- spec/models/spree/order_updater_spec.rb
-- spec/models/spree/payment/gateway_options_spec.rb
-- spec/models/spree/payment/store_credit_spec.rb
-- spec/models/spree/payment_method/store_credit_spec.rb
-- spec/models/spree/payment_method_spec.rb
-- spec/models/spree/payment_spec.rb
-- spec/models/spree/preference_spec.rb
-- spec/models/spree/preferences/configuration_spec.rb
-- spec/models/spree/preferences/preferable_spec.rb
-- spec/models/spree/preferences/scoped_store_spec.rb
-- spec/models/spree/preferences/store_spec.rb
-- spec/models/spree/price_spec.rb
-- spec/models/spree/product/scopes_spec.rb
-- spec/models/spree/product_duplicator_spec.rb
-- spec/models/spree/product_filter_spec.rb
-- spec/models/spree/product_option_type_spec.rb
-- spec/models/spree/product_promotion_rule_spec.rb
-- spec/models/spree/product_property_spec.rb
-- spec/models/spree/product_spec.rb
-- spec/models/spree/promotion/actions/create_adjustment_spec.rb
-- spec/models/spree/promotion/actions/create_item_adjustments_spec.rb
-- spec/models/spree/promotion/actions/create_line_items_spec.rb
-- spec/models/spree/promotion/actions/free_shipping_spec.rb
-- spec/models/spree/promotion/rules/country_spec.rb
-- spec/models/spree/promotion/rules/first_order_spec.rb
-- spec/models/spree/promotion/rules/item_total_spec.rb
-- spec/models/spree/promotion/rules/one_use_per_user_spec.rb
-- spec/models/spree/promotion/rules/option_value_spec.rb
-- spec/models/spree/promotion/rules/product_spec.rb
-- spec/models/spree/promotion/rules/taxon_spec.rb
-- spec/models/spree/promotion/rules/user_logged_in_spec.rb
-- spec/models/spree/promotion/rules/user_spec.rb
-- spec/models/spree/promotion_action_spec.rb
-- spec/models/spree/promotion_category_spec.rb
-- spec/models/spree/promotion_handler/cart_spec.rb
-- spec/models/spree/promotion_handler/coupon_spec.rb
-- spec/models/spree/promotion_handler/free_shipping_spec.rb
-- spec/models/spree/promotion_handler/page_spec.rb
-- spec/models/spree/promotion_rule_spec.rb
-- spec/models/spree/promotion_rule_taxon_spec.rb
-- spec/models/spree/promotion_rule_user_spec.rb
-- spec/models/spree/promotion_spec.rb
-- spec/models/spree/property_prototype_spec.rb
-- spec/models/spree/property_spec.rb
-- spec/models/spree/prototype_spec.rb
-- spec/models/spree/prototype_taxon_spec.rb
-- spec/models/spree/refund_reason_spec.rb
-- spec/models/spree/refund_spec.rb
-- spec/models/spree/reimbursement/credit_spec.rb
-- spec/models/spree/reimbursement/reimbursement_type_engine_spec.rb
-- spec/models/spree/reimbursement/reimbursement_type_validator_spec.rb
-- spec/models/spree/reimbursement_performer_spec.rb
-- spec/models/spree/reimbursement_spec.rb
-- spec/models/spree/reimbursement_tax_calculator_spec.rb
-- spec/models/spree/reimbursement_type/credit_spec.rb
-- spec/models/spree/reimbursement_type/exchange_spec.rb
-- spec/models/spree/reimbursement_type/original_payment_spec.rb
-- spec/models/spree/reimbursement_type/store_credit_spec.rb
-- spec/models/spree/return_authorization_reason_spec.rb
-- spec/models/spree/return_authorization_spec.rb
-- spec/models/spree/return_item/eligibility_validator/default_spec.rb
-- spec/models/spree/return_item/eligibility_validator/inventory_shipped_spec.rb
-- spec/models/spree/return_item/eligibility_validator/no_reimbursements_spec.rb
-- spec/models/spree/return_item/eligibility_validator/order_completed_spec.rb
-- spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb
-- spec/models/spree/return_item/eligibility_validator/time_since_purchase_spec.rb
-- spec/models/spree/return_item/exchange_variant_eligibility/same_option_value_spec.rb
-- spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb
-- spec/models/spree/return_item_spec.rb
-- spec/models/spree/returns_calculator_spec.rb
-- spec/models/spree/role_spec.rb
-- spec/models/spree/shipment_spec.rb
-- spec/models/spree/shipping_calculator_spec.rb
-- spec/models/spree/shipping_category_spec.rb
-- spec/models/spree/shipping_method_spec.rb
-- spec/models/spree/shipping_rate_spec.rb
-- spec/models/spree/state_spec.rb
-- spec/models/spree/stock/availability_validator_spec.rb
-- spec/models/spree/stock/content_item_spec.rb
-- spec/models/spree/stock/coordinator_spec.rb
-- spec/models/spree/stock/differentiator_spec.rb
-- spec/models/spree/stock/estimator_spec.rb
-- spec/models/spree/stock/inventory_unit_builder_spec.rb
-- spec/models/spree/stock/package_spec.rb
-- spec/models/spree/stock/packer_spec.rb
-- spec/models/spree/stock/prioritizer_spec.rb
-- spec/models/spree/stock/quantifier_spec.rb
-- spec/models/spree/stock/splitter/backordered_spec.rb
-- spec/models/spree/stock/splitter/base_spec.rb
-- spec/models/spree/stock/splitter/shipping_category_spec.rb
-- spec/models/spree/stock/splitter/weight_spec.rb
-- spec/models/spree/stock_item_spec.rb
-- spec/models/spree/stock_location_spec.rb
-- spec/models/spree/stock_movement_spec.rb
-- spec/models/spree/stock_transfer_spec.rb
-- spec/models/spree/store_credit_event_spec.rb
-- spec/models/spree/store_credit_spec.rb
-- spec/models/spree/store_spec.rb
-- spec/models/spree/tax_category_spec.rb
-- spec/models/spree/tax_rate_spec.rb
-- spec/models/spree/taxon_spec.rb
-- spec/models/spree/taxonomy_spec.rb
-- spec/models/spree/tracker_spec.rb
-- spec/models/spree/user_spec.rb
-- spec/models/spree/variant_spec.rb
-- spec/models/spree/zone_member_spec.rb
-- spec/models/spree/zone_spec.rb
-- spec/spec_helper.rb
-- spec/support/big_decimal.rb
-- spec/support/concerns/adjustment_source.rb
-- spec/support/concerns/default_price.rb
-- spec/support/rake.rb
-- spec/support/test_gateway.rb
 - spree_core.gemspec
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.payment.js
@@ -1186,7 +986,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.