solidus_core 2.5.0.beta1 → 2.5.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87afc5077e860c226c85bb1b65fef534eea82174295c6650225ec4d06b5d03ba
-  data.tar.gz: d13a7557dd557f3d285ef7734de1a427b7c256d9433f2752bcf69e8c9dae6e17
+  metadata.gz: eea3e082ced1d6d489258eb5eb17e2f9d69d455be304f10d947cd4eb82f6d3ce
+  data.tar.gz: ab928452cf6ce9bd4bb658e7878ce7a816f56cc44cc2ff1e14faa26a642c8e40
 SHA512:
-  metadata.gz: 9fd697a0d3056759267af069b85c21e6c4d480858dbf29b8db4a3c61ebec6568e037c5b75901ca5f64a52eb74d8d3b64d93e444a4f50bde1bf58c6652d003b57
-  data.tar.gz: a874cdab7c718290bc92e7add51f3df2f13208888c8399b0d07ad4b5fd13e6fc6acc501839cf9ac53c543e9fc676e670577b38f37463d3e2c0b875cd9a460265
+  metadata.gz: 3341402dad6a4a27e844aa6390c4fc5fe73c56e757798503362d74842cbb17e2fa1389bfab3b1f88965e7e18eeb465b3897f29585e0b646d2dd30a22ce002732
+  data.tar.gz: e3e782f4b5f4faa8f0355460eb4a737479cf36094ca2fd3032c068d602f1a21f42069e80dfc8b90ef883fef115b2c61a1b15995dcebd7f4775b4b0c8e189c33b

data/app/models/spree/promotion_code/batch_builder.rb

@@ -26,27 +26,22 @@ class ::Spree::PromotionCode::BatchBuilder
   private
 
   def generate_random_codes
-    total_batches = (number_of_codes.to_f / self.class.batch_size).ceil
+    created_codes = 0
 
-    total_batches.times do |i|
-      codes_for_current_batch = Set.new
-      codes_to_generate = [self.class.batch_size, number_of_codes - i * batch_size].min
+    while created_codes < number_of_codes
+      max_codes_to_generate = [self.class.batch_size, number_of_codes - created_codes].min
 
-      while codes_for_current_batch.size < codes_to_generate
-        new_codes = Array.new(codes_to_generate) { generate_random_code }.to_set
-        codes_for_current_batch += get_unique_codes(new_codes)
-      end
+      new_codes = Array.new(max_codes_to_generate) { generate_random_code }.uniq
+      codes_for_current_batch = get_unique_codes(new_codes)
 
-      codes_for_current_batch.map do |value|
-        promotion.codes.build(value: value, promotion_code_batch: promotion_code_batch)
+      codes_for_current_batch.each do |value|
+        Spree::PromotionCode.create!(
+          value: value,
+          promotion: promotion,
+          promotion_code_batch: promotion_code_batch
+        )
       end
-
-      promotion.save!
-
-      # We have to reload the promotion because otherwise all promotion codes
-      # we are creating will remain in memory. Doing a reload will remove all
-      # codes from memory.
-      promotion.reload
+      created_codes += codes_for_current_batch.size
     end
   end
 

data/db/default/spree/refund_reasons.rb

@@ -1 +1 @@
-Spree::RefundReason.find_or_create_by(name: "Return processing")
+Spree::RefundReason.find_or_create_by!(name: "Return processing", mutable: false)

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.5.0.beta1"
+    "2.5.0.beta2"
   end
 
   def self.solidus_gem_version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.5.0.beta1
+  version: 2.5.0.beta2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1136,7 +1136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.