-

app/controllers/shop/shipping_address_controller.rb

@@ -17,6 +17,8 @@ def new
     end
     @address                      = Address.new
     if current_user
+      @address.uuid                 = @shop_order.id
+      @address.address_type         = @shop_order.class.name
       @address.first_name           = current_user.first_name
       @address.last_name            = current_user.last_name
       @address.city                 = current_user.city
@@ -71,7 +73,8 @@ def address_params
                                       :state, 
                                       :country, 
                                       :addressable_id, 
-                                      :addressable_type)
+                                      :addressable_type,
+                                      :uuid)
     end
 
 end

app/mailers/invoice_mailer.rb

@@ -68,7 +68,7 @@ def send_to_buyer
     invoice = render_to_string('shop/invoices/notify_buyer_email', layout: 'invoices')
 
     invoice_url   = url_for( controller: 'shop/invoices', action: 'show', id:  @shop_order.id )
-    ap invoice_url
+
     begin
       template_name = "invoice"
       template_content = []

app/models/admin.rb

@@ -15,6 +15,7 @@ def raise_accounts_version
   end
 
   def self.get_invoice_nr
+    #!!! thread safe no?
     admin = Admin.first_or_create
     admin.update(orders_count: admin.orders_count + 1)
     admin.orders_count

app/models/shop/order.rb

@@ -182,7 +182,7 @@ def require_shipping_address
   end
 
   def shipping_address
-    Address.find_by(addressable_id: self.id, addressable_type: self.class.name)
+    Address.find_by(uuid: self.id, addressable_type: self.class.name)
   end
 
   def payment_source

app/views/shop/shipping_address/_form.slim

@@ -25,6 +25,7 @@
       .col-sm-6
         = f.input :country
     = f.hidden_field :addressable_id    , value: @shop_order.id
+    = f.hidden_field :uuid              , value: @shop_order.id
     = f.hidden_field :addressable_type  , value: @shop_order.class.name
 
 

db/migrate/20151215212506_add_uuid_to_address.rb

@@ -0,0 +1,5 @@
+class AddUuidToAddress < ActiveRecord::Migration
+  def change
+    add_column :addresses, :uuid, :uuid
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151210131408) do
+ActiveRecord::Schema.define(version: 20151215212506) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -235,6 +235,7 @@
     t.datetime "updated_at",                   null: false
     t.string   "zip_code"
     t.string   "middle_name"
+    t.uuid     "uuid"
   end
 
   add_index "addresses", ["addressable_type", "addressable_id"], name: "index_addresses_on_addressable_type_and_addressable_id", using: :btree