spree_core 3.6.6 → 3.7.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f5825aba5d81813afc792f9942d2f237efed04a35ade527cad5019bdbe80763
-  data.tar.gz: 35b9884a0405608d7508b60565d445bea8736b471b4ffd9f8803ce82a822a89f
+  metadata.gz: 49eb4666a35ce5b88c3ce5bc92b0cf34503851edee70623f215bc674ea3d322f
+  data.tar.gz: cefaa50b133701b0572392a03c11bdf4544e9ca97aa0eaa34e5293cd2892336f
 SHA512:
-  metadata.gz: a01961fb48f8f4337072ad64e1d63fbd8ab60b532631460d2effc5bf21d94881c000fc328bb0165c64eeca7443e6015820fd19d3d23252fcaf3b5ee028f49bb8
-  data.tar.gz: 8a10210e4d35acc2d7a42d4e87e3885943b4172154d0ad100967cbaca1a0f5bc871c34f37b31c1a3b9e7a74c909c8ef9bc95cbbfc1e7b60d4f0f2de130fc7298
+  metadata.gz: 1d422e99c814605fe9cbb9ce7eaf3bedd80e93f6298446bd6a9b30cc8d1d3d8e8d870926222aa437bb6d58a0ec725bfb1192a0d28c48c1cadc9a97e0dd3d504d
+  data.tar.gz: caf99f8ededb70977b1e1eba5adcaff62a60108d62b469b82d885921539f8acc1f84528a9161d28f48f7f6ab7755e866eb34392df936904dc1aaaa29a59becf6

data/app/assets/javascripts/spree.js

@@ -0,0 +1,60 @@
+//= require jsuri
+function Spree () {}
+
+Spree.ready = function (callback) {
+  jQuery(callback)
+  return jQuery(document).on('page:load turbolinks:load', function () {
+    return callback(jQuery)
+  })
+}
+
+Spree.mountedAt = function () {
+  return window.SpreePaths.mounted_at
+}
+
+Spree.adminPath = function () {
+  return window.SpreePaths.admin
+}
+
+Spree.pathFor = function (path) {
+  var locationOrigin = (window.location.protocol + '//' + window.location.hostname) + (window.location.port ? ':' + window.location.port : '')
+  return this.url('' + locationOrigin + (this.mountedAt()) + path, this.url_params).toString()
+}
+
+Spree.adminPathFor = function (path) {
+  return this.pathFor('' + (this.adminPath()) + path)
+}
+
+Spree.url = function (uri, query) {
+  if (uri.path === void 0) {
+    // eslint-disable-next-line no-undef
+    uri = new Uri(uri)
+  }
+  if (query) {
+    $.each(query, function (key, value) {
+      return uri.addQueryParam(key, value)
+    })
+  }
+  return uri
+}
+
+Spree.ajax = function (urlOrSettings, settings) {
+  var url
+  if (typeof urlOrSettings === 'string') {
+    return $.ajax(Spree.url(urlOrSettings).toString(), settings)
+  } else {
+    url = urlOrSettings['url']
+    delete urlOrSettings['url']
+    return $.ajax(Spree.url(url).toString(), urlOrSettings)
+  }
+}
+
+Spree.routes = {
+  states_search: Spree.pathFor('api/v1/states'),
+  apply_coupon_code: function (orderId) {
+    return Spree.pathFor('api/v1/orders/' + orderId + '/apply_coupon_code')
+  },
+  cart: Spree.pathFor('cart')
+}
+
+Spree.url_params = {}

data/app/finders/spree/countries/find.rb

@@ -0,0 +1,31 @@
+module Spree
+  module Countries
+    class Find
+      def initialize(scope, params)
+        @scope = scope
+
+        @shippable = String(params[:filter][:shippable]) unless params[:filter].nil?
+      end
+
+      def call
+        countries = by_shippability(scope)
+
+        countries
+      end
+
+      private
+
+      attr_reader :shippable, :scope
+
+      def shippable?
+        shippable.present?
+      end
+
+      def by_shippability(countries)
+        return countries unless shippable?
+
+        countries.joins(zones: :shipping_methods).distinct
+      end
+    end
+  end
+end

data/app/finders/spree/credit_cards/find.rb

@@ -0,0 +1,12 @@
+module Spree
+  module CreditCards
+    class Find
+      def execute(scope:, params:)
+        return scope.default.take if params[:id].eql?('default')
+        return scope.where(payment_method_id: params[:filter]['payment_method_id']) if params[:filter].present?
+
+        scope
+      end
+    end
+  end
+end

data/app/finders/spree/line_items/find_by_variant.rb

@@ -0,0 +1,13 @@
+module Spree
+  module LineItems
+    class FindByVariant
+      def execute(order:, variant:, options: {})
+        order.line_items.detect do |line_item|
+          next unless line_item.variant_id == variant.id
+
+          CompareLineItems.new.call(order: order, line_item: line_item, options: options).value
+        end
+      end
+    end
+  end
+end

data/app/finders/spree/orders/find_current.rb

@@ -0,0 +1,34 @@
+module Spree
+  module Orders
+    class FindCurrent
+      def execute(user:, store:, **params)
+        params = params.merge(store_id: store.id)
+
+        order = incomplete_orders.find_by(params)
+
+        return order unless order.nil?
+        return if user.nil?
+
+        incomplete_orders.order(created_at: :desc).find_by(store: store, user: user)
+      end
+
+      private
+
+      def incomplete_orders
+        Spree::Order.incomplete.includes(scope_includes)
+      end
+
+      def scope_includes
+        {
+          line_items: [
+            variant: [
+              :images,
+              option_values: :option_type,
+              product: :product_properties,
+            ]
+          ]
+        }
+      end
+    end
+  end
+end

data/app/finders/spree/products/find.rb

@@ -0,0 +1,93 @@
+module Spree
+  module Products
+    class Find
+      def initialize(scope:, params:, current_currency:)
+        @scope = scope
+
+        @ids      = String(params.dig(:filter, :ids)).split(',')
+        @price    = String(params.dig(:filter, :price)).split(',')
+        @currency = params[:currency] || current_currency
+        @taxons   = String(params.dig(:filter, :taxons)).split(',')
+        @name     = params.dig(:filter, :name)
+        @options  = params.dig(:filter, :options).try(:to_unsafe_hash)
+      end
+
+      def execute
+        products = by_ids(scope)
+        products = by_price(products)
+        products = by_taxons(products)
+        products = by_name(products)
+        products = by_options(products)
+
+        products
+      end
+
+      private
+
+      attr_reader :ids, :price, :currency, :taxons, :name, :options, :scope
+
+      def ids?
+        ids.present?
+      end
+
+      def price?
+        price.present?
+      end
+
+      def taxons?
+        taxons.present?
+      end
+
+      def name?
+        name.present?
+      end
+
+      def options?
+        options.present?
+      end
+
+      def name_matcher
+        Spree::Product.arel_table[:name].matches("%#{name}%")
+      end
+
+      def by_ids(products)
+        return products unless ids?
+
+        products.where(id: ids)
+      end
+
+      def by_price(products)
+        return products unless price?
+
+        products.joins(master: :default_price).
+          distinct.
+          where(
+            spree_prices: {
+              amount: price.min..price.max,
+              currency: currency
+            }
+          )
+      end
+
+      def by_taxons(products)
+        return products unless taxons?
+
+        products.joins(:taxons).distinct.where(spree_taxons: { id: taxons })
+      end
+
+      def by_name(products)
+        return products unless name?
+
+        products.where(name_matcher)
+      end
+
+      def by_options(products)
+        return products unless options?
+
+        options.map do |key, value|
+          products.with_option_value(key, value)
+        end.inject(:&)
+      end
+    end
+  end
+end

data/app/finders/spree/taxons/find.rb

@@ -0,0 +1,79 @@
+module Spree
+  module Taxons
+    class Find
+      def initialize(scope:, params:)
+        @scope = scope
+
+        @ids      = String(params[:ids]).split(',')
+        @parent   = params[:parent_id]
+        @taxonomy = params[:taxonomy_id]
+        @name     = params[:name]
+        @roots    = params[:roots]
+      end
+
+      def execute
+        taxons = by_ids(scope)
+        taxons = by_parent(taxons)
+        taxons = by_taxonomy(taxons)
+        taxons = by_roots(taxons)
+        taxons = by_name(taxons)
+
+        taxons
+      end
+
+      private
+
+      attr_reader :ids, :parent, :taxonomy, :roots, :name, :scope
+
+      def ids?
+        ids.present?
+      end
+
+      def parent?
+        parent.present?
+      end
+
+      def taxonomy?
+        taxonomy.present?
+      end
+
+      def roots?
+        roots.present?
+      end
+
+      def name?
+        name.present?
+      end
+
+      def by_ids(taxons)
+        return taxons unless ids?
+
+        taxons.where(id: ids)
+      end
+
+      def by_parent(taxons)
+        return taxons unless parent?
+
+        taxons.where(parent_id: parent)
+      end
+
+      def by_taxonomy(taxons)
+        return taxons unless taxonomy?
+
+        taxons.where(taxonomy_id: taxonomy)
+      end
+
+      def by_roots(taxons)
+        return taxons unless roots?
+
+        taxons.roots
+      end
+
+      def by_name(taxons)
+        return taxons unless name?
+
+        taxons.where(name: name)
+      end
+    end
+  end
+end

data/app/helpers/spree/base_helper.rb

@@ -80,8 +80,12 @@ module Spree
     end
 
     # human readable list of variant options
-    def variant_options(v, _options = {})
-      v.options_text
+    def variant_options(variant, _options = {})
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        BaseHelper#variant_options is deprecated and will be removed in Spree 4.0.
+        Please use Variant#options_text or LineItem#options_text
+      DEPRECATION
+      variant.options_text
     end
 
     def frontend_available?
@@ -91,7 +95,7 @@ module Spree
     private
 
     def create_product_image_tag(image, product, options, style)
-      options.reverse_merge! alt: image.alt.blank? ? product.name : image.alt
+      options[:alt] = image.alt.blank? ? product.name : image.alt
       image_tag main_app.url_for(image.url(style)), options
     end
 

data/app/helpers/spree/products_helper.rb

@@ -14,6 +14,7 @@ module Spree
       variant_amount = variant.amount_in(current_currency)
       product_amount = variant.product.amount_in(current_currency)
       return if variant_amount == product_amount || product_amount.nil?
+
       diff   = variant.amount_in(current_currency) - product_amount
       amount = Spree::Money.new(diff.abs, currency: current_currency).to_html
       label  = diff > 0 ? :add : :subtract
@@ -63,7 +64,7 @@ module Spree
 
       if product.available?
         Spree.t(:available)
-      elsif product.available_on && product.available_on.future?
+      elsif product.available_on&.future?
         Spree.t(:pending_sale)
       else
         Spree.t(:no_available_date_set)

data/app/models/concerns/spree/adjustment_source.rb

@@ -11,16 +11,21 @@ module Spree
 
     def create_adjustment(order, adjustable, included = false)
       amount = compute_amount(adjustable)
-      return if amount == 0
-      adjustments.new(order: order,
-                      adjustable: adjustable,
-                      label: label,
-                      amount: amount,
-                      included: included).save
+
+      return if amount.zero?
+
+      adjustments.new(
+        adjustable: adjustable,
+        amount: amount,
+        included: included,
+        label: label,
+        order: order
+      ).save
     end
 
     def create_unique_adjustment(order, adjustable)
       return if already_adjusted?(adjustable)
+
       create_adjustment(order, adjustable)
     end
 

data/app/models/concerns/spree/user_address.rb

@@ -15,14 +15,14 @@ module Spree
 
       def persist_order_address(order)
         b_address = bill_address || build_bill_address
-        b_address.attributes = order.bill_address.attributes.except('id', 'updated_at', 'created_at')
+        b_address.attributes = order.bill_address.value_attributes
         b_address.save
         update_attributes(bill_address_id: b_address.id)
 
         # May not be present if delivery step has been removed
         if order.ship_address
           s_address = ship_address || build_ship_address
-          s_address.attributes = order.ship_address.attributes.except('id', 'updated_at', 'created_at')
+          s_address.attributes = order.ship_address.value_attributes
           s_address.save
           update_attributes(ship_address_id: s_address.id)
         end

data/app/models/concerns/spree/vat_price_calculation.rb

@@ -2,6 +2,7 @@ module Spree
   module VatPriceCalculation
     def gross_amount(amount, price_options)
       return amount unless outside_default_vat_zone?(price_options)
+
       round_to_two_places(add_foreign_vat_for(amount, price_options))
     end
 
@@ -41,7 +42,7 @@ module Spree
     end
 
     def round_to_two_places(amount)
-      BigDecimal.new(amount.to_s).round(2, BigDecimal::ROUND_HALF_UP)
+      BigDecimal(amount.to_s).round(2, BigDecimal::ROUND_HALF_UP)
     end
   end
 end