diff --git a/app/furniture/marketplace/cart.rb b/app/furniture/marketplace/cart.rb index c75b0e881..2ef36b9c9 100644 --- a/app/furniture/marketplace/cart.rb +++ b/app/furniture/marketplace/cart.rb @@ -16,7 +16,6 @@ class Cart < Record has_many :products, through: :cart_products, inverse_of: :carts has_encrypted :delivery_address - self.ignored_columns += ["delivery_address"] enum status: { pre_checkout: "pre_checkout", diff --git a/app/furniture/marketplace/order.rb b/app/furniture/marketplace/order.rb index 8757d77c8..c1ef11048 100644 --- a/app/furniture/marketplace/order.rb +++ b/app/furniture/marketplace/order.rb @@ -12,7 +12,6 @@ class Order < Record has_many :products, through: :ordered_products, inverse_of: :orders has_encrypted :delivery_address - self.ignored_columns += ["delivery_address"] enum status: { pre_checkout: "pre_checkout", diff --git a/db/migrate/20230303201956_drop_marketplace_orders_delivery_address.rb b/db/migrate/20230303201956_drop_marketplace_orders_delivery_address.rb new file mode 100644 index 000000000..0efbaa498 --- /dev/null +++ b/db/migrate/20230303201956_drop_marketplace_orders_delivery_address.rb @@ -0,0 +1,5 @@ +class DropMarketplaceOrdersDeliveryAddress < ActiveRecord::Migration[7.0] + def change + remove_column :marketplace_orders, :delivery_address, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 6f0ba1687..7737542db 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_03_02_202459) do +ActiveRecord::Schema[7.0].define(version: 2023_03_03_201956) do # These are extensions that must be enabled in order to support this database enable_extension "pgcrypto" enable_extension "plpgsql" @@ -134,7 +134,6 @@ t.uuid "shopper_id" t.string "status", default: "pre_checkout", null: false t.string "stripe_session_id" - t.string "delivery_address" t.string "contact_email" t.text "delivery_address_ciphertext" t.index ["marketplace_id"], name: "index_marketplace_orders_on_marketplace_id"