solidus_sample 2.10.3 → 2.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 244679ae3da57d62142eaeb2171ee0141f3aa94c6e8e9249bba54949751c4aa3
-  data.tar.gz: 826d442b98a41449e1df1975107f7f30d7979541af483245cb6311163134847b
+  metadata.gz: f826094223c05a3989c35e5432ae7eb0eb82a9c285b05688240df5fa791c9f3c
+  data.tar.gz: 74e2199b7a816795714b216107cb8834d0275ebcdbe6b776ddd8b40fed28eaba
 SHA512:
-  metadata.gz: bbfb160a9493bd3a29b70b5e18591da14e5cbd4ba5148e120c92a110cb64bd75806a4098ada9eb59cc3371ae1e0d9209c3ae00b1d5d68620eafdf864842a6655
-  data.tar.gz: 53a7cea3312b1bb7a835dbcfa4421d175f19639410ab5c1b96d7c3c6275606a108657eea7e5e68ea39d0946256a7d9b3a717c5cc54bd9996ff07e6e03d24f21a
+  metadata.gz: 57468ff1ddb5605d7de00d54d89c0645a209d1353d2273bf50db4ec98354f23acaf974c63d075a28e8e3928abed7101fdf564e75d232ef02e2cfb3267c4dbaab
+  data.tar.gz: '090a1731d18841b19f7ffddcbefa983e48bb44c2124cd8e0036b512997d6784ce845c6401e946eeaefe7827877ade791b3580abdaa7a021be0c51ded526e1b61'

data/db/samples/addresses.rb

@@ -3,12 +3,10 @@
 united_states = Spree::Country.find_by!(iso: "US")
 new_york = Spree::State.find_by!(name: "New York")
 
-first_names = ["Sterling", "Jennette", "Salome", "Lyla", "Lola", "Cheree",
-               "Hettie", "Barbie", "Amelia", "Marceline", "Keeley", "Mi",
-               "Karon", "Jessika", "Emmy"]
-last_names = ["Torp", "Vandervort", "Stroman", "Lang", "Zulauf", "Bruen",
-              "Torp", "Gutmann", "Renner", "Bergstrom", "Sauer", "Gaylord",
-              "Mills", "Daugherty", "Stark"]
+names = ["Sterling Torp", "Jennette Vandervort", "Salome Stroman", "Lyla Lang",
+         "Lola Zulauf", "Cheree Bruen", "Hettie Torp", "Barbie Gutmann",
+         "Amelia Renner", "Marceline Bergstrom", "Keeley Sauer", "Mi Gaylord",
+         "Karon Mills", "Jessika Daugherty", "Emmy Stark"]
 street_addresses = ["7377 Jacobi Passage", "4725 Serena Ridges",
                     "79832 Hamill Creek", "0746 Genoveva Villages",
                     "86717 D'Amore Hollow", "8529 Delena Well",
@@ -28,8 +26,7 @@ phone_numbers = ["(392)859-7319 x670", "738-831-3210 x6047",
 
 2.times do
   Spree::Address.create!(
-    firstname: first_names.sample,
-    lastname: last_names.sample,
+    name: names.sample,
     address1: street_addresses.sample,
     address2: secondary_addresses.sample,
     city: cities.sample,

data/db/samples/assets.rb

@@ -27,22 +27,6 @@ def image(name, type = "jpg")
 end
 
 images = {
-  products[:solidus_tshirt].master => [
-    {
-      attachment: image("solidus_tshirt")
-    },
-    {
-      attachment: image("solidus_tshirt_back")
-    }
-  ],
-  products[:solidus_long].master => [
-    {
-      attachment: image("solidus_long")
-    },
-    {
-      attachment: image("solidus_long_back")
-    }
-  ],
   products[:solidus_snapback_cap].master => [
     {
       attachment: image("solidus_snapback_cap")
@@ -90,11 +74,6 @@ images = {
     {
       attachment: image("tote_bag_ruby")
     }
-  ],
-  products[:solidus_girly].master => [
-    {
-      attachment: image("solidus_girly")
-    }
   ]
 }
 

data/db/samples/orders.rb

@@ -9,7 +9,7 @@ store = Spree::Store.first!
 orders = []
 orders << Spree::Order.create!(
   number: "R123456789",
-  email: "spree@example.com",
+  email: "solidus@example.com",
   item_total: 150.95,
   adjustment_total: 150.95,
   total: 301.90,
@@ -19,7 +19,7 @@ orders << Spree::Order.create!(
 
 orders << Spree::Order.create!(
   number: "R987654321",
-  email: "spree@example.com",
+  email: "solidus@example.com",
   item_total: 15.95,
   adjustment_total: 15.95,
   total: 31.90,

data/db/samples/reimbursements.rb

@@ -2,22 +2,45 @@
 
 Spree::Sample.load_sample("orders")
 
-order          = Spree::Order.last
-inventory_unit = order.inventory_units.first
+order = Spree::Order.last
+inventory_unit = order.inventory_units.take!
 stock_location = inventory_unit.find_stock_item.stock_location
+return_reason = Spree::ReturnReason.active.take!
+preferred_reimbursement_type = Spree::ReimbursementType.where(name: 'Original').take!
+admin_user = if defined?(Spree::Auth)
+  Spree.user_class.admin.take!
+else
+  Spree.user_class.find_or_create_by!(email: 'admin@example.com')
+end
 
-return_item = Spree::ReturnItem.create(inventory_unit: inventory_unit)
+# Mark the order paid and shipped
+order.payments.pending.each(&:complete)
+order.shipments.each do |shipment|
+  shipment.suppress_mailer = false
+  shipment.ship!
+end
 
-return_item.exchange_variant = return_item.eligible_exchange_variants.last
-return_item.build_exchange_inventory_unit
-return_item.accept!
+# Create a return authorization
+return_item = Spree::ReturnItem.new(
+  inventory_unit: inventory_unit,
+  preferred_reimbursement_type: preferred_reimbursement_type
+)
 
-customer_return = Spree::CustomerReturn.create(
-  stock_location: stock_location,
-  return_items: [return_item]
+order.return_authorizations.create!(
+  reason: return_reason,
+  return_items: [return_item],
+  stock_location: stock_location
 )
 
-order.reimbursements.create(
-  customer_return: customer_return,
-  return_items: [return_item]
+# Create a customer return and mark it as received
+customer_return = Spree::CustomerReturn.create!(
+  return_items: [return_item],
+  stock_location: stock_location
 )
+return_item.reload
+return_item.receive!
+customer_return.process_return!
+
+# Accept the customer return and reimburse it
+reimbursement = Spree::Reimbursement.build_from_customer_return(customer_return)
+reimbursement.return_all(created_by: admin_user)

data/solidus_sample.gemspec

@@ -11,14 +11,14 @@ Gem::Specification.new do |s|
 
   s.author      = 'Solidus Team'
   s.email       = 'contact@solidus.io'
-  s.homepage    = 'http://solidus.io/'
+  s.homepage    = 'http://solidus.io'
   s.license     = 'BSD-3-Clause'
 
-  s.files        = `git ls-files`.split("\n")
-  s.require_path = 'lib'
-  s.requirements << 'none'
+  s.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(spec|script)/})
+  end
 
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 2.5.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_core', s.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_sample
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.11.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.3
+        version: 2.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.3
+        version: 2.11.4
 description: Sample data (including images) for use with Solidus.
 email: contact@solidus.io
 executables: []
@@ -89,9 +89,7 @@ files:
 - lib/spree_sample.rb
 - lib/tasks/sample.rake
 - solidus_sample.gemspec
-- spec/lib/load_sample_spec.rb
-- spec/spec_helper.rb
-homepage: http://solidus.io/
+homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
 metadata: {}
@@ -103,14 +101,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
-requirements:
-- none
+requirements: []
 rubygems_version: 3.1.4
 signing_key:
 specification_version: 4

data/spec/lib/load_sample_spec.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe "Load samples" do
-  it "doesn't raise any error" do
-    expect {
-      Spree::Core::Engine.load_seed
-      SpreeSample::Engine.load_samples
-    }.to output.to_stdout
-  end
-end

data/spec/spec_helper.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-# This file is copied to ~/spec when you run 'ruby script/generate rspec'
-# from the project root directory.
-ENV["RAILS_ENV"] ||= 'test'
-
-require 'solidus_sample'
-require 'spree/testing_support/dummy_app'
-DummyApp.setup(
-  gem_root: File.expand_path('..', __dir__),
-  lib_name: 'solidus_sample'
-)
-
-require 'rspec/rails'
-require 'database_cleaner'
-
-RSpec.configure do |config|
-  config.color = true
-  config.infer_spec_type_from_file_location!
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-  config.mock_with :rspec do |c|
-    c.syntax = :expect
-  end
-
-  config.before(:each) do
-    DatabaseCleaner.clean_with(:truncation)
-  end
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, comment the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = false
-
-  config.example_status_persistence_file_path = "./spec/examples.txt"
-
-  config.order = :random
-
-  Kernel.srand config.seed
-end