Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

accept changesfrom upstream and resolve merge conflict ~ automatic go invoices

Browse source
This commit is contained in:
viehlieb 2022-02-03 12:15:21 +01:00
commit bb3e049630
27 changed files with 263 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

27
db/migrate/20190101000000_create_active_storage_tables.active_storage.rb Normal file
View file

@ -0,0 +1,27 @@
# This migration comes from active_storage (originally 20170806125915)
class CreateActiveStorageTables < ActiveRecord::Migration[4.2][5.2]
def change
create_table :active_storage_blobs do |t|
t.string :key, null: false
t.string :filename, null: false
t.string :content_type
t.text :metadata
t.bigint :byte_size, null: false
t.string :checksum, null: false
t.datetime :created_at, null: false
t.index [:key], unique: true
end
create_table :active_storage_attachments do |t|
t.string :name, null: false
t.references :record, null: false, polymorphic: true, index: false
t.references :blob, null: false
t.datetime :created_at, null: false
t.index [:record_type, :record_id, :name, :blob_id], name: "index_active_storage_attachments_uniqueness", unique: true
t.foreign_key :active_storage_blobs, column: :blob_id
end
end
end

119
db/schema.rb
View file

@ -10,15 +10,36 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2021_12_08_142719) do
ActiveRecord::Schema.define(version: 2021_02_05_090257) do
create_table "article_categories", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "active_storage_attachments", id: :integer, force: :cascade do |t|
t.string "name", null: false
t.string "record_type", null: false
t.bigint "record_id", null: false
t.bigint "blob_id", null: false
t.datetime "created_at", null: false
t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
end
create_table "active_storage_blobs", id: :integer, force: :cascade do |t|
t.string "key", null: false
t.string "filename", null: false
t.string "content_type"
t.text "metadata"
t.bigint "byte_size", null: false
t.string "checksum", null: false
t.datetime "created_at", null: false
t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
end
create_table "article_categories", id: :integer, force: :cascade do |t|
t.string "name", default: "", null: false
t.string "description"
t.index ["name"], name: "index_article_categories_on_name", unique: true
end
create_table "article_prices", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "article_prices", id: :integer, force: :cascade do |t|
t.integer "article_id", null: false
t.decimal "price", precision: 8, scale: 2, default: "0.0", null: false
t.decimal "tax", precision: 8, scale: 2, default: "0.0", null: false
@ -28,7 +49,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["article_id"], name: "index_article_prices_on_article_id"
end
create_table "articles", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "articles", id: :integer, force: :cascade do |t|
t.string "name", default: "", null: false
t.integer "supplier_id", default: 0, null: false
t.integer "article_category_id", default: 0, null: false
@ -54,14 +75,14 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["type"], name: "index_articles_on_type"
end
create_table "assignments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "assignments", id: :integer, force: :cascade do |t|
t.integer "user_id", default: 0, null: false
t.integer "task_id", default: 0, null: false
t.boolean "accepted", default: false
t.index ["user_id", "task_id"], name: "index_assignments_on_user_id_and_task_id", unique: true
end
create_table "bank_accounts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "bank_accounts", id: :integer, force: :cascade do |t|
t.string "name", null: false
t.string "iban"
t.string "description"
@ -70,7 +91,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.string "import_continuation_point"
end
create_table "bank_transactions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "bank_transactions", id: :integer, force: :cascade do |t|
t.integer "bank_account_id", null: false
t.string "external_id"
t.date "date"
@ -84,7 +105,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["financial_link_id"], name: "index_bank_transactions_on_financial_link_id"
end
create_table "documents", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "documents", id: :integer, force: :cascade do |t|
t.string "name"
t.string "mime"
t.binary "data", limit: 4294967295
@ -95,16 +116,16 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["parent_id"], name: "index_documents_on_parent_id"
end
create_table "financial_links", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "financial_links", id: :integer, force: :cascade do |t|
t.text "note"
end
create_table "financial_transaction_classes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "financial_transaction_classes", id: :integer, force: :cascade do |t|
t.string "name", null: false
t.boolean "ignore_for_account_balance", default: false, null: false
end
create_table "financial_transaction_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "financial_transaction_types", id: :integer, force: :cascade do |t|
t.string "name", null: false
t.integer "financial_transaction_class_id", null: false
t.string "name_short"
@ -112,7 +133,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["name_short"], name: "index_financial_transaction_types_on_name_short"
end
create_table "financial_transactions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "financial_transactions", id: :integer, force: :cascade do |t|
t.integer "ordergroup_id"
t.decimal "amount", precision: 8, scale: 2, default: "0.0", null: false
t.text "note", null: false
@ -126,7 +147,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["reverts_id"], name: "index_financial_transactions_on_reverts_id", unique: true
end
create_table "group_order_article_quantities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "group_order_article_quantities", id: :integer, force: :cascade do |t|
t.integer "group_order_article_id", default: 0, null: false
t.integer "quantity", default: 0
t.integer "tolerance", default: 0
@ -134,7 +155,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["group_order_article_id"], name: "index_group_order_article_quantities_on_group_order_article_id"
end
create_table "group_order_articles", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "group_order_articles", id: :integer, force: :cascade do |t|
t.integer "group_order_id", default: 0, null: false
t.integer "order_article_id", default: 0, null: false
t.integer "quantity", default: 0, null: false
@ -147,17 +168,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["order_article_id"], name: "index_group_order_articles_on_order_article_id"
end
create_table "group_order_invoices", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
t.integer "group_order_id"
t.bigint "invoice_number"
t.date "invoice_date"
t.string "payment_method"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["group_order_id"], name: "index_group_order_invoices_on_group_order_id", unique: true
end
create_table "group_orders", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "group_orders", id: :integer, force: :cascade do |t|
t.integer "ordergroup_id"
t.integer "order_id", default: 0, null: false
t.decimal "price", precision: 8, scale: 2, default: "0.0", null: false
@ -170,7 +181,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["ordergroup_id"], name: "index_group_orders_on_ordergroup_id"
end
create_table "groups", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "groups", id: :integer, force: :cascade do |t|
t.string "type", default: "", null: false
t.string "name", default: "", null: false
t.string "description"
@ -195,7 +206,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["name"], name: "index_groups_on_name", unique: true
end
create_table "invites", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "invites", id: :integer, force: :cascade do |t|
t.string "token", default: "", null: false
t.datetime "expires_at", null: false
t.integer "group_id", default: 0, null: false
@ -204,7 +215,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["token"], name: "index_invites_on_token"
end
create_table "invoices", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "invoices", id: :integer, force: :cascade do |t|
t.integer "supplier_id"
t.string "number"
t.date "date"
@ -222,7 +233,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["supplier_id"], name: "index_invoices_on_supplier_id"
end
create_table "links", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "links", id: :integer, force: :cascade do |t|
t.string "name", null: false
t.string "url", null: false
t.integer "workgroup_id"
@ -230,7 +241,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.string "authorization"
end
create_table "mail_delivery_status", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "mail_delivery_status", id: :integer, force: :cascade do |t|
t.datetime "created_at"
t.string "email", null: false
t.string "message", null: false
@ -239,13 +250,13 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["email"], name: "index_mail_delivery_status_on_email"
end
create_table "memberships", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "memberships", id: :integer, force: :cascade do |t|
t.integer "group_id", default: 0, null: false
t.integer "user_id", default: 0, null: false
t.index ["user_id", "group_id"], name: "index_memberships_on_user_id_and_group_id", unique: true
end
create_table "message_recipients", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "message_recipients", id: :integer, force: :cascade do |t|
t.integer "message_id", null: false
t.integer "user_id", null: false
t.integer "email_state", default: 0, null: false
@ -254,7 +265,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["user_id", "read_at"], name: "index_message_recipients_on_user_id_and_read_at"
end
create_table "messages", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "messages", id: :integer, force: :cascade do |t|
t.integer "sender_id"
t.string "subject", null: false
t.text "body"
@ -266,7 +277,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.binary "received_email", limit: 16777215
end
create_table "oauth_access_grants", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "oauth_access_grants", id: :integer, force: :cascade do |t|
t.integer "resource_owner_id", null: false
t.integer "application_id", null: false
t.string "token", null: false
@ -278,7 +289,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true
end
create_table "oauth_access_tokens", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "oauth_access_tokens", id: :integer, force: :cascade do |t|
t.integer "resource_owner_id"
t.integer "application_id"
t.string "token", null: false
@ -292,7 +303,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true
end
create_table "oauth_applications", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "oauth_applications", id: :integer, force: :cascade do |t|
t.string "name", null: false
t.string "uid", null: false
t.string "secret", null: false
@ -304,7 +315,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true
end
create_table "order_articles", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "order_articles", id: :integer, force: :cascade do |t|
t.integer "order_id", default: 0, null: false
t.integer "article_id", default: 0, null: false
t.integer "quantity", default: 0, null: false
@ -318,7 +329,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["order_id"], name: "index_order_articles_on_order_id"
end
create_table "order_comments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "order_comments", id: :integer, force: :cascade do |t|
t.integer "order_id"
t.integer "user_id"
t.text "text"
@ -326,7 +337,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["order_id"], name: "index_order_comments_on_order_id"
end
create_table "orders", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "orders", id: :integer, force: :cascade do |t|
t.integer "supplier_id"
t.text "note"
t.datetime "starts"
@ -345,7 +356,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["state"], name: "index_orders_on_state"
end
create_table "page_versions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "page_versions", id: :integer, force: :cascade do |t|
t.integer "page_id"
t.integer "lock_version"
t.text "body"
@ -356,7 +367,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["page_id"], name: "index_page_versions_on_page_id"
end
create_table "pages", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "pages", id: :integer, force: :cascade do |t|
t.string "title"
t.text "body"
t.string "permalink"
@ -370,20 +381,20 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["title"], name: "index_pages_on_title"
end
create_table "periodic_task_groups", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "periodic_task_groups", id: :integer, force: :cascade do |t|
t.date "next_task_date"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "poll_choices", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "poll_choices", id: :integer, force: :cascade do |t|
t.integer "poll_vote_id", null: false
t.integer "choice", null: false
t.integer "value", null: false
t.index ["poll_vote_id", "choice"], name: "index_poll_choices_on_poll_vote_id_and_choice", unique: true
end
create_table "poll_votes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "poll_votes", id: :integer, force: :cascade do |t|
t.integer "poll_id", null: false
t.integer "user_id", null: false
t.integer "ordergroup_id"
@ -393,7 +404,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["poll_id", "user_id", "ordergroup_id"], name: "index_poll_votes_on_poll_id_and_user_id_and_ordergroup_id", unique: true
end
create_table "polls", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "polls", id: :integer, force: :cascade do |t|
t.integer "created_by_user_id", null: false
t.string "name", null: false
t.text "description"
@ -413,7 +424,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["final_choice"], name: "index_polls_on_final_choice"
end
create_table "printer_job_updates", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "printer_job_updates", id: :integer, force: :cascade do |t|
t.integer "printer_job_id", null: false
t.datetime "created_at", null: false
t.string "state", null: false
@ -421,7 +432,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["printer_job_id", "created_at"], name: "index_printer_job_updates_on_printer_job_id_and_created_at"
end
create_table "printer_jobs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "printer_jobs", id: :integer, force: :cascade do |t|
t.integer "order_id"
t.string "document", null: false
t.integer "created_by_user_id", null: false
@ -430,7 +441,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["finished_at"], name: "index_printer_jobs_on_finished_at"
end
create_table "settings", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "settings", id: :integer, force: :cascade do |t|
t.string "var", null: false
t.text "value"
t.integer "thing_id"
@ -440,7 +451,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true
end
create_table "stock_changes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "stock_changes", id: :integer, force: :cascade do |t|
t.integer "stock_event_id"
t.integer "order_id"
t.integer "stock_article_id"
@ -450,7 +461,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["stock_event_id"], name: "index_stock_changes_on_stock_event_id"
end
create_table "stock_events", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "stock_events", id: :integer, force: :cascade do |t|
t.integer "supplier_id"
t.date "date"
t.datetime "created_at"
@ -460,13 +471,13 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["supplier_id"], name: "index_stock_events_on_supplier_id"
end
create_table "supplier_categories", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "supplier_categories", id: :integer, force: :cascade do |t|
t.string "name", null: false
t.string "description"
t.integer "financial_transaction_class_id"
end
create_table "suppliers", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "suppliers", id: :integer, force: :cascade do |t|
t.string "name", default: "", null: false
t.string "address", default: "", null: false
t.string "phone", default: "", null: false
@ -488,7 +499,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["name"], name: "index_suppliers_on_name", unique: true
end
create_table "tasks", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "tasks", id: :integer, force: :cascade do |t|
t.string "name", default: "", null: false
t.text "description"
t.date "due_date"
@ -505,7 +516,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_142719) do
t.index ["workgroup_id"], name: "index_tasks_on_workgroup_id"
end
create_table "users", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
create_table "users", id: :integer, force: :cascade do |t|
t.string "nick"
t.string "password_hash", default: "", null: false
t.string "password_salt", default: "", null: false