solidus_core 2.7.4 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 155abc7caf186c93f8a96472138556b000580fa2336ebe4e97f8e457b5ce8ba2
-  data.tar.gz: 95660d2bfc41bd390f697cdbe9a2d4e49125429277b45381c796f586825c6355
+  metadata.gz: 6cfc7af157e2912ba67be54f77a8bbcc9c053609b8aac47a95cf94f8411023a5
+  data.tar.gz: 2c05f398e332a2a57e031b3009b0ca06508b4209760b145423716300bedad757
 SHA512:
-  metadata.gz: 932d0cac78e20e8d22fab60c6e150b729e435ac4334edf9512a8641d021eb5023c714b7cdd17bc8d1e4dd8f7cddcec6a5543599531adc045a0bf33d499a53d3a
-  data.tar.gz: ee7706ca6e3c270e22c01612c9d5933ae32c0db023651ea1b202fe1f24b5627493707d3a08c452d247cf6492f6a58fbc1a86bd809c6e8dba5df9471623900d30
+  metadata.gz: dc600844d181e8d722f84c456e673170287ad5c1eb6a983808fc29af90459b0cb5835e306c16d7ba8ef2c4123ac6bbd7d1485179656b905696f05c1076ee0835
+  data.tar.gz: 79493de4d9e86c27260795466c63f314d82fce1b92da34ab56b6b48c137612ec7f24ad408a45d0790f09274e1cc1cea7cb8ff0abb987f33f609ddbb95bbc1354

data/README.md

@@ -1,9 +1,9 @@
 Summary
 ------
-Solidus Core provides the essential e-commerce data models upon which the
+Solidus Core provides the essential ecommerce data models upon which the
 Solidus system depends.
 
-Core Models
+Core models
 -----------
 Solidus implements over 200 [models](https://github.com/solidusio/solidus/tree/master/core/app/models/spree),
 and thus a deep inspection of each in this README would be overkill. Instead,
@@ -15,26 +15,26 @@ Currently, these models remain in the Spree namespace as part of the legacy of
 The documentation of Solidus Core is still in progress. Contributions following
 this form are welcome and encouraged!
 
-* [The Order Sub-System](#the-order-sub-system)
-* [The User Sub-System](#the-user-sub-system)
-* [The Payment Sub-System](#the-payment-sub-system)
-* [The Inventory Sub-System](#the-inventory-sub-system)
-* [The Shipments Sub-System](#the-shipments-sub-system)
+* [Order sub-system](#order-sub-system)
+* [User sub-system](#user-sub-system)
+* [Payment sub-system](#payment-sub-system)
+* [Inventory sub-system](#inventory-sub-system)
+* [Shipments sub-system](#shipments-sub-system)
 
-## The Order Sub-System
+## Order sub-system
 * `Spree::Store` - Records store specific configuration such as store name and URL.
 * `Spree::Order` - The customers cart until completed, then acts as
-permenent record of the transaction.
+permanent record of the transaction.
 * `Spree::LineItem` - Variants placed in the order at a particular price.
 
-## The User Sub-System
+## User sub-system
 * `Spree::LegacyUser` - Default implementation of User.
 * `Spree::UserClassHandle` - Configuration point for User model implementation.
 * [solidus_auth_devise](https://github.com/solidusio/solidus_auth_devise) -
-An offical, more robust implementation of a User class with Devise
+An official, more robust implementation of a User class with Devise
 integration.
 
-## The Payment Sub-System
+## Payment sub-system
 * `Spree::Payment` - Manage and process a payment for an order, from a specific
 source (e.g. `Spree::CreditCard`) using a specific payment method (e.g
 `Solidus::Gateway::Braintree`).
@@ -43,7 +43,7 @@ source (e.g. `Spree::CreditCard`) using a specific payment method (e.g
 See https://github.com/solidusio/solidus_gateway/ for officially supported payment method implementations.
 * `Spree::CreditCard` - The `source` of a `Spree::Payment` using `Spree::PaymentMethod::CreditCard` as payment method.
 
-## The Inventory Sub-System
+## Inventory sub-system
 * `Spree::ReturnAuthorization` - Models the return of Inventory Units to
 a Stock Location for an Order.
 * `Spree::StockLocation` - Records the name and addresses from which stock items
@@ -54,14 +54,16 @@ shipment and which method has been selected to deliver the shipment.
 * `Spree::ShippingMethod` - Represents a means of having a shipment delivered,
 such as FedEx or UPS.
 
-## The Shipments Sub-System
+## Shipments sub-system
 * `Spree::Shipment` - An order's planned shipments including
 tracking and cost. Shipments are fulfilled from Stock Locations.
 
-Developer Notes
+Developer notes
 ---------------
 ## Testing
 
-Run the tests
+Run the tests:
 
-    bundle exec rspec
+```bash
+bundle exec rspec
+```

data/app/assets/images/logo/solidus.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="153px" height="52px" viewBox="0 0 153 52" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.5 (67469) - http://www.bohemiancoding.com/sketch -->
+    <title>solidus</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="solidus" transform="translate(7.000000, 9.000000)" fill="#000000">
+            <path d="M3.36538462,26.6135458 C5.12019231,28.501992 8.00480769,29.9601594 10.5528846,29.9601594 C13.3894231,29.9601594 15.0961538,28.3585657 15.0961538,27.0916335 C15.0961538,25.5856574 13.9182692,24.7968127 12.1153846,24.4621514 L9.32692308,23.936255 C2.88461538,22.7410359 1.08173077,20.685259 1.08173077,17.4342629 C1.08173077,13.5856574 4.35096154,10 10.0721154,10 C13.2451923,10 16.0336538,10.9322709 19.1586538,13.1553785 L16.3461538,16.5976096 C13.9423077,14.5657371 11.8028846,14.063745 10.1923077,14.063745 C8.07692308,14.063745 5.98557692,15.0916335 5.98557692,16.9322709 C5.98557692,18.2948207 7.06730769,19.0119522 8.96634615,19.3227092 L13.9423077,20.2549801 C18.0048077,20.9960159 20,22.9322709 20,26.3266932 C20,29.6733068 17.2596154,34 10.3125,34 C6.44230769,34 3.125,32.6374502 0,30.0079681 L3.36538462,26.6135458 Z" id="Path"></path>
+            <path d="M34.5,10 C42.4047619,10 47,15.988024 47,22 C47,28.011976 42.4047619,34 34.5,34 C26.5952381,34 22,28.011976 22,22 C22,15.988024 26.5714286,10 34.5,10 M34.5,29.4251497 C38.7619048,29.4251497 41.8571429,26.1197605 41.8571429,22.0239521 C41.8571429,17.9281437 38.7619048,14.6227545 34.5,14.6227545 C30.2380952,14.6227545 27.1428571,17.9281437 27.1428571,22.0239521 C27.1428571,26.1197605 30.2380952,29.4251497 34.5,29.4251497" id="Shape" fill-rule="nonzero"></path>
+            <path d="M64.5,4 C65.8834951,4 67,5.11650485 67,6.5 C67,7.88349515 65.8834951,9 64.5,9 C63.1165049,9 62,7.88349515 62,6.5 C62,5.11650485 63.1165049,4 64.5,4" id="Path"></path>
+            <rect id="Rectangle" x="62" y="14" width="5" height="20"></rect>
+            <path d="M89.1428571,4 L89.1428571,12.5273159 C87.1428571,11.0783848 84.5714286,10.1995249 81.5,10.1995249 C73.5952381,10.1995249 69,16.1377672 69,22.0997625 C69,28.0617577 73.5952381,34 81.5,34 C84.5714286,34 87.1428571,33.0973872 89.1428571,31.672209 L89.1428571,34 L94,34 L94,4 L89.1428571,4 Z M81.5,29.4394299 C77.2380952,29.4394299 74.1428571,26.1615202 74.1428571,22.0997625 C74.1428571,18.0380048 77.2380952,14.760095 81.5,14.760095 C85.7619048,14.760095 88.8571429,18.0380048 88.8571429,22.0997625 C88.8571429,26.1615202 85.7619048,29.4394299 81.5,29.4394299 Z" id="Shape" fill-rule="nonzero"></path>
+            <path d="M97.0482759,10 L101.972414,10 L101.972414,23.3413174 C101.972414,26.6946108 104.434483,29.0898204 107.524138,29.0898204 C110.613793,29.0898204 113.075862,26.6946108 113.075862,23.3413174 L113.075862,10 L118,10 L118,23.7724551 C118,30.1676647 112.97931,34 107.5,34 C102.044828,34 97,30.1916168 97,23.7724551 L97,10 L97.0482759,10 Z" id="Path"></path>
+            <path d="M122.365385,26.5896414 C124.120192,28.4780876 127.004808,29.936255 129.552885,29.936255 C132.389423,29.936255 134.096154,28.3346614 134.096154,27.0677291 C134.096154,25.561753 132.918269,24.7729084 131.115385,24.438247 L128.326923,23.9123506 C121.908654,22.7410359 120.105769,20.6613546 120.105769,17.4342629 C120.105769,13.5856574 123.375,10 129.096154,10 C132.269231,10 135.057692,10.9322709 138.182692,13.1553785 L135.370192,16.5976096 C132.966346,14.5657371 130.826923,14.063745 129.216346,14.063745 C127.100962,14.063745 125.009615,15.0916335 125.009615,16.9322709 C125.009615,18.2948207 126.091346,19.0119522 127.990385,19.3227092 L132.942308,20.2549801 C137.004808,20.9960159 139,22.9322709 139,26.3266932 C139,29.6733068 136.259615,34 129.3125,34 C125.442308,34 122.125,32.6374502 119,30.0079681 L122.365385,26.5896414 Z" id="Path"></path>
+            <path d="M56.3986486,28.6315789 C55.0506757,27.8442105 54.5067568,26.9614035 54.4358108,24.6708772 L54.4358108,8.87578947 C54.4358108,4.1277193 52.1182432,2.40982456 47.1283784,0 L45,3.84140351 L47.6013514,5.3445614 C48.9493243,6.13192982 49.4932432,7.01473684 49.5641892,9.30526316 L49.5641892,25.1242105 C49.5641892,29.8722807 51.8817568,31.5901754 56.8716216,34 L59,30.1585965 L56.3986486,28.6315789 Z" id="Path"></path>
+        </g>
+    </g>
+</svg>

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

@@ -45,7 +45,7 @@ Spree.ajax = function(url, options) {
   options = options || {};
   options = $.extend(options, {
     headers: {
-      "X-Spree-Token": Spree.api_key
+      'Authorization': 'Bearer ' + Spree.api_key
     }
   });
   return $.ajax(url, options);
@@ -54,7 +54,7 @@ Spree.ajax = function(url, options) {
 Spree.routes = {
   states_search: Spree.pathFor('api/states'),
   apply_coupon_code: function(order_id) {
-    return Spree.pathFor("api/orders/" + order_id + "/apply_coupon_code");
+    return Spree.pathFor("api/orders/" + order_id + "/coupon_codes");
   }
 };
 

data/app/helpers/spree/base_helper.rb

@@ -111,13 +111,7 @@ module Spree
     end
 
     def available_countries(restrict_to_zone: Spree::Config[:checkout_zone])
-      checkout_zone = Zone.find_by(name: restrict_to_zone)
-
-      if checkout_zone && checkout_zone.kind == 'country'
-        countries = checkout_zone.country_list
-      else
-        countries = Country.all
-      end
+      countries = Spree::Country.available(restrict_to_zone: restrict_to_zone)
 
       country_names = Carmen::Country.all.map do |country|
         [country.code, country.name]

data/app/helpers/spree/taxons_helper.rb

@@ -7,12 +7,12 @@ module Spree
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max = 4)
       price_scope = Spree::Price.where(current_pricing_options.search_arguments)
-      products = taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT spree_products.*, spree_products_taxons.position").limit(max)
+      products = taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").limit(max)
       if products.size < max
         products_arel = Spree::Product.arel_table
         taxon.descendants.each do |descendent_taxon|
           to_get = max - products.length
-          products += descendent_taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
+          products += descendent_taxon.active_products.joins(:prices).merge(price_scope).select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
           break if products.size >= max
         end
       end

data/app/mailers/spree/carton_mailer.rb

@@ -6,10 +6,10 @@ module Spree
     # shipped. If a carton contains items from multiple orders then this will be
     # called with that carton one time for each order.
     #
-    # @param carton [Spree::Carton] the shipped carton
-    # @param order [Spree::Order] one of the orders with items in the carton
-    # @param resend [Boolean] indicates whether the email is a 'resend' (e.g.
-    #        triggered by the admin "resend" button)
+    # @option options carton [Spree::Carton] the shipped carton
+    # @option options order [Spree::Order] one of the orders with items in the carton
+    # @option options resend [Boolean] indicates whether the email is a 'resend' (e.g.
+    #   triggered by the admin "resend" button)
     # @return [Mail::Message]
     #
     # Note: The signature of this method has changed. The new (non-deprecated)

data/app/models/spree/calculator/flat_percent_item_total.rb

@@ -7,7 +7,10 @@ module Spree
     preference :flat_percent, :decimal, default: 0
 
     def compute(object)
-      computed_amount = (object.amount * preferred_flat_percent / 100).round(2)
+      order = object.is_a?(Order) ? object : object.order
+      preferred_currency = order.currency
+      currency_exponent = ::Money::Currency.find(preferred_currency).exponent
+      computed_amount = (object.amount * preferred_flat_percent / 100).round(currency_exponent)
 
       # We don't want to cause the promotion adjustments to push the order into a negative total.
       if computed_amount > object.amount

data/app/models/spree/calculator/shipping/flat_percent_item_total.rb

@@ -9,12 +9,14 @@ module Spree
       preference :flat_percent, :decimal, default: 0
 
       def compute_package(package)
-        compute_from_price(total(package.contents))
+        value = compute_from_price(total(package.contents))
+        preferred_currency = package.order.currency
+        currency_exponent = ::Money::Currency.find(preferred_currency).exponent
+        value.round(currency_exponent)
       end
 
       def compute_from_price(price)
-        value = price * BigDecimal(preferred_flat_percent.to_s) / 100.0
-        value.round(2)
+        price * BigDecimal(preferred_flat_percent.to_s) / 100.0
       end
     end
   end

data/app/models/spree/calculator/tiered_percent.rb

@@ -31,7 +31,8 @@ module Spree
       end
 
       if preferred_currency.casecmp(order.currency).zero?
-        (object.amount * (percent || preferred_base_percent) / 100).round(2)
+        currency_exponent = ::Money::Currency.find(preferred_currency).exponent
+        (object.amount * (percent || preferred_base_percent) / 100).round(currency_exponent)
       else
         0
       end

data/app/models/spree/country.rb

@@ -17,6 +17,14 @@ module Spree
       end
     end
 
+    def self.available(restrict_to_zone: Spree::Config[:checkout_zone])
+      checkout_zone = Zone.find_by(name: restrict_to_zone)
+
+      return checkout_zone.country_list if checkout_zone.try(:kind) == 'country'
+
+      all
+    end
+
     def <=>(other)
       name <=> other.name
     end

data/app/models/spree/fulfilment_changer.rb

@@ -46,7 +46,7 @@ module Spree
       desired_shipment.save! if desired_shipment.new_record?
 
       # Retrieve how many on hand items we can take from desired stock location
-      available_quantity = [desired_shipment.stock_location.count_on_hand(variant), 0].max
+      available_quantity = [desired_shipment.stock_location.count_on_hand(variant), default_on_hand_quantity].max
 
       new_on_hand_quantity = [available_quantity, quantity].min
       unstock_quantity = desired_shipment.stock_location.backorderable?(variant) ? quantity : new_on_hand_quantity
@@ -114,6 +114,14 @@ module Spree
       current_shipment.order.completed? && current_stock_location != desired_stock_location
     end
 
+    def default_on_hand_quantity
+      if current_stock_location != desired_stock_location
+        0
+      else
+        current_shipment.inventory_units.where(variant: variant).on_hand.count
+      end
+    end
+
     def current_shipment_not_already_shipped
       if current_shipment.shipped?
         errors.add(:current_shipment, :has_already_been_shipped)

data/app/models/spree/gallery/product_gallery.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Spree
+  module Gallery
+    class ProductGallery
+      def initialize(product)
+        @product = product
+      end
+
+      # A list of all images associated with this gallery
+      #
+      # @return [Enumerable<Spree::Image>] all images in the gallery
+      def images
+        @images ||= @product.variant_images
+      end
+    end
+  end
+end

data/app/models/spree/gallery/variant_gallery.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Spree
+  module Gallery
+    class VariantGallery
+      def initialize(variant)
+        @variant = variant
+      end
+
+      # A list of all images associated with this gallery
+      #
+      # @return [Enumerable<Spree::Image>] all images in the gallery
+      def images
+        @images ||=
+          @variant.images.presence ||
+          (!@variant.is_master? && @variant.product.master.images).presence ||
+          Spree::Image.none
+      end
+    end
+  end
+end

data/app/models/spree/image.rb

@@ -19,11 +19,21 @@ module Spree
     # we need to look at the write-queue for images which have not been saved yet
     after_post_process :find_dimensions, if: :valid?
 
-    # used by admin products autocomplete
     def mini_url
+      Spree::Deprecation.warn(
+        'Spree::Image#mini_url is DEPRECATED. Use Spree::Image#url(:mini) instead.'
+      )
       attachment.url(:mini, false)
     end
 
+    def url(size)
+      attachment.url(size)
+    end
+
+    def filename
+      attachment_file_name
+    end
+
     def find_dimensions
       temporary = attachment.queued_for_write[:original]
       filename = temporary.path unless temporary.nil?

data/app/models/spree/inventory_unit.rb

@@ -81,9 +81,17 @@ module Spree
 
     # Updates the given inventory units to not be pending.
     #
+    # @deprecated do not use this, use
+    #   Spree::Stock::InventoryUnitsFinalizer.new(inventory_units).run!
     # @param inventory_units [<Spree::InventoryUnit>] the inventory to be
     #   finalized
     def self.finalize_units!(inventory_units)
+      Spree::Deprecation.warn(
+        "inventory_units.finalize_units!(inventory_units) is deprecated. Please
+        use Spree::Stock::InventoryUnitsFinalizer.new(inventory_units).run!",
+        caller
+      )
+
       inventory_units.map do |iu|
         iu.update_columns(
           pending: false,

data/app/models/spree/line_item.rb

@@ -4,7 +4,7 @@ module Spree
   # Variants placed in the Order at a particular price.
   #
   # `Spree::LineItem` is an ActiveRecord model which records which `Spree::Variant`
-  # a customer has chosen to place in their order. It also acts as the permenent
+  # a customer has chosen to place in their order. It also acts as the permanent
   # record of the customer's order by recording relevant price, taxation, and inventory
   # concerns. Line items can also have adjustments placed on them as part of the
   # promotion system.

data/app/models/spree/order.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/order/checkout'
-require 'spree/order/number_generator'
-
 module Spree
   # The customers cart until completed, then acts as permanent record of the transaction.
   #
@@ -138,7 +135,6 @@ module Spree
       find_by! number: value
     end
 
-    delegate :update_totals, :persist_totals, to: :updater
     delegate :firstname, :lastname, to: :bill_address, prefix: true, allow_nil: true
     alias_method :billing_firstname, :bill_address_firstname
     alias_method :billing_lastname, :bill_address_lastname

data/app/models/spree/order_cancellations.rb

@@ -23,10 +23,16 @@ class Spree::OrderCancellations
   # @api public
   #
   # @param [Array<InventoryUnit>] inventory_units the inventory units to be short shipped
-  # @param [String] whodunnit the system or person that is short shipping the inventory units
+  # @param [Spree.user_class] whodunnit (deprecated) the system or person that is short shipping the inventory unit
+  # @param [Spree.user_class] created_by the system or person that is short shipping the inventory unit
   #
   # @return [Array<UnitCancel>] the units that have been canceled due to short shipping
-  def short_ship(inventory_units, whodunnit: nil)
+  def short_ship(inventory_units, whodunnit: nil, created_by: nil)
+    if whodunnit
+      created_by ||= whodunnit
+      Spree::Deprecation.warn("Calling #short_ship on #{self} with whodunnit is deprecated, use created_by instead")
+    end
+
     if inventory_units.map(&:order_id).uniq != [@order.id]
       raise ArgumentError, "Not all inventory units belong to this order"
     end
@@ -36,7 +42,7 @@ class Spree::OrderCancellations
     Spree::OrderMutex.with_lock!(@order) do
       Spree::InventoryUnit.transaction do
         inventory_units.each do |iu|
-          unit_cancels << short_ship_unit(iu, whodunnit: whodunnit)
+          unit_cancels << short_ship_unit(iu, created_by: created_by)
         end
 
         update_shipped_shipments(inventory_units)
@@ -59,17 +65,23 @@ class Spree::OrderCancellations
   #
   # @param [InventoryUnit] inventory_unit the inventory unit to be canceled
   # @param [String] reason the reason that you are canceling the inventory unit
-  # @param [String] whodunnit the system or person that is canceling the inventory unit
+  # @param [Spree.user_class] whodunnit (deprecated) the system or person that is canceling the inventory unit
+  # @param [Spree.user_class] created_by the system or person that is canceling the inventory unit
   #
   # @return [UnitCancel] the unit that has been canceled
-  def cancel_unit(inventory_unit, reason: Spree::UnitCancel::DEFAULT_REASON, whodunnit: nil)
+  def cancel_unit(inventory_unit, reason: Spree::UnitCancel::DEFAULT_REASON, whodunnit: nil, created_by: nil)
+    if whodunnit
+      created_by ||= whodunnit
+      Spree::Deprecation.warn("Calling #cancel_unit on #{self} with whodunnit is deprecated, use created_by instead")
+    end
+
     unit_cancel = nil
 
     Spree::OrderMutex.with_lock!(@order) do
       unit_cancel = Spree::UnitCancel.create!(
         inventory_unit: inventory_unit,
         reason: reason,
-        created_by: whodunnit
+        created_by: created_by
       )
 
       inventory_unit.cancel!
@@ -82,14 +94,18 @@ class Spree::OrderCancellations
   #
   # @api public
   # @param [Array<InventoryUnit>] inventory_units the inventory units to be reimbursed
+  # @param [Spree.user_class] created_by the user that is performing this action
   # @return [Reimbursement] the reimbursement for inventory being canceled
-  def reimburse_units(inventory_units)
+  def reimburse_units(inventory_units, created_by: nil)
+    unless created_by
+      Spree::Deprecation.warn("Calling #reimburse_units on #{self} without created_by is deprecated")
+    end
     reimbursement = nil
 
     Spree::OrderMutex.with_lock!(@order) do
       return_items = inventory_units.map(&:current_or_new_return_item)
       reimbursement = Spree::Reimbursement.new(order: @order, return_items: return_items)
-      reimbursement.return_all
+      reimbursement.return_all(created_by: created_by)
     end
 
     reimbursement
@@ -97,11 +113,16 @@ class Spree::OrderCancellations
 
   private
 
-  def short_ship_unit(inventory_unit, whodunnit: nil)
+  def short_ship_unit(inventory_unit, whodunnit: nil, created_by: nil)
+    if whodunnit
+      created_by ||= whodunnit
+      Spree::Deprecation.warn("Calling #short_ship_unit on #{self} with whodunnit is deprecated, use created_by instead")
+    end
+
     unit_cancel = Spree::UnitCancel.create!(
       inventory_unit: inventory_unit,
       reason: Spree::UnitCancel::SHORT_SHIP,
-      created_by: whodunnit
+      created_by: created_by
     )
     unit_cancel.adjust!
     inventory_unit.cancel!