Change make_permalink behaviour

backend/spec/features/admin/orders/order_details_spec.rb

@@ -256,7 +256,7 @@
 
           context 'A shipment has shipped' do
             it 'should not show or let me back to the cart page, nor show the shipment edit buttons' do
-              order = create(:order, state: 'payment', number: "R100")
+              order = create(:order, state: 'payment')
               order.shipments.create!(stock_location_id: stock_location.id, state: 'shipped')
 
               visit spree.cart_admin_order_path(order)

core/app/models/spree/order.rb

@@ -131,7 +131,13 @@ def states
     validates :number, presence: true, uniqueness: { allow_blank: true }
     validates :store_id, presence: true
 
-    make_permalink field: :number
+    def self.find_by_param(value)
+      find_by number: value
+    end
+
+    def self.find_by_param!(value)
+      find_by! number: value
+    end
 
     delegate :update_totals, :persist_totals, to: :updater
     delegate :firstname, :lastname, to: :bill_address, prefix: true, allow_nil: true

core/lib/spree/core/permalinks.rb

@@ -48,24 +48,20 @@ def generate_permalink
       end
 
       def save_permalink(permalink_value = to_param)
-        with_lock do
-          permalink_value ||= generate_permalink
+        permalink_value ||= generate_permalink
+        permalink_field = self.class.permalink_field
 
-          field = self.class.permalink_field
-          # Do other links exist with this permalink?
-          other = self.class.where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
-          if other.any?
-            # Find the existing permalink with the highest number, and increment that number.
-            # (If none of the existing permalinks have a number, this will evaluate to 1.)
-            number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1
-            permalink_value += "-#{number}"
-          end
-          write_attribute(field, permalink_value)
+        loop do
+          other = self.class.where(permalink_field => permalink_value)
+          break unless other.exists?
+
+          # Try again with a new value
+          permalink_value = generate_permalink
         end
+        write_attribute(permalink_field, permalink_value)
       end
     end
   end
 end
 
 ActiveRecord::Base.send :include, Spree::Core::Permalinks
-ActiveRecord::Relation.send :include, Spree::Core::Permalinks