diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 19602902..00000000 --- a/.drone.yml +++ /dev/null @@ -1,145 +0,0 @@ -kind: pipeline -type: docker -name: build and test - -steps: - - name: rubocop - image: circleci/ruby:2.7-bullseye-node-browsers-legacy - commands: - - sudo apt install --no-install-recommends -y libmagic-dev - - sudo -E bundle install - - sudo -E bundle exec rubocop - volumes: - - name: gem-cache - path: /bundle - - name: tmp - path: /drone/src/tmp - failure: ignore - - - - name: build_test - image: circleci/ruby:2.7-bullseye-node-browsers-legacy - commands: - - sudo apt install --no-install-recommends -y libmagic-dev - - echo 'Wait for db container'; sleep 30 - - bundle config set path '/bundle' - - bundle config set without 'production' - - sudo -E bundle install - - sudo -E bundle exec rake foodsoft:setup_development_docker || true - - sudo -E bundle exec rake rspec-rerun:spec - volumes: - - name: gem-cache - path: /bundle - - name: tmp - path: /drone/src/tmp - environment: - RAILS_LOG_TO_STDOUT: true - RAILS_ENV: test - COVERAGE: lcov - DATABASE_URL: mysql2://user:password@mariadb/test?encoding=utf8mb4 - DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true - PARALLEL_TEST_PROCESSORS: 60 - -services: - - name: mariadb - image: mariadb - environment: - MYSQL_USER: user - MYSQL_PASSWORD: password - MYSQL_DATABASE: test - MYSQL_ROOT_PASSWORD: password - -volumes: - - name: gem-cache - host: - path: /tmp/cache - - name: tmp - temp: {} ---- - -kind: pipeline -type: docker -name: docker build and deploy -steps: - - name: build and publish docker image - image: plugins/docker - settings: - registry: git.local-it.org - repo: git.local-it.org/foodsoft/foodsoft - username: philipp - password: - from_secret: docker_registry - tags: - - latest - - ${DRONE_BRANCH} - - ${DRONE_COMMIT:0:8} - cache_from: - - "git.local-it.org/foodsoft/foodsoft:latest" - - "git.local-it.org/foodsoft/foodsoft:${DRONE_BRANCH}" - - name: deployment - image: git.local-it.org/philipp/stack-ssh-deply:latest - settings: - stack: "foodsoft_${DRONE_BRANCH}" - compose: "deployment/compose.yml" - deploy_key: - from_secret: drone_deploy_key - host: "dev.local-it.cloud" - user: "root" - port: 22 - reg_user: philipp - reg_pass: - from_secret: docker_registry - reg_url: git.local-it.org - image: git.local-it.org/foodsoft/foodsoft:${DRONE_COMMIT:0:8} - generate_secrets: true - networks: - - proxy - environment: - IMAGE: git.local-it.org/foodsoft/foodsoft:${DRONE_COMMIT:0:8} - STACK_NAME: "foodsoft_${DRONE_BRANCH}" - DOMAIN: "foodsoft.dev.local-it.cloud" - LETS_ENCRYPT_ENV: production - FOODCOOP_MULTI_INSTALL: true - FOODCOOP_NAME: Einkaufskooperative Foobar - FOODCOOP_CITY: Berlin - FOODCOOP_COUNTRY: Deutschland - FOODCOOP_EMAIL: foodsoft@local-it.org - FOODCOOP_PHONE: 123456789 - FOODCOOP_STREET: Einkaufsstraße 5 - FOODCOOP_ZIP_CODE: 12345 - FOODCOOP_HOMEPAGE: https://foodsoft.local-it.org - FOODCOOP_HELP_URL: https://git.local-it.org/foodsoft/foodsoft - FOODCOOP_TIME_ZONE: Berlin - FOODCOOP_USE_NICK: true - FOODCOOP_LANGUAGE: de - FOODCOOP_FOOTER: 'Foodsoft hosted by local-it e,V,.' - USE_APPLE_POINTS: false - STOP_ORDERING_UNDER: 75 - MINIMUM_BALANCE: 0 - MYSQL_DB: foodsoft - MYSQL_HOST: db - MYSQL_PORT: 3306 - MYSQL_USER: foodsoft - EMAIL_SENDER: demo@local-it.org - EMAIL_ERROR: flip@yksflip.de - SMTP_ADDRESS: mail.local-it.org - SMTP_AUTHENTICATION: login - SMTP_DOMAIN: mail.local-it.org - SMTP_ENABLE_STARTTLS_AUTO: true - SMTP_PORT: 587 - SMTP_USER_NAME: demo@local-it.org - EMAIL_REPLY_DOMAIN: - SMTP_SERVER_HOST: 0.0.0.0 - SMTP_SERVER_PORT: 2525 - SECRET_DB_PASSWORD_VERSION: v1 - SECRET_DB_ROOT_PASSWORD_VERSION: v1 - SECRET_SHARED_LISTS_DB_PASSWORD_VERSION: v1 - SECRET_SMTP_PASSWORD_VERSION: v1 - SECRET_SECRET_KEY_BASE_VERSION: v1 - APP_CONFIG_VERSION: v1 - DB_CONFIG_VERSION: v1 - ENTRYPOINT_VERSION: v1 - PRODUCTION_ENV_VERSION: v1 -trigger: - branch: - - demo diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 1d3cd010..b7e21eab 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -266,7 +266,7 @@ Metrics/AbcSize: # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods, inherit_mode. # AllowedMethods: refine Metrics/BlockLength: - Max: 212 + Max: 210 # Offense count: 6 # Configuration parameters: CountBlocks. @@ -451,24 +451,6 @@ RSpec/DescribedClass: - "spec/models/ordergroup_spec.rb" - "spec/models/user_spec.rb" -# Offense count: 15 -# This cop supports unsafe autocorrection (--autocorrect-all). -RSpec/EmptyExampleGroup: - Exclude: - - 'spec/requests/api/article_categories_spec.rb' - - 'spec/requests/api/configs_spec.rb' - - 'spec/requests/api/financial_transaction_classes_spec.rb' - - 'spec/requests/api/financial_transaction_types_spec.rb' - - 'spec/requests/api/financial_transactions_spec.rb' - - 'spec/requests/api/navigations_spec.rb' - - 'spec/requests/api/order_articles_spec.rb' - - 'spec/requests/api/orders_spec.rb' - - 'spec/requests/api/user/financial_transactions_spec.rb' - - 'spec/requests/api/user/group_order_articles_spec.rb' - - 'spec/requests/api/user/users_spec.rb' - - - # Offense count: 65 # Configuration parameters: CountAsOne. RSpec/ExampleLength: @@ -599,14 +581,6 @@ RSpec/ScatteredSetup: - "spec/integration/balancing_spec.rb" - "spec/integration/login_spec.rb" -# Offense count: 4 -# Configuration parameters: AllowedPatterns, IgnoredPatterns. -# SupportedStyles: snake_case, camelCase -RSpec/VariableName: - EnforcedStyle: snake_case - AllowedPatterns: - - ^Authorization$ - # Offense count: 1 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames. RSpec/VerifiedDoubles: diff --git a/.ruby-version b/.ruby-version index 37c2961c..d48d3702 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +2.6.9 diff --git a/Dockerfile b/Dockerfile index ae57d2f9..c999b3d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7 +FROM ruby:2.6 RUN supercronicUrl=https://github.com/aptible/supercronic/releases/download/v0.1.3/supercronic-linux-amd64 && \ supercronicBin=/usr/local/bin/supercronic && \ @@ -15,16 +15,13 @@ ENV PORT=3000 \ WORKDIR /usr/src/app -COPY Gemfile Gemfile.lock ./ -COPY plugins/ ./plugins -COPY config/ ./config +COPY . ./ # install dependencies and generate crontab RUN buildDeps='libmagic-dev' && \ apt-get update && \ apt-get install --no-install-recommends -y $buildDeps && \ echo 'gem: --no-document' >> ~/.gemrc && \ - gem install bundler && \ bundle config build.nokogiri "--use-system-libraries" && \ bundle install --deployment --without development test -j 4 && \ apt-get purge -y --auto-remove $buildDeps && \ @@ -32,8 +29,6 @@ RUN buildDeps='libmagic-dev' && \ \ bundle exec whenever >crontab -COPY . ./ - # compile assets with temporary mysql server RUN export DATABASE_URL=mysql2://localhost/temp?encoding=utf8 && \ export SECRET_KEY_BASE=thisisnotimportantnow && \ @@ -53,10 +48,9 @@ RUN export DATABASE_URL=mysql2://localhost/temp?encoding=utf8 && \ rm -Rf /var/lib/apt/lists/* /var/cache/apt/* # Make relevant dirs and files writable for app user -RUN mkdir -p tmp storage && \ +RUN mkdir -p tmp && \ chown nobody config/app_config.yml && \ - chown nobody tmp && \ - chown nobody storage + chown nobody tmp # Run app as unprivileged user USER nobody diff --git a/Dockerfile-dev b/Dockerfile-dev index 37dce5f6..ca7865a5 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -1,4 +1,4 @@ -FROM ruby:2.7 +FROM ruby:2.6 # Install dependencies RUN deps='libmagic-dev chromium nodejs' && \ @@ -19,7 +19,6 @@ ENV PORT=3000 \ WORKDIR /app -RUN gem install bundler RUN bundle config build.nokogiri "--use-system-libraries" EXPOSE 3000 diff --git a/Gemfile b/Gemfile index 30662ddb..a6e27fae 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,11 @@ # A sample Gemfile source "https://rubygems.org" -gem "rails", '~> 7.0' -gem 'mail', '~> 2.7.1' # bug with mail 2.8.0 https://github.com/mikel/mail/issues/1489 +gem "rails", '~> 5.2' - -gem 'sassc-rails' +gem 'sass-rails' gem 'less-rails' +gem 'uglifier', '>= 1.0.3' # See https://github.com/sstephenson/execjs#readme for more supported runtimes gem 'therubyracer', platforms: :ruby @@ -23,7 +22,7 @@ gem 'bootsnap', require: false gem 'mysql2' gem 'prawn' gem 'prawn-table' -gem 'haml', '~> 5.0' +gem 'haml' gem 'haml-rails' gem 'kaminari' gem 'simple_form' @@ -47,9 +46,7 @@ gem 'whenever', require: false # For defining cronjobs, see config/schedule.rb gem 'ruby-units' gem 'attribute_normalizer' gem 'ice_cube' -# At time of development 01-06-2022 mmddyyyy necessary fix for config_helper.rb form builder was not in rubygems so we pull from github, see: https://github.com/gregschmit/recurring_select/pull/152 -gem 'recurring_select', git: 'https://github.com/gregschmit/recurring_select' -gem 'foodsoft_article_import', git: 'https://git.local-it.org/Foodsoft/foodsoft_article_import', tag: 'v1.0' +gem 'recurring_select' gem 'roo' gem 'roo-xls' gem 'spreadsheet' @@ -58,8 +55,6 @@ gem 'gaffe' gem 'ruby-filemagic' gem 'mime-types' gem 'midi-smtp-server' -gem 'rswag-api' -gem 'rswag-ui' # we use the git version of acts_as_versioned, and need to include it in this Gemfile gem 'acts_as_versioned', git: 'https://github.com/technoweenie/acts_as_versioned.git' @@ -86,8 +81,7 @@ group :development do gem 'binding_of_caller' # gem "rails-i18n-debug" # chrome debugging extension https://github.com/dejan/rails_panel - # TODO: disabled due to https://github.com/rails/rails/issues/40781 - # gem 'meta_request' + gem 'meta_request' # Get infos when not using proper eager loading gem 'bullet' @@ -118,15 +112,10 @@ group :test do gem 'rspec-core' gem 'rspec-rerun' gem 'i18n-spec' - gem 'rails-controller-testing' # code coverage gem 'simplecov', require: false gem 'simplecov-lcov', require: false # api - gem 'rswag-specs' + gem 'apivore', require: false gem 'hashie', '~> 3.4.6', require: false # https://github.com/westfieldlabs/apivore/issues/114 end - -gem "importmap-rails", "~> 1.1" -gem "image_processing", "~> 1.12" -gem "terser", "~> 1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 6f60ccef..c53687fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,22 +1,3 @@ -GIT - remote: https://git.local-it.org/Foodsoft/foodsoft_article_import - revision: 49a0c1ddb3bb67a357c692c63af0cda2db7c45b0 - tag: v1.0 - specs: - foodsoft_article_import (1.0.0) - roo (~> 2.9.0) - -GIT - remote: https://github.com/gregschmit/recurring_select - revision: 29febc4c4abdd6c30636c33a7d2daecb09973ecf - specs: - recurring_select (3.0.0) - coffee-rails (>= 3.1) - ice_cube (>= 0.11) - jquery-rails (>= 3.0) - rails (>= 5.2) - sass-rails (>= 4.0) - GIT remote: https://github.com/technoweenie/acts_as_versioned.git revision: 63b1fc8529d028fae632fe80ec0cb25df56cd76b @@ -78,83 +59,67 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + actioncable (5.2.8.1) + actionpack (= 5.2.8.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.0.4) - actionpack (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activesupport (= 7.0.4) + actionmailer (5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4) - actionview (= 7.0.4) - activesupport (= 7.0.4) - rack (~> 2.0, >= 2.2.0) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4) - actionpack (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) - actionview (7.0.4) - activesupport (= 7.0.4) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) active_model_serializers (0.10.13) actionpack (>= 4.1, < 7.1) activemodel (>= 4.1, < 7.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (7.0.4) - activesupport (= 7.0.4) + activejob (5.2.8.1) + activesupport (= 5.2.8.1) globalid (>= 0.3.6) - activemodel (7.0.4) - activesupport (= 7.0.4) - activerecord (7.0.4) - activemodel (= 7.0.4) - activesupport (= 7.0.4) - activestorage (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activesupport (= 7.0.4) - marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.4) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activerecord (5.2.8.1) + activemodel (= 5.2.8.1) + activesupport (= 5.2.8.1) + arel (>= 9.0) + activestorage (5.2.8.1) + actionpack (= 5.2.8.1) + activerecord (= 5.2.8.1) + marcel (~> 1.0.0) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) acts_as_tree (2.9.1) activerecord (>= 3.0.0) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) + apivore (1.6.2) + actionpack (>= 4, < 6) + hashie (~> 3.3) + json-schema (~> 2.5) + rspec (~> 3) + rspec-expectations (~> 3.1) + rspec-mocks (~> 3.1) apparition (0.6.0) capybara (~> 3.13, < 4) websocket-driver (>= 0.6.5) + arel (9.0.0) ast (2.4.2) attribute_normalizer (1.2.0) base32 (0.3.4) @@ -165,15 +130,15 @@ GEM bindex (0.8.1) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.15.0) + bootsnap (1.13.0) msgpack (~> 1.2) bootstrap-datepicker-rails (1.9.0.1) railties (>= 3.0) builder (3.2.4) - bullet (7.0.7) + bullet (7.0.3) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - capybara (3.38.0) + capybara (3.36.0) addressable matrix mini_mime (>= 0.1.3) @@ -205,7 +170,6 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.3.3) date_time_attribute (0.1.2) activesupport (>= 3.0.0) debug_inspector (1.1.0) @@ -218,13 +182,13 @@ GEM diff-lcs (1.5.0) diffy (3.4.2) docile (1.4.0) - doorkeeper (5.6.2) + doorkeeper (5.6.0) railties (>= 5) - doorkeeper-i18n (5.2.6) + doorkeeper-i18n (5.2.5) doorkeeper (>= 5.2) email_reply_trimmer (0.1.13) - erubi (1.12.0) - eventmachine (1.0.9.1) + erubi (1.11.0) + eventmachine (1.2.7) exception_notification (4.5.0) actionmailer (>= 5.2, < 8) activesupport (>= 5.2, < 8) @@ -235,15 +199,16 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (3.1.0) + faker (2.22.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) gaffe (1.2.0) rails (>= 4.0.0) globalid (1.0.0) activesupport (>= 5.0) - haml (5.2.2) - temple (>= 0.8.0) + haml (6.0.5) + temple (>= 0.8.2) + thor tilt haml-rails (2.1.0) actionpack (>= 5.1) @@ -262,12 +227,6 @@ GEM i18n-spec (0.6.0) iso ice_cube (0.16.4) - image_processing (1.12.2) - mini_magick (>= 4.9.5, < 5) - ruby-vips (>= 2.0.17, < 3) - importmap-rails (1.1.5) - actionpack (>= 6.0.0) - railties (>= 6.0.0) inherited_resources (1.13.1) actionpack (>= 5.2, < 7.1) has_scope (~> 0.6) @@ -276,13 +235,13 @@ GEM interception (0.5) iso (0.4.0) i18n - jquery-rails (4.5.1) + jquery-rails (4.5.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.6.3) - json-schema (3.0.0) - addressable (>= 2.8) + json (2.6.2) + json-schema (2.8.1) + addressable (>= 2.4) jsonapi-renderer (0.2.2) kaminari (1.2.2) activesupport (>= 4.1.0) @@ -302,7 +261,7 @@ GEM actionpack (>= 5.0) less (~> 2.6.0) sprockets (~> 3.0) - libv8 (3.16.14.19-x86_64-linux) + libv8 (3.16.14.19) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -323,34 +282,29 @@ GEM thin marcel (1.0.2) matrix (0.4.2) + meta_request (0.7.3) + rack-contrib (>= 1.1, < 3) + railties (>= 3.0.0, < 7) method_source (1.0.0) midi-smtp-server (3.0.3) mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) - mini_magick (4.12.0) mini_mime (1.1.2) - minitest (5.17.0) + mini_portile2 (2.8.0) + minitest (5.16.3) mono_logger (1.1.1) msgpack (1.6.0) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) mysql2 (0.5.4) - net-imap (0.3.4) - date - net-protocol - net-pop (0.1.2) - net-protocol - net-protocol (0.2.1) - timeout - net-smtp (0.3.3) - net-protocol nio4r (2.5.8) - nokogiri (1.13.10-x86_64-linux) + nokogiri (1.13.10) + mini_portile2 (~> 2.8.0) racc (~> 1.4) parallel (1.22.1) - parser (3.2.0.0) + parser (3.1.2.1) ast (~> 2.4.1) pdf-core (0.9.0) polyglot (0.3.5) @@ -368,73 +322,75 @@ GEM pry-stack_explorer (0.6.1) binding_of_caller (~> 1.0) pry (~> 0.13) - public_suffix (5.0.1) - puma (6.0.2) + public_suffix (5.0.0) + puma (5.6.5) nio4r (~> 2.0) - racc (1.6.2) - rack (2.2.5) + racc (1.6.1) + rack (2.2.4) + rack-contrib (2.3.0) + rack (~> 2.0) rack-cors (1.1.1) rack (>= 2.0.0) - rack-protection (3.0.5) + rack-protection (3.0.4) rack rack-test (2.0.2) rack (>= 1.3) - rails (7.0.4) - actioncable (= 7.0.4) - actionmailbox (= 7.0.4) - actionmailer (= 7.0.4) - actionpack (= 7.0.4) - actiontext (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activemodel (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) - bundler (>= 1.15.0) - railties (= 7.0.4) + rails (5.2.8.1) + actioncable (= 5.2.8.1) + actionmailer (= 5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) + activemodel (= 5.2.8.1) + activerecord (= 5.2.8.1) + activestorage (= 5.2.8.1) + activesupport (= 5.2.8.1) + bundler (>= 1.3.0) + railties (= 5.2.8.1) + sprockets-rails (>= 2.0.0) rails-assets-listjs (0.2.0.beta.4) railties (>= 3.1) - rails-controller-testing (1.0.5) - actionpack (>= 5.0.1.rc1) - actionview (>= 5.0.1.rc1) - activesupport (>= 5.0.1.rc1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.4) loofah (~> 2.19, >= 2.19.1) - rails-i18n (7.0.6) + rails-i18n (5.1.3) i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 8) + railties (>= 5.0, < 6) rails-settings-cached (0.4.3) rails (>= 4.2.0) rails_tokeninput (1.7.0) railties (>= 3.1.0) - railties (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) method_source - rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) rainbow (3.1.1) rake (13.0.6) - ransack (3.2.1) - activerecord (>= 6.1.5) - activesupport (>= 6.1.5) + ransack (2.5.0) + activerecord (>= 5.2.4) + activesupport (>= 5.2.4) i18n rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) + recurring_select (3.0.0) + coffee-rails (>= 3.1) + ice_cube (>= 0.11) + jquery-rails (>= 3.0) + rails (>= 5.2) + sass-rails (>= 4.0) redis (5.0.5) redis-client (>= 0.9.0) - redis-client (0.11.2) + redis-client (0.9.0) connection_pool - redis-namespace (1.10.0) + redis-namespace (1.9.0) redis (>= 4) ref (2.0.0) - regexp_parser (2.6.1) + regexp_parser (2.6.0) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) @@ -444,71 +400,59 @@ GEM redis-namespace (~> 1.6) sinatra (>= 0.9.2) rexml (3.2.5) - roo (2.9.0) + roo (2.8.3) nokogiri (~> 1) rubyzip (>= 1.3.0, < 3.0.0) roo-xls (1.2.0) nokogiri roo (>= 2.0.0, < 3) spreadsheet (> 0.9.0) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.0) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.1) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.1) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (6.0.1) - actionpack (>= 6.1) - activesupport (>= 6.1) - railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) + rspec-support (~> 3.11.0) + rspec-rails (5.1.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) rspec-rerun (1.1.0) rspec (~> 3.0) - rspec-support (3.12.0) - rswag-api (2.7.0) - railties (>= 3.1, < 7.1) - rswag-specs (2.7.0) - activesupport (>= 3.1, < 7.1) - json-schema (>= 2.2, < 4.0) - railties (>= 3.1, < 7.1) - rspec-core (>= 2.14) - rswag-ui (2.7.0) - actionpack (>= 3.1, < 7.1) - railties (>= 3.1, < 7.1) - rubocop (1.43.0) + rspec-support (3.11.1) + rubocop (1.36.0) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) + rubocop-ast (>= 1.20.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.24.1) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.21.0) parser (>= 3.1.1.0) - rubocop-rails (2.17.4) + rubocop-rails (2.16.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.16.0) + rubocop-rspec (2.13.2) rubocop (~> 1.33) ruby-filemagic (0.7.3) ruby-ole (1.2.12.2) - ruby-prof (1.4.5) + ruby-prof (1.4.3) ruby-progressbar (1.11.0) ruby-units (3.0.0) - ruby-vips (2.1.4) - ffi (~> 1.12) ruby2_keywords (0.0.5) rubyzip (2.3.2) sass-rails (6.0.0) @@ -531,21 +475,21 @@ GEM simple_form (5.1.0) actionpack (>= 5.2) activemodel (>= 5.2) - simplecov (0.22.0) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) - sinatra (3.0.5) + sinatra (3.0.4) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.5) + rack-protection (= 3.0.4) tilt (~> 2.0) - skinny (0.2.4) - eventmachine (~> 1.0.0) - thin (>= 1.5, < 1.7) + skinny (0.2.2) + eventmachine (~> 1.0) + thin spreadsheet (1.3.0) ruby-ole sprockets (3.7.2) @@ -559,19 +503,17 @@ GEM sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) table_print (1.5.7) - temple (0.9.1) - terser (1.1.13) - execjs (>= 0.3.0, < 3) + temple (0.8.2) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thin (1.6.2) - daemons (>= 1.0.9) - eventmachine (>= 1.0.0) - rack (>= 1.0.0) + thin (1.8.1) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) thor (1.2.1) + thread_safe (0.3.6) tilt (2.0.11) - timeout (0.3.1) ttfunk (1.7.0) twitter-bootstrap-rails (2.2.8) actionpack (>= 3.1) @@ -580,18 +522,20 @@ GEM railties (>= 3.1) twitter-text (1.14.7) unf (~> 0.1.0) - tzinfo (2.0.5) - concurrent-ruby (~> 1.0) + tzinfo (1.2.10) + thread_safe (~> 0.1) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.4.2) + unicode-display_width (2.3.0) uniform_notifier (1.16.0) - web-console (4.2.0) - actionview (>= 6.0.0) - activemodel (>= 6.0.0) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) bindex (>= 0.4.0) - railties (>= 6.0.0) + railties (>= 5.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -605,15 +549,15 @@ GEM twitter-text xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.6) PLATFORMS - x86_64-linux + ruby DEPENDENCIES active_model_serializers (~> 0.10.0) acts_as_tree acts_as_versioned! + apivore apparition attribute_normalizer better_errors @@ -631,7 +575,6 @@ DEPENDENCIES exception_notification factory_bot_rails faker - foodsoft_article_import! foodsoft_discourse! foodsoft_documents! foodsoft_links! @@ -639,21 +582,19 @@ DEPENDENCIES foodsoft_polls! foodsoft_wiki! gaffe - haml (~> 5.0) + haml haml-rails hashie (~> 3.4.6) i18n-js (~> 3.0.0.rc8) i18n-spec ice_cube - image_processing (~> 1.12) - importmap-rails (~> 1.1) inherited_resources jquery-rails kaminari less-rails listen - mail (~> 2.7.1) mailcatcher + meta_request midi-smtp-server mime-types mysql2 @@ -663,30 +604,26 @@ DEPENDENCIES pry-stack_explorer puma rack-cors - rails (~> 7.0) + rails (~> 5.2) rails-assets-listjs (= 0.2.0.beta.4) - rails-controller-testing rails-i18n rails-settings-cached (= 0.4.3) rails_tokeninput ransack - recurring_select! + recurring_select resque roo roo-xls rspec-core rspec-rails rspec-rerun - rswag-api - rswag-specs - rswag-ui rubocop rubocop-rails rubocop-rspec ruby-filemagic ruby-prof ruby-units - sassc-rails + sass-rails sd_notify select2-rails simple-navigation (~> 3.14.0) @@ -698,11 +635,11 @@ DEPENDENCIES sprockets (< 4) sqlite3 (~> 1.3.6) table_print - terser (~> 1.1) therubyracer twitter-bootstrap-rails (~> 2.2.8) + uglifier (>= 1.0.3) web-console whenever BUNDLED WITH - 2.4.5 + 1.17.3 diff --git a/README.md b/README.md index ccaa4db3..a1a9de24 100644 --- a/README.md +++ b/README.md @@ -1,124 +1,65 @@ Foodsoft ========= +[![Build Status](https://github.com/foodcoops/foodsoft/workflows/Ruby/badge.svg)](https://github.com/foodcoops/foodsoft/actions) +[![Coverage Status](https://coveralls.io/repos/foodcoops/foodsoft/badge.svg?branch=master)](https://coveralls.io/r/foodcoops/foodsoft?branch=master) +[![Docs Status](https://inch-ci.org/github/foodcoops/foodsoft.svg?branch=master)](http://inch-ci.org/github/foodcoops/foodsoft) +[![Code Climate](https://codeclimate.com/github/foodcoops/foodsoft.svg)](https://codeclimate.com/github/foodcoops/foodsoft) +[![Docker Status](https://img.shields.io/docker/cloud/build/foodcoops/foodsoft.svg)](https://hub.docker.com/r/foodcoops/foodsoft) +[![Documentation](https://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/foodcoops/foodsoft) -[Website](https://foodsoft.local-it.org) -[Prototypefund](https://prototypefund.de/project/weiterentwicklung-von-foodsoft/) +Web-based software to manage a non-profit food coop (product catalog, ordering, accounting, job scheduling). + +A food cooperative is a group of people that buy food from suppliers of their own choosing. A collective do-it-yourself supermarket. Members order their products online and collect them on a specified day. And all put in a bit of work to make that possible. Foodsoft facilitates the process. + +If you're a food coop considering to use foodsoft, please have a look at the [wiki page for foodcoops](https://github.com/foodcoops/foodsoft/wiki/For-foodcoops). When you'd like to experiment with or develop foodsoft, you can read [how to set it up](https://github.com/foodcoops/foodsoft/blob/master/doc/SETUP_DEVELOPMENT.md) on your own computer. + +More information about using this software and contributing can be found on the [wiki](https://github.com/foodcoops/foodsoft/wiki). -Foodsoft ist ein Tool für [Lebensmittelkooperativen](https://de.wikipedia.org/wiki/Lebensmittelkooperative), welches selbstorganisierte gemeinsame Bestellungen in Großmengen von regionalen und ökologischen Produkten vereinfacht und transparent gestaltet. +Developing +---------- -Foodsoft wurde ursprünglich entwickelt und betrieben von [foodcoops.net](https://foodcoops.net/) +Get foodsoft [running locally](doc/SETUP_DEVELOPMENT.md), +then visit our [Developing Guidelines](https://github.com/foodcoops/foodsoft/wiki/Developing-Guidelines) +page on the wiki. + +Get a foodsoft dev-environment running in the browser with Gitpod + +[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/foodcoops/foodsoft) + +Follow these [instructions](doc/SETUP_DEVELOPMENT_GITPOD.md) to complete setup from within the Gitpod workspace. + +Deploying +--------- + +Setup foodsoft to [run in production](doc/SETUP_PRODUCTION.md), or join an existing +[hosting platform](https://foodcoops.net/foodsoft-hosting/). -#### Zielgruppe +License +------- -Unsere Zielgruppen sind Bürger:innen, Gruppen und Vereine, die eine Einkauskooperative aufbauen wollen und eine Software, die die Bestellung, Verteilung und Abrechnung erleichtert, benötigen. +Foodsoft is licensed under the [AGPL](https://www.gnu.org/licenses/agpl-3.0.html) +license (version 3 or later). Practically this means that you are free to use, +adapt and redistribute the software, as long as you publish any changes you +make to the code. -#### Vorhaben +For private use, there are no restrictions, but if you give others access to +Foodsoft (like running it open to the internet), you must also make your +changes available under the same license. This can be as easy as +[forking](https://github.com/foodcoops/foodsoft/fork) the project on Github and +pushing your changes. You are not required to integrate your changes back into +the main Foodsoft version (but if you're up for it that would be very welcome). -* ✅ Technische Schuld reduzieren -* ✅ Ruby on Rails Upgrade -* ✅ Artikel Import verbessern - (Großhandelschnitstelle) -* ✅ Userexperience Verbessern - -#### Was ist eine Einkaufskooperative? - -![Wie funktioniert eine Einkauskooperative?](./doc/foodcoop-explained.jpg) - - - -State of this Fork ------------------- - -#### Increase Test Coverage - -1. integration and model tests - * [x] fork - * [x] upstream [#966](https://github.com/foodcoops/foodsoft/pull/966) -1. Controller tests - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/8_increase_test_coverage_controllers) - * [ ] upstream [#970](https://github.com/foodcoops/foodsoft/pull/970) - -#### Upgrade - -1. Migrate to RSwag API Tests - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/28_introduce_rswag) - * [x] upstream [#969](https://github.com/foodcoops/foodsoft/pull/969) -1. Rails v7 - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/9_rails_v_7) - * [x] upstream [#979](https://github.com/foodcoops/foodsoft/pull/979) - disussion [#956](https://github.com/foodcoops/foodsoft/issues/956) -1. Javascript Importmap - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/9_rails_v_7_js_importmap) - * [x] upstream - -#### Article Order Import/Export - -Updating Articles from large resellers and exporting orders is now much easier! - -1. adds bnn fileformat that is used from large german resellers e.g. naturkost nord - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/11_bnn_import_article_update) - [gem](https://git.local-it.org/Foodsoft/foodsoft_article_import) - * [ ] upstream -1. Import category field - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/56_add_update_of_article_category_to_file_import) - * [ ] upstream -1. Export order as a custom csv file - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/12_generate_custom_csv_file) - * [ ] upstream -1. Naturkostnord Plugin - * [ ] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/12_nkn_file_plugin) - * [ ] upstream - -#### Improve User Experience - -1. Richtext editor for messages. Also allows sending attachements. - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/16_html_message_templates) - * [x] upstream -1. Show the sum of all order group balances - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/47_finance_ordergroup_sums) - * [x] upstream -1. UI improvements for group order view - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/uxui_group_order) - * [ ] upstream -1. Favorites - * [ ] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/20_favourites) - * [ ] upstream -1. Show the per kilo / litre price - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/11_include_kilo_litre_price) - * [ ] upstream - -#### Other - -1. Fix broken plugin mechanism - * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/downgrade-haml) - * [x] upstream - -#### Screenshots - -![rswag](./doc/screenshots/rswag.png) - ---- - -![bnn upload](./doc/screenshots/bnn_upload.png) - ---- - -![message formatting](./doc/screenshots/message_formatting.png) - ---- - -![balance sum](./doc/screenshots/balance_sum.png) - ---- - -![custom csv export](./doc/screenshots/custom_csv_export.png) -csv export - ---- - -![order](./doc/screenshots/order.png) +To make it a little easier, configuration files are exempt, so you can just +install and configure Foodsoft without having to publish your changes. These +files are marked as public domain in the file header. +If you have any remaining questions, please +[open an issue](https://github.com/foodcoops/foodsoft/issues/new) or open a new +topic at the [forum](https://forum.foodcoops.net). +Please see [LICENSE](LICENSE.md) for the full and authoritative text. Some +bundled third-party components have [other licenses](vendor/README.md). +Thanks to [Icons8](http://icons8.com/) for letting us use their icons. diff --git a/app/assets/javascripts/application_legacy.js b/app/assets/javascripts/application.js similarity index 100% rename from app/assets/javascripts/application_legacy.js rename to app/assets/javascripts/application.js diff --git a/app/assets/javascripts/ordering.js b/app/assets/javascripts/ordering.js index 1097f8a7..a3dd1050 100644 --- a/app/assets/javascripts/ordering.js +++ b/app/assets/javascripts/ordering.js @@ -179,13 +179,17 @@ function updateBalance() { var balance = groupBalance - total; $('#new_balance').html(I18n.l("currency", balance)); $('#total_balance').val(I18n.l("currency", balance)); + // determine bgcolor and submit button state according to balance + var bgcolor = ''; if (balance < minimumBalance) { + bgcolor = '#FF0000'; $('#submit_button').attr('disabled', 'disabled') - $('#balance-alert').css('display', 'block') - } else { $('#submit_button').removeAttr('disabled') - $('#balance-alert').css('display', 'none') + } + // update bgcolor + for (i in itemTotal) { + $('#td_price_' + i).css('background-color', bgcolor); } } diff --git a/app/assets/stylesheets/actiontext.css b/app/assets/stylesheets/actiontext.css deleted file mode 100644 index 3cfcb2b7..00000000 --- a/app/assets/stylesheets/actiontext.css +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and - * the trix-editor content (whether displayed or under editing). Feel free to incorporate this - * inclusion directly in any other asset bundle and remove this file. - * - *= require trix -*/ - -/* - * We need to override trix.css’s image gallery styles to accommodate the - * element we wrap around attachments. Otherwise, - * images in galleries will be squished by the max-width: 33%; rule. -*/ -.trix-content .attachment-gallery > action-text-attachment, -.trix-content .attachment-gallery > .attachment { - flex: 1 0 33%; - padding: 0 0.5em; - max-width: 33%; -} - -.trix-content .attachment-gallery.attachment-gallery--2 > action-text-attachment, -.trix-content .attachment-gallery.attachment-gallery--2 > .attachment, .trix-content .attachment-gallery.attachment-gallery--4 > action-text-attachment, -.trix-content .attachment-gallery.attachment-gallery--4 > .attachment { - flex-basis: 50%; - max-width: 50%; -} - -.trix-content action-text-attachment .attachment { - padding: 0 !important; - max-width: 100% !important; -} diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 01dba421..6bdfecd2 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -7,5 +7,4 @@ *= require list.unlist *= require list.missing *= require recurring_select -*= require actiontext */ diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 3d98e4a5..971308c9 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -230,7 +230,7 @@ table { margin: .5em 0; input:disabled { - background-color: gray; } + background-color: red; } } } } @@ -241,9 +241,6 @@ table { tr.order-article:hover .article-info { display: none; } - tr.order-article:focus .article-info { - display: none; - } } #order-footer { @@ -278,13 +275,10 @@ tr.order-article .article-info { display: none; } -tr.order-article:focus .article-info { +tr.order-article:hover .article-info { display: block; } -tr.order-article:focus { - background-color: #E9E9E9; -} // ********* Articles diff --git a/app/assets/stylesheets/list.missing.css b/app/assets/stylesheets/list.missing.css index 2dc36577..4eea5d78 100644 --- a/app/assets/stylesheets/list.missing.css +++ b/app/assets/stylesheets/list.missing.css @@ -1,23 +1,11 @@ -.missing-many td { - background-color: #ffc590aa; +.list .missing-many td, .list .missing-many:hover td { + background-color: #ebbebe; } -.missing-many:hover td, .missing-many:focus td { - background-color: #ffc590; +.list .missing-few td, .list .missing-few:hover td { + background-color: #ffee75; } -.missing-few td { - background-color: #fcf488aa; -} - -.missing-few:hover td, .missing-few:focus td { - background-color: #fcf488; -} - -.missing-none td { - background-color: #d0f6ffaa; -} - -.missing-none:hover td, .missing-none:focus td { - background-color: #d0f6ff; +.list .missing-none td, .list .missing-none:hover td { + background-color: #E4EED6; } diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb index 16b506e8..4161e66a 100644 --- a/app/controllers/articles_controller.rb +++ b/app/controllers/articles_controller.rb @@ -46,11 +46,6 @@ class ArticlesController < ApplicationController render :layout => false end - def edit - @article = Article.find(params[:id]) - render :action => 'new', :layout => false - end - def create @article = Article.new(params[:article]) if @article.valid? && @article.save @@ -60,6 +55,11 @@ class ArticlesController < ApplicationController end end + def edit + @article = Article.find(params[:id]) + render :action => 'new', :layout => false + end + # Updates one Article and highlights the line if succeded def update @article = Article.find(params[:id]) @@ -148,12 +148,10 @@ class ArticlesController < ApplicationController # Update articles from a spreadsheet def parse_upload uploaded_file = params[:articles]['file'] or raise I18n.t('articles.controller.parse_upload.no_file') - type = params[:articles]['type'] options = { filename: uploaded_file.original_filename } options[:outlist_absent] = (params[:articles]['outlist_absent'] == '1') options[:convert_units] = (params[:articles]['convert_units'] == '1') - options[:update_category] = (params[:articles]['update_category'] == '1') - @updated_article_pairs, @outlisted_articles, @new_articles = @supplier.sync_from_file uploaded_file.tempfile, type, options + @updated_article_pairs, @outlisted_articles, @new_articles = @supplier.sync_from_file uploaded_file.tempfile, options if @updated_article_pairs.empty? && @outlisted_articles.empty? && @new_articles.empty? redirect_to supplier_articles_path(@supplier), :notice => I18n.t('articles.controller.parse_upload.notice') end diff --git a/app/controllers/finance/financial_transactions_controller.rb b/app/controllers/finance/financial_transactions_controller.rb index e0c53e19..930acebe 100644 --- a/app/controllers/finance/financial_transactions_controller.rb +++ b/app/controllers/finance/financial_transactions_controller.rb @@ -18,7 +18,7 @@ class Finance::FinancialTransactionsController < ApplicationController sort = "created_on DESC" end - @q = FinancialTransaction.ransack(params[:q]) + @q = FinancialTransaction.search(params[:q]) @financial_transactions_all = @q.result(distinct: true).includes(:user).order(sort) @financial_transactions_all = @financial_transactions_all.visible unless params[:show_hidden] @financial_transactions_all = @financial_transactions_all.where(ordergroup_id: @ordergroup.id) if @ordergroup diff --git a/app/controllers/finance/ordergroups_controller.rb b/app/controllers/finance/ordergroups_controller.rb index d334f223..cb661571 100644 --- a/app/controllers/finance/ordergroups_controller.rb +++ b/app/controllers/finance/ordergroups_controller.rb @@ -11,10 +11,7 @@ class Finance::OrdergroupsController < Finance::BaseController @ordergroups = Ordergroup.undeleted.order(sort) @ordergroups = @ordergroups.include_transaction_class_sum @ordergroups = @ordergroups.where('groups.name LIKE ?', "%#{params[:query]}%") unless params[:query].nil? - @ordergroups = @ordergroups.page(params[:page]).per(@per_page) - @total_balances = FinancialTransactionClass.sorted.each_with_object({}) do |c, tmp| - tmp[c.id] = c.financial_transactions.reduce(0) { | sum, t | sum + t.amount } - end + @ordergroups = @ordergroups.page(params[:page]).per(@per_page) end end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index d01a78ca..a3d9cd53 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -18,7 +18,7 @@ class HomeController < ApplicationController @bank_accounts = @types.includes(:bank_account).map(&:bank_account).uniq.compact @bank_accounts = [BankAccount.last] if @bank_accounts.empty? else - redirect_to root_path, alert: I18n.t('group_orders.errors.no_member') + redirect_to root_url, alert: I18n.t('group_orders.errors.no_member') end end @@ -26,7 +26,7 @@ class HomeController < ApplicationController if @current_user.update(user_params) @current_user.ordergroup.update(ordergroup_params) if ordergroup_params session[:locale] = @current_user.locale - redirect_to my_profile_path, notice: I18n.t('home.changes_saved') + redirect_to my_profile_url, notice: I18n.t('home.changes_saved') else render :profile end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 1e041bf2..cfa7cef6 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -49,7 +49,7 @@ class OrdersController < ApplicationController send_order_pdf @order, params[:document] end format.csv do - send_data OrderCsv.new(@order, options= {custom_csv: params[:custom_csv]}).to_csv, filename: @order.name + '.csv', type: 'text/csv' + send_data OrderCsv.new(@order).to_csv, filename: @order.name + '.csv', type: 'text/csv' end format.text do send_data OrderTxt.new(@order).to_txt, filename: @order.name + '.txt', type: 'text/plain' @@ -57,19 +57,6 @@ class OrdersController < ApplicationController end end - def custom_csv - @order = Order.find(params[:id]) - @view = (params[:view] || 'default').gsub(/[^-_a-zA-Z0-9]/, '') - @partial = case @view - when 'default' then 'articles' - when 'groups' then 'shared/articles_by/groups' - when 'articles' then 'shared/articles_by/articles' - else 'articles' - end - - render :layout => false - end - # Page to create a new order. def new if params[:order_id] diff --git a/app/helpers/group_orders_helper.rb b/app/helpers/group_orders_helper.rb index 4f1d352f..c5e27c66 100644 --- a/app/helpers/group_orders_helper.rb +++ b/app/helpers/group_orders_helper.rb @@ -53,12 +53,4 @@ module GroupOrdersHelper return 'missing-many' end end - - def price_per_base_unit(article:, price:) - quantity_unit = QuantityUnit.parse(article.unit) - return nil unless quantity_unit.present? - - scaled_price, base_unit = quantity_unit.scale_price_to_base_unit(price) - "#{number_to_currency(scaled_price)}/#{base_unit}" - end end diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb index 5f7fb904..ff238730 100644 --- a/app/helpers/orders_helper.rb +++ b/app/helpers/orders_helper.rb @@ -155,16 +155,4 @@ module OrdersHelper link_to t('orders.index.action_receive'), receive_order_path(order), class: "btn#{' btn-success' unless order.received?} #{options[:class]}" end end - - def custom_csv_collection - [ - OrderArticle.human_attribute_name(:units_to_order), - Article.human_attribute_name(:order_number), - Article.human_attribute_name(:name), - Article.human_attribute_name(:unit), - Article.human_attribute_name(:unit_quantity_short), - ArticlePrice.human_attribute_name(:price), - OrderArticle.human_attribute_name(:total_price) - ] - end end diff --git a/app/javascript/application.js b/app/javascript/application.js deleted file mode 100644 index ed5cae66..00000000 --- a/app/javascript/application.js +++ /dev/null @@ -1,3 +0,0 @@ -// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails -import "trix" -import "@rails/actiontext" diff --git a/app/lib/order_csv.rb b/app/lib/order_csv.rb deleted file mode 100644 index 653edf90..00000000 --- a/app/lib/order_csv.rb +++ /dev/null @@ -1,61 +0,0 @@ -require 'csv' - -class OrderCsv < RenderCsv - def header - params = @options[:custom_csv] - arr = if params.nil? - [ - OrderArticle.human_attribute_name(:units_to_order), - Article.human_attribute_name(:order_number), - Article.human_attribute_name(:name), - Article.human_attribute_name(:unit), - Article.human_attribute_name(:unit_quantity_short), - ArticlePrice.human_attribute_name(:price), - OrderArticle.human_attribute_name(:total_price) - ] - else - [ - params[:first], - params[:second], - params[:third], - params[:fourth], - params[:fifth], - params[:sixth], - params[:seventh] - ] - end - end - - def data - @object.order_articles.ordered.includes([:article, :article_price]).all.map do |oa| - yield [ - match_params(oa, header[0]), - match_params(oa, header[1]), - match_params(oa, header[2]), - match_params(oa, header[3]), - match_params(oa, header[4]), - match_params(oa, header[5]), - match_params(oa, header[6]) - ] - end - end - - def match_params(object, attribute) - case attribute - when OrderArticle.human_attribute_name(:units_to_order) - object.units_to_order - when Article.human_attribute_name(:order_number) - object.article.order_number - when Article.human_attribute_name(:name) - object.article.name - when Article.human_attribute_name(:unit) - object.article.unit - when Article.human_attribute_name(:unit_quantity_short) - object.price.unit_quantity > 1 ? object.price.unit_quantity : nil - when ArticlePrice.human_attribute_name(:price) - number_to_currency(object.price.price * object.price.unit_quantity) - when OrderArticle.human_attribute_name(:total_price) - number_to_currency(object.total_price) - end - end -end diff --git a/app/lib/quantity_unit.rb b/app/lib/quantity_unit.rb deleted file mode 100644 index 0a910f87..00000000 --- a/app/lib/quantity_unit.rb +++ /dev/null @@ -1,59 +0,0 @@ -class QuantityUnit - def initialize(quantity, unit) - @quantity = quantity - @unit = unit - end - - def self.parse(number_with_unit) - # remove whitespace - number_with_unit = number_with_unit.gsub(/\s+/, '') - # to lowercase - number_with_unit = number_with_unit.downcase - # remove numerical part - number = number_with_unit.gsub(/[^0-9.,]/, '') - # remove unit part - unit = number_with_unit.gsub(/[^a-zA-Z]/, '') - # convert comma to dot - number = number.gsub(',', '.') - # convert to float - number = number.to_f - - return nil unless unit.in?(%w[g kg l ml]) - - QuantityUnit.new(number, unit) - end - - def scale_price_to_base_unit(price) - return nil unless price.is_a?(Numeric) - - factor = if @unit == 'kg' || @unit == 'l' - 1 - elsif @unit == 'g' || @unit == 'ml' - 1000 - end - - scaled_price = price / @quantity * factor - scaled_price.round(2) - - base_unit = if @unit == 'kg' || @unit == 'g' - 'kg' - elsif @unit == 'l' || @unit == 'ml' - 'L' - end - - [scaled_price, base_unit] - end - - - def to_s - "#{@quantity} #{@unit}" - end - - def quantity - @quantity - end - - def unit - @unit - end -end \ No newline at end of file diff --git a/app/models/article.rb b/app/models/article.rb index 1eca49cd..76a68605 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -143,24 +143,20 @@ class Article < ApplicationRecord new_unit = new_article.unit end - attribute_hash = { - :name => [self.name, new_article.name], - :manufacturer => [self.manufacturer, new_article.manufacturer.to_s], - :origin => [self.origin, new_article.origin], - :unit => [self.unit, new_unit], - :price => [self.price.to_f.round(2), new_price.to_f.round(2)], - :tax => [self.tax, new_article.tax], - :deposit => [self.deposit.to_f.round(2), new_article.deposit.to_f.round(2)], - # take care of different num-objects. - :unit_quantity => [self.unit_quantity.to_s.to_f, new_unit_quantity.to_s.to_f], - :note => [self.note.to_s, new_article.note.to_s] - } - if options[:update_category] == true - new_article_category = new_article.article_category - attribute_hash[:article_category] = [self.article_category, new_article_category] unless new_article_category.blank? - end - - Article.compare_attributes(attribute_hash) + return Article.compare_attributes( + { + :name => [self.name, new_article.name], + :manufacturer => [self.manufacturer, new_article.manufacturer.to_s], + :origin => [self.origin, new_article.origin], + :unit => [self.unit, new_unit], + :price => [self.price.to_f.round(2), new_price.to_f.round(2)], + :tax => [self.tax, new_article.tax], + :deposit => [self.deposit.to_f.round(2), new_article.deposit.to_f.round(2)], + # take care of different num-objects. + :unit_quantity => [self.unit_quantity.to_s.to_f, new_unit_quantity.to_s.to_f], + :note => [self.note.to_s, new_article.note.to_s] + } + ) end # Compare attributes from two different articles. diff --git a/app/models/concerns/localize_input.rb b/app/models/concerns/localize_input.rb index b6330fcc..cfb44a44 100644 --- a/app/models/concerns/localize_input.rb +++ b/app/models/concerns/localize_input.rb @@ -8,7 +8,7 @@ module LocalizeInput separator = I18n.t("separator", scope: "number.format") delimiter = I18n.t("delimiter", scope: "number.format") input.gsub!(delimiter, "") if input.match(/\d+#{Regexp.escape(delimiter)}+\d+#{Regexp.escape(separator)}+\d+/) # Remove delimiter - input.gsub!(separator, ".") or input.gsub!(",", ".") # Replace separator with db compatible character + input.gsub!(separator, ".") # Replace separator with db compatible character input rescue Rails.logger.warn "Can't localize input: #{input}" diff --git a/app/models/group_order.rb b/app/models/group_order.rb index f3153c44..c789ef4e 100644 --- a/app/models/group_order.rb +++ b/app/models/group_order.rb @@ -32,8 +32,8 @@ class GroupOrder < ApplicationRecord # Generate some data for the javascript methods in ordering view def load_data data = {} - data[:account_balance] = ordergroup.nil? ? BigDecimal('+Infinity') : ordergroup.account_balance - data[:available_funds] = ordergroup.nil? ? BigDecimal('+Infinity') : ordergroup.get_available_funds(self) + data[:account_balance] = ordergroup.nil? ? BigDecimal.new('+Infinity') : ordergroup.account_balance + data[:available_funds] = ordergroup.nil? ? BigDecimal.new('+Infinity') : ordergroup.get_available_funds(self) # load prices and other stuff.... data[:order_articles] = {} diff --git a/app/models/supplier.rb b/app/models/supplier.rb index 06ef36bb..862f5c24 100644 --- a/app/models/supplier.rb +++ b/app/models/supplier.rb @@ -1,4 +1,3 @@ -require 'foodsoft_article_import' class Supplier < ApplicationRecord include MarkAsDeletedWithName include CustomFields @@ -74,24 +73,15 @@ class Supplier < ApplicationRecord # Synchronise articles with spreadsheet. # # @param file [File] Spreadsheet file to parse - # @param options [Hash] Options passed to {FoodsoftArticleImport#parse} except when listed here. + # @param options [Hash] Options passed to {FoodsoftFile#parse} except when listed here. # @option options [Boolean] :outlist_absent Set to +true+ to remove articles not in spreadsheet. # @option options [Boolean] :convert_units Omit or set to +true+ to keep current units, recomputing unit quantity and price. - def sync_from_file(file, type, options = {}) + def sync_from_file(file, options = {}) all_order_numbers = [] updated_article_pairs, outlisted_articles, new_articles = [], [], [] - custom_codes_path = File.join(Rails.root, "config", "custom_codes.yml") - opts = options.except(:convert_units, :outlist_absent, :update_category) - custom_codes_file_path = custom_codes_path if File.exist?(custom_codes_path) - FoodsoftArticleImport.parse(file, custom_file_path: custom_codes_file_path, type: type, **opts) do |new_attrs, status, line| + FoodsoftFile::parse file, options do |status, new_attrs, line| article = articles.undeleted.where(order_number: new_attrs[:order_number]).first - - if new_attrs[:article_category].present? && options[:update_category] - new_attrs[:article_category] = ArticleCategory.find_match(new_attrs[:article_category]) || ArticleCategory.create_or_find_by!(name: new_attrs[:article_category]) - else - new_attrs[:article_category] = nil - end - + new_attrs[:article_category] = ArticleCategory.find_match(new_attrs[:article_category]) new_attrs[:tax] ||= FoodsoftConfig[:tax_default] new_article = articles.build(new_attrs) @@ -99,7 +89,7 @@ class Supplier < ApplicationRecord if article.nil? new_articles << new_article else - unequal_attributes = article.unequal_attributes(new_article, options.slice(:convert_units, :update_category)) + unequal_attributes = article.unequal_attributes(new_article, options.slice(:convert_units)) unless unequal_attributes.empty? article.attributes = unequal_attributes updated_article_pairs << [article, unequal_attributes] diff --git a/app/views/active_storage/blobs/_blob.html.erb b/app/views/active_storage/blobs/_blob.html.erb deleted file mode 100644 index 49ba357d..00000000 --- a/app/views/active_storage/blobs/_blob.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -
attachment--<%= blob.filename.extension %>"> - <% if blob.representable? %> - <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %> - <% end %> - -
- <% if caption = blob.try(:caption) %> - <%= caption %> - <% else %> - <%= blob.filename %> - <%= number_to_human_size blob.byte_size %> - <% end %> -
-
diff --git a/app/views/articles/_sync_table.html.haml b/app/views/articles/_sync_table.html.haml index 62640cbe..ac17adfa 100644 --- a/app/views/articles/_sync_table.html.haml +++ b/app/views/articles/_sync_table.html.haml @@ -49,8 +49,7 @@ .input-prepend %span.add-on= t 'number.currency.format.unit' = form.text_field 'deposit', class: 'input-mini', style: 'width: 45px' - %td{:style => highlight_new(attrs, :article_category)} - = form.select :article_category_id, ArticleCategory.all.map {|a| [ a.name, a.id ] }, + %td= form.select :article_category_id, ArticleCategory.all.map {|a| [ a.name, a.id ] }, {include_blank: true}, class: 'input-small' - unless changed_article.errors.empty? %tr.alert diff --git a/app/views/articles/upload.html.haml b/app/views/articles/upload.html.haml index dc32fe3a..8f91d790 100644 --- a/app/views/articles/upload.html.haml +++ b/app/views/articles/upload.html.haml @@ -71,19 +71,11 @@ = form_for :articles, :url => parse_upload_supplier_articles_path(@supplier), :html => { multipart: true, class: "form-horizontal" } do |f| - .control-group - %label(for="articles_file") - %strong= t '.file_label' + %label(for="articles_file")= t '.file_label' = f.file_field "file" - %label(for="articles_file") - %strong="select the file type you are about to upload" - =f.collection_select :type, ["bnn","foodsoft","odin"], :to_s, :to_s .control-group - %label(for="articles_update_category") - = f.check_box "update_category" - = t '.options.update_category' %label(for="articles_outlist_absent") = f.check_box "outlist_absent" = t '.options.outlist_absent' diff --git a/app/views/finance/ordergroups/_ordergroups.html.haml b/app/views/finance/ordergroups/_ordergroups.html.haml index 3e0c99fc..83a05ed2 100644 --- a/app/views/finance/ordergroups/_ordergroups.html.haml +++ b/app/views/finance/ordergroups/_ordergroups.html.haml @@ -22,12 +22,3 @@ %td = link_to t('.new_transaction'), new_finance_ordergroup_transaction_path(ordergroup), class: 'btn btn-mini' = link_to t('.account_statement'), finance_ordergroup_transactions_path(ordergroup), class: 'btn btn-mini' - %thead - %tr - %th= t 'Total' - %th - - FinancialTransactionClass.sorted.each do |c| - - name = FinancialTransactionClass.has_multiple_classes ? c.display : heading_helper(Ordergroup, :account_balance) - %th.numeric= format_currency @total_balances[c.id] - %th.numeric - = format_currency @total_balances.values.reduce(:+) \ No newline at end of file diff --git a/app/views/group_orders/_explanations.haml b/app/views/group_orders/_explanations.haml deleted file mode 100644 index 30e5b91c..00000000 --- a/app/views/group_orders/_explanations.haml +++ /dev/null @@ -1,15 +0,0 @@ -%h4= t '.title' -%hr -%table.table-condensed - %thead - %th= t '.package_fill_level' - %tbody - %tr{class: "missing-none"} - %td= t '.missing_none' - %tr{class: "missing-few"} - %td= t '.missing_few' - %tr{class: "missing-many"} - %td= t '.missing_many' -%hr - %b= t('.tolerance') + ':' - = t '.tolerance_explained' \ No newline at end of file diff --git a/app/views/group_orders/_form.html.haml b/app/views/group_orders/_form.html.haml index 9d13e525..3ffd583e 100644 --- a/app/views/group_orders/_form.html.haml +++ b/app/views/group_orders/_form.html.haml @@ -11,142 +11,170 @@ var listjsResetPlugin = ['reset', {highlightClass: 'btn-primary'}]; var listjsDelayPlugin = ['delay', {delayedSearchTime: 500}]; new List(document.body, { - valueNames: ['name'], - engine: 'unlist', - plugins: [listjsResetPlugin, listjsDelayPlugin], - // make large pages work too (as we don't have paging - articles may disappear!) - page: 10000, - indexAsync: true + valueNames: ['name'], + engine: 'unlist', + plugins: [listjsResetPlugin, listjsDelayPlugin], + // make large pages work too (as we don't have paging - articles may disappear!) + page: 10000, + indexAsync: true }); }); - title t('.title'), false -.alert.alert-error#balance-alert{style: ('display:none')} - =t 'group_orders.errors.balance_alert' .row-fluid - .span2 - .well - = render 'switch_order', current_order: @order - .well - = render 'explanations' - .well.span9 - %h2.span9= t '.sub_title', order_name: @order.name - .span3 - %table.table-condensed - -if @order.ends - %tr - %td= heading_helper(Order, :ends) + ': ' - %td= format_time(@order.ends) - - unless @order.stockit? or @order.supplier.min_order_quantity.blank? - %tr - %td= heading_helper(Supplier, :min_order_quantity) - %td= number_to_currency(@order.supplier.min_order_quantity) - %tr - %td= t('group_orders.form.sum_amount') + ':' - %td= number_to_currency(@order.sum) - %hr - .form-search.pull-right + .well.pull-left + = close_button :alert + %h2= @order.name + %dl.dl-horizontal + - unless @order.note.blank? + %dt= heading_helper Order, :note + %dd= @order.note + %dt= heading_helper Order, :created_by + %dd= show_user_link(@order.created_by) + %dt= heading_helper Order, :ends + %dd= format_time(@order.ends) + %dt= heading_helper Order, :pickup + %dd= format_date(@order.pickup) + - unless @order.stockit? or @order.supplier.min_order_quantity.blank? + %dt= heading_helper Supplier, :min_order_quantity, short: true + %dd= @order.supplier.min_order_quantity + %dt= t '.sum_amount' + %dd= number_to_currency @order.sum + - unless @group_order.new_record? + %dt= heading_helper GroupOrder, :updated_by + %dd + = show_user(@group_order.updated_by) + (#{format_time(@group_order.updated_on)}) + %dt= heading_helper Ordergroup, :account_balance + %dd= number_to_currency(@ordering_data[:account_balance]) + - unless FoodsoftConfig[:charge_members_manually] + %dt= heading_helper Ordergroup, :available_funds + %dd= number_to_currency(@ordering_data[:available_funds]) + + .well.pull-right + = close_button :alert + = render 'switch_order', current_order: @order + +.row-fluid + .well.clear + .form-search .input-append = text_field_tag :article, params[:article], placeholder: t('.search_article'), class: 'search-query delayed-search resettable' %button.add-on.btn.reset-search{:type => :button, :title => t('.reset_article_search')} %i.icon.icon-remove - = form_for @group_order do |f| - = f.hidden_field :lock_version - = f.hidden_field :order_id - = f.hidden_field :updated_by_user_id - = f.hidden_field :ordergroup_id - %table.table - %thead - %tr - %th= heading_helper Article, :name + += form_for @group_order do |f| + = f.hidden_field :lock_version + = f.hidden_field :order_id + = f.hidden_field :updated_by_user_id + = f.hidden_field :ordergroup_id + %table.table.table-hover + %thead + %tr + %th= heading_helper Article, :name + - if @order.stockit? + %th{style: 'width:120px'}= heading_helper StockArticle, :supplier + %th{style: "width:13px;"} + %th{style: "width:4.5em;"}= t '.price' + %th{style: "width:4.5em;"}= heading_helper Article, :unit + - unless @order.stockit? + %th{style: "width:70px;"}= heading_helper OrderArticle, :missing_units, short: true + %th#col_required= heading_helper GroupOrderArticle, :quantity + %th#col_tolerance= heading_helper GroupOrderArticle, :tolerance + - else + %th(style="width:20px")= heading_helper StockArticle, :available + %th#col_required= heading_helper GroupOrderArticle, :quantity + %th{style: "width:15px;"}= heading_helper GroupOrderArticle, :total_price + %tbody.list + - @order.articles_grouped_by_category.each do |category, order_articles| + %tr.list-heading.article-category + %td + = category + %i.icon-tag + %td{colspan: "9"} + - order_articles.each do |order_article| + %tr{class: "#{cycle('even', 'odd', name: 'articles')} order-article #{get_missing_units_css_class(@ordering_data[:order_articles][order_article.id][:missing_units])}", valign: "top"} + %td.name= order_article.article.name - if @order.stockit? - %th{style: 'width:120px'}= heading_helper StockArticle, :supplier - %th{style: "width:13px;"} - %th{style: "width:4.5em;"}= t '.price' - %th{style: "width:4.5em;"}= t '.price_per_base_unit' - %th{style: "width:4.5em;"}= heading_helper Article, :unit - - unless @order.stockit? - %th{style: "width:70px;"}= heading_helper OrderArticle, :missing_units, short: true - %th#col_required= heading_helper GroupOrderArticle, :quantity - %th#col_tolerance= heading_helper GroupOrderArticle, :tolerance - - else - %th(style="width:20px")= heading_helper StockArticle, :available - %th#col_required= heading_helper GroupOrderArticle, :quantity - %th{style: "width:15px;"}= heading_helper GroupOrderArticle, :total_price - %tbody.list - - @order.articles_grouped_by_category.each do | category, order_articles| - %tr.list-heading.article-category - %td - = category - %i.icon-tag - %td{colspan: "9"} - - order_articles.each do |order_article| - %tr{class: "#{cycle('even', 'odd', name: 'articles')} order-article #{get_missing_units_css_class(@ordering_data[:order_articles][order_article.id][:missing_units])}", valign: "top", tabindex: "0"} - %td.name= order_article.article.name - - if @order.stockit? - %td= truncate order_article.article.supplier.name, length: 15 - %td= h order_article.article.origin - %td= number_to_currency(@ordering_data[:order_articles][order_article.id][:price]) - %td= price_per_base_unit(article: order_article.article, price: @ordering_data[:order_articles][order_article.id][:price]) - %td= order_article.article.unit - %td - - if @order.stockit? - = @ordering_data[:order_articles][order_article.id][:quantity_available] - - else - %span{id: "missing_units_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:missing_units] + %td= truncate order_article.article.supplier.name, length: 15 + %td= h order_article.article.origin + %td= number_to_currency(@ordering_data[:order_articles][order_article.id][:price]) + %td= order_article.article.unit + %td + - if @order.stockit? + = @ordering_data[:order_articles][order_article.id][:quantity_available] + - else + %span{id: "missing_units_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:missing_units] - %td.quantity - .outer{style: "diyplay: inline-block; float: left; width: 50px;"} - %input{id: "q_#{order_article.id}", name: "group_order[group_order_articles_attributes][#{order_article.id}][quantity]", type: "hidden", value: @ordering_data[:order_articles][order_article.id][:quantity], 'data-min' => (@ordering_data[:order_articles][order_article.id][:quantity] if @order.boxfill?), 'data-max' => (@ordering_data[:order_articles][order_article.id][:quantity]+@ordering_data[:order_articles][order_article.id][:missing_units] if @order.boxfill?)}/ - %span.used{id: "q_used_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:used_quantity] - + - %span.unused{id: "q_unused_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:quantity] - @ordering_data[:order_articles][order_article.id][:used_quantity] - .btn-group - %a.btn.btn-ordering{'data-decrease_quantity' => order_article.id} - %i.icon-minus - %a.btn.btn-ordering{'data-increase_quantity' => order_article.id} - %i.icon-plus + %td.quantity + %input{id: "q_#{order_article.id}", name: "group_order[group_order_articles_attributes][#{order_article.id}][quantity]", type: "hidden", value: @ordering_data[:order_articles][order_article.id][:quantity], 'data-min' => (@ordering_data[:order_articles][order_article.id][:quantity] if @order.boxfill?), 'data-max' => (@ordering_data[:order_articles][order_article.id][:quantity]+@ordering_data[:order_articles][order_article.id][:missing_units] if @order.boxfill?)}/ + %span.used{id: "q_used_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:used_quantity] + + + %span.unused{id: "q_unused_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:quantity] - @ordering_data[:order_articles][order_article.id][:used_quantity] + .btn-group + %a.btn.btn-ordering{'data-increase_quantity' => order_article.id} + %i.icon-plus + %a.btn.btn-ordering{'data-decrease_quantity' => order_article.id} + %i.icon-minus - %td.tolerance{style: ('display:none' if @order.stockit?)} - %input{id: "t_#{order_article.id}", name: "group_order[group_order_articles_attributes][#{order_article.id}][tolerance]", type: "hidden", value: @ordering_data[:order_articles][order_article.id][:tolerance], 'data-min' => (@ordering_data[:order_articles][order_article.id][:tolerance] if @order.boxfill?)}/ - - if (@ordering_data[:order_articles][order_article.id][:unit] > 1) - %span.used{id: "t_used_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:used_tolerance] - + - %span.unused{id: "t_unused_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:tolerance] - @ordering_data[:order_articles][order_article.id][:used_tolerance] - .btn-group - %a.btn.btn-ordering{'data-decrease_tolerance' => order_article.id} - %i.icon-minus - %a.btn.btn-ordering{'data-increase_tolerance' => order_article.id} - %i.icon-plus + %td.tolerance{style: ('display:none' if @order.stockit?)} + %input{id: "t_#{order_article.id}", name: "group_order[group_order_articles_attributes][#{order_article.id}][tolerance]", type: "hidden", value: @ordering_data[:order_articles][order_article.id][:tolerance], 'data-min' => (@ordering_data[:order_articles][order_article.id][:tolerance] if @order.boxfill?)}/ + - if (@ordering_data[:order_articles][order_article.id][:unit] > 1) + %span.used{id: "t_used_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:used_tolerance] + + + %span.unused{id: "t_unused_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:tolerance] - @ordering_data[:order_articles][order_article.id][:used_tolerance] + .btn-group + %a.btn.btn-ordering{'data-increase_tolerance' => order_article.id} + %i.icon-plus + %a.btn.btn-ordering{'data-decrease_tolerance' => order_article.id} + %i.icon-minus - %td{id: "td_price_#{order_article.id}", style: "text-align:right; padding-right:10px; width:4em"} - %span{id: "price_#{order_article.id}_display"}= number_to_currency(@ordering_data[:order_articles][order_article.id][:total_price]) - .article-info - .article-name= order_article.article.name - .pull-right - = t('.units_full') + ':' - %span{id: "units_#{order_article.id}"}= order_article.units_to_order - %br/ - = t('.units_total') + ':' - %span{id: "q_total_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:quantity] + @ordering_data[:order_articles][order_article.id][:others_quantity] - %br/ - = t('.total_tolerance') + ':' - %span{id: "t_total_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:tolerance] + @ordering_data[:order_articles][order_article.id][:others_tolerance] - %br/ - .pull-left - #{heading_helper Article, :manufacturer}: #{order_article.article.manufacturer} - %br/ - #{heading_helper Article, :units}: #{@order.stockit? ? order_article.article.quantity_available : @ordering_data[:order_articles][order_article.id][:unit]} * #{h order_article.article.unit} - %br/ - #{heading_helper Article, :note}: #{order_article.article.note} - %br/ - #order-footer - #info-box - #total-sum - = render 'total_sum' - #order-button - = submit_tag( t('.action_save'), id: 'submit_button', class: 'btn btn-primary' ) - #{link_to t('ui.or_cancel'), group_orders_path} - %input#total_balance{name: "total_balance", type: "hidden", value: @ordergroup.account_balance - @group_order.price}/ - %input{name: "version", type: "hidden", value: @version}/ + %td{id: "td_price_#{order_article.id}", style: "text-align:right; padding-right:10px; width:4em"} + %span{id: "price_#{order_article.id}_display"}= number_to_currency(@ordering_data[:order_articles][order_article.id][:total_price]) + .article-info + .article-name= order_article.article.name + .pull-right + = t('.units_full') + ':' + %span{id: "units_#{order_article.id}"}= order_article.units_to_order + %br/ + = t('.units_total') + ':' + %span{id: "q_total_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:quantity] + @ordering_data[:order_articles][order_article.id][:others_quantity] + %br/ + = t('.total_tolerance') + ':' + %span{id: "t_total_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:tolerance] + @ordering_data[:order_articles][order_article.id][:others_tolerance] + %br/ + .pull-left + #{heading_helper Article, :manufacturer}: #{order_article.article.manufacturer} + %br/ + #{heading_helper Article, :units}: #{@order.stockit? ? order_article.article.quantity_available : @ordering_data[:order_articles][order_article.id][:unit]} * #{h order_article.article.unit} + %br/ + #{heading_helper Article, :note}: #{order_article.article.note} + %br/ + #order-footer + #info-box + #total-sum + %table + %tr + %td= t('.total_sum_amount') + ':' + %td.currency + %span#total_price= number_to_currency(@group_order.price) + %tr + - if FoodsoftConfig[:charge_members_manually] + - old_balance = @ordering_data[:account_balance] + %td= heading_helper(Ordergroup, :account_balance) + ':' + %td.currency= number_to_currency(@ordering_data[:account_balance]) + - else + - old_balance = @ordering_data[:available_funds] + %td= heading_helper(Ordergroup, :available_funds) + ':' + %td.currency= number_to_currency(@ordering_data[:available_funds]) + %tr + %td= t('.new_funds') + ':' + %td.currency + %strong + %span#new_balance= number_to_currency(old_balance - @group_order.price) + #order-button + = submit_tag( t('.action_save'), id: 'submit_button', class: 'btn btn-primary' ) + #{link_to t('ui.or_cancel'), group_orders_path} + %input#total_balance{name: "total_balance", type: "hidden", value: @ordergroup.account_balance - @group_order.price}/ + %input{name: "version", type: "hidden", value: @version}/ diff --git a/app/views/group_orders/_switch_order.html.haml b/app/views/group_orders/_switch_order.html.haml index 70234b39..76443524 100644 --- a/app/views/group_orders/_switch_order.html.haml +++ b/app/views/group_orders/_switch_order.html.haml @@ -1,10 +1,9 @@ -- orders = Order.open.started +- orders = Order.open.started.reject{ |order| order == current_order } - unless orders.empty? - %ul.nav.nav-pills.nav-stacked - .nav-header= t '.title' - %li= link_to t('ui.overview'), :group_orders + %h2= t '.title' + %ul.unstyled - orders.each do |order| - .btn-small.pull-right - =link_to_ordering(order, style: (order == current_order ? 'color: white' : '' ), 'data-confirm_switch_order' => true){ t 'ui.edit' } - %li( class="#{ order == current_order ? 'active' : ''}") - =link_to_ordering(order, show: true, 'data-confirm_switch_order' => true) \ No newline at end of file + %li + = link_to_ordering(order, 'data-confirm_switch_order' => true) + - if order.ends + = t '.remaining', remaining: time_ago_in_words(order.ends) diff --git a/app/views/group_orders/_total_sum.haml b/app/views/group_orders/_total_sum.haml deleted file mode 100644 index 28911b32..00000000 --- a/app/views/group_orders/_total_sum.haml +++ /dev/null @@ -1,19 +0,0 @@ -%table - %tr - %td= t('group_orders.form.total_sum_amount') + ':' - %td.currency - %span#total_price= number_to_currency(@group_order.price) - %tr - - if FoodsoftConfig[:charge_members_manually] - - old_balance = @ordering_data[:account_balance] - %td= heading_helper(Ordergroup, :account_balance) + ':' - %td.currency= number_to_currency(@ordering_data[:account_balance]) - - else - - old_balance = @ordering_data[:available_funds] - %td= heading_helper(Ordergroup, :available_funds) + ':' - %td.currency= number_to_currency(@ordering_data[:available_funds]) - %tr - %td= t('group_orders.form.new_funds') + ':' - %td.currency - %strong - %span#new_balance= number_to_currency(old_balance - @group_order.price) diff --git a/app/views/group_orders/index.html.haml b/app/views/group_orders/index.html.haml index 55c97c81..158bc06c 100644 --- a/app/views/group_orders/index.html.haml +++ b/app/views/group_orders/index.html.haml @@ -18,27 +18,22 @@ %th= heading_helper Ordergroup, :available_funds %th.numeric= number_to_currency(@ordergroup.get_available_funds) -.row-fluid - .span9 - = render :partial => "shared/open_orders", :locals => {:ordergroup => @ordergroup} - // finished orders += render :partial => "shared/open_orders", :locals => {:ordergroup => @ordergroup} + +// finished orders - unless @finished_not_closed_orders_including_group_order.empty? - .row-fluid - .span9 - %section - %h2= t '.finished_orders.title' - = render partial: 'orders', locals: {orders: @finished_not_closed_orders_including_group_order, pagination: false} - - if @ordergroup.value_of_finished_orders > 0 - %p - = t('.finished_orders.total_sum') + ':' - %b= number_to_currency(@ordergroup.value_of_finished_orders) + %section + %h2= t '.finished_orders.title' + = render partial: 'orders', locals: {orders: @finished_not_closed_orders_including_group_order, pagination: false} + - if @ordergroup.value_of_finished_orders > 0 + %p + = t('.finished_orders.total_sum') + ':' + %b= number_to_currency(@ordergroup.value_of_finished_orders) // closed orders - unless @closed_orders_including_group_order.empty? - .row-fluid - .span9 - %section - %h2= t '.closed_orders.title' - = render partial: 'orders', locals: {orders: @closed_orders_including_group_order, pagination: false} - %br/ - = link_to t('.closed_orders.more'), archive_group_orders_path + %section + %h2= t '.closed_orders.title' + = render partial: 'orders', locals: {orders: @closed_orders_including_group_order, pagination: false} + %br/ + = link_to t('.closed_orders.more'), archive_group_orders_path diff --git a/app/views/group_orders/show.html.haml b/app/views/group_orders/show.html.haml index b9d4f674..8c9678d7 100644 --- a/app/views/group_orders/show.html.haml +++ b/app/views/group_orders/show.html.haml @@ -7,115 +7,107 @@ - title t('.title', order: @order.name) .row-fluid - - .well.span2 - = render 'switch_order', current_order: @order - .well.span9 - %h2= t '.articles.title' + .well.pull-left + // Order summary %dl.dl-horizontal - // Name %dt= heading_helper Order, :name %dd= @order.name - // Order Ends + %dt= heading_helper Order, :note + %dd= @order.note %dt= heading_helper Order, :ends %dd= format_time(@order.ends) - // Pickup - - unless @order.pickup.blank? - %dt= heading_helper Order, :pickup - %dd= format_date(@order.pickup) - // Min Order Quantity - - unless @order.stockit? or @order.supplier.min_order_quantity.blank? - %dt= heading_helper Supplier, :min_order_quantity, short: true - %dd= @order.supplier.min_order_quantity - // Group Order Sum Amount - %dt= t 'group_orders.form.sum_amount' - %dd= number_to_currency @order.sum - // Created By - %dt= heading_helper Order, :created_by - %dd= show_user_link(@order.created_by) - // Updated By - - unless @group_order.new_record? - %dt= heading_helper GroupOrder, :updated_by - %dd - = show_user(@group_order.updated_by) - (#{format_time(@group_order.updated_on)}) - // Closed By + %dt= heading_helper Order, :pickup + %dd= format_date(@order.pickup) + %dt= heading_helper GroupOrder, :price + %dd + - if @group_order + = number_to_currency(@group_order.price) + - else + = t '.not_ordered' + - if @group_order && @group_order.transport + %dt= heading_helper GroupOrder, :transport + %dd= number_to_currency(@group_order.transport) + %dt= heading_helper GroupOrder, :total + %dd= number_to_currency(@group_order.total) - if @order.closed? %dt= heading_helper Order, :closed_by %dd= show_user_link @order.updated_by - // Note - - unless @order.note.blank? - %dt= heading_helper Order, :note - %dd= @order.note + %p= link_to t('.comment'), "#comments" - // Article box - %section - .column_content#result - - if @group_order - %p= link_to t('.articles.show_hide'), '#', 'data-toggle-this' => 'tr.ignored' - %table.table.table-hover - %thead - %tr - %th{style: "width:40%"}= heading_helper Article, :name - %th= heading_helper Article, :units - %th= t '.articles.unit_price' - %th - %abbr{title: t('.articles.ordered_title')}= t '.articles.ordered' - %th - %abbr{title: t('.articles.order_nopen_title')} - - if @order.open? - = t '.articles.order_open' - - else - = t '.articles.order_not_open' - %th= heading_helper GroupOrderArticle, :total_price - %tbody - - for category_name, order_articles in @order.articles_grouped_by_category - %tr.article-category - %td - = category_name - %i.icon-tag - %td{colspan: "9"} - - order_articles.each do |oa| - - # get the order-results for the ordergroup - - r = get_order_results(oa, @group_order.id) - %tr{class: cycle('even', 'odd', name: 'articles') + " " + order_article_class_name(r[:quantity], r[:tolerance], r[:result])} - %td{style: "width:40%"} - = oa.article.name - - unless oa.article.note.blank? - = image_tag("lamp_grey.png", {alt: t('.articles.show_note'), size: "15x16", border: "0", onmouseover: "$('#note_#{oa.id}').show();", onmouseout: "$('#note_#{oa.id}').hide();"}) - %td= "#{oa.price.unit_quantity} x #{oa.article.unit}" - %td= number_to_currency(oa.price.fc_price) - %td - = r[:quantity] - = "+ #{r[:tolerance]}" if oa.price.unit_quantity > 1 - %td= r[:result] > 0 ? r[:result] : "0" - %td= number_to_currency(r[:sub_total]) + .well.pull-right + = close_button :alert + = render 'switch_order', current_order: @order + +// Article box +%section + %h2= t '.articles.title' + .column_content#result + - if @group_order + %p.pull-right= link_to t('.articles.show_hide'), '#', 'data-toggle-this' => 'tr.ignored' + %p= link_to(t('.articles.edit_order'), edit_group_order_path(@group_order, order_id: @order.id), class: 'btn btn-primary') if @order.open? + %table.table.table-hover + %thead + %tr + %th{style: "width:40%"}= heading_helper Article, :name + %th= heading_helper Article, :units + %th= t '.articles.unit_price' + %th + %abbr{title: t('.articles.ordered_title')}= t '.articles.ordered' + %th + %abbr{title: t('.articles.order_nopen_title')} + - if @order.open? + = t '.articles.order_open' + - else + = t '.articles.order_not_open' + %th= heading_helper GroupOrderArticle, :total_price + %tbody + - for category_name, order_articles in @order.articles_grouped_by_category + %tr.article-category + %td + = category_name + %i.icon-tag + %td{colspan: "9"} + - order_articles.each do |oa| + - # get the order-results for the ordergroup + - r = get_order_results(oa, @group_order.id) + %tr{class: cycle('even', 'odd', name: 'articles') + " " + order_article_class_name(r[:quantity], r[:tolerance], r[:result])} + %td{style: "width:40%"} + = oa.article.name - unless oa.article.note.blank? - %tr{id: "note_#{oa.id}", class: "note even", style: "display:none"} - %td{colspan: "6"}=h oa.article.note - %tr{class: cycle('even', 'odd', name: 'articles')} - %th{colspan: "5"}= heading_helper GroupOrder, :price - %th= number_to_currency(@group_order.price) - - if @group_order.transport - %tr{class: cycle('even', 'odd', name: 'articles')} - %td{colspan: "5"}= heading_helper GroupOrder, :transport - %td= number_to_currency(@group_order.transport) - %tr{class: cycle('even', 'odd', name: 'articles')} - %th{colspan: "5"}= heading_helper GroupOrder, :total - %th= number_to_currency(@group_order.total) - %br/ - = link_to_top - %p.pull-right= link_to(t('.articles.edit_order'), edit_group_order_path(@group_order, order_id: @order.id), class: 'btn btn-primary') if @order.open? - - else - - if @order.open? - = t '.articles.not_ordered_msg' - = link_to t('.articles.order_now'), action: "order", id: @order - - else - = t '.articles.order_closed_msg' + = image_tag("lamp_grey.png", {alt: t('.articles.show_note'), size: "15x16", border: "0", onmouseover: "$('#note_#{oa.id}').show();", onmouseout: "$('#note_#{oa.id}').hide();"}) + %td= "#{oa.price.unit_quantity} x #{oa.article.unit}" + %td= number_to_currency(oa.price.fc_price) + %td + = r[:quantity] + = "+ #{r[:tolerance]}" if oa.price.unit_quantity > 1 + %td= r[:result] > 0 ? r[:result] : "0" + %td= number_to_currency(r[:sub_total]) + - unless oa.article.note.blank? + %tr{id: "note_#{oa.id}", class: "note even", style: "display:none"} + %td{colspan: "6"}=h oa.article.note + %tr{class: cycle('even', 'odd', name: 'articles')} + %th{colspan: "5"}= heading_helper GroupOrder, :price + %th= number_to_currency(@group_order.price) + - if @group_order.transport + %tr{class: cycle('even', 'odd', name: 'articles')} + %td{colspan: "5"}= heading_helper GroupOrder, :transport + %td= number_to_currency(@group_order.transport) + %tr{class: cycle('even', 'odd', name: 'articles')} + %th{colspan: "5"}= heading_helper GroupOrder, :total + %th= number_to_currency(@group_order.total) + %br/ + = link_to_top + - else + - if @order.open? + = t '.articles.not_ordered_msg' + = link_to t('.articles.order_now'), action: "order", id: @order + - else + = t '.articles.order_closed_msg' + // Comments box -%hr -%h2= t '.comments.title' -#comments - = render 'shared/comments', comments: @order.comments -#new_comment= render 'order_comments/form', order_comment: @order.comments.build(user: current_user) -= link_to_top \ No newline at end of file +%section + %h2= t '.comments.title' + #comments + = render 'shared/comments', comments: @order.comments + #new_comment= render 'order_comments/form', order_comment: @order.comments.build(user: current_user) + = link_to_top diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 66e14355..974ce8f2 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -8,10 +8,10 @@ = csrf_meta_tags = stylesheet_link_tag "application", :media => "all" //%link(href="images/favicon.ico" rel="shortcut icon") + = yield(:head) = foodcoop_css_tag - %body = yield @@ -19,9 +19,7 @@ Javascripts \================================================== / Placed at the end of the document so the pages load faster - = javascript_importmap_tags - = javascript_include_tag "application_legacy" - + = javascript_include_tag "application" :javascript I18n.defaultLocale = "#{I18n.default_locale}"; I18n.locale = "#{I18n.locale}"; diff --git a/app/views/layouts/action_text/contents/_content.html.erb b/app/views/layouts/action_text/contents/_content.html.erb deleted file mode 100644 index 9e3c0d0d..00000000 --- a/app/views/layouts/action_text/contents/_content.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -
- <%= yield -%> -
diff --git a/app/views/layouts/email.html.haml b/app/views/layouts/email.html.haml deleted file mode 100644 index 6bcf3b4a..00000000 --- a/app/views/layouts/email.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -= yield -\ -%hr -%ul - %li - %a{href: root_url} Foodsoft - - if FoodsoftConfig[:homepage] - %li - %a{href: FoodsoftConfig[:homepage]} Foodcoop - - if FoodsoftConfig[:help_url] - %li - %a{href: FoodsoftConfig[:help_url]}= t '.help' \ No newline at end of file diff --git a/app/views/orders/_custom_csv_form.html.haml b/app/views/orders/_custom_csv_form.html.haml deleted file mode 100644 index 87295af0..00000000 --- a/app/views/orders/_custom_csv_form.html.haml +++ /dev/null @@ -1,15 +0,0 @@ -= simple_form_for :custom_csv,format: :csv, :url => order_path(@order, view: @view, format: :csv), method: :get do |f| - .modal-header - = close_button :modal - .h3=I18n.t('.orders.custom_csv.description') - .modal-body - = f.input :first, as: :select, collection: custom_csv_collection, label: "1. " + I18n.t('.orders.custom_csv.column') - = f.input :second, as: :select, collection: custom_csv_collection, required: false, label: "2. " + I18n.t('.orders.custom_csv.column') - = f.input :third, as: :select, collection: custom_csv_collection, required: false, label: "3. " + I18n.t('.orders.custom_csv.column') - = f.input :fourth, as: :select, collection: custom_csv_collection, required: false, label: "4. " + I18n.t('.orders.custom_csv.column') - = f.input :fifth, as: :select, collection: custom_csv_collection, required: false, label: "5. " + I18n.t('.orders.custom_csv.column') - = f.input :sixth, as: :select, collection: custom_csv_collection, required: false, label: "6. " + I18n.t('.orders.custom_csv.column') - = f.input :seventh, as: :select, collection: custom_csv_collection, required: false, label: "7. " + I18n.t('.orders.custom_csv.column') - .modal-footer - = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'} - = f.submit class: 'btn btn-primary' diff --git a/app/views/orders/custom_csv.js.haml b/app/views/orders/custom_csv.js.haml deleted file mode 100644 index 41a6ec83..00000000 --- a/app/views/orders/custom_csv.js.haml +++ /dev/null @@ -1,3 +0,0 @@ -$('#modalContainer').html('#{j(render("custom_csv_form"))}'); -$('#modalContainer').modal(); -$('#modalContainer').submit(function() {$('#modalContainer').modal('hide');}); \ No newline at end of file diff --git a/app/views/shared/_open_orders.html.haml b/app/views/shared/_open_orders.html.haml index 80e4621f..cef00797 100644 --- a/app/views/shared/_open_orders.html.haml +++ b/app/views/shared/_open_orders.html.haml @@ -9,7 +9,6 @@ %thead %tr %th= heading_helper Order, :name - %th %th= heading_helper Order, :pickup %th= heading_helper Order, :ends %th= t '.who_ordered' @@ -18,23 +17,21 @@ - total = 0 - orders.each do |order| %tr - %td - = link_to_ordering(order, show: true) - %td - .btn-small= link_to_ordering(order){ t 'ui.edit' } + %td= link_to_ordering(order) %td= format_date(order.pickup) unless order.pickup.nil? %td= format_time(order.ends) unless order.ends.nil? - if group_order = order.group_order(ordergroup) - total += group_order.price %td= "#{show_user group_order.updated_by} (#{format_time(group_order.updated_on)})" %td.numeric - = number_to_currency(group_order.price) + = link_to_ordering(order, show: true) do + = number_to_currency(group_order.price) - else %td{:colspan => 2} - if total > 0 %tfooter %tr - %th(colspan="4") + %th(colspan="3") %th= t('.total_sum') + ':' %th.numeric= number_to_currency(total) - else diff --git a/app/views/shared/_order_download_button.html.haml b/app/views/shared/_order_download_button.html.haml index 2c362533..6890c3ca 100644 --- a/app/views/shared/_order_download_button.html.haml +++ b/app/views/shared/_order_download_button.html.haml @@ -10,4 +10,3 @@ - unless order.stockit? %li= link_to t('.fax_txt'), order_path(order, format: :txt), {title: t('.download_file')} %li= link_to t('.fax_csv'), order_path(order, format: :csv), {title: t('.download_file')} - %li= link_to t('.custom_csv'), custom_csv_order_path(order), remote: true diff --git a/bin/importmap b/bin/importmap deleted file mode 100755 index 36502ab1..00000000 --- a/bin/importmap +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby - -require_relative "../config/application" -require "importmap/commands" diff --git a/bin/setup b/bin/setup index ec47b79b..94fd4d79 100755 --- a/bin/setup +++ b/bin/setup @@ -1,33 +1,36 @@ #!/usr/bin/env ruby -require "fileutils" +require 'fileutils' +include FileUtils # path to your application root. -APP_ROOT = File.expand_path("..", __dir__) +APP_ROOT = File.expand_path('..', __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") end -FileUtils.chdir APP_ROOT do - # This script is a way to set up or update your development environment automatically. - # This script is idempotent, so that you can run it at any time and get an expectable outcome. +chdir APP_ROOT do + # This script is a starting point to setup your application. # Add necessary setup steps to this file. - puts "== Installing dependencies ==" - system! "gem install bundler --conservative" - system("bundle check") || system!("bundle install") + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') # puts "\n== Copying sample files ==" - # unless File.exist?("config/database.yml") - # FileUtils.cp "config/database.yml.sample", "config/database.yml" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' # end puts "\n== Preparing database ==" - system! "bin/rails db:prepare" + system! 'bin/rails db:setup' puts "\n== Removing old logs and tempfiles ==" - system! "bin/rails log:clear tmp:clear" + system! 'bin/rails log:clear tmp:clear' puts "\n== Restarting application server ==" - system! "bin/rails restart" + system! 'bin/rails restart' end diff --git a/config/application.rb b/config/application.rb index f76faa95..544e534c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,7 +9,7 @@ Bundler.require(*Rails.groups) module Foodsoft class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 7.0 + config.load_defaults 5.0 # Settings in config/environments/* take precedence over those specified here. # Application configuration can go into files in config/initializers @@ -36,6 +36,9 @@ module Foodsoft # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" + # TODO: Remove this. See CVE-2022-32224 for details. + config.active_record.yaml_column_permitted_classes = [BigDecimal, Date, Symbol, Time] + # Enable escaping HTML in JSON. config.active_support.escape_html_entities_in_json = true @@ -63,14 +66,6 @@ module Foodsoft # Load legacy scripts from vendor config.assets.precompile += ['vendor/assets/javascripts/*.js'] - config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal] - - config.autoloader = :zeitwerk - - config.active_storage.variant_processor = :mini_magick - - # Ex:- :default =>'' - # CORS for API config.middleware.insert_before 0, Rack::Cors do allow do diff --git a/config/environments/production.rb b/config/environments/production.rb index d08234e5..0560b38d 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,5 +1,3 @@ -require "active_support/core_ext/integer/time" - # Foodsoft production configuration. # # This file is in the public domain. @@ -29,23 +27,23 @@ Rails.application.configure do config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? # Compress JavaScripts and CSS. - config.assets.js_compressor = :terser + config.assets.js_compressor = :uglifier config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. config.assets.compile = false # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.asset_host = "http://assets.example.com" + # config.action_controller.asset_host = 'http://assets.example.com' # Specifies the header that your server uses for sending files. # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX - # Store uploaded files on the local file system (see config/storage.yml for options). + # Store uploaded files on the local file system (see config/storage.yml for options) config.active_storage.service = :local - # Mount Action Cable outside main process or domain. + # Mount Action Cable outside main process or domain # config.action_cable.mount_path = nil # config.action_cable.url = 'wss://example.com/cable' # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] @@ -53,8 +51,6 @@ Rails.application.configure do # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. config.force_ssl = ENV["RAILS_FORCE_SSL"] != "false" - # Include generic and useful information about system operation, but avoid logging too much - # information to avoid inadvertent exposure of personally identifiable information (PII). # Set to :debug to see everything in the log. config.log_level = :info @@ -67,10 +63,6 @@ Rails.application.configure do # Use a different cache store in production. # config.cache_store = :mem_cache_store - # Use a real queuing backend for Active Job (and separate queues per environment). - # config.active_job.queue_adapter = :resque - # config.active_job.queue_name_prefix = "foodsoft_production" - config.action_mailer.perform_caching = false # Ignore bad email addresses and do not raise email delivery errors. @@ -106,7 +98,7 @@ Rails.application.configure do end # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = Logger::Formatter.new + config.log_formatter = ::Logger::Formatter.new # Use a different logger for distributed setups. # require 'syslog/logger' diff --git a/config/environments/test.rb b/config/environments/test.rb index 6ea4d1e7..ccf3767f 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,31 +1,30 @@ -require "active_support/core_ext/integer/time" - -# The test environment is used exclusively to run your application's -# test suite. You never need to work with it otherwise. Remember that -# your test database is "scratch space" for the test suite and is wiped -# and recreated between test runs. Don't rely on the data there! +# Foodsoft test configuration. +# +# This file is in the public domain. Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - # Turn false under Spring and add config.action_view.cache_template_loading = true. + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! config.cache_classes = true - # Eager loading loads your whole application. When running a single test locally, - # this probably isn't necessary. It's a good idea to do in a continuous integration - # system, or in some way before deploying your code. - config.eager_load = ENV["CI"].present? + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false # Configure public file server for tests with Cache-Control for performance. config.public_file_server.enabled = true config.public_file_server.headers = { - "Cache-Control" => "public, max-age=#{1.hour.to_i}" + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" } # Show full error reports and disable caching. config.consider_all_requests_local = true config.action_controller.perform_caching = false - config.cache_store = :null_store # Raise exceptions instead of rendering exception templates. config.action_dispatch.show_exceptions = false @@ -33,7 +32,7 @@ Rails.application.configure do # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false - # Store uploaded files on the local file system in a temporary directory. + # Store uploaded files on the local file system in a temporary directory config.active_storage.service = :test config.action_mailer.perform_caching = false @@ -46,15 +45,6 @@ Rails.application.configure do # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr - # Raise exceptions for disallowed deprecations. - config.active_support.disallowed_deprecation = :raise - - # Tell Active Support which deprecation messages to disallow. - config.active_support.disallowed_deprecation_warnings = [] - - # Raises error for missing translations. - # config.i18n.raise_on_missing_translations = true - - # Annotate rendered view with file names. - # config.action_view.annotate_rendered_view_with_filenames = true + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true end diff --git a/config/importmap.rb b/config/importmap.rb deleted file mode 100644 index f882664b..00000000 --- a/config/importmap.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Pin npm packages by running ./bin/importmap -pin "application", preload: true -pin "trix" -pin "@rails/actiontext", to: "actiontext.js" diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index e1c4d5fa..4b828e80 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -5,8 +5,10 @@ Rails.application.config.assets.version = '1.0' # Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. -Rails.application.config.assets.precompile += %w( application_legacy.js jquery.min.js ) +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 54f47cf1..d3bcaa5e 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -1,25 +1,25 @@ # Be sure to restart your server when you modify this file. -# Define an application-wide content security policy. -# See the Securing Rails Applications Guide for more information: -# https://guides.rubyonrails.org/security.html#content-security-policy-header +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy -# Rails.application.configure do -# config.content_security_policy do |policy| -# policy.default_src :self, :https -# policy.font_src :self, :https, :data -# policy.img_src :self, :https, :data -# policy.object_src :none -# policy.script_src :self, :https -# policy.style_src :self, :https -# # Specify URI for violation reports -# # policy.report_uri "/csp-violation-report-endpoint" -# end -# -# # Generate session nonces for permitted importmap and inline scripts -# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s } -# config.content_security_policy_nonce_directives = %w(script-src) -# -# # Report violations without enforcing the policy. -# # config.content_security_policy_report_only = true +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" # end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb deleted file mode 100644 index e5a82f16..00000000 --- a/config/initializers/cors.rb +++ /dev/null @@ -1,16 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Avoid CORS issues when API is called from the frontend app. -# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. - -# Read more: https://github.com/cyu/rack-cors - -# Rails.application.config.middleware.insert_before 0, Rack::Cors do -# allow do -# origins "example.com" -# -# resource "*", -# headers: :any, -# methods: [:get, :post, :put, :patch, :delete, :options, :head] -# end -# end diff --git a/config/initializers/currency_display.rb b/config/initializers/currency_display.rb index 71d108d2..7caa6a64 100644 --- a/config/initializers/currency_display.rb +++ b/config/initializers/currency_display.rb @@ -1,7 +1,7 @@ # remove all currency translations, so that we can set the default language and # have it shown in all other languages too -I18n.available_locales.each do |locale| - unless locale == I18n.default_locale - I18n.backend.store_translations(locale, number: { currency: { format: { unit: nil } } }) +::I18n.available_locales.each do |locale| + unless locale == ::I18n.default_locale + ::I18n.backend.store_translations(locale, number: { currency: { format: { unit: nil } } }) end end diff --git a/config/initializers/extensions.rb b/config/initializers/extensions.rb index 68c7c8f4..799f52e6 100644 --- a/config/initializers/extensions.rb +++ b/config/initializers/extensions.rb @@ -3,7 +3,7 @@ class String # remove comma from decimal inputs def self.delocalized_decimal(string) if !string.blank? and string.is_a?(String) - BigDecimal(string.sub(',', '.')) + BigDecimal.new(string.sub(',', '.')) else string end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb index adc6568c..4a994e1e 100644 --- a/config/initializers/filter_parameter_logging.rb +++ b/config/initializers/filter_parameter_logging.rb @@ -1,8 +1,4 @@ # Be sure to restart your server when you modify this file. -# Configure parameters to be filtered from the log file. Use this to limit dissemination of -# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported -# notations and behaviors. -Rails.application.config.filter_parameters += [ - :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn -] +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/mail_receiver.rb b/config/initializers/mail_receiver.rb index 088d7c93..67288cc1 100644 --- a/config/initializers/mail_receiver.rb +++ b/config/initializers/mail_receiver.rb @@ -1,3 +1 @@ -Rails.application.config.to_prepare do - FoodsoftMailReceiver.register BounceMailReceiver -end +FoodsoftMailReceiver.register BounceMailReceiver diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 00000000..fac64e0a --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,17 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Once upgraded flip defaults one by one to migrate to the new default. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Enable per-form CSRF tokens. Previous versions had false. +Rails.application.config.action_controller.per_form_csrf_tokens = false + +# Enable origin-checking CSRF mitigation. Previous versions had false. +Rails.application.config.action_controller.forgery_protection_origin_check = false + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = false diff --git a/config/initializers/new_framework_defaults_5_1.rb b/config/initializers/new_framework_defaults_5_1.rb new file mode 100644 index 00000000..9010abd5 --- /dev/null +++ b/config/initializers/new_framework_defaults_5_1.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.1 upgrade. +# +# Once upgraded flip defaults one by one to migrate to the new default. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make `form_with` generate non-remote forms. +Rails.application.config.action_view.form_with_generates_remote_forms = false + +# Unknown asset fallback will return the path passed in when the given +# asset is not present in the asset pipeline. +# Rails.application.config.assets.unknown_asset_fallback = false diff --git a/config/initializers/new_framework_defaults_5_2.rb b/config/initializers/new_framework_defaults_5_2.rb new file mode 100644 index 00000000..5132a0b1 --- /dev/null +++ b/config/initializers/new_framework_defaults_5_2.rb @@ -0,0 +1,38 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.2 upgrade. +# +# Once upgraded flip defaults one by one to migrate to the new default. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make Active Record use stable #cache_key alongside new #cache_version method. +# This is needed for recyclable cache keys. +# Rails.application.config.active_record.cache_versioning = true + +# Use AES-256-GCM authenticated encryption for encrypted cookies. +# Also, embed cookie expiry in signed or encrypted cookies for increased security. +# +# This option is not backwards compatible with earlier Rails versions. +# It's best enabled when your entire app is migrated and stable on 5.2. +# +# Existing cookies will be converted on read then written with the new scheme. +# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true + +# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages +# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true. +# Rails.application.config.active_support.use_authenticated_message_encryption = true + +# Add default protection from forgery to ActionController::Base instead of in +# ApplicationController. +# Rails.application.config.action_controller.default_protect_from_forgery = true + +# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and +# 'f' after migrating old data. +Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true + +# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header. +# Rails.application.config.active_support.use_sha1_digests = true + +# Make `form_with` generate id attributes for any generated HTML tags. +# Rails.application.config.action_view.form_with_generates_ids = true diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb deleted file mode 100644 index 00f64d71..00000000 --- a/config/initializers/permissions_policy.rb +++ /dev/null @@ -1,11 +0,0 @@ -# Define an application-wide HTTP permissions policy. For further -# information see https://developers.google.com/web/updates/2018/06/feature-policy -# -# Rails.application.config.permissions_policy do |f| -# f.camera :none -# f.gyroscope :none -# f.microphone :none -# f.usb :none -# f.fullscreen :self -# f.payment :self, "https://secure.example.com" -# end diff --git a/config/initializers/rails6_backports.rb b/config/initializers/rails6_backports.rb new file mode 100644 index 00000000..b72f4220 --- /dev/null +++ b/config/initializers/rails6_backports.rb @@ -0,0 +1,98 @@ +raise "Remove no-longer-needed #{__FILE__}!" if Rails::VERSION::MAJOR >= 6 + +require "weakref" + +module ActiveRecord + # Backport https://github.com/rails/rails/pull/36998 and https://github.com/rails/rails/pull/36999 + # to avoid `ThreadError: can't create Thread: Resource temporarily unavailable` issues + module ConnectionAdapters + class ConnectionPool + class Reaper + @mutex = Mutex.new + @pools = {} + @threads = {} + + class << self + def register_pool(pool, frequency) # :nodoc: + @mutex.synchronize do + unless @threads[frequency]&.alive? + @threads[frequency] = spawn_thread(frequency) + end + @pools[frequency] ||= [] + @pools[frequency] << WeakRef.new(pool) + end + end + + private + + def spawn_thread(frequency) + Thread.new(frequency) do |t| + running = true + while running + sleep t + @mutex.synchronize do + @pools[frequency].select!(&:weakref_alive?) + @pools[frequency].each do |p| + p.reap + p.flush + rescue WeakRef::RefError + end + + if @pools[frequency].empty? + @pools.delete(frequency) + @threads.delete(frequency) + running = false + end + end + end + end + end + end + + def run + return unless frequency && frequency > 0 + + self.class.register_pool(pool, frequency) + end + end + + def reap + stale_connections = synchronize do + return unless @connections + + @connections.select do |conn| + conn.in_use? && !conn.owner.alive? + end.each(&:steal!) + end + + stale_connections.each do |conn| + if conn.active? + conn.reset! + checkin conn + else + remove conn + end + end + end + + def flush(minimum_idle = @idle_timeout) + return if minimum_idle.nil? + + idle_connections = synchronize do + return unless @connections + + @connections.select do |conn| + !conn.in_use? && conn.seconds_idle >= minimum_idle + end.each do |conn| + conn.lease + + @available.delete conn + @connections.delete conn + end + end + + idle_connections.each(&:disconnect!) + end + end + end +end diff --git a/config/initializers/rswag_api.rb b/config/initializers/rswag_api.rb deleted file mode 100644 index e4b798f6..00000000 --- a/config/initializers/rswag_api.rb +++ /dev/null @@ -1,13 +0,0 @@ -Rswag::Api.configure do |c| - # Specify a root folder where Swagger JSON files are located - # This is used by the Swagger middleware to serve requests for API descriptions - # NOTE: If you're using rswag-specs to generate Swagger, you'll need to ensure - # that it's configured to generate files in the same folder - c.swagger_root = Rails.root.to_s + '/swagger' - - # Inject a lambda function to alter the returned Swagger prior to serialization - # The function will have access to the rack env for the current request - # For example, you could leverage this to dynamically assign the "host" property - # - # c.swagger_filter = lambda { |swagger, env| swagger['host'] = env['HTTP_HOST'] } -end diff --git a/config/initializers/rswag_ui.rb b/config/initializers/rswag_ui.rb deleted file mode 100644 index cc9f2ef8..00000000 --- a/config/initializers/rswag_ui.rb +++ /dev/null @@ -1,15 +0,0 @@ -Rswag::Ui.configure do |c| - # List the Swagger endpoints that you want to be documented through the - # swagger-ui. The first parameter is the path (absolute or relative to the UI - # host) to the corresponding endpoint and the second is a title that will be - # displayed in the document selector. - # NOTE: If you're using rspec-api to expose Swagger files - # (under swagger_root) as JSON or YAML endpoints, then the list below should - # correspond to the relative paths for those endpoints. - - c.swagger_endpoint '/api-docs/v1/swagger.yaml', 'API V1 Docs' - - # Add Basic Auth in case your API is private - # c.basic_auth_enabled = true - # c.basic_auth_credentials 'username', 'password' -end diff --git a/config/initializers/zeitwerk.rb b/config/initializers/zeitwerk.rb deleted file mode 100644 index 9c505a26..00000000 --- a/config/initializers/zeitwerk.rb +++ /dev/null @@ -1,5 +0,0 @@ -# config/initializers/zeitwerk.rb -ActiveSupport::Dependencies - .autoload_paths - .delete("#{Rails.root}/app/controllers/concerns") - \ No newline at end of file diff --git a/config/locales/de.yml b/config/locales/de.yml index d6254d84..5a1a5b35 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -568,7 +568,6 @@ de: options: convert_units: Derzeitige Einheiten beibehalten, berechne Mengeneinheit und Preis (wie Synchronisieren). outlist_absent: Artikel löschen, die nicht in der hochgeladenen Datei sind. - update_category: Kategorien aus der Datei übernehmen und erstellen. sample: juices: Säfte nuts: Nüsse @@ -1046,33 +1045,17 @@ de: error_stale: In der Zwischenzeit hat jemand anderes auch bestellt, daher konnte die Bestellung nicht aktualisiert werden. notice: Die Bestellung wurde gespeichert. errors: - balance_alert: Kontostand im Minus closed: Diese Bestellung ist bereits abgeschlossen. no_member: Du bist kein Mitglieder einer Bestellgruppe. notfound: Fehlerhafte URL, das ist nicht Deine Bestellung. - explanations: - package_fill_level: | - Gebindefüllstand - missing_none: | - Voll - missing_few: | - Wenig fehlt - missing_many: | - Viel fehlt - title: Erklärungen - tolerance_explained: | - Zusätzliche Menge die du bestellen würdest, damit das Gebinde voll wird. - tolerance: Toleranz form: action_save: Bestellung speichern new_funds: Neuer Kontostand price: Preis - price_per_base_unit: Grundpreis reset_article_search: Suche zurücksetzen search_article: Artikel suchen... sum_amount: Gesamtbestellmenge bisher title: Bestellen - sub_title: Bestellung für %{order_name} aufgeben total_sum_amount: Gesamtbetrag total_tolerance: Gesamt-Toleranz units: Gebinde @@ -1116,6 +1099,7 @@ de: sum: Summe title: Dein Bestellergebnis für %{order} switch_order: + remaining: "noch %{remaining}" title: Laufende Bestellungen update: error_general: Die Bestellung konnte nicht aktualisiert werden, da ein Fehler auftrat. @@ -1237,7 +1221,6 @@ de: footer_2_foodsoft: 'Foodsoft: %{url}' footer_3_homepage: 'Foodcoop: %{url}' footer_4_help: 'Hilfe: %{url}' - help: 'Hilfe' foodsoft: Foodsoft footer: revision: Revision %{revision} @@ -1480,9 +1463,6 @@ de: units_ordered: Bestellte Einheiten create: notice: Die Bestellung wurde erstellt. - custom_csv: - description: Wähle die Attribute und deren Reihenfolge für die zu erzeugende CSV Datei - column: Spalte edit: title: 'Bestellung bearbeiten: %{name}' edit_amount: diff --git a/config/locales/en.yml b/config/locales/en.yml index ea65f309..59e94385 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -569,7 +569,6 @@ en: options: convert_units: Keep current units, recompute unit quantity and price (like synchronize). outlist_absent: Delete articles not in uploaded file. - update_category: Create and replace categories from uploaded file. sample: juices: Juices nuts: Nuts @@ -1048,33 +1047,17 @@ en: error_stale: Someone else has ordered in the meantime, couldn't update the order. notice: The order was saved. errors: - balance_alert: Negative account balance closed: This order is already closed. no_member: You are not a member of an ordergroup. notfound: Incorrect URL, this is not your order. - explanations: - title: Explanations - tolerance: Tolerance - package_fill_level: | - Package Fill Level - missing_none: | - No more missing - missing_few: | - Few missing - missing_many: | - Many missing - tolerance_explained: | - Additional amount you would buy to fill a wholesale package form: action_save: Save order new_funds: New account balance price: Price - price_per_base_unit: Base price reset_article_search: Reset search search_article: Search for articles... sum_amount: Current amount title: Orders - sub_title: Place order for %{order_name} total_sum_amount: Total amount total_tolerance: Total tolerance units: Units @@ -1118,6 +1101,7 @@ en: sum: Sum title: Your order result for %{order} switch_order: + remaining: "%{remaining} remaining" title: Current orders update: error_general: The order couldn’t be updated due to a bug. @@ -1240,7 +1224,6 @@ en: footer_2_foodsoft: 'Foodsoft: %{url}' footer_3_homepage: 'Foodcoop: %{url}' footer_4_help: 'Help: %{url}' - help: 'Help' foodsoft: Foodsoft footer: revision: revision %{revision} @@ -1490,9 +1473,6 @@ en: units_ordered: Units ordered create: notice: The order was created. - custom_csv: - description: Please choose the order as well as the attributes for the csv file - column: column edit: title: 'Edit order: %{name}' edit_amount: @@ -1646,7 +1626,6 @@ en: who_ordered: Who ordered? order_download_button: article_pdf: Article PDF - custom_csv: Custom CSV download_file: Download file fax_csv: Fax CSV fax_pdf: Fax PDF diff --git a/config/locales/es.yml b/config/locales/es.yml index 1f594ead..620ec3bb 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -515,7 +515,6 @@ es: options: convert_units: Mantener unidades actuales, recomputar la cantidad y precio de unidades (como sincronizar). outlist_absent: Borrar artículos que no están en el archivo subido. - update_category: Toma las categorías del archivo subido. sample: juices: Jugos nuts: Nueces @@ -930,7 +929,6 @@ es: action_save: Guardar pedido new_funds: Nuevo balance de cuenta price: Precio - price_per_base_unit: Precio de base reset_article_search: Reinicia la búsqueda search_article: Busca artículos... sum_amount: Cantidad actual @@ -1084,7 +1082,6 @@ es: layouts: email: footer_4_help: 'Ayuda: %{url}' - help: 'Ayuda' footer: revision: revisión %{revision} header: @@ -1262,9 +1259,6 @@ es: units_ordered: Unidades pedidas create: notice: Se ha creado el pedido - custom_csv: - description: Por favor elija el orden de los atributos así como los atributos para el archivo csv - column: columna edit: title: 'Edita pedido: %{name}' edit_amount: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 04dc03fc..4dbdb864 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -678,7 +678,6 @@ fr: action_save: Enregistrer ta commande new_funds: Nouveau solde price: Prix - price_per_base_unit: Prix de base reset_article_search: Réinitialiser la recherche search_article: Rechercher des produits... sum_amount: Quantité déjà commandée @@ -835,7 +834,6 @@ fr: email: footer_3_homepage: 'Boufcoop: %{url}' footer_4_help: 'Aide: %{url}' - help: 'Aide' footer: revision: révision %{revision} header: @@ -1012,9 +1010,6 @@ fr: units_ordered: Unités commandées create: notice: La commande a bien été définie. - custom_csv: - description: Veuillez choisir l'ordre des attributs ainsi que les attributs pour le fichier csv - column: colonne edit: title: 'Modifier la commande: %{name}' edit_amount: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index dd41b666..4c97dda4 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -539,7 +539,6 @@ nl: options: convert_units: Bestaande eenheden behouden, herbereken groothandelseenheid en prijs (net als synchronizeren). outlist_absent: Artikelen die niet in het bestand voorkomen, verwijderen. - upload_category: Categorieën overnemen uit bestand. sample: juices: Sappen nuts: Noten @@ -1018,7 +1017,6 @@ nl: error_stale: In de tussentijd heeft iemand anders ook bestelt, daarom kon de bestelling niet bijgewerkt worden. notice: Bestelling opgeslagen. errors: - balance_alert: Accountsaldo in het rood closed: Deze bestelling is al gesloten. no_member: Je bent geen lid van dit huishouden. notfound: Foute URL, dit is niet jouw bestelling. @@ -1026,12 +1024,10 @@ nl: action_save: Bestelling opslaan new_funds: Nieuw tegoed price: Prijs - price_per_base_unit: Basisprjis reset_article_search: Alles tonen search_article: Artikelen zoeken... sum_amount: Huidig totaalbedrag title: Bestellen - sub_title: Plaats bestelling voor %{order_name} total_sum_amount: Totalbedrag total_tolerance: Totale tolerantie units: Eenheden @@ -1075,6 +1071,7 @@ nl: sum: Som title: Jouw bestelling voor %{order} switch_order: + remaining: "nog %{remaining}" title: Lopende bestellingen update: error_general: Er is een probleem opgetreden, de bestelling kon niet bijgewerkt worden. @@ -1197,7 +1194,6 @@ nl: footer_2_foodsoft: 'Foodsoft: %{url}' footer_3_homepage: 'Foodcoop: %{url}' footer_4_help: 'Help: %{url}' - help: 'Help' foodsoft: Foodsoft footer: revision: revisie %{revision} @@ -1442,9 +1438,6 @@ nl: units_ordered: Bestelde eenheden create: notice: De bestelling is aangemaakt. - custom_csv: - description: Kies de volgorde van de attributen en de attributen voor het csv-bestand - column: kolom edit: title: 'Bestelling aanpassen: %{name}' edit_amount: diff --git a/config/routes.rb b/config/routes.rb index b82699ec..5b27eba4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,4 @@ Rails.application.routes.draw do - mount Rswag::Ui::Engine => '/api-docs' - mount Rswag::Api::Engine => '/api-docs' get "order_comments/new" get "comments/new" @@ -47,7 +45,6 @@ Rails.application.routes.draw do get :receive post :receive - get :custom_csv get :receive_on_order_article_create get :receive_on_order_article_update end diff --git a/db/migrate/20230106144438_add_service_name_to_active_storage_blobs.active_storage.rb b/db/migrate/20230106144438_add_service_name_to_active_storage_blobs.active_storage.rb deleted file mode 100644 index a15c6ce8..00000000 --- a/db/migrate/20230106144438_add_service_name_to_active_storage_blobs.active_storage.rb +++ /dev/null @@ -1,22 +0,0 @@ -# This migration comes from active_storage (originally 20190112182829) -class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0] - def up - return unless table_exists?(:active_storage_blobs) - - unless column_exists?(:active_storage_blobs, :service_name) - add_column :active_storage_blobs, :service_name, :string - - if configured_service = ActiveStorage::Blob.service.name - ActiveStorage::Blob.unscoped.update_all(service_name: configured_service) - end - - change_column :active_storage_blobs, :service_name, :string, null: false - end - end - - def down - return unless table_exists?(:active_storage_blobs) - - remove_column :active_storage_blobs, :service_name - end -end diff --git a/db/migrate/20230106144439_create_active_storage_variant_records.active_storage.rb b/db/migrate/20230106144439_create_active_storage_variant_records.active_storage.rb deleted file mode 100644 index e1020fc9..00000000 --- a/db/migrate/20230106144439_create_active_storage_variant_records.active_storage.rb +++ /dev/null @@ -1,28 +0,0 @@ -# This migration comes from active_storage (originally 20191206030411) -class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0] - def change - return unless table_exists?(:active_storage_blobs) - - # Use Active Record's configured type for primary key - create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t| - t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type - t.string :variation_digest, null: false - - t.index [:blob_id, :variation_digest], name: "index_active_storage_variant_records_uniqueness", unique: true - t.foreign_key :active_storage_blobs, column: :blob_id - end - end - - private - - def primary_key_type - config = Rails.configuration.generators - config.options[config.orm][:primary_key_type] || :primary_key - end - - def blobs_primary_key_type - pkey_name = connection.primary_key(:active_storage_blobs) - pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name } - pkey_column.bigint? ? :bigint : pkey_column.type - end -end diff --git a/db/migrate/20230106144440_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/db/migrate/20230106144440_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb deleted file mode 100644 index 93c8b85a..00000000 --- a/db/migrate/20230106144440_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb +++ /dev/null @@ -1,8 +0,0 @@ -# This migration comes from active_storage (originally 20211119233751) -class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0] - def change - return unless table_exists?(:active_storage_blobs) - - change_column_null(:active_storage_blobs, :checksum, true) - end -end diff --git a/db/migrate/20230209105256_create_action_text_tables.action_text.rb b/db/migrate/20230209105256_create_action_text_tables.action_text.rb deleted file mode 100644 index 1be48d70..00000000 --- a/db/migrate/20230209105256_create_action_text_tables.action_text.rb +++ /dev/null @@ -1,26 +0,0 @@ -# This migration comes from action_text (originally 20180528164100) -class CreateActionTextTables < ActiveRecord::Migration[6.0] - def change - # Use Active Record's configured type for primary and foreign keys - primary_key_type, foreign_key_type = primary_and_foreign_key_types - - create_table :action_text_rich_texts, id: primary_key_type do |t| - t.string :name, null: false - t.text :body, size: :long - t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type - - t.timestamps - - t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true - end - end - - private - def primary_and_foreign_key_types - config = Rails.configuration.generators - setting = config.options[config.orm][:primary_key_type] - primary_key_type = setting || :primary_key - foreign_key_type = setting || :bigint - [primary_key_type, foreign_key_type] - end -end diff --git a/db/migrate/20230215085312_migrate_message_body_to_action_text.rb b/db/migrate/20230215085312_migrate_message_body_to_action_text.rb deleted file mode 100644 index 64e01214..00000000 --- a/db/migrate/20230215085312_migrate_message_body_to_action_text.rb +++ /dev/null @@ -1,10 +0,0 @@ -class MigrateMessageBodyToActionText < ActiveRecord::Migration[7.0] - include ActionView::Helpers::TextHelper - def change - rename_column :messages, :body, :body_old - Message.all.each do |message| - message.update_attribute(:body, simple_format(message.body_old)) - end - remove_column :messages, :body_old - end -end diff --git a/db/schema.rb b/db/schema.rb index 4c853039..ce812b3f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2,70 +2,54 @@ # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. # -# This file is the source Rails uses to define your schema when running `bin/rails -# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to -# be faster and is potentially less error prone than running all of your -# migrations from scratch. Old migrations may fail to apply correctly if those -# migrations use external dependencies or application code. +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do - create_table "action_text_rich_texts", charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| - t.string "name", null: false - t.text "body", size: :long - t.string "record_type", null: false - t.bigint "record_id", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true - end +ActiveRecord::Schema.define(version: 2021_02_05_090257) do - create_table "active_storage_attachments", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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", precision: nil, 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, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| + 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" - t.datetime "created_at", precision: nil, null: false - t.string "service_name", 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 "active_storage_variant_records", charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| - t.integer "blob_id", null: false - t.string "variation_digest", null: false - t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true - end - - create_table "article_categories", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| + 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", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 t.decimal "deposit", precision: 8, scale: 2, default: "0.0", null: false t.integer "unit_quantity" - t.datetime "created_at", precision: nil + t.datetime "created_at" t.index ["article_id"], name: "index_article_prices_on_article_id" end - create_table "articles", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 @@ -74,15 +58,15 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.boolean "availability", default: true, null: false t.string "manufacturer" t.string "origin" - t.datetime "shared_updated_on", precision: nil + t.datetime "shared_updated_on" t.decimal "price", precision: 8, scale: 2 t.float "tax" t.decimal "deposit", precision: 8, scale: 2, default: "0.0" t.integer "unit_quantity", default: 1, null: false t.string "order_number" - t.datetime "created_at", precision: nil - t.datetime "updated_at", precision: nil - t.datetime "deleted_at", precision: nil + t.datetime "created_at" + t.datetime "updated_at" + t.datetime "deleted_at" t.string "type" t.integer "quantity", default: 0 t.index ["article_category_id"], name: "index_articles_on_article_category_id" @@ -91,31 +75,31 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.index ["type"], name: "index_articles_on_type" end - create_table "assignments", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" t.decimal "balance", precision: 12, scale: 2, default: "0.0", null: false - t.datetime "last_import", precision: nil + t.datetime "last_import" t.string "import_continuation_point" t.integer "bank_gateway_id" end - create_table "bank_gateways", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| + create_table "bank_gateways", id: :integer, force: :cascade do |t| t.string "name", null: false t.string "url", null: false t.string "authorization" t.integer "unattended_user_id" end - create_table "bank_transactions", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" @@ -124,32 +108,32 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.string "reference" t.text "text" t.text "receipt" - t.binary "image", size: :medium + t.binary "image", limit: 16777215 t.integer "financial_link_id" t.index ["financial_link_id"], name: "index_bank_transactions_on_financial_link_id" end - create_table "documents", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| + create_table "documents", id: :integer, force: :cascade do |t| t.string "name" t.string "mime" - t.binary "data", size: :long + t.binary "data", limit: 4294967295 t.integer "created_by_user_id" - t.datetime "created_at", precision: nil - t.datetime "updated_at", precision: nil + t.datetime "created_at" + t.datetime "updated_at" t.integer "parent_id" t.index ["parent_id"], name: "index_documents_on_parent_id" end - create_table "financial_links", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| + create_table "financial_links", id: :integer, force: :cascade do |t| t.text "note" end - create_table "financial_transaction_classes", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" @@ -157,12 +141,12 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.index ["name_short"], name: "index_financial_transaction_types_on_name_short" end - create_table "financial_transactions", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 t.integer "user_id", default: 0, null: false - t.datetime "created_on", precision: nil, null: false + t.datetime "created_on", null: false t.integer "financial_transaction_type_id", null: false t.integer "financial_link_id" t.integer "reverts_id" @@ -171,20 +155,20 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.index ["reverts_id"], name: "index_financial_transactions_on_reverts_id", unique: true end - create_table "group_order_article_quantities", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 - t.datetime "created_on", precision: nil, null: false + t.datetime "created_on", null: false t.index ["group_order_article_id"], name: "index_group_order_article_quantities_on_group_order_article_id" end - create_table "group_order_articles", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 t.integer "tolerance", default: 0, null: false - t.datetime "updated_on", precision: nil, null: false + t.datetime "updated_on", null: false t.decimal "result", precision: 8, scale: 3 t.decimal "result_computed", precision: 8, scale: 3 t.index ["group_order_id", "order_article_id"], name: "goa_index", unique: true @@ -192,12 +176,12 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.index ["order_article_id"], name: "index_group_order_articles_on_order_article_id" end - create_table "group_orders", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 t.integer "lock_version", default: 0, null: false - t.datetime "updated_on", precision: nil, null: false + t.datetime "updated_on", null: false t.integer "updated_by_user_id" t.decimal "transport", precision: 8, scale: 2 t.index ["order_id"], name: "index_group_orders_on_order_id" @@ -205,18 +189,18 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.index ["ordergroup_id"], name: "index_group_orders_on_ordergroup_id" end - create_table "groups", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" t.decimal "account_balance", precision: 12, scale: 2, default: "0.0", null: false - t.datetime "created_on", precision: nil, null: false + t.datetime "created_on", null: false t.boolean "role_admin", default: false, null: false t.boolean "role_suppliers", default: false, null: false t.boolean "role_article_meta", default: false, null: false t.boolean "role_finance", default: false, null: false t.boolean "role_orders", default: false, null: false - t.datetime "deleted_at", precision: nil + t.datetime "deleted_at" t.string "contact_person" t.string "contact_phone" t.string "contact_address" @@ -230,16 +214,16 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.index ["name"], name: "index_groups_on_name", unique: true end - create_table "invites", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| + create_table "invites", id: :integer, force: :cascade do |t| t.string "token", default: "", null: false - t.datetime "expires_at", precision: nil, null: false + t.datetime "expires_at", null: false t.integer "group_id", default: 0, null: false t.integer "user_id", default: 0, null: false t.string "email", default: "", null: false t.index ["token"], name: "index_invites_on_token" end - create_table "invoices", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| + create_table "invoices", id: :integer, force: :cascade do |t| t.integer "supplier_id" t.string "number" t.date "date" @@ -248,16 +232,16 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.decimal "amount", precision: 8, scale: 2, default: "0.0", null: false t.decimal "deposit", precision: 8, scale: 2, default: "0.0", null: false t.decimal "deposit_credit", precision: 8, scale: 2, default: "0.0", null: false - t.datetime "created_at", precision: nil - t.datetime "updated_at", precision: nil + t.datetime "created_at" + t.datetime "updated_at" t.integer "created_by_user_id" t.string "attachment_mime" - t.binary "attachment_data", size: :medium + t.binary "attachment_data", limit: 16777215 t.integer "financial_link_id" t.index ["supplier_id"], name: "index_invoices_on_supplier_id" end - create_table "links", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" @@ -265,80 +249,81 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.string "authorization" end - create_table "mail_delivery_status", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| - t.datetime "created_at", precision: nil + 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 t.string "attachment_mime" - t.binary "attachment_data", size: :long + t.binary "attachment_data", limit: 4294967295 t.index ["email"], name: "index_mail_delivery_status_on_email" end - create_table "memberships", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 - t.datetime "read_at", precision: nil + t.datetime "read_at" t.index ["message_id"], name: "index_message_recipients_on_message_id" t.index ["user_id", "read_at"], name: "index_message_recipients_on_user_id_and_read_at" end - create_table "messages", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" t.boolean "private", default: false - t.datetime "created_at", precision: nil + t.datetime "created_at" t.integer "reply_to" t.integer "group_id" t.string "salt" - t.binary "received_email", size: :medium + t.binary "received_email", limit: 16777215 end - create_table "oauth_access_grants", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 t.integer "expires_in", null: false t.text "redirect_uri", null: false - t.datetime "created_at", precision: nil, null: false - t.datetime "revoked_at", precision: nil + t.datetime "created_at", null: false + t.datetime "revoked_at" t.string "scopes" t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true end - create_table "oauth_access_tokens", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 t.string "refresh_token" t.integer "expires_in" - t.datetime "revoked_at", precision: nil - t.datetime "created_at", precision: nil, null: false + t.datetime "revoked_at" + t.datetime "created_at", null: false t.string "scopes" t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id" t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true end - create_table "oauth_applications", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 t.text "redirect_uri", null: false t.string "scopes", default: "", null: false - t.datetime "created_at", precision: nil - t.datetime "updated_at", precision: nil + t.datetime "created_at" + t.datetime "updated_at" t.boolean "confidential", default: true, null: false t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true end - create_table "order_articles", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 @@ -352,45 +337,45 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.index ["order_id"], name: "index_order_articles_on_order_id" end - create_table "order_comments", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" - t.datetime "created_at", precision: nil + t.datetime "created_at" t.index ["order_id"], name: "index_order_comments_on_order_id" end - create_table "orders", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| + create_table "orders", id: :integer, force: :cascade do |t| t.integer "supplier_id" t.text "note" - t.datetime "starts", precision: nil - t.datetime "ends", precision: nil + t.datetime "starts" + t.datetime "ends" t.string "state", default: "open" t.integer "lock_version", default: 0, null: false t.integer "updated_by_user_id" t.decimal "foodcoop_result", precision: 8, scale: 2 t.integer "created_by_user_id" - t.datetime "boxfill", precision: nil + t.datetime "boxfill" t.integer "invoice_id" t.date "pickup" - t.datetime "last_sent_mail", precision: nil + t.datetime "last_sent_mail" t.integer "end_action", default: 0, null: false t.decimal "transport", precision: 8, scale: 2 t.index ["state"], name: "index_orders_on_state" end - create_table "page_versions", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" t.integer "updated_by" t.integer "redirect" t.integer "parent_id" - t.datetime "updated_at", precision: nil + t.datetime "updated_at" t.index ["page_id"], name: "index_page_versions_on_page_id" end - create_table "pages", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| + create_table "pages", id: :integer, force: :cascade do |t| t.string "title" t.text "body" t.string "permalink" @@ -398,41 +383,41 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.integer "updated_by" t.integer "redirect" t.integer "parent_id" - t.datetime "created_at", precision: nil - t.datetime "updated_at", precision: nil + t.datetime "created_at" + t.datetime "updated_at" t.index ["permalink"], name: "index_pages_on_permalink" t.index ["title"], name: "index_pages_on_title" end - create_table "periodic_task_groups", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t| + create_table "periodic_task_groups", id: :integer, force: :cascade do |t| t.date "next_task_date" - t.datetime "created_at", precision: nil, null: false - t.datetime "updated_at", precision: nil, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end - create_table "poll_choices", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" t.text "note" - t.datetime "created_at", precision: nil - t.datetime "updated_at", precision: nil + t.datetime "created_at" + t.datetime "updated_at" 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", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" - t.datetime "starts", precision: nil - t.datetime "ends", precision: nil + t.datetime "starts" + t.datetime "ends" t.boolean "one_vote_per_ordergroup", default: false, null: false t.text "required_ordergroup_custom_fields" t.text "required_user_custom_fields" @@ -442,66 +427,66 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.integer "multi_select_count", default: 0, null: false t.integer "min_points" t.integer "max_points" - t.datetime "created_at", precision: nil - t.datetime "updated_at", precision: nil + t.datetime "created_at" + t.datetime "updated_at" t.index ["final_choice"], name: "index_polls_on_final_choice" end - create_table "printer_job_updates", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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", precision: nil, null: false + t.datetime "created_at", null: false t.string "state", null: false t.text "message" t.index ["printer_job_id", "created_at"], name: "index_printer_job_updates_on_printer_job_id_and_created_at" end - create_table "printer_jobs", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 t.integer "finished_by_user_id" - t.datetime "finished_at", precision: nil + t.datetime "finished_at" t.index ["finished_at"], name: "index_printer_jobs_on_finished_at" end - create_table "settings", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" t.string "thing_type", limit: 30 - t.datetime "created_at", precision: nil, null: false - t.datetime "updated_at", precision: nil, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false 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", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" t.integer "quantity", default: 0 - t.datetime "created_at", precision: nil + t.datetime "created_at" t.index ["stock_article_id"], name: "index_stock_changes_on_stock_article_id" t.index ["stock_event_id"], name: "index_stock_changes_on_stock_event_id" end - create_table "stock_events", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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", precision: nil + t.datetime "created_at" t.text "note" t.integer "invoice_id" t.string "type", null: false t.index ["supplier_id"], name: "index_stock_events_on_supplier_id" end - create_table "supplier_categories", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" t.integer "bank_account_id" end - create_table "suppliers", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 @@ -516,21 +501,21 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.string "note" t.integer "shared_supplier_id" t.string "min_order_quantity" - t.datetime "deleted_at", precision: nil + t.datetime "deleted_at" t.string "shared_sync_method" t.string "iban" t.integer "supplier_category_id" t.index ["name"], name: "index_suppliers_on_name", unique: true end - create_table "tasks", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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" t.boolean "done", default: false t.integer "workgroup_id" - t.datetime "created_on", precision: nil, null: false - t.datetime "updated_on", precision: nil, null: false + t.datetime "created_on", null: false + t.datetime "updated_on", null: false t.integer "required_users", default: 1 t.integer "duration", default: 1 t.integer "periodic_task_group_id" @@ -540,7 +525,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.index ["workgroup_id"], name: "index_tasks_on_workgroup_id" end - create_table "users", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", 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 @@ -548,16 +533,15 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_085312) do t.string "last_name", default: "", null: false t.string "email", default: "", null: false t.string "phone" - t.datetime "created_on", precision: nil, null: false + t.datetime "created_on", null: false t.string "reset_password_token" - t.datetime "reset_password_expires", precision: nil - t.datetime "last_login", precision: nil - t.datetime "last_activity", precision: nil - t.datetime "deleted_at", precision: nil + t.datetime "reset_password_expires" + t.datetime "last_login" + t.datetime "last_activity" + t.datetime "deleted_at" t.string "iban" t.index ["email"], name: "index_users_on_email", unique: true t.index ["nick"], name: "index_users_on_nick", unique: true end - add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" end diff --git a/db/seeds.rb b/db/seeds.rb index eb1f356e..37a996ff 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,4 +1,4 @@ # default seed is minimal -require Rails.root.join('db/seeds/demo-seeds.rb') +require Rails.root.join('db/seeds/minimal.seeds.rb') # to generate new seeds, use the seed_dumper gem diff --git a/db/seeds/demo-seeds.rb b/db/seeds/demo-seeds.rb deleted file mode 100644 index 31bcdf98..00000000 --- a/db/seeds/demo-seeds.rb +++ /dev/null @@ -1,147 +0,0 @@ -require_relative 'seed_helper.rb' - -FinancialTransactionClass.create!(:id => 1, :name => 'Standard') -FinancialTransactionClass.create!(:id => 2, :name => 'Foodsoft') -FinancialTransactionType.create!(:id => 1, :name => "Foodcoop", :financial_transaction_class_id => 1) - -alice = User.create!(:id => 1, :nick => "alice", :password => "secret", :first_name => "Alice", :last_name => "Administrator", :email => "admin@foo.test", :phone => "+4421486548", :created_on => 'Wed, 15 Jan 2014 16:15:33 UTC +00:00') -bob = User.create!(:id => 2, :nick => "bob", :password => "secret", :first_name => "Bob", :last_name => "Doe", :email => "bob@doe.test", :created_on => 'Sun, 19 Jan 2014 17:38:22 UTC +00:00') - - -Workgroup.create!(:id => 1, :name => "Administrators", :description => "System administrators.", :account_balance => 0.0, :created_on => 'Wed, 15 Jan 2014 16:15:33 UTC +00:00', :role_admin => true, :role_suppliers => true, :role_article_meta => true, :role_finance => true, :role_orders => true, :next_weekly_tasks_number => 8, :ignore_apple_restriction => false) -Workgroup.create!(:id => 2, :name => "Finances", :account_balance => 0.0, :created_on => 'Sun, 19 Jan 2014 17:40:03 UTC +00:00', :role_admin => false, :role_suppliers => false, :role_article_meta => false, :role_finance => true, :role_orders => false, :next_weekly_tasks_number => 8, :ignore_apple_restriction => false) -Ordergroup.create!(:id => 5, :name => "Alice WG", :account_balance => 0.90E2, :created_on => 'Sat, 18 Jan 2014 00:38:48 UTC +00:00', :role_admin => false, :role_suppliers => false, :role_article_meta => false, :role_finance => false, :role_orders => false, :stats => { :jobs_size => 0, :orders_sum => 1021.74 }, :next_weekly_tasks_number => 8, :ignore_apple_restriction => true) -Ordergroup.create!(:id => 8, :name => "Bob's Family", :account_balance => 0.90E2, :created_on => 'Wed, 09 Apr 2014 12:23:29 UTC +00:00', :role_admin => false, :role_suppliers => false, :role_article_meta => false, :role_finance => false, :role_orders => false, :contact_person => "John Doe", :stats => { :jobs_size => 0, :orders_sum => 0 }, :next_weekly_tasks_number => 8, :ignore_apple_restriction => false) -FinancialTransaction.create!(:ordergroup_id => 5, :amount => 0.90E2, :note => "Bank transfer", :user_id => 2, :created_on => 'Mon, 17 Feb 2014 16:19:34 UTC +00:00', :financial_transaction_type_id => 1) -FinancialTransaction.create!(:ordergroup_id => 8, :amount => 0.90E2, :note => "Bank transfer", :user_id => 2, :created_on => 'Mon, 17 Feb 2014 16:19:34 UTC +00:00', :financial_transaction_type_id => 1) - -Membership.create!(:group_id => 1, :user_id => 1) -Membership.create!(:group_id => 5, :user_id => 1) -Membership.create!(:group_id => 2, :user_id => 2) -Membership.create!(:group_id => 8, :user_id => 2) - -supplier_category = SupplierCategory.create!(:id => 1, :name => "Other", :financial_transaction_class_id => 1) - -chocolate_supplier = Supplier.create!( - name: "Kollektiv CHOCK!", - address: "Grabower Straße 1\n12345 Berlin", - phone: "0123456789", - email: "info@bbakery.test", - supplier_category: supplier_category -) - -nkn_supplier = Supplier.create!( - name: "Naturgut Süd", - address: "Somewhere in Hamburg, maybe St. Pauli?", - phone: "0123434789", - email: "foodsoft@local-it.org", - supplier_category: supplier_category -) - -chocolate_category = ArticleCategory.create!(name: "Schokolade") -obst_category = ArticleCategory.create!(name: "Obst, Gemüse, Sprossen, Pilze") -nudeln_category = ArticleCategory.create!(name: "Nudeln, Trockenfrüchte, Müsli") -reis_category = ArticleCategory.create!(name: "Getreide, Ölsaaten. Nußkerne") - -Article.create!( - name: "Vollmilch-Schokolade", - supplier_id: chocolate_supplier.id, - article_category_id: chocolate_category.id, - manufacturer: "Grabower Süßwaren GmbH", - origin: "D", price: 3.0, tax: 7.0, - unit: "200g", unit_quantity: 5, - note: "bio, fairtrade, 40% Kakao, vegan", - availability: true, order_number: "1") - -Article.create!( - name: "Weiße Schokolade", - supplier_id: chocolate_supplier.id, - article_category_id: chocolate_category.id, - manufacturer: "Grabower Süßwaren GmbH", - origin: "D", price: 3.49, tax: 7.0, - unit: "200g", unit_quantity: 5, - note: "bio, fairtrade, 40% Kakao, vegan", - availability: true, order_number: "2") - -dark_chocolate = Article.create!( - name: "Dunkle Schokolade", - supplier_id: chocolate_supplier.id, - article_category_id: chocolate_category.id, - manufacturer: "Grabower Süßwaren GmbH", - origin: "D", price: 2.89, tax: 7.0, - unit: "200g", unit_quantity: 5, - note: "bio, fairtrade, 40% Kakao, vegan", - availability: true, order_number: "3") - -Article.create!( - name: "Himbeer-Schokolade", - supplier_id: chocolate_supplier.id, - article_category_id: chocolate_category.id, - manufacturer: "Grabower Süßwaren GmbH", - origin: "D", price: 2.89, tax: 7.0, - unit: "170g", unit_quantity: 4, - note: "bio, fairtrade, 40% Kakao, vegan", - availability: true, order_number: "4") - -previous_order = seed_order(supplier_id: chocolate_supplier.id, starts: 10.days.ago, ends: 7.days.ago) - -GroupOrderArticle.create!( - group_order: GroupOrder.create!(order_id: previous_order.id, ordergroup_id: 8), - order_article: previous_order.order_articles.find_by(article_id: dark_chocolate.id), - quantity: 5, tolerance: 0) - -previous_order.close!(alice) - -seed_order(supplier_id: chocolate_supplier.id, starts: 0.days.ago, ends: 7.days.from_now) - - -apple = Article.create!( - name: "Äpfel Elstar", - supplier_id: nkn_supplier.id, - article_category_id: obst_category.id, - manufacturer: "Obsthof Bruno Brugger", - origin: "D", price: 3.49, tax: 7.0, - unit: "1kg", unit_quantity: 10, - note: "lecker, fruchtig, demeter", - availability: true, order_number: "5") - -brokkoli = Article.create!( - name: "Brokkoli", - supplier_id: nkn_supplier.id, - article_category_id: obst_category.id, - manufacturer: "Fattoria degli Orsi", - origin: "IT", price: 2.89, tax: 7.0, - unit: "400g", unit_quantity: 6, - note: "gesund und lecker", - availability: true, order_number: "6") - -tomatoes = Article.create!( - name: "Tomaten", - supplier_id: nkn_supplier.id, - article_category_id: obst_category.id, - manufacturer: "Terra di Puglia", - origin: "IT", price: 2.89, tax: 7.0, - unit: "500g", unit_quantity: 20, - note: "pomodori italiani, demeter", - availability: true, order_number: "7") - -rice = Article.create!( - name: "Reis", - supplier_id: nkn_supplier.id, - article_category_id: reis_category.id, - manufacturer: "Finck", - origin: "D", price: 3.29, tax: 7.0, - unit: "3kg", unit_quantity: 10, - note: "Reis im Vorratssack, demeter", - availability: true, order_number: "8") - -spaghetti = Article.create!( - name: "Spaghetti", - supplier_id: nkn_supplier.id, - article_category_id: nudeln_category.id, - manufacturer: "Pastificio Zanellini spa", - origin: "D", price: 2.89, tax: 7.0, - unit: "500g", unit_quantity: 4, - note: "100% italienisches Hartweizengrieß", - availability: true, order_number: "9") - diff --git a/db/seeds/seed_helper.rb b/db/seeds/seed_helper.rb index a1f958bf..574be356 100644 --- a/db/seeds/seed_helper.rb +++ b/db/seeds/seed_helper.rb @@ -8,10 +8,10 @@ def seed_group_orders # order 3..12 times a random article go = og.group_orders.create!(order: order, updated_by_user_id: 1) - (rand(10) + 3).times do + (3 + rand(10)).times do goa = go.group_order_articles.find_or_create_by!(order_article: order.order_articles.offset(rand(noas)).first) unit_quantity = goa.order_article.price.unit_quantity - goa.update_quantities rand([4, unit_quantity * 2 + 2].max), rand(unit_quantity) + goa.update_quantities rand([4, 2 * unit_quantity + 2].max), rand(unit_quantity) end end # update totals diff --git a/demo_day_nks.bnn b/demo_day_nks.bnn deleted file mode 100644 index 9bb9c733..00000000 --- a/demo_day_nks.bnn +++ /dev/null @@ -1,7 +0,0 @@ -BNN;3;0;Naturkost Nord, Hamburg;T;Angebot Nr. 0922;EUR;20220905;20221001;20220825;837;1 -5;;;;4280001958081;4280001958203;Žpfel Elstar;erntefrisch und knackig;;;obb;;D;C%;DE-™KO-001;120;0301;10;55;;1;10 x1kg;10;1kg;1;N;;;;1,41;;;;1;;;4,49;2,89;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;1;; -6;;;;4280001958081;4280001958203;Brokkoli;gesund und lecker;;;fig;;IT;C%;DE-™KO-001;120;03;10;55;;1;6 x400g;6;400g;1;N;;;;1,41;;;;1;;;4,49;2,99;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;2,5;; -7;;;;4280001958081;4280001958203;Tomaten;pomodori italiani, demeter;;;TDP;;IT;C%;DE-™KO-001;120;03;10;55;;1;20 x500g;20;500g;1;N;;;;1,41;;;;1;;;4,49;3,19;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;2;; -8;;;;4280001958081;4280001958203;Reis;Reis im Vorratssack, demeter;;;FIN;;D;C%;DE-™KO-001;120;05;10;55;;1;12 x3k;12;3kg;1;N;;;;1,41;;;;1;;;4,49;3,49;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;0,3;; -9;;;;4280001958081;4280001958203;Spaghetti;100% italienisches Hartweizengrieá;;;ZLN;;D;C%;DE-™KO-001;120;06;10;55;;1;4 x500g;4;500g;1;N;;;;1,41;;;;1;;;4,49;2,99;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;2;; -10;;;;4280001958081;4280001958203;Kartoffeln;vorwiegend festkochend;;;rsh;;D;C%;DE-™KO-001;120;0311;10;55;;1;6 x5Kg;6;5Kg;1;N;;;;1,41;;;;1;;;4,49;3,00;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;0.2;; \ No newline at end of file diff --git a/deployment/.env.sample b/deployment/.env.sample deleted file mode 100644 index a0d398c6..00000000 --- a/deployment/.env.sample +++ /dev/null @@ -1,65 +0,0 @@ -TYPE=foodsoft - -DOMAIN=order.example.org -#EXTRA_DOMAINS=', `www.order.example.com`' -LETS_ENCRYPT_ENV=production -COMPOSE_FILE="compose.yml" - -# app settings -FOODCOOP_MULTI_INSTALL=true # Best for now, see https://github.com/foodcoops/foodsoft/pull/841 -FOODCOOP_NAME=example -FOODCOOP_CITY=XXX -FOODCOOP_COUNTRY=XXX -FOODCOOP_EMAIL=info@example.org -FOODCOOP_PHONE=XXX -FOODCOOP_STREET=XXX -FOODCOOP_ZIP_CODE=XXX -FOODCOOP_HOMEPAGE=https://order.example.org -FOODCOOP_HELP_URL=https://order.example.org -FOODCOOP_TIME_ZONE=Amsterdam -FOODCOOP_USE_NICK=true -FOODCOOP_LANGUAGE=en -FOODCOOP_FOOTER='example hosted by Your Tech Co-op.' -USE_APPLE_POINTS=false -STOP_ORDERING_UNDER=75 -MINIMUM_BALANCE=0 - -# database settings -MYSQL_DB=foodsoft -MYSQL_HOST=db -MYSQL_PORT=3306 -MYSQL_USER=foodsoft - -# shared supplier list settings -# COMPOSE_FILE="$COMPOSE_FILE:compose.sharedlists.yml" -# ENABLE_SHARED_LISTS=0 -# SHARED_LISTS_DB_TYPE=mysql2 -# SHARED_LISTS_HOST=order.otherfoodcoop.org -# SHARED_LISTS_DB_NAME=sharedlists -# SHARED_LISTS_USER=example - -# Group order invoices generation pull request -# https://github.com/foodcoops/foodsoft/pull/907 -# COMPOSE_FILE="$COMPOSE_FILE:compose.groupOrderInvoice.yml" - -# outgoing mail settings -EMAIL_SENDER=noreply@example.org -EMAIL_ERROR=systems@example.org -SMTP_ADDRESS=mail.example.com -SMTP_AUTHENTICATION=plain -SMTP_DOMAIN=mail.example.com -SMTP_ENABLE_STARTTLS_AUTO=true -SMTP_PORT=587 -SMTP_USER_NAME=foodsoft - -# incoming mail settings -EMAIL_REPLY_DOMAIN=example.org -SMTP_SERVER_HOST=0.0.0.0 -SMTP_SERVER_PORT=2525 - -# secret versions -SECRET_DB_PASSWORD_VERSION=v1 -SECRET_DB_ROOT_PASSWORD_VERSION=v1 -SECRET_SHARED_LISTS_DB_PASSWORD_VERSION=v1 -SECRET_SMTP_PASSWORD_VERSION=v1 -SECRET_SECRET_KEY_BASE_VERSION=v1 # length=30 diff --git a/deployment/app_config.yml.tmpl b/deployment/app_config.yml.tmpl deleted file mode 100644 index f1e1a580..00000000 --- a/deployment/app_config.yml.tmpl +++ /dev/null @@ -1,168 +0,0 @@ -# {{ env "DOMAIN" }} configuration - -default: &defaults - # If you wanna serve more than one foodcoop with one installation - # Don't forget to setup databases for each foodcoop. See also MULTI_COOP_INSTALL - multi_coop_install: {{ env "FOODCOOP_MULTI_INSTALL" }} - - # If multi_coop_install you have to use a coop name, which you you wanna be selected by default - default_scope: "{{ env "FOODCOOP_NAME" }}" - - # name of this foodcoop - name: "{{ env "FOODCOOP_NAME" }}" - - # foodcoop contact information (used for FAX messages) - contact: - street: "{{ env "FOODCOOP_STREET" }}" - zip_code: "{{ env "FOODCOOP_ZIP_CODE" }}" - city: "{{ env "FOODCOOP_CITY" }}" - country: "{{ env "FOODCOOP_COUNTRY" }}" - email: "{{ env "FOODCOOP_EMAIL" }}" - phone: "{{ env "FOODCOOP_PHONE" }}" - - # Homepage - homepage: "{{ env "FOODCOOP_HOMEPAGE" }}" - - # foodsoft documentation URL - help_url: "{{ env "FOODCOOP_HELP_URL" }}" - - # documentation URL for the apples&pears work system - applepear_url: https://github.com/foodcoops/foodsoft/wiki/%C3%84pfel-u.-Birnen - - # custom foodsoft software URL (used in footer) - foodsoft_url: https://foodcoops.github.io - - # Default language - default_locale: {{ env "FOODCOOP_LANGUAGE" }} - - # By default, foodsoft takes the language from the webbrowser/operating system. - # In case you really want foodsoft in a certain language by default, set this to true. - # When members are logged in, the language from their profile settings is still used. - ignore_browser_locale: false - - # Default timezone, e.g. UTC, Amsterdam, Berlin, etc. - time_zone: "{{ env "FOODCOOP_TIME_ZONE" }}" - - # Currency symbol, and whether to add a whitespace after the unit. - currency_unit: € - #currency_space: true - - # price markup in percent - price_markup: 2.0 - - # default vat percentage for new articles - tax_default: 7.0 - - # tolerance order option: If set to false, article tolerance values do not count - # for total article price as long as the order is not finished. - tolerance_is_costly: false - - # Ordergroups, which have less than 75 apples should not be allowed to make new orders - # Comment out this option to activate this restriction - stop_ordering_under: {{ env "STOP_ORDERING_UNDER" }} - - # Comment out to completely hide apple points (be sure to comment stop_ordering_under) - use_apple_points: {{ env "USE_APPLE_POINTS" }} - - # ordergroups can only order when their balance is higher than or equal to this - # not fully enforced right now, since the check is only client-side - minimum_balance: {{ env "MINIMUM_BALANCE" }} - - # how many days there are between two periodic tasks - #tasks_period_days: 7 - - # how many days upfront periodic tasks are created - #tasks_upfront_days: 49 - - # default order schedule, used to provide initial dates for new orders - # (recurring dates in ical format; no spaces!) - #order_schedule: - # ends: - # recurr: FREQ=WEEKLY;INTERVAL=2;BYDAY=MO - # time: '9:00' - # # reference point, this is generally the first pickup day; empty is often ok - # #initial: - - # When use_nick is enabled, there will be a nickname field in the user form, - # and the option to show a nickname instead of full name to foodcoop members. - # Members of a user's groups and administrators can still see full names. - use_nick: {{ env "FOODCOOP_USE_NICK" }} - - # Most plugins can be enabled/disabled here as well. Messages and wiki are enabled - # by default and need to be set to false to disable. Most other plugins needs to - # be enabled before they do anything. - use_wiki: true - use_messages: true - use_documents: true - use_polls: true - - # Base font size for generated PDF documents - #pdf_font_size: 12 - - # Page size for generated PDF documents - #pdf_page_size: A4 - - # Some documents (like group and article PDFs) can include page breaks - # after each sublist. - #pdf_add_page_breaks: true - - # Alternatively, this can be set for each document. - #pdf_add_page_breaks: - # order_by_groups: true - # order_by_articles: true - - # Page footer (html allowed). Default is a Foodsoft footer. Set to `blank` for no footer. - page_footer: {{ env "FOODCOOP_FOOTER" }} - - # Custom CSS for the foodcoop - #custom_css: 'body { background-color: #fcffba; }' - - # Uncomment to add tracking code for web statistics, e.g. for Piwik. (Added to bottom of page) - #webstats_tracking_code: | - # - # ...... - - # email address to be used as sender - email_sender: "{{ env "EMAIL_SENDER" }}" - - # email address to be used as from - email_from: "{{ env "EMAIL_SENDER" }}" - - # domain to be used for reply emails - reply_email_domain: {{ env "EMAIL_REPLY_DOMAIN" }} - - # If your foodcoop uses a mailing list instead of internal messaging system - #mailing_list: list@example.org - #mailing_list_subscribe: list-subscribe@example.org - - # Config for the exception_notification plugin - notification: - error_recipients: - - "{{ env "EMAIL_ERROR" }}" - sender_address: "\"Foodsoft error\" <{{ env "EMAIL_SENDER" }}>" - email_prefix: "[foodsoft] " - - # http config for this host to generate links in emails (uses environment config when not set) - protocol: https - host: "{{ env "DOMAIN" }}" - #port: 3000 - - {{ if eq (env "ENABLE_SHARED_LISTS") "1" }} - # Access to sharedlists, the external article-database. - # This allows a foodcoop to subscribe to a selection of a supplier's full assortment, - # and makes it possible to share data with several foodcoops. Using this requires installing - # an additional application with a separate database. - shared_lists: - adapter: "{{ env "SHARED_LISTS_DB_TYPE" }}" - host: "{{ env "SHARED_LISTS_HOST" }}" - database: "{{ env "SHARED_LISTS_DB_NAME" }}" - username: "{{ env "SHARED_LISTS_USER" }}" - password: "{{ secret "shared_lists_db_password" }}" - {{ end }} - -# don't remove this, required to run the app -production: - <<: *defaults - -{{ env "FOODCOOP_NAME" }}: - <<: *defaults diff --git a/deployment/compose.yml b/deployment/compose.yml deleted file mode 100644 index 50543ba4..00000000 --- a/deployment/compose.yml +++ /dev/null @@ -1,190 +0,0 @@ ---- -version: "3.8" - -x-env: &env - CERTBOT_DISABLED: 1 - DOMAIN: - EMAIL_ERROR: - EMAIL_REPLY_DOMAIN: - EMAIL_SENDER: - FOODCOOP_CITY: - FOODCOOP_COUNTRY: - FOODCOOP_EMAIL: - FOODCOOP_FOOTER: - FOODCOOP_HELP_URL: - FOODCOOP_HOMEPAGE: - FOODCOOP_MULTI_INSTALL: - FOODCOOP_NAME: - FOODCOOP_PHONE: - FOODCOOP_STREET: - FOODCOOP_TIME_ZONE: - FOODCOOP_ZIP_CODE: - FOODCOOP_USE_NICK: - FOODCOOP_LANGUAGE: - LOG_LEVEL: - MINIMUM_BALANCE: - MYSQL_DB: - MYSQL_HOST: - MYSQL_PORT: - MYSQL_USER: - QUEUE: foodsoft_notifier - REDIS_URL: redis://cache:6379 - SECRET_KEY_BASE_FILE: /run/secrets/secret_key_base - SMTP_ADDRESS: - SMTP_AUTHENTICATION: - SMTP_DOMAIN: - SMTP_ENABLE_STARTTLS_AUTO: - SMTP_PASSWORD_FILE: /run/secrets/smtp_password - SMTP_PORT: - SMTP_USER_NAME: - STOP_ORDERING_UNDER: - USE_APPLE_POINTS: - -x-configs: &configs - - source: app_config - target: /usr/src/app/config/app_config.yml - - source: db_config - target: /usr/src/app/config/database.yml - - source: entrypoint - target: /usr/src/app/docker-entrypoint.sh - mode: 0555 - -x-secrets: &secrets - - db_password - - secret_key_base - - smtp_password - -services: - app: - image: ${IMAGE} - networks: - - internal - - proxy - secrets: *secrets - configs: *configs - entrypoint: &entrypoint /usr/src/app/docker-entrypoint.sh - environment: - <<: *env - FOODSOFT_SERVICE: app - RAILS_SERVE_STATIC_FILES: 'true' - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:3000"] - interval: 15s - timeout: 10s - retries: 10 - start_period: 1m - deploy: - update_config: - failure_action: rollback - order: start-first - labels: - - "traefik.enable=true" - - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})" - - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3000" - - "coop-cloud.${STACK_NAME}.version=1.0.0+4.7.1" - - cron: - image: ${IMAGE} - secrets: *secrets - configs: *configs - entrypoint: *entrypoint - environment: - <<: *env - FOODSOFT_SERVICE: cron - networks: - - internal - - worker: - image: ${IMAGE} - secrets: *secrets - configs: *configs - entrypoint: *entrypoint - environment: - <<: *env - FOODSOFT_SERVICE: worker - networks: - - internal - - smtp: - image: ${IMAGE} - configs: *configs - entrypoint: *entrypoint - secrets: *secrets - environment: - <<: *env - FOODSOFT_SERVICE: smtp - SMTP_SERVER_HOST: - SMTP_SERVER_PORT: - networks: - - proxy - - internal - deploy: - labels: - - "traefik.enable=true" - - "traefik.tcp.routers.foodsoft-smtp.rule=HostSNI(`*`)" - - "traefik.tcp.routers.foodsoft-smtp.entrypoints=foodsoft-smtp" - - "traefik.tcp.services.foodsoft-smtp.loadbalancer.server.port=${SMTP_SERVER_PORT}" - - db: - image: "mariadb:10.6" - command: "mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_520_ci" - environment: - MYSQL_USER: ${MYSQL_USER} - MYSQL_DATABASE: ${MYSQL_DB} - MYSQL_PASSWORD_FILE: /run/secrets/db_password - MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_root_password - secrets: - - db_password - - db_root_password - volumes: - - "db:/var/lib/mysql" - networks: - - internal - deploy: - labels: - backupbot.backup: "true" - backupbot.backup.pre-hook: 'mkdir -p /tmp/backup/ && mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" $${MYSQL_DATABASE} > /tmp/backup/backup.sql' - backupbot.backup.post-hook: "rm -rf /tmp/backup" - backupbot.backup.path: "/tmp/backup/" - cache: - image: "redis:6" - networks: - - internal - -networks: - internal: - proxy: - external: true - -volumes: - db: - -configs: - app_config: - name: ${STACK_NAME}_app_config_${APP_CONFIG_VERSION} - file: app_config.yml.tmpl - template_driver: golang - db_config: - name: ${STACK_NAME}_db_config_${DB_CONFIG_VERSION} - file: database.yml.tmpl - template_driver: golang - entrypoint: - name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION} - file: entrypoint.sh.tmpl - template_driver: golang - -secrets: - db_password: - name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} - external: true - db_root_password: - name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION} - external: true - smtp_password: - name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION} - external: true - secret_key_base: - name: ${STACK_NAME}_secret_key_base_${SECRET_SECRET_KEY_BASE_VERSION} - external: true diff --git a/deployment/database.yml.tmpl b/deployment/database.yml.tmpl deleted file mode 100644 index bf64dc72..00000000 --- a/deployment/database.yml.tmpl +++ /dev/null @@ -1,9 +0,0 @@ -production: - adapter: "mysql2" - encoding: "utf8mb4" - collation: "utf8mb4_unicode_520_ci" - username: "{{ env "MYSQL_USER" }}" - password: "{{ secret "db_password" }}" - database: "{{ env "MYSQL_DB" }}" - host: "{{ env "MYSQL_HOST" }}" - port: "{{ env "MYSQL_PORT" }}" diff --git a/deployment/entrypoint.sh.tmpl b/deployment/entrypoint.sh.tmpl deleted file mode 100644 index 06f27b08..00000000 --- a/deployment/entrypoint.sh.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -set -eu - -file_env() { - local var="$1" - local fileVar="${var}_FILE" - local def="${2:-}" - - if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then - echo >&2 "error: both $var and $fileVar are set (but are exclusive)" - exit 1 - fi - - local val="$def" - - if [ "${!var:-}" ]; then - val="${!var}" - elif [ "${!fileVar:-}" ]; then - val="$(< "${!fileVar}")" - fi - - export "$var"="$val" - unset "$fileVar" -} - -file_env "SECRET_KEY_BASE" -file_env "SMTP_PASSWORD" - -echo "------------------------------------------------------------------------------" -echo "Running entrypoint commands against '$FOODSOFT_SERVICE' service" -echo "------------------------------------------------------------------------------" - -if [ "$FOODSOFT_SERVICE" == "app" ]; then - bundle exec rake db:setup || true - bundle exec rake db:migrate || true - ./proc-start web -elif [ "$FOODSOFT_SERVICE" == "cron" ]; then - ./proc-start cron -elif [ "$FOODSOFT_SERVICE" == "worker" ]; then - ./proc-start worker -elif [ "$FOODSOFT_SERVICE" == "smtp" ]; then - ./proc-start mail -fi diff --git a/doc/API.md b/doc/API.md index f295e82f..2e09cfa4 100644 --- a/doc/API.md +++ b/doc/API.md @@ -5,11 +5,9 @@ like listing open orders, updating the ordergroup's order, and listing financial transactions. Not all Foodsoft functionality is available through the API, but we're open for new additions. -The API is documented using [Open API 3.0.1](https://github.com/OAI/OpenAPI-Specification) -/ [Swagger](https://swagger.io/) in [swagger.yaml](/swagger/v1/swagger.yaml). +The API is documented using [Open API 2.0](https://github.com/OAI/OpenAPI-Specification) +/ [Swagger](https://swagger.io/) in [swagger.v1.yml](swagger.v1.yml). This provides a machine-readable reference that is used to provide documentation. -It is generated by [rswag](https://github.com/rswag) wich also provides api-tests. -It can be generated running `RAILS_ENV=test rails rswag`. **Note:** the current OAuth scopes may be subject to change, until the next release of Foodsoft. diff --git a/doc/foodcoop-explained.jpg b/doc/foodcoop-explained.jpg deleted file mode 100644 index 723204f2..00000000 Binary files a/doc/foodcoop-explained.jpg and /dev/null differ diff --git a/doc/logo-bmbf.svg b/doc/logo-bmbf.svg deleted file mode 100644 index 228001de..00000000 --- a/doc/logo-bmbf.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/doc/logo-okfn.svg b/doc/logo-okfn.svg deleted file mode 100644 index 035d7a5d..00000000 --- a/doc/logo-okfn.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/doc/screenshots/balance_sum.png b/doc/screenshots/balance_sum.png deleted file mode 100644 index db2f9033..00000000 Binary files a/doc/screenshots/balance_sum.png and /dev/null differ diff --git a/doc/screenshots/bnn_upload.png b/doc/screenshots/bnn_upload.png deleted file mode 100644 index b22dedd8..00000000 Binary files a/doc/screenshots/bnn_upload.png and /dev/null differ diff --git a/doc/screenshots/custom_csv_export.png b/doc/screenshots/custom_csv_export.png deleted file mode 100644 index ba7e12bc..00000000 Binary files a/doc/screenshots/custom_csv_export.png and /dev/null differ diff --git a/doc/screenshots/message_formatting.png b/doc/screenshots/message_formatting.png deleted file mode 100644 index 0c80c200..00000000 Binary files a/doc/screenshots/message_formatting.png and /dev/null differ diff --git a/doc/screenshots/order.png b/doc/screenshots/order.png deleted file mode 100644 index fd6e0e7c..00000000 Binary files a/doc/screenshots/order.png and /dev/null differ diff --git a/doc/screenshots/rswag.png b/doc/screenshots/rswag.png deleted file mode 100644 index b94bd581..00000000 Binary files a/doc/screenshots/rswag.png and /dev/null differ diff --git a/doc/swagger.v1.yml b/doc/swagger.v1.yml new file mode 100644 index 00000000..d8e793d3 --- /dev/null +++ b/doc/swagger.v1.yml @@ -0,0 +1,1106 @@ +swagger: '2.0' +info: + title: Foodsoft API v1 + version: '1.0.0' + description: > + [Foodsoft](https://github.com/foodcoops/foodsoft) is web-based software to manage + a non-profit food coop (product catalog, ordering, accounting, job scheduling). + + + This is a description of Foodsoft's API v1. + + + Note that each food cooperative typically has their own instance (on a shared + server or their own installation), and there are just as many APIs (if the Foodsoft + version is recent enough). + This API description points to the default development url with the default + Foodsoft scope - that would be [http://localhost:3000/f](http://localhost:3000/f). + + You may find the search parameters for index endpoints lacking. They are not + documented here, because there are too many combinations. For now, you'll need + to resort to [Ransack](https://github.com/activerecord-hackery/ransack) and + looking at Foodsoft's `ransackable_*` model class methods. +externalDocs: + description: General Foodsoft API documentation + url: https://github.com/foodcoops/foodsoft/blob/master/doc/API.md + +# development url with default scope +host: localhost:3000 +schemes: + - 'http' +basePath: /f/api/v1 + +produces: + - 'application/json' + +paths: + /user: + get: + summary: info about the currently logged-in user + tags: + - 1. User + responses: + 200: + description: success + schema: + type: object + properties: + user: + $ref: '#/definitions/User' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: missing scope + schema: + $ref: '#/definitions/Error403' + security: + - foodsoft_auth: ['user:read', 'user:write'] + + /user/financial_overview: + get: + summary: financial summary about the currently logged-in user + tags: + - 1. User + - 6. FinancialTransaction + responses: + 200: + description: success + schema: + type: object + properties: + financial_overview: + $ref: '#/definitions/FinanceOverview' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: missing scope + schema: + $ref: '#/definitions/Error403' + security: + - foodsoft_auth: ['finance:user'] + + /user/financial_transactions: + get: + summary: financial transactions of the member's ordergroup + tags: + - 1. User + - 6. FinancialTransaction + parameters: + - $ref: '#/parameters/page' + - $ref: '#/parameters/per_page' + responses: + 200: + description: success + schema: + type: object + properties: + financial_transactions: + type: array + items: + $ref: '#/definitions/FinancialTransaction' + meta: + $ref: '#/definitions/Meta' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: user has no ordergroup or missing scope + schema: + $ref: '#/definitions/Error403' + security: + - foodsoft_auth: ['finance:user'] + post: + summary: create new financial transaction (requires enabled self service) + tags: + - 1. User + - 6. FinancialTransaction + parameters: + - in: body + name: body + description: financial transaction to create + required: true + schema: + $ref: '#/definitions/FinancialTransactionForCreate' + responses: + 200: + description: success + schema: + type: object + properties: + financial_transaction: + $ref: '#/definitions/FinancialTransaction' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: user has no ordergroup, is below minimum balance, self service is disabled, or missing scope + schema: + $ref: '#/definitions/Error403' + 404: + description: financial transaction type not found + schema: + $ref: '#/definitions/Error404' + 422: + description: invalid parameter value + schema: + $ref: '#/definitions/Error422' + /user/financial_transactions/{id}: + parameters: + - $ref: '#/parameters/idInUrl' + get: + summary: find financial transaction by id + tags: + - 1. User + - 6. FinancialTransaction + responses: + 200: + description: success + schema: + type: object + properties: + financial_transaction: + $ref: '#/definitions/FinancialTransaction' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: user has no ordergroup or missing scope + schema: + $ref: '#/definitions/Error403' + 404: + description: not found + schema: + $ref: '#/definitions/Error404' + security: + - foodsoft_auth: ['finance:user'] + + /user/group_order_articles: + get: + summary: group order articles + tags: + - 1. User + - 2. Order + parameters: + - $ref: '#/parameters/page' + - $ref: '#/parameters/per_page' + - $ref: '#/parameters/q_ordered' + responses: + 200: + description: success + schema: + type: object + properties: + group_order_articles: + type: array + items: + $ref: '#/definitions/GroupOrderArticle' + meta: + $ref: '#/definitions/Meta' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: user has no ordergroup or missing scope + schema: + $ref: '#/definitions/Error403' + security: + - foodsoft_auth: ['group_orders:user'] + post: + summary: create new group order article + tags: + - 1. User + - 2. Order + parameters: + - in: body + name: body + description: group order article to create + required: true + schema: + $ref: '#/definitions/GroupOrderArticleForCreate' + responses: + 200: + description: success + schema: + type: object + properties: + group_order_article: + $ref: '#/definitions/GroupOrderArticle' + order_article: + $ref: '#/definitions/OrderArticle' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: user has no ordergroup, order not open, is below minimum balance, has not enough apple points, or missing scope + schema: + $ref: '#/definitions/Error403' + 404: + description: order article not found in open orders + schema: + $ref: '#/definitions/Error404' + 422: + description: invalid parameter value or group order article already exists + schema: + $ref: '#/definitions/Error422' + /user/group_order_articles/{id}: + parameters: + - $ref: '#/parameters/idInUrl' + get: + summary: find group order article by id + tags: + - 1. User + - 2. Order + responses: + 200: + description: success + schema: + type: object + properties: + group_order_article: + $ref: '#/definitions/GroupOrderArticle' + order_article: + $ref: '#/definitions/OrderArticle' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: user has no ordergroup or missing scope + schema: + $ref: '#/definitions/Error403' + 404: + description: not found + schema: + $ref: '#/definitions/Error404' + security: + - foodsoft_auth: ['group_orders:user'] + patch: + summary: update a group order article (but delete if quantity and tolerance are zero) + tags: + - 1. User + - 2. Order + parameters: + - $ref: '#/parameters/idInUrl' + - in: body + name: body + description: group order article update + required: true + schema: + $ref: '#/definitions/GroupOrderArticleForUpdate' + responses: + 200: + description: success + schema: + type: object + properties: + group_order_article: + $ref: '#/definitions/GroupOrderArticle' + order_article: + $ref: '#/definitions/OrderArticle' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: user has no ordergroup, order not open, is below minimum balance, has not enough apple points, or missing scope + schema: + $ref: '#/definitions/Error403' + 404: + description: order article not found in open orders + schema: + $ref: '#/definitions/Error404' + 422: + description: invalid parameter value + schema: + $ref: '#/definitions/Error422' + delete: + summary: remove group order article + tags: + - 1. User + - 2. Order + parameters: + - $ref: '#/parameters/idInUrl' + responses: + 200: + description: success + schema: + type: object + properties: + group_order_article: + $ref: '#/definitions/GroupOrderArticle' + order_article: + $ref: '#/definitions/OrderArticle' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: user has no ordergroup, order not open, is below minimum balance, has not enough apple points, or missing scope + schema: + $ref: '#/definitions/Error403' + 404: + description: order article not found in open orders + schema: + $ref: '#/definitions/Error404' + + /financial_transactions: + get: + summary: financial transactions + tags: + - 6. FinancialTransaction + parameters: + - $ref: '#/parameters/page' + - $ref: '#/parameters/per_page' + responses: + 200: + description: success + schema: + type: object + properties: + financial_transactions: + type: array + items: + $ref: '#/definitions/FinancialTransaction' + meta: + $ref: '#/definitions/Meta' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: missing scope or no permission + schema: + $ref: '#/definitions/Error403' + security: + - foodsoft_auth: ['finance:read', 'finance:write'] + /financial_transactions/{id}: + parameters: + - $ref: '#/parameters/idInUrl' + get: + summary: find financial transaction by id + tags: + - 6. FinancialTransaction + responses: + 200: + description: success + schema: + type: object + properties: + financial_transaction: + $ref: '#/definitions/FinancialTransaction' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: missing scope or no permission + schema: + $ref: '#/definitions/Error403' + 404: + description: not found + schema: + $ref: '#/definitions/Error404' + security: + - foodsoft_auth: ['finance:read', 'finance:write'] + /orders: + get: + summary: orders + tags: + - 2. Order + parameters: + - $ref: '#/parameters/page' + - $ref: '#/parameters/per_page' + responses: + 200: + description: success + schema: + type: object + properties: + orders: + type: array + items: + $ref: '#/definitions/Order' + meta: + $ref: '#/definitions/Meta' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: missing scope or no permission + schema: + $ref: '#/definitions/Error403' + security: + - foodsoft_auth: ['orders:read', 'orders:write'] + /orders/{id}: + parameters: + - $ref: '#/parameters/idInUrl' + get: + summary: find order by id + tags: + - 2. Order + responses: + 200: + description: success + schema: + type: object + properties: + order: + $ref: '#/definitions/Order' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: missing scope or no permission + schema: + $ref: '#/definitions/Error403' + 404: + description: not found + schema: + $ref: '#/definitions/Error404' + security: + - foodsoft_auth: ['orders:read', 'orders:write'] + /order_articles: + get: + summary: order articles + tags: + - 2. Order + parameters: + - $ref: '#/parameters/page' + - $ref: '#/parameters/per_page' + - $ref: '#/parameters/q_ordered' + responses: + 200: + description: success + schema: + type: object + properties: + order_articles: + type: array + items: + $ref: '#/definitions/OrderArticle' + meta: + $ref: '#/definitions/Meta' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: missing scope or no permission + schema: + $ref: '#/definitions/Error403' + security: + - foodsoft_auth: ['group_orders:user'] + /order_articles/{id}: + parameters: + - $ref: '#/parameters/idInUrl' + get: + summary: find order article by id + tags: + - 2. Order + responses: + 200: + description: success + schema: + type: object + properties: + order_article: + $ref: '#/definitions/OrderArticle' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: missing scope or no permission + schema: + $ref: '#/definitions/Error403' + 404: + description: not found + schema: + $ref: '#/definitions/Error404' + security: + - foodsoft_auth: ['orders:read', 'orders:write'] + /article_categories: + get: + summary: article categories + tags: + - 2. Category + parameters: + - $ref: '#/parameters/page' + - $ref: '#/parameters/per_page' + responses: + 200: + description: success + schema: + type: object + properties: + article_categories: + type: array + items: + $ref: '#/definitions/ArticleCategory' + meta: + $ref: '#/definitions/Meta' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + + security: + - foodsoft_auth: ['all'] + /article_categories/{id}: + parameters: + - $ref: '#/parameters/idInUrl' + get: + summary: find article category by id + tags: + - 2. Category + responses: + 200: + description: success + schema: + type: object + properties: + article_category: + $ref: '#/definitions/ArticleCategory' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 404: + description: not found + schema: + $ref: '#/definitions/Error404' + security: + - foodsoft_auth: ['all'] + + /financial_transaction_classes: + get: + summary: financial transaction classes + tags: + - 2. Category + parameters: + - $ref: '#/parameters/page' + - $ref: '#/parameters/per_page' + responses: + 200: + description: success + schema: + type: object + properties: + financial_transaction_classes: + type: array + items: + $ref: '#/definitions/FinancialTransactionClass' + meta: + $ref: '#/definitions/Meta' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + + security: + - foodsoft_auth: ['all'] + /financial_transaction_classes/{id}: + parameters: + - $ref: '#/parameters/idInUrl' + get: + summary: find financial transaction class by id + tags: + - 2. Category + responses: + 200: + description: success + schema: + type: object + properties: + financial_transaction_class: + $ref: '#/definitions/FinancialTransactionClass' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 404: + description: not found + schema: + $ref: '#/definitions/Error404' + security: + - foodsoft_auth: ['all'] + + /financial_transaction_types: + get: + summary: financial transaction types + tags: + - 2. Category + parameters: + - $ref: '#/parameters/page' + - $ref: '#/parameters/per_page' + responses: + 200: + description: success + schema: + type: object + properties: + financial_transaction_types: + type: array + items: + $ref: '#/definitions/FinancialTransactionType' + meta: + $ref: '#/definitions/Meta' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + + security: + - foodsoft_auth: ['all'] + /financial_transaction_types/{id}: + parameters: + - $ref: '#/parameters/idInUrl' + get: + summary: find financial transaction type by id + tags: + - 2. Category + responses: + 200: + description: success + schema: + type: object + properties: + financial_transaction_type: + $ref: '#/definitions/FinancialTransactionType' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 404: + description: not found + schema: + $ref: '#/definitions/Error404' + security: + - foodsoft_auth: ['all'] + + /config: + get: + summary: configuration variables + tags: + - 7. General + responses: + 200: + description: success + schema: + type: object + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + 403: + description: missing scope or no permission + schema: + $ref: '#/definitions/Error403' + security: + - foodsoft_auth: ['config:user', 'config:read', 'config:write'] + /navigation: + get: + summary: navigation + tags: + - 7. General + responses: + 200: + description: success + schema: + type: object + properties: + navigation: + $ref: '#/definitions/Navigation' + 401: + description: not logged-in + schema: + $ref: '#/definitions/Error401' + security: + - foodsoft_auth: [] + +parameters: + # url parameters + idInUrl: + name: id + type: integer + in: path + minimum: 1 + required: true + + # query parameters + page: + name: page + type: integer + in: query + description: page number + minimum: 0 + default: 0 + per_page: + name: per_page + type: integer + in: query + description: items per page + minimum: 0 + default: 20 + + # non-ransack query parameters + q_ordered: + name: q[ordered] + type: string + in: query + description: "'member' show articles ordered by the user's ordergroup, 'all' by all members, and 'supplier' ordered at the supplier" + enum: ['member', 'all', 'supplier'] + +definitions: + # models + User: + type: object + properties: + id: + type: integer + name: + type: string + description: full name + email: + type: string + description: email address + locale: + type: string + description: language code + required: ['id', 'name', 'email'] + + FinancialTransactionForCreate: + type: object + properties: + amount: + type: number + description: amount credited (negative for a debit transaction) + financial_transaction_type_id: + type: integer + description: id of the type of the transaction + note: + type: string + description: note entered with the transaction + required: ['amount', 'financial_transaction_type_id', 'note'] + FinancialTransaction: + allOf: + - $ref: '#/definitions/FinancialTransactionForCreate' + - type: object + properties: + id: + type: integer + user_id: + type: ['integer', 'null'] + description: id of user who entered the transaction (may be null for deleted users or 0 for a system user) + user_name: + type: ['string', 'null'] + description: name of user who entered the transaction (may be null or empty string for deleted users or system users) + financial_transaction_type_name: + type: string + description: name of the type of the transaction + created_at: + type: string + format: date-time + description: when the transaction was entered + required: ['id', 'user_id', 'user_name', 'financial_transaction_type_name', 'created_at'] + + FinancialTransactionClass: + type: object + properties: + id: + type: integer + name: + type: string + description: full name + required: ['id', 'name'] + + FinancialTransactionType: + type: object + properties: + id: + type: integer + name: + type: string + description: full name + name_short: + type: ['string', 'null'] + description: short name (used for bank transfers) + bank_account_id: + type: ['integer', 'null'] + description: id of the bank account used for this transaction type + bank_account_name: + type: ['string', 'null'] + description: name of the bank account used for this transaction type + bank_account_iban: + type: ['string', 'null'] + description: IBAN of the bank account used for this transaction type + financial_transaction_class_id: + type: integer + description: id of the class of the transaction + financial_transaction_class_name: + type: string + description: name of the class of the transaction + required: ['id', 'name', 'financial_transaction_class_id', 'financial_transaction_class_name'] + + FinanceOverview: + type: object + properties: + account_balance: + type: number + description: booked accout balance of ordergroup + available_funds: + type: number + description: fund available to order articles + financial_transaction_class_sums: + type: array + items: + type: object + properties: + id: + type: integer + description: id of the financial transaction class + name: + type: string + description: name of the financial transaction class + amount: + type: number + description: sum of the amounts belonging to the financial transaction class + required: ['id', 'name', 'amount'] + required: ['account_balance', 'available_funds', 'financial_transaction_class_sums'] + + ArticleCategory: + type: object + properties: + id: + type: integer + name: + type: string + required: ['id', 'name'] + + Order: + type: object + properties: + id: + type: integer + name: + type: string + description: name of the order's supplier (or stock) + starts: + type: string + format: date-time + description: when the order was opened + ends: + type: ['string', 'null'] + format: date-time + description: when the order will close or was closed + boxfill: + type: ['string', 'null'] + format: date-time + description: when the order will enter or entered the boxfill phase + pickup: + type: ['string', 'null'] + format: date + description: pickup date + is_open: + type: boolean + description: if the order is currently open or not + is_boxfill: + type: boolean + description: if the order is currently in the boxfill phase or not + + Article: + type: object + properties: + id: + type: integer + name: + type: string + supplier_id: + type: integer + description: id of supplier, or 0 for stock articles + supplier_name: + type: ['string', 'null'] + description: name of the supplier, or null for stock articles + unit: + type: string + description: amount of each unit, e.g. "100 g" or "kg" + unit_quantity: + type: integer + description: units can only be ordered from the supplier in multiples of unit_quantity + note: + type: ['string', 'null'] + description: generic note + manufacturer: + type: ['string', 'null'] + description: manufacturer + origin: + type: ['string', 'null'] + description: origin, preferably (starting with a) 2-letter ISO country code + article_category_id: + type: integer + description: id of article category + quantity_available: + type: integer + description: number of units available (only present on stock articles) + required: ['id', 'name', 'supplier_id', 'supplier_name', 'unit', 'unit_quantity', 'note', 'manufacturer', 'origin', 'article_category_id'] + + OrderArticle: + type: object + properties: + id: + type: integer + order_id: + type: integer + description: id of order this order article belongs to + price: + type: number + format: float + description: foodcoop price + quantity: + type: integer + description: number of units ordered by members + tolerance: + type: integer + description: number of extra units that members are willing to buy to fill a box + units_to_order: + type: integer + description: number of units to order from the supplier + article: + $ref: '#/definitions/Article' + + GroupOrderArticleForUpdate: + type: object + properties: + quantity: + type: integer + description: number of units ordered by the user's ordergroup + tolerance: + type: integer + description: number of extra units the user's ordergroup is willing to buy for filling a box + GroupOrderArticleForCreate: + allOf: + - $ref: '#/definitions/GroupOrderArticleForUpdate' + - type: object + properties: + order_article_id: + type: integer + description: id of order article + GroupOrderArticle: + allOf: + - $ref: '#/definitions/GroupOrderArticleForCreate' + - type: object + properties: + id: + type: integer + result: + type: number + format: float + description: number of units the user's ordergroup will receive or has received + total_price: + type: number + format: float + description: total price of this group order article + + Navigation: + type: array + items: + type: object + properties: + name: + type: string + description: title + url: + type: string + description: link + items: + $ref: '#/definitions/Navigation' + required: ['name'] + minProperties: 2 # name+url or name+items + + # collection meta object in root of a response + Meta: + type: object + properties: + page: + type: integer + description: page number of the returned collection + per_page: + type: integer + description: number of items per page + total_pages: + type: integer + description: total number of pages + total_count: + type: integer + description: total number of items in the collection + required: ['page', 'per_page', 'total_pages', 'total_count'] + + Error: + type: object + properties: + error: + type: string + description: error code + error_description: + type: string + description: human-readable error message (localized) + Error404: + type: object + properties: + error: + type: string + description: 'not_found' + error_description: + $ref: '#/definitions/Error/properties/error_description' + Error401: + type: object + properties: + error: + type: string + description: 'unauthorized' + error_description: + $ref: '#/definitions/Error/properties/error_description' + Error403: + type: object + properties: + error: + type: string + description: 'forbidden or invalid_scope' + error_description: + $ref: '#/definitions/Error/properties/error_description' + Error422: + type: object + properties: + error: + type: string + description: unprocessable entity + error_description: + $ref: '#/definitions/Error/properties/error_description' + + +securityDefinitions: + foodsoft_auth: + type: oauth2 + flow: implicit + authorizationUrl: http://localhost:3000/f/oauth/authorize + scopes: + config:user: reading Foodsoft configuration for regular users + config:read: reading Foodsoft configuration values + config:write: reading and updating Foodsoft configuration values + finance:user: accessing your own financial transactions + finance:read: reading all financial transactions + finance:write: reading and creating financial transactions + user:read: reading your own user profile + user:write: reading and updating your own user profile + offline_access: retain access after user has logged out diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index b0a325db..0a8b3fec 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -11,7 +11,6 @@ services: build: context: . dockerfile: Dockerfile-dev - platform: linux/x86_64 command: ./proc-start worker volumes: - bundle:/usr/local/bundle diff --git a/app/lib/api/errors.rb b/lib/api/errors.rb similarity index 100% rename from app/lib/api/errors.rb rename to lib/api/errors.rb diff --git a/app/lib/apple_bar.rb b/lib/apple_bar.rb similarity index 75% rename from app/lib/apple_bar.rb rename to lib/apple_bar.rb index 236417c6..a2176ea3 100644 --- a/app/lib/apple_bar.rb +++ b/lib/apple_bar.rb @@ -14,23 +14,23 @@ class AppleBar def group_bar_state if apples >= 100 'success' - elsif FoodsoftConfig[:stop_ordering_under].present? && - (apples >= FoodsoftConfig[:stop_ordering_under]) - 'warning' else - 'danger' + if FoodsoftConfig[:stop_ordering_under].present? and + apples >= FoodsoftConfig[:stop_ordering_under] + 'warning' + else + 'danger' + end end end # Use apples as percentage, but show at least 10 percent def group_bar_width - [@ordergroup.apples, 2].max + @ordergroup.apples < 2 ? 2 : @ordergroup.apples end def mean_order_amount_per_job - (1 / @global_avg).round - rescue - 0 + (1 / @global_avg).round rescue 0 end def apples diff --git a/app/lib/articles_csv.rb b/lib/articles_csv.rb similarity index 87% rename from app/lib/articles_csv.rb rename to lib/articles_csv.rb index 55bc7fc5..910de9be 100644 --- a/app/lib/articles_csv.rb +++ b/lib/articles_csv.rb @@ -1,4 +1,4 @@ -class ArticlesCsv < RenderCsv +class ArticlesCsv < RenderCSV include ApplicationHelper def header @@ -16,7 +16,7 @@ class ArticlesCsv < RenderCsv Article.human_attribute_name(:unit_quantity), '', '', - Article.human_attribute_name(:article_category) + Article.human_attribute_name(:article_category), ] end @@ -36,7 +36,7 @@ class ArticlesCsv < RenderCsv o.unit_quantity, '', '', - o.article_category.try(:name) + o.article_category.try(:name), ] end end diff --git a/app/lib/bank_account_connector.rb b/lib/bank_account_connector.rb similarity index 90% rename from app/lib/bank_account_connector.rb rename to lib/bank_account_connector.rb index b728ebb9..93e7cc7c 100644 --- a/app/lib/bank_account_connector.rb +++ b/lib/bank_account_connector.rb @@ -8,7 +8,9 @@ class BankAccountConnector nil end - attr_reader :text + def text + @text + end end class TextField @@ -22,7 +24,13 @@ class BankAccountConnector nil end - attr_reader :name, :value + def name + @name + end + + def value + @value + end def label @label || @name.to_s @@ -65,7 +73,17 @@ class BankAccountConnector @bank_account.iban end - attr_reader :auto_submit, :controls, :count + def auto_submit + @auto_submit + end + + def controls + @controls + end + + def count + @count + end def text(data) @controls += [TextItem.new(data)] @@ -124,9 +142,11 @@ class BankAccountConnector @bank_account.save! end - def load(data); end + def load(data) + end - def dump; end + def dump + end def t(key, args = {}) return t(".fields.#{key}") unless key.is_a? String diff --git a/app/lib/bank_account_connector_external.rb b/lib/bank_account_connector_external.rb similarity index 100% rename from app/lib/bank_account_connector_external.rb rename to lib/bank_account_connector_external.rb diff --git a/app/lib/bank_account_information_importer.rb b/lib/bank_account_information_importer.rb similarity index 100% rename from app/lib/bank_account_information_importer.rb rename to lib/bank_account_information_importer.rb diff --git a/app/lib/bank_transaction_reference.rb b/lib/bank_transaction_reference.rb similarity index 85% rename from app/lib/bank_transaction_reference.rb rename to lib/bank_transaction_reference.rb index 22b9f181..d033c544 100644 --- a/app/lib/bank_transaction_reference.rb +++ b/lib/bank_transaction_reference.rb @@ -1,7 +1,7 @@ class BankTransactionReference # parses a string from a bank transaction field def self.parse(data) - m = /(^|[^\w.])FS(?\d+)(\.(?\d+))?(?([A-Za-z]+\d+(\.\d+)?)+)([^\w.]|$)/.match(data) + m = /(^|[^\w\.])FS(?\d+)(\.(?\d+))?(?([A-Za-z]+\d+(\.\d+)?)+)([^\w\.]|$)/.match(data) return unless m parts = {} @@ -13,7 +13,7 @@ class BankTransactionReference ret = { group: m[:group].to_i, parts: parts } ret[:user] = m[:user].to_i if m[:user] - ret + return ret end def self.js_code_for_user(user) diff --git a/app/lib/bank_transactions_csv.rb b/lib/bank_transactions_csv.rb similarity index 93% rename from app/lib/bank_transactions_csv.rb rename to lib/bank_transactions_csv.rb index 4adbc192..34c39403 100644 --- a/app/lib/bank_transactions_csv.rb +++ b/lib/bank_transactions_csv.rb @@ -1,6 +1,6 @@ require 'csv' -class BankTransactionsCsv < RenderCsv +class BankTransactionsCsv < RenderCSV include ApplicationHelper def header diff --git a/app/lib/date_time_attribute_validate.rb b/lib/date_time_attribute_validate.rb similarity index 82% rename from app/lib/date_time_attribute_validate.rb rename to lib/date_time_attribute_validate.rb index 23127898..08138d02 100644 --- a/app/lib/date_time_attribute_validate.rb +++ b/lib/date_time_attribute_validate.rb @@ -27,20 +27,12 @@ module DateTimeAttributeValidate define_method("#{attribute}_date_value=") do |val| self.instance_variable_set("@#{attribute}_is_set", true) self.instance_variable_set("@#{attribute}_date_value", val) - begin - self.send("#{attribute}_date=", val) - rescue - nil - end + self.send("#{attribute}_date=", val) rescue nil end define_method("#{attribute}_time_value=") do |val| self.instance_variable_set("@#{attribute}_is_set", true) self.instance_variable_set("@#{attribute}_time_value", val) - begin - self.send("#{attribute}_time=", val) - rescue - nil - end + self.send("#{attribute}_time=", val) rescue nil end # fallback to field when values are not set @@ -56,19 +48,11 @@ module DateTimeAttributeValidate # validate date and time define_method("#{attribute}_datetime_value_valid") do date = self.instance_variable_get("@#{attribute}_date_value") - unless date.blank? || begin - Date.parse(date) - rescue - nil - end + unless date.blank? || (Date.parse(date) rescue nil) errors.add(attribute, "is not a valid date") # @todo I18n end time = self.instance_variable_get("@#{attribute}_time_value") - unless time.blank? || begin - Time.parse(time) - rescue - nil - end + unless time.blank? || (Time.parse(time) rescue nil) errors.add(attribute, "is not a valid time") # @todo I18n end end diff --git a/app/lib/financial_transactions_csv.rb b/lib/financial_transactions_csv.rb similarity index 95% rename from app/lib/financial_transactions_csv.rb rename to lib/financial_transactions_csv.rb index fc12d000..dc21d892 100644 --- a/app/lib/financial_transactions_csv.rb +++ b/lib/financial_transactions_csv.rb @@ -1,6 +1,6 @@ require 'csv' -class FinancialTransactionsCsv < RenderCsv +class FinancialTransactionsCsv < RenderCSV include ApplicationHelper def header diff --git a/app/lib/foodsoft/expansion_variables.rb b/lib/foodsoft/expansion_variables.rb similarity index 96% rename from app/lib/foodsoft/expansion_variables.rb rename to lib/foodsoft/expansion_variables.rb index 97f7b6bb..bcf67e7a 100644 --- a/app/lib/foodsoft/expansion_variables.rb +++ b/lib/foodsoft/expansion_variables.rb @@ -54,8 +54,8 @@ module Foodsoft # @param options [Hash] Extra variables to expand # @return [String] Expanded string def self.expand(str, options = {}) - str.gsub(/{{([._a-zA-Z0-9]+)}}/) do - options[::Regexp.last_match(1)] || self.get(::Regexp.last_match(1)) + str.gsub /{{([._a-zA-Z0-9]+)}}/ do + options[$1] || self.get($1) end end diff --git a/app/lib/foodsoft_config.rb b/lib/foodsoft_config.rb similarity index 98% rename from app/lib/foodsoft_config.rb rename to lib/foodsoft_config.rb index 6ea166d3..5a370459 100644 --- a/app/lib/foodsoft_config.rb +++ b/lib/foodsoft_config.rb @@ -44,8 +44,6 @@ class FoodsoftConfig # @return [ActiveSupport::HashWithIndifferentAccess] Current configuration from configuration file. mattr_accessor :config - mattr_accessor :default_config - # Configuration file location. # Taken from environment variable +FOODSOFT_APP_CONFIG+, # or else +config/app_config.yml+. @@ -191,7 +189,7 @@ class FoodsoftConfig # @return [Hash] Full configuration. def to_hash - keys.index_with { |k| self[k] } + keys.to_h { |k| [k, self[k]] } end # for using active_model_serializer in the api/v1/configs controller @@ -218,6 +216,7 @@ class FoodsoftConfig # end # # @return [Hash] Default configuration values + mattr_accessor :default_config private @@ -230,7 +229,7 @@ class FoodsoftConfig end def setup_database - database_config = ActiveRecord::Base.configurations.find_db_config(Rails.env).configuration_hash + database_config = ActiveRecord::Base.configurations[Rails.env] database_config = database_config.merge(config[:database]) if config[:database].present? ActiveRecord::Base.establish_connection(database_config) end diff --git a/app/lib/foodsoft_date_util.rb b/lib/foodsoft_date_util.rb similarity index 84% rename from app/lib/foodsoft_date_util.rb rename to lib/foodsoft_date_util.rb index a14ad453..98dc1c61 100644 --- a/app/lib/foodsoft_date_util.rb +++ b/lib/foodsoft_date_util.rb @@ -6,11 +6,7 @@ module FoodsoftDateUtil schedule = IceCube::Schedule.new(start) schedule.add_recurrence_rule rule_from(options[:recurr]) # @todo handle ical parse errors - occ = begin - schedule.next_occurrence(from).to_time - rescue - nil - end + occ = (schedule.next_occurrence(from).to_time rescue nil) end if options && options[:time] && occ occ = occ.beginning_of_day.advance(seconds: Time.parse(options[:time]).seconds_since_midnight) @@ -21,10 +17,9 @@ module FoodsoftDateUtil # @param p [String, Symbol, Hash, IceCube::Rule] What to return a rule from. # @return [IceCube::Rule] Recurring rule def self.rule_from(p) - case p - when String + if p.is_a? String IceCube::Rule.from_ical(p) - when Hash + elsif p.is_a? Hash IceCube::Rule.from_hash(p) else p diff --git a/lib/foodsoft_file.rb b/lib/foodsoft_file.rb new file mode 100644 index 00000000..95d06c60 --- /dev/null +++ b/lib/foodsoft_file.rb @@ -0,0 +1,25 @@ +# Foodsoft-file import +class FoodsoftFile + # parses a string from a foodsoft-file + # returns two arrays with articles and outlisted_articles + # the parsed article is a simple hash + def self.parse(file, options = {}) + SpreadsheetFile.parse file, options do |row, row_index| + next if row[2].blank? + + article = { :order_number => row[1], + :name => row[2], + :note => row[3], + :manufacturer => row[4], + :origin => row[5], + :unit => row[6], + :price => row[7], + :tax => row[8], + :deposit => (row[9].nil? ? "0" : row[9]), + :unit_quantity => row[10], + :article_category => row[13] } + status = row[0] && row[0].strip.downcase == 'x' ? :outlisted : nil + yield status, article, row_index + end + end +end diff --git a/app/lib/foodsoft_mail_receiver.rb b/lib/foodsoft_mail_receiver.rb similarity index 73% rename from app/lib/foodsoft_mail_receiver.rb rename to lib/foodsoft_mail_receiver.rb index 18e93be3..560e7edd 100644 --- a/app/lib/foodsoft_mail_receiver.rb +++ b/lib/foodsoft_mail_receiver.rb @@ -19,7 +19,7 @@ class FoodsoftMailReceiver < MidiSmtpServer::Smtpd private - def on_rcpt_to_event(_ctx, rcpt_to) + def on_rcpt_to_event(ctx, rcpt_to) recipient = rcpt_to.gsub(/^\s*<\s*(.*)\s*>\s*$/, '\1') @handlers << self.class.find_handler(recipient) rcpt_to @@ -29,18 +29,20 @@ class FoodsoftMailReceiver < MidiSmtpServer::Smtpd end def on_message_data_event(ctx) - @handlers.each do |handler| - handler.call(ctx[:message][:data]) + begin + @handlers.each do |handler| + handler.call(ctx[:message][:data]) + end + rescue => error + ExceptionNotifier.notify_exception(error, data: ctx) + raise error + ensure + @handlers.clear end - rescue => error - ExceptionNotifier.notify_exception(error, data: ctx) - raise error - ensure - @handlers.clear end def self.find_handler(recipient) - m = /(?[^@.]+)\.(?
[^@]+)(@(?[^@]+))?/.match recipient + m = /(?[^@\.]+)\.(?
[^@]+)(@(?[^@]+))?/.match recipient raise "recipient is missing or has an invalid format" if m.nil? raise "Foodcoop '#{m[:foodcoop]}' could not be found" unless FoodsoftConfig.allowed_foodcoop? m[:foodcoop] @@ -49,7 +51,7 @@ class FoodsoftMailReceiver < MidiSmtpServer::Smtpd @@registered_classes.each do |klass| if match = klass.regexp.match(m[:address]) handler = klass.new match - return ->(data) { handler.received(data) } + return lambda { |data| handler.received(data) } end end diff --git a/app/lib/invoices_csv.rb b/lib/invoices_csv.rb similarity index 95% rename from app/lib/invoices_csv.rb rename to lib/invoices_csv.rb index eecad298..aa20cd08 100644 --- a/app/lib/invoices_csv.rb +++ b/lib/invoices_csv.rb @@ -1,6 +1,6 @@ require 'csv' -class InvoicesCsv < RenderCsv +class InvoicesCsv < RenderCSV include ApplicationHelper def header @@ -32,7 +32,7 @@ class InvoicesCsv < RenderCsv t.deposit, t.deposit_credit, t.paid_on, - t.note + t.note, ] end end diff --git a/lib/order_csv.rb b/lib/order_csv.rb new file mode 100644 index 00000000..6ec96581 --- /dev/null +++ b/lib/order_csv.rb @@ -0,0 +1,29 @@ +require 'csv' + +class OrderCsv < RenderCSV + def header + [ + OrderArticle.human_attribute_name(:units_to_order), + Article.human_attribute_name(:order_number), + Article.human_attribute_name(:name), + Article.human_attribute_name(:unit), + Article.human_attribute_name(:unit_quantity_short), + ArticlePrice.human_attribute_name(:price), + OrderArticle.human_attribute_name(:total_price) + ] + end + + def data + @object.order_articles.ordered.includes([:article, :article_price]).all.map do |oa| + yield [ + oa.units_to_order, + oa.article.order_number, + oa.article.name, + oa.article.unit, + oa.price.unit_quantity > 1 ? oa.price.unit_quantity : nil, + number_to_currency(oa.price.price * oa.price.unit_quantity), + number_to_currency(oa.total_price) + ] + end + end +end diff --git a/app/lib/order_pdf.rb b/lib/order_pdf.rb similarity index 99% rename from app/lib/order_pdf.rb rename to lib/order_pdf.rb index 164be66b..034ca51f 100644 --- a/app/lib/order_pdf.rb +++ b/lib/order_pdf.rb @@ -1,4 +1,4 @@ -class OrderPdf < RenderPdf +class OrderPdf < RenderPDF attr_reader :order def initialize(order, options = {}) diff --git a/app/lib/order_txt.rb b/lib/order_txt.rb similarity index 81% rename from app/lib/order_txt.rb rename to lib/order_txt.rb index 7f23e705..5ad1fba6 100644 --- a/app/lib/order_txt.rb +++ b/lib/order_txt.rb @@ -1,5 +1,5 @@ class OrderTxt - def initialize(order, _options = {}) + def initialize(order, options = {}) @order = order end @@ -15,10 +15,10 @@ class OrderTxt text += "****** " + I18n.t('orders.fax.to_address') + "\n\n" text += "#{FoodsoftConfig[:name]}\n#{contact[:street]}\n#{contact[:zip_code]} #{contact[:city]}\n\n" text += "****** " + I18n.t('orders.fax.articles') + "\n\n" - text += format("%8s %8s %s\n", I18n.t('orders.fax.number'), I18n.t('orders.fax.amount'), I18n.t('orders.fax.name')) + text += "%8s %8s %s\n" % [I18n.t('orders.fax.number'), I18n.t('orders.fax.amount'), I18n.t('orders.fax.name')] # now display all ordered articles @order.order_articles.ordered.includes([:article, :article_price]).each do |oa| - text += format("%8s %8d %s\n", oa.article.order_number, oa.units_to_order.to_i, oa.article.name) + text += "%8s %8d %s\n" % [oa.article.order_number, oa.units_to_order.to_i, oa.article.name] end text end diff --git a/app/lib/ordergroups_csv.rb b/lib/ordergroups_csv.rb similarity index 85% rename from app/lib/ordergroups_csv.rb rename to lib/ordergroups_csv.rb index f6fba00f..c41d2e83 100644 --- a/app/lib/ordergroups_csv.rb +++ b/lib/ordergroups_csv.rb @@ -1,4 +1,4 @@ -class OrdergroupsCsv < RenderCsv +class OrdergroupsCsv < RenderCSV include ApplicationHelper def header @@ -14,9 +14,9 @@ class OrdergroupsCsv < RenderCsv Ordergroup.human_attribute_name(:break_start), Ordergroup.human_attribute_name(:break_end), Ordergroup.human_attribute_name(:last_user_activity), - Ordergroup.human_attribute_name(:last_order) + Ordergroup.human_attribute_name(:last_order), ] - row + Ordergroup.custom_fields.pluck(:label) + row + Ordergroup.custom_fields.map { |f| f[:label] } end def data @@ -33,7 +33,7 @@ class OrdergroupsCsv < RenderCsv o.break_start, o.break_end, o.last_user_activity, - o.last_order.try(:starts) + o.last_order.try(:starts), ] yield row + Ordergroup.custom_fields.map { |f| o.settings.custom_fields[f[:name]] } end diff --git a/app/lib/render_csv.rb b/lib/render_csv.rb similarity index 86% rename from app/lib/render_csv.rb rename to lib/render_csv.rb index c1fd24db..b900f1f7 100644 --- a/app/lib/render_csv.rb +++ b/lib/render_csv.rb @@ -1,6 +1,6 @@ require 'csv' -class RenderCsv +class RenderCSV include ActionView::Helpers::NumberHelper def initialize(object, options = {}) @@ -20,7 +20,6 @@ class RenderCsv end data { |d| csv << d } end - ret << I18n.t('.orders.articles.prices_sum') << ";" << "#{number_to_currency(@object.sum(:gross))}/#{number_to_currency(@object.sum(:net))}" if @options[:custom_csv] ret.encode(@options[:encoding], invalid: :replace, undef: :replace) end diff --git a/app/lib/render_pdf.rb b/lib/render_pdf.rb similarity index 97% rename from app/lib/render_pdf.rb rename to lib/render_pdf.rb index 479dc4a3..a5cde2b6 100644 --- a/app/lib/render_pdf.rb +++ b/lib/render_pdf.rb @@ -18,7 +18,7 @@ class RotatedCell < Prawn::Table::Cell::Text (height + (border_top_width / 2.0) + (border_bottom_width / 2.0)) / tan_rotation end - def styled_width_of(_text) + def styled_width_of(text) options = @text_options.reject { |k| k == :style } with_font { (@pdf.height_of(@content, options) + padding_top + padding_bottom) / tan_rotation } end @@ -52,7 +52,7 @@ class RotatedCell < Prawn::Table::Cell::Text end end -class RenderPdf < Prawn::Document +class RenderPDF < Prawn::Document include ActionView::Helpers::NumberHelper include ApplicationHelper @@ -156,10 +156,9 @@ class RenderPdf < Prawn::Document def pdf_add_page_breaks?(docid = nil) docid ||= self.class.name.underscore cfg = FoodsoftConfig[:pdf_add_page_breaks] - case cfg - when Array + if cfg.is_a? Array cfg.index(docid.to_s).any? - when Hash + elsif cfg.is_a? Hash cfg[docid.to_s] else cfg diff --git a/lib/spreadsheet_file.rb b/lib/spreadsheet_file.rb new file mode 100644 index 00000000..dbca9c90 --- /dev/null +++ b/lib/spreadsheet_file.rb @@ -0,0 +1,22 @@ +require 'roo' + +class SpreadsheetFile + def self.parse(file, options = {}) + filepath = file.is_a?(String) ? file : file.to_path + filename = options.delete(:filename) || filepath + fileext = File.extname(filename) + options[:csv_options] = { col_sep: ';', encoding: 'utf-8' }.merge(options[:csv_options] || {}) + s = Roo::Spreadsheet.open(filepath, options.merge({ extension: fileext })) + + row_index = 1 + s.each do |row| + if row_index == 1 + # @todo try to detect headers; for now using the index is ok + else + yield row, row_index + end + row_index += 1 + end + row_index + end +end diff --git a/app/lib/templates/haml/scaffold/_form.html.haml b/lib/templates/haml/scaffold/_form.html.haml similarity index 100% rename from app/lib/templates/haml/scaffold/_form.html.haml rename to lib/templates/haml/scaffold/_form.html.haml diff --git a/app/lib/token_verifier.rb b/lib/token_verifier.rb similarity index 97% rename from app/lib/token_verifier.rb rename to lib/token_verifier.rb index b481d60f..a8a0f1eb 100644 --- a/app/lib/token_verifier.rb +++ b/lib/token_verifier.rb @@ -21,6 +21,8 @@ class TokenVerifier < ActiveSupport::MessageVerifier # return original message if r.length > 2 r[2] + else + nil end end @@ -30,6 +32,8 @@ class TokenVerifier < ActiveSupport::MessageVerifier class InvalidPrefix < ActiveSupport::MessageVerifier::InvalidSignature; end + protected + def self.secret # secret_key_base for Rails 4, but Rails 3 initializer may still be used Foodsoft::Application.config.secret_key_base || Foodsoft::Application.config.secret_token diff --git a/app/lib/users_csv.rb b/lib/users_csv.rb similarity index 97% rename from app/lib/users_csv.rb rename to lib/users_csv.rb index a7d54698..56ec3a23 100644 --- a/app/lib/users_csv.rb +++ b/lib/users_csv.rb @@ -1,4 +1,4 @@ -class UsersCsv < RenderCsv +class UsersCsv < RenderCSV include ApplicationHelper def header diff --git a/plugins/current_orders/app/controllers/current_orders/articles_controller.rb b/plugins/current_orders/app/controllers/current_orders/articles_controller.rb index ef23f332..0e4b7dd9 100644 --- a/plugins/current_orders/app/controllers/current_orders/articles_controller.rb +++ b/plugins/current_orders/app/controllers/current_orders/articles_controller.rb @@ -32,7 +32,7 @@ class CurrentOrders::ArticlesController < ApplicationController else @order_articles = OrderArticle.where(order_id: @current_orders.all.map(&:id)) end - @q = OrderArticle.ransack(params[:q]) + @q = OrderArticle.search(params[:q]) @order_articles = @order_articles.ordered.merge(@q.result).includes(:article, :article_price) @order_article = @order_articles.where(id: params[:id]).first end diff --git a/plugins/messages/app/controllers/messages_controller.rb b/plugins/messages/app/controllers/messages_controller.rb index 159984ed..628f145b 100644 --- a/plugins/messages/app/controllers/messages_controller.rb +++ b/plugins/messages/app/controllers/messages_controller.rb @@ -20,8 +20,8 @@ class MessagesController < ApplicationController @message.group_id = original_message.group_id @message.private = original_message.private @message.subject = I18n.t('messages.model.reply_subject', :subject => original_message.subject) - @message.body = I18n.t('messages.model.reply_header', :user => original_message.sender.display, :when => I18n.l(original_message.created_at, :format => :short)) + "\n" \ - + "
" + original_message.body.to_trix_html + "
" + @message.body = I18n.t('messages.model.reply_header', :user => original_message.sender.display, :when => I18n.l(original_message.created_at, :format => :short)) + "\n" + original_message.body.each_line { |l| @message.body += I18n.t('messages.model.reply_indent', :line => l) } else redirect_to new_message_url, alert: I18n.t('messages.new.error_private') end diff --git a/plugins/messages/app/helpers/messages_helper.rb b/plugins/messages/app/helpers/messages_helper.rb index d386e6df..d5371fe4 100644 --- a/plugins/messages/app/helpers/messages_helper.rb +++ b/plugins/messages/app/helpers/messages_helper.rb @@ -5,7 +5,7 @@ module MessagesHelper body = "" else subject = message.subject - body = truncate(message.body.to_plain_text, :length => length - subject.length) + body = truncate(message.body, :length => length - subject.length) end "#{link_to(h(subject), message)} #{h(body)}".html_safe end diff --git a/plugins/messages/app/models/message.rb b/plugins/messages/app/models/message.rb index b5087d0d..f6b03c10 100644 --- a/plugins/messages/app/models/message.rb +++ b/plugins/messages/app/models/message.rb @@ -22,8 +22,6 @@ class Message < ApplicationRecord validates_presence_of :message_recipients, :subject, :body validates_length_of :subject, :in => 1..255 - has_rich_text :body - after_initialize do @recipients_ids ||= [] @send_method ||= 'recipients' diff --git a/plugins/messages/app/views/messages/new.haml b/plugins/messages/app/views/messages/new.haml index d288cd72..57d6b452 100644 --- a/plugins/messages/app/views/messages/new.haml +++ b/plugins/messages/app/views/messages/new.haml @@ -110,7 +110,7 @@ = f.input :recipient_tokens, :input_html => { 'data-pre' => User.where(id: @message.recipients_ids).map(&:token_attributes).to_json } = f.input :private, inline_label: t('.hint_private') = f.input :subject, input_html: {class: 'input-xxlarge'} - = f.rich_text_area :body, input_html: {class: 'input-xxlarge', rows: 13} + = f.input :body, input_html: {class: 'input-xxlarge', rows: 13} .form-actions = f.submit class: 'btn btn-primary' = link_to t('ui.or_cancel'), :back diff --git a/plugins/messages/app/views/messages/show.haml b/plugins/messages/app/views/messages/show.haml index 8b3f7c1c..36e7b570 100644 --- a/plugins/messages/app/views/messages/show.haml +++ b/plugins/messages/app/views/messages/show.haml @@ -33,7 +33,7 @@ - if @message.can_toggle_private?(current_user) = link_to t('.change_visibility'), toggle_private_message_path(@message), method: :post, class: 'btn btn-mini' %hr/ - .trix-content= @message.body + %p= simple_format(h(@message.body)) %hr/ %p = link_to t('.reply'), new_message_path(:message => {:reply_to => @message.id}), class: 'btn' diff --git a/plugins/messages/app/views/messages_mailer/foodsoft_message.html.haml b/plugins/messages/app/views/messages_mailer/foodsoft_message.html.haml deleted file mode 100644 index 7ca572f3..00000000 --- a/plugins/messages/app/views/messages_mailer/foodsoft_message.html.haml +++ /dev/null @@ -1,11 +0,0 @@ -= raw @message.body -%hr -%ul - - if @message.group - %li= t '.footer_group', group: @message.group.name - %li - %a{href: new_message_url('message[reply_to]' => @message.id)}= t '.reply' - %li - %a{href: message_url(@message)}= t '.see_message_online' - %li - %a{href: my_profile_url}= t '.messaging_options' diff --git a/plugins/messages/config/locales/de.yml b/plugins/messages/config/locales/de.yml index eb8cff21..f1615163 100644 --- a/plugins/messages/config/locales/de.yml +++ b/plugins/messages/config/locales/de.yml @@ -138,9 +138,6 @@ de: Antworten: %{reply_url} Nachricht online einsehen: %{msg_url} Nachrichten-Einstellungen: %{profile_url} - reply: Antworten - see_message_online: Nachricht online einsehen - messaging_options: Nachrichten-Einstellungen footer_group: | Gesendet an Gruppe: %{group} navigation: diff --git a/plugins/messages/config/locales/en.yml b/plugins/messages/config/locales/en.yml index ccd8bb6c..ede3f88c 100644 --- a/plugins/messages/config/locales/en.yml +++ b/plugins/messages/config/locales/en.yml @@ -140,9 +140,6 @@ en: Reply: %{reply_url} See message online: %{msg_url} Messaging options: %{profile_url} - reply: Reply - see_message_online: See message online - messaging_options: Messaging options footer_group: | Sent to group: %{group} navigation: diff --git a/plugins/messages/config/locales/fr.yml b/plugins/messages/config/locales/fr.yml index 67d452c5..54584b48 100644 --- a/plugins/messages/config/locales/fr.yml +++ b/plugins/messages/config/locales/fr.yml @@ -67,9 +67,6 @@ fr: Répondre: %{reply_url} Afficher ce message dans ton navigateur: %{msg_url} Préférences des messages: %{profile_url} - reply: Répondre - see_message_online: Afficher ce message dans ton navigateur - messaging_options: Préférences des messages simple_form: labels: settings: diff --git a/plugins/messages/config/locales/nl.yml b/plugins/messages/config/locales/nl.yml index 56738c0b..d3960a23 100644 --- a/plugins/messages/config/locales/nl.yml +++ b/plugins/messages/config/locales/nl.yml @@ -140,9 +140,6 @@ nl: Antwoorden: %{reply_url} Bericht online lezen: %{msg_url} Berichtinstellingen: %{profile_url} - reply: Antwoorden - see_message_online: Bericht online lezen - messaging_options: Berichtinstellingen footer_group: | Verzenden aan groep: %{group} navigation: diff --git a/spec/api/v1/order_articles_spec.rb b/spec/api/v1/order_articles_spec.rb new file mode 100644 index 00000000..e65867db --- /dev/null +++ b/spec/api/v1/order_articles_spec.rb @@ -0,0 +1,59 @@ +require 'spec_helper' + +# Most routes are tested in the swagger_spec, this tests (non-ransack) parameters. +describe Api::V1::OrderArticlesController, type: :controller do + include ApiOAuth + let(:api_scopes) { ['orders:read'] } + + let(:json_order_articles) { json_response['order_articles'] } + let(:json_order_article_ids) { json_order_articles.map { |joa| joa["id"] } } + + describe "GET :index" do + context "with param q[ordered]" do + let(:order) { create(:order, article_count: 4) } + let(:order_articles) { order.order_articles } + + before do + order_articles[0].update!(quantity: 0, tolerance: 0, units_to_order: 0) + order_articles[1].update!(quantity: 1, tolerance: 0, units_to_order: 0) + order_articles[2].update!(quantity: 0, tolerance: 1, units_to_order: 0) + order_articles[3].update!(quantity: 0, tolerance: 0, units_to_order: 1) + end + + it "(unset)" do + get :index, params: { foodcoop: 'f' } + expect(json_order_articles.count).to eq 4 + end + + it "all" do + get :index, params: { foodcoop: 'f', q: { ordered: 'all' } } + expect(json_order_article_ids).to match_array order_articles[1..2].map(&:id) + end + + it "supplier" do + get :index, params: { foodcoop: 'f', q: { ordered: 'supplier' } } + expect(json_order_article_ids).to match_array [order_articles[3].id] + end + + it "member" do + get :index, params: { foodcoop: 'f', q: { ordered: 'member' } } + expect(json_order_articles.count).to eq 0 + end + + context "when ordered by user" do + let(:user) { create(:user, :ordergroup) } + let(:go) { create(:group_order, order: order, ordergroup: user.ordergroup) } + + before do + create(:group_order_article, group_order: go, order_article: order_articles[1], quantity: 1) + create(:group_order_article, group_order: go, order_article: order_articles[2], tolerance: 0) + end + + it "member" do + get :index, params: { foodcoop: 'f', q: { ordered: 'member' } } + expect(json_order_article_ids).to match_array order_articles[1..2].map(&:id) + end + end + end + end +end diff --git a/spec/api/v1/swagger_spec.rb b/spec/api/v1/swagger_spec.rb new file mode 100644 index 00000000..3da37332 --- /dev/null +++ b/spec/api/v1/swagger_spec.rb @@ -0,0 +1,284 @@ +require 'spec_helper' +require 'apivore' + +# we want to load a local file in YAML-format instead of a served JSON file +class SwaggerCheckerFile < Apivore::SwaggerChecker + def fetch_swagger! + YAML.load(File.read(swagger_path)) + end +end + +describe 'API v1', type: :apivore, order: :defined do + include ApiHelper + + subject { SwaggerCheckerFile.instance_for Rails.root.join('doc', 'swagger.v1.yml') } + + context 'has valid paths' do + context 'user' do + let(:api_scopes) { ['user:read'] } + # create multiple users to make sure we're getting the authenticated user, not just any + let!(:other_user_1) { create :user } + let!(:user) { create :user } + let!(:other_user_2) { create :user } + + it { is_expected.to validate(:get, '/user', 200, api_auth) } + it { is_expected.to validate(:get, '/user', 401) } + + it_handles_invalid_token_and_scope(:get, '/user') + end + + context 'user/financial_overview' do + let(:api_scopes) { ['finance:user'] } + let!(:user) { create :user, :ordergroup } + + it { is_expected.to validate(:get, '/user/financial_overview', 200, api_auth) } + it { is_expected.to validate(:get, '/user/financial_overview', 401) } + + it_handles_invalid_token_and_scope(:get, '/user/financial_overview') + end + + context 'user/financial_transactions' do + let(:api_scopes) { ['finance:user'] } + let(:other_user) { create :user, :ordergroup } + let!(:other_ft_1) { create :financial_transaction, ordergroup: other_user.ordergroup } + + context 'without ordergroup' do + it { is_expected.to validate(:get, '/user/financial_transactions', 403, api_auth) } + it { is_expected.to validate(:get, '/user/financial_transactions/{id}', 403, api_auth({ 'id' => other_ft_1.id })) } + end + + context 'with ordergroup' do + let(:user) { create :user, :ordergroup } + let!(:ft_1) { create :financial_transaction, ordergroup: user.ordergroup } + let!(:ft_2) { create :financial_transaction, ordergroup: user.ordergroup } + let!(:ft_3) { create :financial_transaction, ordergroup: user.ordergroup } + + let(:create_params) { { '_data' => { financial_transaction: { amount: 1, financial_transaction_type_id: ft_1.financial_transaction_type.id, note: 'note' } } } } + + it { is_expected.to validate(:get, '/user/financial_transactions', 200, api_auth) } + it { is_expected.to validate(:get, '/user/financial_transactions/{id}', 200, api_auth({ 'id' => ft_2.id })) } + it { is_expected.to validate(:get, '/user/financial_transactions/{id}', 404, api_auth({ 'id' => other_ft_1.id })) } + it { is_expected.to validate(:get, '/user/financial_transactions/{id}', 404, api_auth({ 'id' => FinancialTransaction.last.id + 1 })) } + + context 'without using self service' do + it { is_expected.to validate(:post, '/user/financial_transactions', 403, api_auth(create_params)) } + end + + context 'with using self service' do + before { FoodsoftConfig[:use_self_service] = true } + + it { is_expected.to validate(:post, '/user/financial_transactions', 200, api_auth(create_params)) } + + context 'with invalid financial transaction type' do + let(:create_params) { { '_data' => { financial_transaction: { amount: 1, financial_transaction_type_id: -1, note: 'note' } } } } + + it { is_expected.to validate(:post, '/user/financial_transactions', 404, api_auth(create_params)) } + end + + context 'without note' do + let(:create_params) { { '_data' => { financial_transaction: { amount: 1, financial_transaction_type_id: ft_1.financial_transaction_type.id } } } } + + it { is_expected.to validate(:post, '/user/financial_transactions', 422, api_auth(create_params)) } + end + + context 'without enough balance' do + before { FoodsoftConfig[:minimum_balance] = 1000 } + + it { is_expected.to validate(:post, '/user/financial_transactions', 403, api_auth(create_params)) } + end + end + + it_handles_invalid_token_and_scope(:get, '/user/financial_transactions') + it_handles_invalid_token_and_scope(:post, '/user/financial_transactions', -> { api_auth(create_params) }) + it_handles_invalid_token_and_scope(:get, '/user/financial_transactions/{id}', -> { api_auth('id' => ft_2.id) }) + end + end + + context 'user/group_order_articles' do + let(:api_scopes) { ['group_orders:user'] } + let(:order) { create(:order, article_count: 2) } + + let(:user_2) { create :user, :ordergroup } + let(:group_order_2) { create(:group_order, order: order, ordergroup: user_2.ordergroup) } + let!(:goa_2) { create :group_order_article, order_article: order.order_articles[0], group_order: group_order_2 } + + before { group_order_2.update_price!; user_2.ordergroup.update_stats! } + + context 'without ordergroup' do + it { is_expected.to validate(:get, '/user/group_order_articles', 403, api_auth) } + it { is_expected.to validate(:get, '/user/group_order_articles/{id}', 403, api_auth({ 'id' => goa_2.id })) } + end + + context 'with ordergroup' do + let(:user) { create :user, :ordergroup } + let(:update_params) { { 'id' => goa.id, '_data' => { group_order_article: { quantity: goa.quantity + 1, tolerance: 0 } } } } + let(:create_params) { { '_data' => { group_order_article: { order_article_id: order.order_articles[1].id, quantity: 1 } } } } + let(:group_order) { create(:group_order, order: order, ordergroup: user.ordergroup) } + let!(:goa) { create :group_order_article, order_article: order.order_articles[0], group_order: group_order } + + before { group_order.update_price!; user.ordergroup.update_stats! } + + it { is_expected.to validate(:get, '/user/group_order_articles', 200, api_auth) } + it { is_expected.to validate(:get, '/user/group_order_articles/{id}', 200, api_auth({ 'id' => goa.id })) } + it { is_expected.to validate(:get, '/user/group_order_articles/{id}', 404, api_auth({ 'id' => goa_2.id })) } + it { is_expected.to validate(:get, '/user/group_order_articles/{id}', 404, api_auth({ 'id' => GroupOrderArticle.last.id + 1 })) } + + it { is_expected.to validate(:post, '/user/group_order_articles', 200, api_auth(create_params)) } + it { is_expected.to validate(:patch, '/user/group_order_articles/{id}', 200, api_auth(update_params)) } + it { is_expected.to validate(:delete, '/user/group_order_articles/{id}', 200, api_auth({ 'id' => goa.id })) } + + context 'with an existing group_order_article' do + let(:create_params) { { '_data' => { group_order_article: { order_article_id: order.order_articles[0].id, quantity: 1 } } } } + + it { is_expected.to validate(:post, '/user/group_order_articles', 422, api_auth(create_params)) } + end + + context 'with invalid parameter values' do + let(:create_params) { { '_data' => { group_order_article: { order_article_id: order.order_articles[0].id, quantity: -1 } } } } + let(:update_params) { { 'id' => goa.id, '_data' => { group_order_article: { quantity: -1, tolerance: 0 } } } } + + it { is_expected.to validate(:post, '/user/group_order_articles', 422, api_auth(create_params)) } + it { is_expected.to validate(:patch, '/user/group_order_articles/{id}', 422, api_auth(update_params)) } + end + + context 'with a closed order' do + let(:order) { create(:order, article_count: 2, state: :finished) } + + it { is_expected.to validate(:post, '/user/group_order_articles', 404, api_auth(create_params)) } + it { is_expected.to validate(:patch, '/user/group_order_articles/{id}', 404, api_auth(update_params)) } + it { is_expected.to validate(:delete, '/user/group_order_articles/{id}', 404, api_auth({ 'id' => goa.id })) } + end + + context 'without enough balance' do + before { FoodsoftConfig[:minimum_balance] = 1000 } + + it { is_expected.to validate(:post, '/user/group_order_articles', 403, api_auth(create_params)) } + it { is_expected.to validate(:patch, '/user/group_order_articles/{id}', 403, api_auth(update_params)) } + it { is_expected.to validate(:delete, '/user/group_order_articles/{id}', 200, api_auth({ 'id' => goa.id })) } + end + + context 'without enough apple points' do + before { allow_any_instance_of(Ordergroup).to receive(:not_enough_apples?).and_return(true) } + + it { is_expected.to validate(:post, '/user/group_order_articles', 403, api_auth(create_params)) } + it { is_expected.to validate(:patch, '/user/group_order_articles/{id}', 403, api_auth(update_params)) } + it { is_expected.to validate(:delete, '/user/group_order_articles/{id}', 200, api_auth({ 'id' => goa.id })) } + end + + it_handles_invalid_token_and_scope(:get, '/user/group_order_articles') + it_handles_invalid_token_and_scope(:post, '/user/group_order_articles', -> { api_auth(create_params) }) + it_handles_invalid_token_and_scope(:get, '/user/group_order_articles/{id}', -> { api_auth({ 'id' => goa.id }) }) + it_handles_invalid_token_and_scope(:patch, '/user/group_order_articles/{id}', -> { api_auth(update_params) }) + it_handles_invalid_token_and_scope(:delete, '/user/group_order_articles/{id}', -> { api_auth({ 'id' => goa.id }) }) + end + end + + context 'config' do + let(:api_scopes) { ['config:user'] } + + it { is_expected.to validate(:get, '/config', 200, api_auth) } + it { is_expected.to validate(:get, '/config', 401) } + + it_handles_invalid_token_and_scope(:get, '/config') + end + + context 'navigation' do + it { is_expected.to validate(:get, '/navigation', 200, api_auth) } + it { is_expected.to validate(:get, '/navigation', 401) } + + it_handles_invalid_token(:get, '/navigation') + end + + context 'financial_transactions' do + let(:api_scopes) { ['finance:read'] } + let(:user) { create(:user, :role_finance) } + let(:other_user) { create :user, :ordergroup } + let!(:ft_1) { create :financial_transaction, ordergroup: other_user.ordergroup } + let!(:ft_2) { create :financial_transaction, ordergroup: other_user.ordergroup } + + it { is_expected.to validate(:get, '/financial_transactions', 200, api_auth) } + it { is_expected.to validate(:get, '/financial_transactions/{id}', 200, api_auth({ 'id' => ft_2.id })) } + it { is_expected.to validate(:get, '/financial_transactions/{id}', 404, api_auth({ 'id' => FinancialTransaction.last.id + 1 })) } + + context 'without role_finance' do + let(:user) { create(:user) } + + it { is_expected.to validate(:get, '/financial_transactions', 403, api_auth) } + it { is_expected.to validate(:get, '/financial_transactions/{id}', 403, api_auth({ 'id' => ft_2.id })) } + end + + it_handles_invalid_token_and_scope(:get, '/financial_transactions') + it_handles_invalid_token_and_scope(:get, '/financial_transactions/{id}', -> { api_auth({ 'id' => ft_2.id }) }) + end + + context 'financial_transaction_classes' do + let!(:cla_1) { create :financial_transaction_class } + let!(:cla_2) { create :financial_transaction_class } + + it { is_expected.to validate(:get, '/financial_transaction_classes', 200, api_auth) } + it { is_expected.to validate(:get, '/financial_transaction_classes/{id}', 200, api_auth({ 'id' => cla_2.id })) } + it { is_expected.to validate(:get, '/financial_transaction_classes/{id}', 404, api_auth({ 'id' => cla_2.id + 1 })) } + + it_handles_invalid_token(:get, '/financial_transaction_classes') + it_handles_invalid_token(:get, '/financial_transaction_classes/{id}', -> { api_auth({ 'id' => cla_1.id }) }) + end + + context 'financial_transaction_types' do + let!(:tpy_1) { create :financial_transaction_type } + let!(:tpy_2) { create :financial_transaction_type } + + it { is_expected.to validate(:get, '/financial_transaction_types', 200, api_auth) } + it { is_expected.to validate(:get, '/financial_transaction_types/{id}', 200, api_auth({ 'id' => tpy_2.id })) } + it { is_expected.to validate(:get, '/financial_transaction_types/{id}', 404, api_auth({ 'id' => tpy_2.id + 1 })) } + + it_handles_invalid_token(:get, '/financial_transaction_types') + it_handles_invalid_token(:get, '/financial_transaction_types/{id}', -> { api_auth({ 'id' => tpy_1.id }) }) + end + + context 'orders' do + let(:api_scopes) { ['orders:read'] } + let!(:order) { create :order } + + it { is_expected.to validate(:get, '/orders', 200, api_auth) } + it { is_expected.to validate(:get, '/orders/{id}', 200, api_auth({ 'id' => order.id })) } + it { is_expected.to validate(:get, '/orders/{id}', 404, api_auth({ 'id' => Order.last.id + 1 })) } + + it_handles_invalid_token_and_scope(:get, '/orders') + it_handles_invalid_token_and_scope(:get, '/orders/{id}', -> { api_auth({ 'id' => order.id }) }) + end + + context 'order_articles' do + let(:api_scopes) { ['orders:read'] } + let!(:order_article) { create(:order, article_count: 1).order_articles.first } + let!(:stock_article) { create(:stock_article) } + let!(:stock_order_article) { create(:stock_order, article_ids: [stock_article.id]).order_articles.first } + + it { is_expected.to validate(:get, '/order_articles', 200, api_auth) } + it { is_expected.to validate(:get, '/order_articles/{id}', 200, api_auth({ 'id' => order_article.id })) } + it { is_expected.to validate(:get, '/order_articles/{id}', 200, api_auth({ 'id' => stock_order_article.id })) } + it { is_expected.to validate(:get, '/order_articles/{id}', 404, api_auth({ 'id' => Article.last.id + 1 })) } + + it_handles_invalid_token_and_scope(:get, '/order_articles') + it_handles_invalid_token_and_scope(:get, '/order_articles/{id}', -> { api_auth({ 'id' => order_article.id }) }) + end + + context 'article_categories' do + let!(:cat_1) { create :article_category } + let!(:cat_2) { create :article_category } + + it { is_expected.to validate(:get, '/article_categories', 200, api_auth) } + it { is_expected.to validate(:get, '/article_categories/{id}', 200, api_auth({ 'id' => cat_2.id })) } + it { is_expected.to validate(:get, '/article_categories/{id}', 404, api_auth({ 'id' => cat_2.id + 1 })) } + + it_handles_invalid_token(:get, '/article_categories') + it_handles_invalid_token(:get, '/article_categories/{id}', -> { api_auth({ 'id' => cat_1.id }) }) + end + end + + # needs to be last context so it is always run at the end + context 'and finally' do + it 'tests all documented routes' do + is_expected.to validate_all_paths + end + end +end diff --git a/spec/api/v1/user/financial_transactions_spec.rb b/spec/api/v1/user/financial_transactions_spec.rb new file mode 100644 index 00000000..c7e8f826 --- /dev/null +++ b/spec/api/v1/user/financial_transactions_spec.rb @@ -0,0 +1,109 @@ +require 'spec_helper' + +# Most routes are tested in the swagger_spec, this tests endpoints that change data. +describe Api::V1::User::FinancialTransactionsController, type: :controller do + include ApiOAuth + let(:user) { create(:user, :ordergroup) } + let(:api_scopes) { ['finance:user'] } + + let(:ftc1) { create :financial_transaction_class } + let(:ftc2) { create :financial_transaction_class } + let(:ftt1) { create :financial_transaction_type, financial_transaction_class: ftc1 } + let(:ftt2) { create :financial_transaction_type, financial_transaction_class: ftc2 } + let(:ftt3) { create :financial_transaction_type, financial_transaction_class: ftc2 } + + let(:amount) { rand(-100..100) } + let(:note) { Faker::Lorem.sentence } + + let(:json_ft) { json_response['financial_transaction'] } + + shared_examples "financial_transactions endpoint success" do + before { request } + + it "returns status 200" do + expect(response).to have_http_status :ok + end + end + + shared_examples "financial_transactions create/update success" do + include_examples "financial_transactions endpoint success" + + it "returns the financial_transaction" do + expect(json_ft['id']).to be_present + expect(json_ft['financial_transaction_type_id']).to eq ftt1.id + expect(json_ft['financial_transaction_type_name']).to eq ftt1.name + expect(json_ft['amount']).to eq amount + expect(json_ft['note']).to eq note + expect(json_ft['user_id']).to eq user.id + end + + it "updates the financial_transaction" do + resulting_ft = FinancialTransaction.where(id: json_ft['id']).first + expect(resulting_ft).to be_present + expect(resulting_ft.financial_transaction_type).to eq ftt1 + expect(resulting_ft.amount).to eq amount + expect(resulting_ft.note).to eq note + expect(resulting_ft.user).to eq user + end + end + + shared_examples "financial_transactions endpoint failure" do |status| + it "returns status #{status}" do + request + expect(response.status).to eq status + end + + it "does not change the ordergroup" do + expect { request }.to_not change { + user.ordergroup.attributes + } + end + + it "does not change the financial_transactions of ordergroup" do + expect { request }.to_not change { + user.ordergroup.financial_transactions.count + } + end + end + + describe "POST :create" do + let(:ft_params) { { amount: amount, financial_transaction_type_id: ftt1.id, note: note } } + let(:request) { post :create, params: { financial_transaction: ft_params, foodcoop: 'f' } } + + context 'without using self service' do + include_examples "financial_transactions endpoint failure", 403 + end + + context 'with using self service' do + before { FoodsoftConfig[:use_self_service] = true } + + context "with no existing financial transaction" do + include_examples "financial_transactions create/update success" + end + + context "with existing financial transaction" do + before { user.ordergroup.add_financial_transaction! 5000, 'for ordering', user, ftt3 } + + include_examples "financial_transactions create/update success" + end + + context "with invalid financial transaction type" do + let(:ft_params) { { amount: amount, financial_transaction_type_id: -1, note: note } } + + include_examples "financial_transactions endpoint failure", 404 + end + + context "without note" do + let(:ft_params) { { amount: amount, financial_transaction_type_id: ftt1.id } } + + include_examples "financial_transactions endpoint failure", 422 + end + + context 'without enough balance' do + before { FoodsoftConfig[:minimum_balance] = 1000 } + + include_examples "financial_transactions endpoint failure", 403 + end + end + end +end diff --git a/spec/api/v1/user/group_order_articles_spec.rb b/spec/api/v1/user/group_order_articles_spec.rb new file mode 100644 index 00000000..3bfa299e --- /dev/null +++ b/spec/api/v1/user/group_order_articles_spec.rb @@ -0,0 +1,220 @@ +require 'spec_helper' + +# Most routes are tested in the swagger_spec, this tests endpoints that change data. +describe Api::V1::User::GroupOrderArticlesController, type: :controller do + include ApiOAuth + let(:user) { create(:user, :ordergroup) } + let(:json_goa) { json_response['group_order_article'] } + let(:json_oa) { json_response['order_article'] } + let(:api_scopes) { ['group_orders:user'] } + + let(:order) { create(:order, article_count: 1) } + let(:oa_1) { order.order_articles.first } + + let(:other_quantity) { rand(1..10) } + let(:other_tolerance) { rand(1..10) } + let(:user_other) { create(:user, :ordergroup) } + let!(:go_other) { create(:group_order, order: order, ordergroup: user_other.ordergroup) } + let!(:goa_other) { create(:group_order_article, group_order: go_other, order_article: oa_1, quantity: other_quantity, tolerance: other_tolerance) } + + before { go_other.update_price!; user_other.ordergroup.update_stats! } + + shared_examples "group_order_articles endpoint success" do + before { request } + + it "returns status 200" do + expect(response).to have_http_status :ok + end + + it "returns the order_article" do + expect(json_oa['id']).to eq oa_1.id + expect(json_oa['quantity']).to eq new_quantity + other_quantity + expect(json_oa['tolerance']).to eq new_tolerance + other_tolerance + end + + it "updates the group_order" do + go = nil + expect { + request + go = user.ordergroup.group_orders.where(order: order).last + }.to change { go&.updated_by }.to(user) + .and change { go&.price } + end + end + + shared_examples "group_order_articles create/update success" do + include_examples "group_order_articles endpoint success" + + it "returns the group_order_article" do + expect(json_goa['id']).to be_present + expect(json_goa['order_article_id']).to eq oa_1.id + expect(json_goa['quantity']).to eq new_quantity + expect(json_goa['tolerance']).to eq new_tolerance + end + + it "updates the group_order_article" do + resulting_goa = GroupOrderArticle.where(id: json_goa['id']).first + expect(resulting_goa).to be_present + expect(resulting_goa.quantity).to eq new_quantity + expect(resulting_goa.tolerance).to eq new_tolerance + end + end + + shared_examples "group_order_articles endpoint failure" do |status| + it "returns status #{status}" do + request + expect(response.status).to eq status + end + + it "does not change the group_order" do + expect { request }.to_not change { + go = user.ordergroup.group_orders.where(order: order).last + go&.attributes + } + end + + it "does not change the group_order_article" do + expect { request }.to_not change { + goa = GroupOrderArticle.joins(:group_order) + .where(order_article_id: oa_1.id, group_orders: { ordergroup: user.ordergroup }).last + goa&.attributes + } + end + end + + describe "POST :create" do + let(:new_quantity) { rand(1..10) } + let(:new_tolerance) { rand(1..10) } + + let(:goa_params) { { order_article_id: oa_1.id, quantity: new_quantity, tolerance: new_tolerance } } + let(:request) { post :create, params: { group_order_article: goa_params, foodcoop: 'f' } } + + context "with no existing group_order" do + include_examples "group_order_articles create/update success" + end + + context "with an existing group_order" do + let!(:go) { create(:group_order, order: order, ordergroup: user.ordergroup) } + + include_examples "group_order_articles create/update success" + end + + context "with an existing group_order_article" do + let!(:go) { create(:group_order, order: order, ordergroup: user.ordergroup) } + let!(:goa) { create(:group_order_article, group_order: go, order_article: oa_1, quantity: 0, tolerance: 1) } + + before { go.update_price!; user.ordergroup.update_stats! } + + include_examples "group_order_articles endpoint failure", 422 + end + + context "with invalid parameter values" do + let(:goa_params) { { order_article_id: oa_1.id, quantity: -1, tolerance: new_tolerance } } + + include_examples "group_order_articles endpoint failure", 422 + end + + context 'with a closed order' do + let(:order) { create(:order, article_count: 1, state: :finished) } + + include_examples "group_order_articles endpoint failure", 404 + end + + context 'without enough balance' do + before { FoodsoftConfig[:minimum_balance] = 1000 } + + include_examples "group_order_articles endpoint failure", 403 + end + + context 'without enough apple points' do + before { allow_any_instance_of(Ordergroup).to receive(:not_enough_apples?).and_return(true) } + + include_examples "group_order_articles endpoint failure", 403 + end + end + + describe "PATCH :update" do + let(:new_quantity) { rand(2..10) } + let(:goa_params) { { quantity: new_quantity, tolerance: new_tolerance } } + let(:request) { patch :update, params: { id: goa.id, group_order_article: goa_params, foodcoop: 'f' } } + let(:new_tolerance) { rand(2..10) } + + let!(:go) { create(:group_order, order: order, ordergroup: user.ordergroup) } + let!(:goa) { create(:group_order_article, group_order: go, order_article: oa_1, quantity: 1, tolerance: 0) } + + before { go.update_price!; user.ordergroup.update_stats! } + + context "happy flow" do + include_examples "group_order_articles create/update success" + end + + context "with invalid parameter values" do + let(:goa_params) { { order_article_id: oa_1.id, quantity: -1, tolerance: new_tolerance } } + + include_examples "group_order_articles endpoint failure", 422 + end + + context 'with a closed order' do + let(:order) { create(:order, article_count: 1, state: :finished) } + + include_examples "group_order_articles endpoint failure", 404 + end + + context 'without enough balance' do + before { FoodsoftConfig[:minimum_balance] = 1000 } + + include_examples "group_order_articles endpoint failure", 403 + end + + context 'without enough apple points' do + before { allow_any_instance_of(Ordergroup).to receive(:not_enough_apples?).and_return(true) } + + include_examples "group_order_articles endpoint failure", 403 + end + end + + describe "DELETE :destroy" do + let(:new_quantity) { 0 } + let(:request) { delete :destroy, params: { id: goa.id, foodcoop: 'f' } } + let(:new_tolerance) { 0 } + + let!(:go) { create(:group_order, order: order, ordergroup: user.ordergroup) } + let!(:goa) { create(:group_order_article, group_order: go, order_article: oa_1) } + + before { go.update_price!; user.ordergroup.update_stats! } + + shared_examples "group_order_articles destroy success" do + include_examples "group_order_articles endpoint success" + + it "does not return the group_order_article" do + expect(json_goa).to be_nil + end + + it "deletes the group_order_article" do + expect(GroupOrderArticle.where(id: goa.id)).to be_empty + end + end + + context "happy flow" do + include_examples "group_order_articles destroy success" + end + + context 'with a closed order' do + let(:order) { create(:order, article_count: 1, state: :finished) } + + include_examples "group_order_articles endpoint failure", 404 + end + + context 'without enough balance' do + before { FoodsoftConfig[:minimum_balance] = 1000 } + + include_examples "group_order_articles destroy success" + end + + context 'without enough apple points' do + before { allow_any_instance_of(Ordergroup).to receive(:not_enough_apples?).and_return(true) } + + include_examples "group_order_articles destroy success" + end + end +end diff --git a/spec/api/v1/user/ordergroup_spec.rb b/spec/api/v1/user/ordergroup_spec.rb new file mode 100644 index 00000000..5eacb63e --- /dev/null +++ b/spec/api/v1/user/ordergroup_spec.rb @@ -0,0 +1,55 @@ +require 'spec_helper' + +describe Api::V1::User::OrdergroupController, type: :controller do + include ApiOAuth + let(:user) { create :user, :ordergroup } + let(:api_scopes) { ['finance:user'] } + + let(:ftc1) { create :financial_transaction_class } + let(:ftc2) { create :financial_transaction_class } + let(:ftt1) { create :financial_transaction_type, financial_transaction_class: ftc1 } + let(:ftt2) { create :financial_transaction_type, financial_transaction_class: ftc2 } + let(:ftt3) { create :financial_transaction_type, financial_transaction_class: ftc2 } + + describe "GET :financial_overview" do + let(:order) { create(:order, article_count: 1) } + let(:json_financial_overview) { json_response['financial_overview'] } + let(:oa_1) { order.order_articles.first } + + let!(:go) { create(:group_order, order: order, ordergroup: user.ordergroup) } + let!(:goa) { create(:group_order_article, group_order: go, order_article: oa_1, quantity: 1, tolerance: 0) } + + before { go.update_price!; user.ordergroup.update_stats! } + + before do + og = user.ordergroup + og.add_financial_transaction!(-1, '-1', user, ftt1) + og.add_financial_transaction!(2, '2', user, ftt1) + og.add_financial_transaction!(3, '3', user, ftt1) + + og.add_financial_transaction!(-10, '-10', user, ftt2) + og.add_financial_transaction!(20, '20', user, ftt2) + og.add_financial_transaction!(30, '30', user, ftt2) + + og.add_financial_transaction!(-100, '-100', user, ftt3) + og.add_financial_transaction!(200, '200', user, ftt3) + og.add_financial_transaction!(300, '300', user, ftt3) + end + + it "returns correct values" do + get :financial_overview, params: { foodcoop: 'f' } + expect(json_financial_overview['account_balance']).to eq 444 + expect(json_financial_overview['available_funds']).to eq 444 - go.price + + ftcs = Hash[json_financial_overview['financial_transaction_class_sums'].map { |x| [x['id'], x] }] + + ftcs1 = ftcs[ftc1.id] + expect(ftcs1['name']).to eq ftc1.name + expect(ftcs1['amount']).to eq 4 + + ftcs2 = ftcs[ftc2.id] + expect(ftcs2['name']).to eq ftc2.name + expect(ftcs2['amount']).to eq 440 + end + end +end diff --git a/spec/app_config.yml b/spec/app_config.yml index a9bd72b0..2e146be9 100644 --- a/spec/app_config.yml +++ b/spec/app_config.yml @@ -6,7 +6,6 @@ default: &defaults multi_coop_install: false - use_self_service: true default_scope: 'f' name: FC Minimal diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb deleted file mode 100644 index 35db7574..00000000 --- a/spec/controllers/application_controller_spec.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe ApplicationController, type: :controller do - describe 'current' do - it 'returns current ApplicationController' do - described_class.new.send(:store_controller) - expect(described_class.current).to be_instance_of described_class - end - end -end diff --git a/spec/controllers/articles_controller_spec.rb b/spec/controllers/articles_controller_spec.rb deleted file mode 100644 index e2940f48..00000000 --- a/spec/controllers/articles_controller_spec.rb +++ /dev/null @@ -1,348 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe ArticlesController, type: :controller do - let(:user) { create :user, :role_article_meta } - let(:article_category_a) { create :article_category, name: "AAAA" } - let(:article_category_b) { create :article_category, name: "BBBB" } - let(:article_category_c) { create :article_category, name: "CCCC" } - let(:supplier) { create :supplier} - let(:article_a) { create :article, name: 'AAAA', note: "ZZZZ", unit: '750 g', article_category: article_category_b, availability: false, supplier_id: supplier.id } - let(:article_b) { create :article, name: 'BBBB', note: "XXXX", unit: '500 g', article_category: article_category_a, availability: true, supplier_id: supplier.id } - let(:article_c) { create :article, name: 'CCCC', note: "YYYY", unit: '250 g', article_category: article_category_c, availability: true, supplier_id: supplier.id } - let(:article_no_supplier) { create :article, name: 'no_supplier', note: "no_supplier", unit: '100 g', article_category: article_category_b, availability: true } - - let(:order) { create :order } - let(:order2) { create :order } - - def get_with_supplier(action, params: {}, xhr: false, format: nil) - params['supplier_id'] = supplier.id - get_with_defaults(action, params: params, xhr: xhr, format: format) - end - - def post_with_supplier(action, params: {}, xhr: false, format: nil) - params['supplier_id'] = supplier.id - post_with_defaults(action, params: params, xhr: xhr, format: format) - end - - before { login user } - - describe 'GET index' do - before do - supplier - article_a - article_b - article_c - supplier.reload - end - it 'assigns sorting on articles' do - sortings = [ - ['name', [article_a, article_b, article_c]], - ['name_reverse', [article_c, article_b, article_a]], - ['note', [article_b, article_c, article_a]], - ['note_reverse', [article_a, article_c, article_b]], - ['unit', [article_c, article_b, article_a]], - ['unit_reverse', [article_a, article_b, article_c]], - ['article_category', [article_b, article_a, article_c]], - ['article_category_reverse', [article_c, article_a, article_b]], - ['availability', [article_a, article_b, article_c]], - ['availability_reverse', [article_b, article_c, article_a]] - ] - sortings.each do |sorting| - get_with_supplier :index, params: { sort: sorting[0] } - expect(response).to have_http_status(:success) - expect(assigns(:articles).to_a).to eq(sorting[1]) - end - end - - it 'triggers an article csv' do - get_with_supplier :index, format: :csv - expect(response.header['Content-Type']).to include('text/csv') - expect(response.body).to include(article_a.unit, article_b.unit) - end - end - - describe 'new' do - it 'renders form for a new article' do - get_with_supplier :new, xhr: true - expect(response).to have_http_status(:success) - end - end - - describe 'copy' do - it 'renders form with copy of an article' do - get_with_supplier :copy, params: { article_id: article_a.id }, xhr: true - expect(assigns(:article).attributes).to eq(article_a.dup.attributes) - expect(response).to have_http_status(:success) - end - end - - describe '#create' do - it 'creates a new article' do - valid_attributes = article_a.attributes.except('id') - valid_attributes['name'] = 'ABAB' - get_with_supplier :create, params: { article: valid_attributes }, xhr: true - expect(response).to have_http_status(:success) - end - - it 'fails to create a new article and renders #new' do - get_with_supplier :create, params: { article: { id: nil } }, xhr: true - expect(response).to have_http_status(:success) - expect(response).to render_template('articles/new') - end - end - - describe 'edit' do - it 'opens form to edit article attributes' do - get_with_supplier :edit, params: { id: article_a.id }, xhr: true - expect(response).to have_http_status(:success) - expect(response).to render_template('articles/new') - end - end - - describe '#edit all' do - it 'renders edit_all' do - get_with_supplier :edit_all, xhr: true - expect(response).to have_http_status(:success) - expect(response).to render_template('articles/edit_all') - end - end - - describe '#update' do - it 'updates article attributes' do - get_with_supplier :update, params: { id: article_a.id, article: { unit: '300 g' } }, xhr: true - expect(assigns(:article).unit).to eq('300 g') - expect(response).to have_http_status(:success) - end - - it 'updates article with empty name attribute' do - get_with_supplier :update, params: { id: article_a.id, article: { name: nil } }, xhr: true - expect(response).to render_template('articles/new') - end - end - - describe '#update_all' do - it 'updates all articles' do - get_with_supplier :update_all, params: { articles: { "#{article_a.id}": attributes_for(:article), "#{article_b.id}": attributes_for(:article) } } - expect(response).to have_http_status(:redirect) - end - - it 'fails on updating all articles' do - get_with_supplier :update_all, params: { articles: { "#{article_a.id}": attributes_for(:article, name: 'ab') } } - expect(response).to have_http_status(:success) - expect(response).to render_template('articles/edit_all') - end - end - - describe '#update_selected' do - let(:order_article) { create :order_article, order: order, article: article_no_supplier } - - before do - order_article - end - - it 'updates selected articles' do - get_with_supplier :update_selected, params: { selected_articles: [article_a.id, article_b.id] } - expect(response).to have_http_status(:redirect) - end - - it 'destroys selected articles' do - get_with_supplier :update_selected, params: { selected_articles: [article_a.id, article_b.id], selected_action: 'destroy' } - article_a.reload - article_b.reload - expect(article_a).to be_deleted - expect(article_b).to be_deleted - expect(response).to have_http_status(:redirect) - end - - it 'sets availability false on selected articles' do - get_with_supplier :update_selected, params: { selected_articles: [article_a.id, article_b.id], selected_action: 'setNotAvailable' } - article_a.reload - article_b.reload - expect(article_a).not_to be_availability - expect(article_b).not_to be_availability - expect(response).to have_http_status(:redirect) - end - - it 'sets availability true on selected articles' do - get_with_supplier :update_selected, params: { selected_articles: [article_a.id, article_b.id], selected_action: 'setAvailable' } - article_a.reload - article_b.reload - expect(article_a).to be_availability - expect(article_b).to be_availability - expect(response).to have_http_status(:redirect) - end - - it 'fails deletion if one article is in open order' do - get_with_supplier :update_selected, params: { selected_articles: [article_a.id, article_no_supplier.id], selected_action: 'destroy' } - article_a.reload - article_no_supplier.reload - expect(article_a).not_to be_deleted - expect(article_no_supplier).not_to be_deleted - expect(response).to have_http_status(:redirect) - end - end - - describe '#parse_upload' do - let(:file) { Rack::Test::UploadedFile.new(Rails.root.join('spec/fixtures/files/upload_test.csv'), original_filename: 'upload_test.csv') } - - it 'updates articles from spreadsheet' do - post_with_supplier :parse_upload, params: { articles: { file: file, outlist_absent: '1', convert_units: '1', type: 'foodsoft' } } - expect(response).to have_http_status(:success) - end - - it 'missing file not updates particles from spreadsheet' do - post_with_supplier :parse_upload, params: { articles: { file: nil, outlist_absent: '1', convert_units: '1' } } - expect(response).to have_http_status(:redirect) - expect(flash[:alert]).to match(I18n.t('errors.general_msg', msg: "undefined method `original_filename' for \"\":String").to_s) - end - end - - describe '#sync' do - # TODO: double render error in controller - it 'throws double render error' do - expect do - post :sync, params: { foodcoop: FoodsoftConfig[:default_scope], supplier_id: supplier.id } - end.to raise_error(AbstractController::DoubleRenderError) - end - - xit 'updates particles from spreadsheet' do - post :sync, params: { foodcoop: FoodsoftConfig[:default_scope], supplier_id: supplier.id, articles: { '#{article_a.id}': attributes_for(:article), '#{article_b.id}': attributes_for(:article) } } - expect(response).to have_http_status(:redirect) - end - end - - describe '#destroy' do - let(:order_article) { create :order_article, order: order, article: article_no_supplier } - - before do - order_article - end - - it 'does not delete article if order open' do - get_with_supplier :destroy, params: { id: article_no_supplier.id }, xhr: true - expect(assigns(:article)).not_to be_deleted - expect(response).to have_http_status(:success) - expect(response).to render_template('articles/destroy') - end - - it 'deletes article if order closed' do - get_with_supplier :destroy, params: { id: article_b.id }, xhr: true - expect(assigns(:article)).to be_deleted - expect(response).to have_http_status(:success) - expect(response).to render_template('articles/destroy') - end - end - - describe '#update_synchronized' do - let(:order_article) { create :order_article, order: order, article: article_no_supplier } - - before do - order_article - article_a - article_b - article_no_supplier - end - - it 'deletes articles' do - # TODO: double render error in controller - get_with_supplier :update_synchronized, params: { outlisted_articles: { article_a.id => article_a, article_b.id => article_b } } - article_a.reload - article_b.reload - expect(article_a).to be_deleted - expect(article_b).to be_deleted - expect(response).to have_http_status(:redirect) - end - - it 'updates articles' do - get_with_supplier :update_synchronized, params: { articles: { article_a.id => { name: 'NewNameA' }, article_b.id => { name: 'NewNameB' } } } - expect(assigns(:updated_articles).first.name).to eq 'NewNameA' - expect(response).to have_http_status(:redirect) - end - - it 'does not update articles if article with same name exists' do - get_with_supplier :update_synchronized, params: { articles: { article_a.id => { unit: '2000 g' }, article_b.id => { name: 'AAAA' } } } - error_array = [assigns(:updated_articles).first.errors.first, assigns(:updated_articles).last.errors.first] - expect(error_array).to include(ActiveModel::Error) - expect(response).to have_http_status(:success) - end - - it 'does update articles if article with same name was deleted before' do - get_with_supplier :update_synchronized, params: { - outlisted_articles: { article_a.id => article_a }, - articles: { - article_a.id => { name: 'NewName' }, - article_b.id => { name: 'AAAA' } - } - } - error_array = [assigns(:updated_articles).first.errors.first, assigns(:updated_articles).last.errors.first] - expect(error_array).not_to be_any - expect(response).to have_http_status(:redirect) - end - - it 'does not delete articles in open order' do - get_with_supplier :update_synchronized, params: { outlisted_articles: { article_no_supplier.id => article_no_supplier } } - article_no_supplier.reload - expect(article_no_supplier).not_to be_deleted - expect(response).to have_http_status(:success) - end - - it 'assigns updated article_pairs on error' do - get_with_supplier :update_synchronized, params: { - articles: { article_a.id => { name: 'EEEE' } }, - outlisted_articles: { article_no_supplier.id => article_no_supplier } - } - expect(assigns(:updated_article_pairs).first).to eq([article_a, { name: 'EEEE' }]) - article_no_supplier.reload - expect(article_no_supplier).not_to be_deleted - expect(response).to have_http_status(:success) - end - - it 'updates articles in open order' do - get_with_supplier :update_synchronized, params: { articles: { article_no_supplier.id => { name: 'EEEE' } } } - article_no_supplier.reload - expect(article_no_supplier.name).to eq 'EEEE' - expect(response).to have_http_status(:redirect) - end - end - - describe '#shared' do - let(:shared_supplier) { create :shared_supplier, shared_articles: [shared_article] } - let(:shared_article) { create :shared_article, name: 'shared' } - let(:article_s) { create :article, name: 'SSSS', note: 'AAAA', unit: '250 g', article_category: article_category_a, availability: false } - - let(:supplier_with_shared) { create :supplier, shared_supplier: shared_supplier } - - it 'renders view with articles' do - get_with_defaults :shared, params: { supplier_id: supplier_with_shared.id, name_cont_all_joined: 'shared' }, xhr: true - expect(assigns(:supplier).shared_supplier.shared_articles).to be_any - expect(assigns(:articles)).to be_any - expect(response).to have_http_status(:success) - end - end - - describe '#import' do - let(:shared_supplier) { create :shared_supplier, shared_articles: [shared_article] } - let(:shared_article) { create :shared_article, name: 'shared' } - - before do - shared_article - article_category_a - end - - it 'fills form with article details' do - get_with_supplier :import, params: { article_category_id: article_category_b.id, direct: 'true', shared_article_id: shared_article.id }, xhr: true - expect(assigns(:article)).not_to be_nil - expect(response).to have_http_status(:success) - expect(response).to render_template(:create) - end - - it 'does redirect to :new if param :direct not set' do - get_with_supplier :import, params: { article_category_id: article_category_b.id, shared_article_id: shared_article.id }, xhr: true - expect(assigns(:article)).not_to be_nil - expect(response).to have_http_status(:success) - expect(response).to render_template(:new) - end - end -end diff --git a/spec/controllers/concerns/auth_concern_spec.rb b/spec/controllers/concerns/auth_concern_spec.rb deleted file mode 100644 index 10bf8ec7..00000000 --- a/spec/controllers/concerns/auth_concern_spec.rb +++ /dev/null @@ -1,212 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -class DummyAuthController < ApplicationController; end - -describe 'Auth concern', type: :controller do - controller DummyAuthController do - # Defining a dummy action for an anynomous controller which inherits from the described class. - def authenticate_blank - authenticate - end - - def authenticate_unknown_group - authenticate('nooby') - end - - def authenticate_pickups - authenticate('pickups') - head :ok unless performed? - end - - def authenticate_finance_or_orders - authenticate('finance_or_orders') - head :ok unless performed? - end - - def try_authenticate_membership_or_admin - authenticate_membership_or_admin - end - - def try_authenticate_or_token - authenticate_or_token('xyz') - head :ok unless performed? - end - - def call_deny_access - deny_access - end - - def call_current_user - current_user - end - - def call_login_and_redirect_to_return_to - user = User.find(params[:user_id]) - login_and_redirect_to_return_to(user) - end - - def call_login - user = User.find(params[:user_id]) - login(user) - end - end - - # unit testing protected/private methods - describe 'protected/private methods' do - let(:user) { create :user } - let(:wrong_user) { create :user } - - describe '#current_user' do - before do - login user - routes.draw { get 'call_current_user' => 'dummy_auth#call_current_user' } - end - - describe 'with valid session' do - it 'returns current_user' do - get_with_defaults :call_current_user, params: { user_id: user.id }, format: JSON - expect(assigns(:current_user)).to eq user - end - end - - describe 'with invalid session' do - it 'not returns current_user' do - session[:user_id] = nil - get_with_defaults :call_current_user, params: { user_id: nil }, format: JSON - expect(assigns(:current_user)).to be_nil - end - end - end - - describe '#deny_access' do - it 'redirects to root_url' do - login user - routes.draw { get 'deny_access' => 'dummy_auth#call_deny_access' } - get_with_defaults :call_deny_access - expect(response).to redirect_to(root_url) - end - end - - describe '#login' do - before do - routes.draw { get 'call_login' => 'dummy_auth#call_login' } - end - - it 'sets user in session' do - login wrong_user - get_with_defaults :call_login, params: { user_id: user.id }, format: JSON - expect(session[:user_id]).to eq user.id - expect(session[:scope]).to eq FoodsoftConfig.scope - expect(session[:locale]).to eq user.locale - end - end - - describe '#login_and_redirect_to_return_to' do - it 'redirects to already set target' do - login user - session[:return_to] = my_profile_url - routes.draw { get 'call_login_and_redirect_to_return_to' => 'dummy_auth#call_login_and_redirect_to_return_to' } - get_with_defaults :call_login_and_redirect_to_return_to, params: { user_id: user.id } - expect(session[:return_to]).to be_nil - end - end - end - - describe 'authenticate' do - describe 'not logged in' do - it 'does not authenticate' do - routes.draw { get 'authenticate_blank' => 'dummy_auth#authenticate_blank' } - get_with_defaults :authenticate_blank - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(login_path) - expect(flash[:alert]).to match(I18n.t('application.controller.error_authn')) - end - end - - describe 'logged in' do - let(:user) { create :user } - let(:pickups_user) { create :user, :role_pickups } - let(:finance_user) { create :user, :role_finance } - let(:orders_user) { create :user, :role_orders } - - it 'does not authenticate with unknown group' do - login user - routes.draw { get 'authenticate_unknown_group' => 'dummy_auth#authenticate_unknown_group' } - get_with_defaults :authenticate_unknown_group - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(root_path) - expect(flash[:alert]).to match(I18n.t('application.controller.error_denied', sign_in: ActionController::Base.helpers.link_to(I18n.t('application.controller.error_denied_sign_in'), login_path))) - end - - it 'does not authenticate with pickups group' do - login pickups_user - routes.draw { get 'authenticate_pickups' => 'dummy_auth#authenticate_pickups' } - get_with_defaults :authenticate_pickups - expect(response).to have_http_status(:success) - end - - it 'does not authenticate with finance group' do - login finance_user - routes.draw { get 'authenticate_finance_or_orders' => 'dummy_auth#authenticate_finance_or_orders' } - get_with_defaults :authenticate_finance_or_orders - expect(response).to have_http_status(:success) - end - - it 'does not authenticate with orders group' do - login orders_user - routes.draw { get 'authenticate_finance_or_orders' => 'dummy_auth#authenticate_finance_or_orders' } - get_with_defaults :authenticate_finance_or_orders - expect(response).to have_http_status(:success) - end - end - end - - describe 'authenticate_membership_or_admin' do - describe 'logged in' do - let(:pickups_user) { create :user, :role_pickups } - let(:workgroup) { create :workgroup } - - it 'redirects with not permitted group' do - group_id = workgroup.id - login pickups_user - routes.draw { get 'try_authenticate_membership_or_admin' => 'dummy_auth#try_authenticate_membership_or_admin' } - get_with_defaults :try_authenticate_membership_or_admin, params: { id: group_id } - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(root_path) - expect(flash[:alert]).to match(I18n.t('application.controller.error_members_only')) - end - end - end - - describe 'authenticate_or_token' do - describe 'logged in' do - let(:token_verifier) { TokenVerifier.new('xyz') } - let(:token_msg) { token_verifier.generate } - let(:user) { create :user } - - before { login user } - - it 'authenticates token' do - routes.draw { get 'try_authenticate_or_token' => 'dummy_auth#try_authenticate_or_token' } - get_with_defaults :try_authenticate_or_token, params: { token: token_msg } - expect(response).not_to have_http_status(:redirect) - end - - it 'redirects on faulty token' do - routes.draw { get 'try_authenticate_or_token' => 'dummy_auth#try_authenticate_or_token' } - get_with_defaults :try_authenticate_or_token, params: { token: 'abc' } - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(root_path) - expect(flash[:alert]).to match(I18n.t('application.controller.error_token')) - end - - it 'authenticates current user on empty token' do - routes.draw { get 'try_authenticate_or_token' => 'dummy_auth#try_authenticate_or_token' } - get_with_defaults :try_authenticate_or_token - expect(response).to have_http_status(:success) - end - end - end -end diff --git a/spec/controllers/finance/balancing_controller_spec.rb b/spec/controllers/finance/balancing_controller_spec.rb deleted file mode 100644 index d62b9974..00000000 --- a/spec/controllers/finance/balancing_controller_spec.rb +++ /dev/null @@ -1,211 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe Finance::BalancingController, type: :controller do - let(:user) { create :user, :role_finance, :role_orders, groups: [create(:ordergroup)] } - - before { login user } - - describe 'GET index' do - let(:order) { create :order } - - it 'renders index page' do - get_with_defaults :index - expect(response).to have_http_status(:success) - expect(response).to render_template('finance/balancing/index') - end - end - - describe 'new balancing' do - let(:supplier) { create :supplier } - let(:article1) { create :article, name: 'AAAA', supplier: supplier, unit_quantity: 1 } - let(:article2) { create :article, name: 'AAAB', supplier: supplier, unit_quantity: 1 } - - let(:order) { create :order, supplier: supplier, article_ids: [article1.id, article2.id] } - - let(:go1) { create :group_order, order: order } - let(:go2) { create :group_order, order: order } - let(:oa1) { order.order_articles.find_by_article_id(article1.id) } - let(:oa2) { order.order_articles.find_by_article_id(article2.id) } - let(:oa3) { order2.order_articles.find_by_article_id(article2.id) } - let(:goa1) { create :group_order_article, group_order: go1, order_article: oa1 } - let(:goa2) { create :group_order_article, group_order: go1, order_article: oa2 } - - before do - goa1.update_quantities(3, 0) - goa2.update_quantities(1, 0) - oa1.update_results! - oa2.update_results! - end - - it 'renders new order page' do - get_with_defaults :new, params: { order_id: order.id } - expect(response).to have_http_status(:success) - expect(response).to render_template('finance/balancing/new') - end - - it 'assigns sorting on articles' do - sortings = [ - ['name', [oa1, oa2]], - ['name_reverse', [oa2, oa1]], - ['order_number', [oa1, oa2]], - ['order_number_reverse', [oa1, oa2]] # just one order - ] - sortings.each do |sorting| - get_with_defaults :new, params: { order_id: order.id, sort: sorting[0] } - expect(response).to have_http_status(:success) - expect(assigns(:articles).to_a).to eq(sorting[1]) - end - end - end - - describe 'update summary' do - let(:order) { create(:order) } - - it 'shows the summary view' do - get_with_defaults :update_summary, params: { id: order.id }, xhr: true - expect(response).to have_http_status(:success) - expect(response).to render_template('finance/balancing/update_summary') - end - end - - describe 'new_on_order' do - let(:order) { create(:order) } - let(:order_article) { order.order_articles.first } - - it 'calls article update' do - get_with_defaults :new_on_order_article_update, params: { id: order.id, order_article_id: order_article.id }, xhr: true - expect(response).not_to render_template(layout: 'application') - expect(response).to render_template('finance/balancing/new_on_order_article_update') - end - - it 'calls article create' do - get_with_defaults :new_on_order_article_create, params: { id: order.id, order_article_id: order_article.id }, xhr: true - expect(response).not_to render_template(layout: 'application') - expect(response).to render_template('finance/balancing/new_on_order_article_create') - end - end - - describe 'edit_note' do - let(:order) { create(:order) } - - it 'updates order note' do - get_with_defaults :edit_note, params: { id: order.id, order: { note: 'Hello' } }, xhr: true - expect(response).to have_http_status(:success) - expect(response).to render_template('finance/balancing/edit_note') - end - end - - describe 'update_note' do - let(:order) { create(:order) } - - it 'updates order note' do - get_with_defaults :update_note, params: { id: order.id, order: { note: 'Hello' } }, xhr: true - expect(response).to have_http_status(:success) - end - - it 'redirects to edit note on failed update' do - get_with_defaults :update_note, params: { id: order.id, order: { article_ids: nil } }, xhr: true - expect(response).to have_http_status(:success) - expect(response).to render_template('finance/balancing/edit_note') - end - end - - describe 'transport' do - let(:order) { create(:order) } - - it 'calls the edit transport view' do - get_with_defaults :edit_transport, params: { id: order.id }, xhr: true - expect(response).to have_http_status(:success) - expect(response).to render_template('finance/balancing/edit_transport') - end - - it 'does redirect if order valid' do - get_with_defaults :update_transport, params: { id: order.id, order: { ends: Time.now } }, xhr: true - expect(response).to have_http_status(:redirect) - expect(assigns(:order).errors.count).to eq(0) - expect(response).to redirect_to(new_finance_order_path(order_id: order.id)) - end - - it 'does redirect if order invalid' do - get_with_defaults :update_transport, params: { id: order.id, order: { starts: Time.now + 2, ends: Time.now } }, xhr: true - expect(assigns(:order).errors.count).to eq(1) - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(new_finance_order_path(order_id: order.id)) - end - end - - describe 'confirm' do - let(:order) { create(:order) } - - it 'renders the confirm template' do - get_with_defaults :confirm, params: { id: order.id }, xhr: true - expect(response).to have_http_status(:success) - expect(response).to render_template('finance/balancing/confirm') - end - end - - describe 'close and update account balances' do - let(:order) { create(:order) } - let(:order1) { create(:order, ends: Time.now) } - let(:fft) { create(:financial_transaction_type) } - - it 'does not close order if ends not set' do - get_with_defaults :close, params: { id: order.id, type: fft.id } - expect(assigns(:order)).not_to be_closed - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(new_finance_order_url(order_id: order.id)) - end - - it 'closes order' do - get_with_defaults :close, params: { id: order1.id, type: fft.id } - expect(assigns(:order)).to be_closed - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(finance_order_index_url) - end - end - - describe 'close direct' do - let(:order) { create(:order) } - - it 'does not close order if already closed' do - order.close_direct!(user) - get_with_defaults :close_direct, params: { id: order.id } - expect(assigns(:order)).to be_closed - end - - it 'closes order directly' do - get_with_defaults :close_direct, params: { id: order.id } - expect(assigns(:order)).to be_closed - end - end - - describe 'close all direct' do - let(:invoice) { create(:invoice) } - let(:invoice1) { create(:invoice) } - let(:order) { create(:order, state: 'finished', ends: Time.now + 2.hours, invoice: invoice) } - let(:order1) { create(:order, state: 'finished', ends: Time.now + 2.hours) } - - before do - order - order1 - end - - it 'does close orders' do - get_with_defaults :close_all_direct_with_invoice - order.reload - expect(order).to be_closed - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(finance_order_index_url) - end - - it 'does not close orders when invoice not set' do - get_with_defaults :close_all_direct_with_invoice - order1.reload - expect(order1).not_to be_closed - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(finance_order_index_url) - end - end -end diff --git a/spec/controllers/finance/base_controller_spec.rb b/spec/controllers/finance/base_controller_spec.rb deleted file mode 100644 index 388f3a17..00000000 --- a/spec/controllers/finance/base_controller_spec.rb +++ /dev/null @@ -1,30 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe Finance::BaseController, type: :controller do - let(:user) { create :user, :role_finance, :role_orders, :ordergroup } - - before { login user } - - describe 'GET index' do - let(:fin_trans) { create_list :financial_transaction, 3, user: user, ordergroup: user.ordergroup } - let(:orders) { create_list :order, 2, state: 'finished' } - let(:invoices) { create_list :invoice, 4 } - - before do - fin_trans - orders - invoices - end - - it 'renders index page' do - get_with_defaults :index - expect(response).to have_http_status(:success) - expect(response).to render_template('finance/index') - expect(assigns(:financial_transactions).size).to eq(fin_trans.size) - expect(assigns(:orders).size).to eq(orders.size) - expect(assigns(:unpaid_invoices).size).to eq(invoices.size) - end - end -end diff --git a/spec/controllers/finance/ordergroups_controller_spec.rb b/spec/controllers/finance/ordergroups_controller_spec.rb deleted file mode 100644 index f960c61d..00000000 --- a/spec/controllers/finance/ordergroups_controller_spec.rb +++ /dev/null @@ -1,50 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe Finance::OrdergroupsController do - let(:user) { create(:user, :role_finance, :role_orders, :ordergroup) } - let(:fin_trans_type1) { create(:financial_transaction_type) } - let(:fin_trans_type2) { create(:financial_transaction_type) } - let(:fin_trans1) do - create(:financial_transaction, - user: user, - ordergroup: user.ordergroup, - financial_transaction_type: fin_trans_type1) - end - let(:fin_trans2) do - create(:financial_transaction, - user: user, - ordergroup: user.ordergroup, - financial_transaction_type: fin_trans_type1) - end - let(:fin_trans3) do - create(:financial_transaction, - user: user, - ordergroup: user.ordergroup, - financial_transaction_type: fin_trans_type2) - end - - before { login user } - - describe 'GET index' do - before do - fin_trans1 - fin_trans2 - fin_trans3 - end - - it 'renders index page' do - get_with_defaults :index - expect(response).to have_http_status(:success) - expect(response).to render_template('finance/ordergroups/index') - end - - it 'calculates total balance sums correctly' do - get_with_defaults :index - expect(assigns(:total_balances).size).to eq(2) - expect(assigns(:total_balances)[fin_trans_type1.id]).to eq(fin_trans1.amount + fin_trans2.amount) - expect(assigns(:total_balances)[fin_trans_type2.id]).to eq(fin_trans3.amount) - end - end -end diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb index be106282..c5732bd9 100644 --- a/spec/controllers/home_controller_spec.rb +++ b/spec/controllers/home_controller_spec.rb @@ -14,16 +14,12 @@ describe HomeController, type: :controller do end end - describe 'logegd in' do + describe 'logged in' do before { login user } - it 'assigns tasks' do + it 'succeeds' do get_with_defaults :index - - expect(assigns(:unaccepted_tasks)).not_to be_nil - expect(assigns(:next_tasks)).not_to be_nil - expect(assigns(:unassigned_tasks)).not_to be_nil - expect(response).to render_template('home/index') + expect(response).to have_http_status(:success) end end end @@ -31,10 +27,9 @@ describe HomeController, type: :controller do describe 'GET profile' do before { login user } - it 'renders dashboard' do + it 'succeeds' do get_with_defaults :profile expect(response).to have_http_status(:success) - expect(response).to render_template('home/profile') end end @@ -54,10 +49,9 @@ describe HomeController, type: :controller do before { login og_user } - it 'renders reference calculator' do + it 'succeeds' do get_with_defaults :reference_calculator expect(response).to have_http_status(:success) - expect(response).to render_template('home/reference_calculator') end end end @@ -70,11 +64,9 @@ describe HomeController, type: :controller do before { login user } - it 'renders profile after update with invalid attributes' do + it 'stays on profile after update with invalid attributes' do get_with_defaults :update_profile, params: { user: invalid_attributes } expect(response).to have_http_status(:success) - expect(response).to render_template('home/profile') - expect(assigns(:current_user).errors.present?).to be true end it 'redirects to profile after update with unchanged attributes' do @@ -124,36 +116,9 @@ describe HomeController, type: :controller do before { login og_user } - it 'renders ordergroup' do + it 'succeeds' do get_with_defaults :ordergroup expect(response).to have_http_status(:success) - expect(response).to render_template('home/ordergroup') - end - - describe 'assigns sortings' do - let(:fin_trans1) { create :financial_transaction, user: og_user, ordergroup: og_user.ordergroup, note: 'A', amount: 100 } - let(:fin_trans2) { create :financial_transaction, user: og_user, ordergroup: og_user.ordergroup, note: 'B', amount: 200, created_on: Time.now + 1.minute } - - before do - fin_trans1 - fin_trans2 - end - - it 'by criteria' do - sortings = [ - ['date', [fin_trans1, fin_trans2]], - ['note', [fin_trans1, fin_trans2]], - ['amount', [fin_trans1, fin_trans2]], - ['date_reverse', [fin_trans2, fin_trans1]], - ['note_reverse', [fin_trans2, fin_trans1]], - ['amount_reverse', [fin_trans2, fin_trans1]] - ] - sortings.each do |sorting| - get_with_defaults :ordergroup, params: { sort: sorting[0] } - expect(response).to have_http_status(:success) - expect(assigns(:financial_transactions).to_a).to eq(sorting[1]) - end - end end end end @@ -182,7 +147,7 @@ describe HomeController, type: :controller do get_with_defaults :cancel_membership, params: { group_id: fin_user.groups.first.id } expect(response).to have_http_status(:redirect) expect(response).to redirect_to(my_profile_path) - expect(flash[:notice]).to match(/#{I18n.t('home.ordergroup_cancelled', :group => membership.group.name)}/) + expect(flash[:notice]).to match(/#{I18n.t('home.ordergroup_cancelled', group: membership.group.name)}/) end it 'removes user membership' do @@ -190,7 +155,7 @@ describe HomeController, type: :controller do get_with_defaults :cancel_membership, params: { membership_id: membership.id } expect(response).to have_http_status(:redirect) expect(response).to redirect_to(my_profile_path) - expect(flash[:notice]).to match(/#{I18n.t('home.ordergroup_cancelled', :group => membership.group.name)}/) + expect(flash[:notice]).to match(/#{I18n.t('home.ordergroup_cancelled', group: membership.group.name)}/) end end end diff --git a/spec/controllers/login_controller_spec.rb b/spec/controllers/login_controller_spec.rb deleted file mode 100644 index c824e429..00000000 --- a/spec/controllers/login_controller_spec.rb +++ /dev/null @@ -1,67 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe LoginController, type: :controller do - let(:invite) { create :invite } - - describe 'GET accept_invitation' do - let(:expired_invite) { create :expired_invite } - - describe 'with valid token' do - it 'accepts invitation' do - get_with_defaults :accept_invitation, params: { token: invite.token } - expect(response).to have_http_status(:success) - expect(response).to render_template('login/accept_invitation') - end - end - - describe 'with invalid token' do - it 'redirects to login' do - get_with_defaults :accept_invitation, params: { token: invite.token + 'XX' } - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(login_url) - expect(flash[:alert]).to match(I18n.t('login.controller.error_invite_invalid')) - end - end - - describe 'with timed out token' do - it 'redirects to login' do - get_with_defaults :accept_invitation, params: { token: expired_invite.token } - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(login_url) - expect(flash[:alert]).to match(I18n.t('login.controller.error_invite_invalid')) - end - end - - describe 'without group' do - it 'redirects to login' do - invite.group.destroy - get_with_defaults :accept_invitation, params: { token: invite.token } - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(login_url) - expect(flash[:alert]).to match(I18n.t('login.controller.error_group_invalid')) - end - end - end - - describe 'POST accept_invitation' do - describe 'with invalid parameters' do - it 'renders accept_invitation view' do - post_with_defaults :accept_invitation, params: { token: invite.token, user: invite.user.slice('first_name') } - expect(response).to have_http_status(:success) - expect(response).to render_template('login/accept_invitation') - expect(assigns(:user).errors.present?).to be true - end - end - - describe 'with valid parameters' do - it 'redirects to login' do - post_with_defaults :accept_invitation, params: { token: invite.token, user: invite.user.slice('first_name', 'password') } - expect(response).to have_http_status(:redirect) - expect(response).to redirect_to(login_url) - expect(flash[:notice]).to match(I18n.t('login.controller.accept_invitation.notice')) - end - end - end -end diff --git a/spec/factories/invite.rb b/spec/factories/invite.rb deleted file mode 100644 index 51d48840..00000000 --- a/spec/factories/invite.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'factory_bot' - -FactoryBot.define do - factory :invite do - user { create :user } - group { create :group } - email { Faker::Internet.email } - - factory :expired_invite do - after :create do |invite| - invite.update_column(:expires_at, Time.now.yesterday) - end - end - end -end diff --git a/spec/factories/order_article.rb b/spec/factories/order_article.rb deleted file mode 100644 index 99ca8701..00000000 --- a/spec/factories/order_article.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'factory_bot' - -FactoryBot.define do - factory :order_article do - order { create :order } - article { create :article } - end -end diff --git a/spec/fixtures/bnn_file_01.bnn b/spec/fixtures/bnn_file_01.bnn deleted file mode 100644 index 177da7be..00000000 --- a/spec/fixtures/bnn_file_01.bnn +++ /dev/null @@ -1,5 +0,0 @@ -BNN;3;0;Naturkost Nord, Hamburg;T;Angebot Nr. 0922;EUR;20220905;20221001;20220825;837;1 -29932;;;;4280001958081;4280001958203;Walnoten (ongeroosterd);bio;;;med;;GR;C%;DE-?KO-001;120;1302;10;55;;1;;1;1 kg;1;N;930190;99260;;1,41;;;;1;;;4,49;2,34;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;28,571;; -28391;;;;4280001958081;4280001958203;Pijnboompitten;dem;;;med;;GR;C%;DE-?KO-001;120;1302;10;55;;1;;1;100 g;10;N;930190;99260;;1,41;;;;1;;;5,56;2.89;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;28,571;; -1829;;;;4280001958081;4280001958203;Appelsap (verpakt);;;;med;;GR;C%;DE-?KO-001;120;1302;10;55;;1;4x250 ml;10;4x250 ml;10;N;930190;99260;;3,21;;;;1;;;4,49;2.89;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;ml;28,571;; -177813;;;;4280001958081;4280001958203;Tomaten;bio;;;med;;GR;C%;DE-?KO-001;120;1302;10;55;;1;;1;500 g;20;N;930190;99260;;1,20;;;;1;;;4,49;2.89;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;g;28,571;; diff --git a/spec/fixtures/bnn_file_02.bnn b/spec/fixtures/bnn_file_02.bnn deleted file mode 100644 index e3dba5bb..00000000 --- a/spec/fixtures/bnn_file_02.bnn +++ /dev/null @@ -1,2 +0,0 @@ -BNN;3;0;Naturkost Nord, Hamburg;T;Angebot Nr. 0922;EUR;20220905;20221001;20220825;837;1 -1;;;;4280001958081;4280001958203;Tomatoes;organic;;;med;;GR;C%;DE-?KO-001;120;1302;10;55;;1;;20;500 g;1;N;930190;99260;;1,41;;;;1;;;4,49;1,20;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;g;28,571;; \ No newline at end of file diff --git a/spec/fixtures/files/upload_test.csv b/spec/fixtures/files/upload_test.csv deleted file mode 100644 index ac2f59b0..00000000 --- a/spec/fixtures/files/upload_test.csv +++ /dev/null @@ -1,3 +0,0 @@ -avail.;Order number;Name;Note;Manufacturer;Origin;Unit;Price (net);VAT;Deposit;Unit quantity;"";"";Category -"";;AAAA;AAAA;;;500 g;25.55;6.0;0.0;1;"";"";AAAA -"";;BBBB;BBBB;;;250 g;12.11;6.0;0.0;2;"";"";BBBB diff --git a/spec/fixtures/odin_file_01.xml b/spec/fixtures/odin_file_01.xml deleted file mode 100644 index 3b60e83e..00000000 --- a/spec/fixtures/odin_file_01.xml +++ /dev/null @@ -1,273 +0,0 @@ - - - -1039 -1.08 -Estafette Associatie C.V. -Geldermalsen - - -8719325207668 -Walnoten (ongeroosterd) -Nucli rose - -0 -0 -0 -1 -kg -Stuk -0 -Het warme woud -bio - - -NL - -6 -1017515 -29932 -10 -Actief -druiven* -0 -0 -2 -2 -0 -0 -0 -2 -2 -0 -2 -0 -2 -0 -2 -2 -2 -2 -1 -0 -2 -0 -2 -2 - - - -0 -0 -0 -0 -1 - -2 -0 - -adviesprijs -2022-08-18 -2.34 -7.95 - - - -8719325207668 -Pijnboompitten -Nucli rose - -0 -0 -0 -100 -g -Stuk -0 -NELEMAN -dem - - -TR - -6 -1017515 -28391 -10 -Actief -druiven* -0 -0 -2 -2 -0 -0 -0 -2 -2 -0 -2 -0 -2 -0 -2 -2 -2 -2 -1 -0 -2 -0 -2 -2 - - - -0 -0 -0 -0 -1 - -2 -0 - -adviesprijs -2022-08-18 -5.56 -7.95 - - - -8719325207668 -Appelsap (verpakt) -Nucli rose - -0 -0 -0 -4x250 -ml -Stuk -0.4 -Appelgaarde - - - -DE - -6 -1017515 -1829 -10 -Actief -druiven* -0 -0 -2 -2 -0 -0 -0 -2 -2 -0 -2 -0 -2 -0 -2 -2 -2 -2 -1 -0 -2 -0 -2 -2 - - - -0 -0 -0 -0 -1 - -2 -0 - -adviesprijs -2022-08-18 -3.21 -7.95 - - - -8719325207668 -Tomaten -Nucli rose - -0 -0 -0 -500 -g -Stuk -0 -De röde hof -bio - - -DE - -6 -1017515 -177813 -20 -Actief -druiven* -0 -0 -2 -2 -0 -0 -0 -2 -2 -0 -2 -0 -2 -0 -2 -2 -2 -2 -1 -0 -2 -0 -2 -2 - - - -0 -0 -0 -0 -1 - -2 -0 - -adviesprijs -2022-08-18 -1.2 -7.95 - - - \ No newline at end of file diff --git a/spec/fixtures/odin_file_02.xml b/spec/fixtures/odin_file_02.xml deleted file mode 100644 index c732b4d5..00000000 --- a/spec/fixtures/odin_file_02.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - -1039 -1.08 -Estafette Associatie C.V. -Geldermalsen - - -8719325207668 -Tomatoes -Nucli rose - -0 -0 -0 -500 -g -Stuk -0 -De röde hof -organic - - -Somewhere, UK - -6 -1017515 -1 -20 -Actief -druiven* -0 -0 -2 -2 -0 -0 -0 -2 -2 -0 -2 -0 -2 -0 -2 -2 -2 -2 -1 -0 -2 -0 -2 -2 - - - -0 -0 -0 -0 -1 - -2 -0 - -adviesprijs -2022-08-18 -1.2 -7.95 - - - \ No newline at end of file diff --git a/spec/fixtures/upload_test.csv b/spec/fixtures/upload_test.csv deleted file mode 100644 index ac2f59b0..00000000 --- a/spec/fixtures/upload_test.csv +++ /dev/null @@ -1,3 +0,0 @@ -avail.;Order number;Name;Note;Manufacturer;Origin;Unit;Price (net);VAT;Deposit;Unit quantity;"";"";Category -"";;AAAA;AAAA;;;500 g;25.55;6.0;0.0;1;"";"";AAAA -"";;BBBB;BBBB;;;250 g;12.11;6.0;0.0;2;"";"";BBBB diff --git a/spec/integration/articles_spec.rb b/spec/integration/articles_spec.rb index b6a3a243..bbd5e375 100644 --- a/spec/integration/articles_spec.rb +++ b/spec/integration/articles_spec.rb @@ -1,17 +1,14 @@ require_relative '../spec_helper' feature ArticlesController do - let(:user) { create(:user, groups: [create(:workgroup, role_article_meta: true)]) } - let(:supplier) { create(:supplier) } - let!(:article_category) { create(:article_category) } + let(:user) { create :user, groups: [create(:workgroup, role_article_meta: true)] } + let(:supplier) { create :supplier } + let!(:article_category) { create :article_category } before { login user } describe ':index', js: true do - before { - login user - visit supplier_articles_path(supplier_id: supplier.id) - } + before { visit supplier_articles_path(supplier_id: supplier.id) } it 'can visit supplier articles path' do expect(page).to have_content(supplier.name) @@ -21,7 +18,7 @@ feature ArticlesController do it 'can create a new article' do click_on I18n.t('articles.index.new') expect(page).to have_selector('form#new_article') - article = build(:article, supplier: supplier, article_category: article_category) + article = build :article, supplier: supplier, article_category: article_category within('#new_article') do fill_in 'article_name', :with => article.name fill_in 'article_unit', :with => article.unit @@ -52,7 +49,6 @@ feature ArticlesController do let(:file) { Rails.root.join(test_file) } it do - find("#articles_type option[value='foodsoft']").select_option find('input[type="submit"]').click expect(find("tr:nth-child(1) #new_articles__note").value).to eq "bio â—Ž" expect(find("tr:nth-child(2) #new_articles__name").value).to eq "Pijnboompitten" @@ -68,124 +64,56 @@ feature ArticlesController do end end - Dir.glob('spec/fixtures/bnn_file_01.*') do |test_file| - describe "can import articles from #{test_file}" do - let(:file) { Rails.root.join(test_file) } + describe "can update existing article" do + let!(:article) { create :article, supplier: supplier, name: 'Foobar', order_number: 1, unit: '250 g' } - it do - find("#articles_type option[value='bnn']").select_option - find('input[type="submit"]').click - expect(find("tr:nth-child(1) #new_articles__note").value).to eq "bio" - expect(find("tr:nth-child(1) #new_articles__name").value).to eq "Walnoten (ongeroosterd)" - # set article category - 4.times do |i| - all("tr:nth-child(#{i + 1}) select > option")[1].select_option - end - find('input[type="submit"]').click - - expect(page).to have_content("Pijnboompitten") - - expect(supplier.articles.count).to eq 4 - end + it do + find('input[type="submit"]').click + expect(find("#articles_#{article.id}_name").value).to eq 'Tomatoes' + find('input[type="submit"]').click + article.reload + expect(article.name).to eq 'Tomatoes' + expect([article.unit, article.unit_quantity, article.price]).to eq ['500 g', 20, 1.2] end end - end - describe "updates" do - file_paths = ['spec/fixtures/foodsoft_file_02.csv', 'spec/fixtures/bnn_file_02.bnn', 'spec/fixtures/odin_file_02.xml'] - let(:filename) { 'foodsoft_file_02.csv' } - let(:file) { Rails.root.join("spec/fixtures/#{filename}") } - let(:val) { 'foodsoft' } - let(:type) { %w[foodsoft bnn odin] } + describe "handles missing data" do + it do + find('input[type="submit"]').click # to overview + find('input[type="submit"]').click # missing category, re-show form + expect(find('tr.alert')).to be_present + expect(supplier.articles.count).to eq 0 - before do - visit upload_supplier_articles_path(supplier_id: supplier.id) - attach_file 'articles_file', file - find("#articles_type option[value='#{val}']").select_option + all("tr select > option")[1].select_option + find('input[type="submit"]').click # now it should succeed + expect(supplier.articles.count).to eq 1 + end end - file_paths.each_with_index do |test_file, index| - describe "updates article for #{test_file}" do - let(:article) { create(:article, supplier: supplier, name: 'Foobar', order_number: 1, unit: '250 g') } - let(:file) { Rails.root.join(test_file) } - let(:val) { type[index] } + describe "can remove an existing article" do + let!(:article) { create :article, supplier: supplier, name: 'Foobar', order_number: 99999 } - it do - article.reload - find('input[type="submit"]').click - expect(find("#articles_#{article.id}_name").value).to eq 'Tomatoes' - find('input[type="submit"]').click - article.reload - expect(article.name).to eq 'Tomatoes' - if type[index] == "odin" - expect([article.unit, article.unit_quantity, article.price]).to eq ['500gr', 20, 1.20] - else - expect([article.unit, article.unit_quantity, article.price]).to eq ['500 g', 20, 1.20] - end - end + it do + check('articles_outlist_absent') + find('input[type="submit"]').click + expect(find("#outlisted_articles_#{article.id}", visible: :all)).to be_present - it "handles missing data" do - find('input[type="submit"]').click # to overview - find('input[type="submit"]').click # missing category, re-show form - expect(find('tr.alert')).to be_present - expect(supplier.articles.count).to eq 0 - - all("tr select > option")[1].select_option - find('input[type="submit"]').click # now it should succeed - expect(supplier.articles.count).to eq 1 - end + all("tr select > option")[1].select_option + find('input[type="submit"]').click + expect(article.reload.deleted?).to be true end + end - describe "takes over category from file" do - it do - find(:css, '#articles_update_category[value="1"]').set(true) # check take over category from file - expect(ArticleCategory.count).to eq 1 # new Category vegetables should be created from file - find('input[type="submit"]').click # upload file - find('input[type="submit"]').click # submit changes - expect(ArticleCategory.count).to eq 2 # it is - expect(supplier.articles.count).to eq 1 - expect(supplier.articles.first.article_category.name).to eq "Vegetables" - end - end + describe "can convert units when updating" do + let!(:article) { create :article, supplier: supplier, order_number: 1, unit: '250 g' } - describe "overwrites article_category from file" do - let!(:article_category) { create(:article_category, name: "Fruit") } - let(:article) { create(:article, supplier: supplier, name: 'Tomatoes', order_number: 1, unit: '250 g', article_category: article_category) } - - it do - find(:css, '#articles_update_category[value="1"]').set(true) # check take over category from file - find('input[type="submit"]').click #upload file - find('input[type="submit"]').click #submit changes - expect(supplier.articles.count).to eq 1 - expect(supplier.articles.first.article_category.name).to eq "Vegetables" - end - end - - describe "can remove an existing article" do - let!(:article) { create(:article, supplier: supplier, name: 'Foobar', order_number: 99999) } - - it do - check('articles_outlist_absent') - find('input[type="submit"]').click - expect(find("#outlisted_articles_#{article.id}", visible: :all)).to be_present - - all("tr select > option")[1].select_option - find('input[type="submit"]').click - expect(article.reload.deleted?).to be true - end - end - - describe "can convert units when updating" do - let!(:article) { create(:article, supplier: supplier, order_number: 1, unit: '250 g') } - - it do - check('articles_convert_units') - find('input[type="submit"]').click - expect(find("#articles_#{article.id}_name").value).to eq 'Tomatoes' - find('input[type="submit"]').click - article.reload - expect([article.unit, article.unit_quantity, article.price]).to eq ['250 g', 40, 0.6] - end + it do + check('articles_convert_units') + find('input[type="submit"]').click + expect(find("#articles_#{article.id}_name").value).to eq 'Tomatoes' + find('input[type="submit"]').click + article.reload + expect([article.unit, article.unit_quantity, article.price]).to eq ['250 g', 40, 0.6] end end end diff --git a/spec/lib/quantity_unit_spec.rb b/spec/lib/quantity_unit_spec.rb deleted file mode 100644 index bbe3d546..00000000 --- a/spec/lib/quantity_unit_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -require_relative '../spec_helper' - -describe QuantityUnit do - it "parses a string correctly" do - qu = QuantityUnit.parse("1.5 k g"); expect([qu.quantity, qu.unit]).to eq([1.5, "kg"]) - qu = QuantityUnit.parse(" 1,5 kg"); expect([qu.quantity, qu.unit]).to eq([1.5, "kg"]) - qu = QuantityUnit.parse("1500 g"); expect([qu.quantity, qu.unit]).to eq([1500, "g"]) - qu = QuantityUnit.parse("1.5L "); expect([qu.quantity, qu.unit]).to eq([1.5, "l"]) - qu = QuantityUnit.parse("2400mL"); expect([qu.quantity, qu.unit]).to eq([2400, "ml"]) - end - - it "scales prices correctly" do - qu = QuantityUnit.new(1.5, "kg") - expect(qu.scale_price_to_base_unit(12.34)).to eq([8.23, "kg"]) - qu = QuantityUnit.new(1500, "g") - expect(qu.scale_price_to_base_unit(12.34)).to eq([8.23, "kg"]) - qu = QuantityUnit.new(1.5, "l") - expect(qu.scale_price_to_base_unit(12.34)).to eq([8.23, "L"]) - qu = QuantityUnit.new(2400, "ml") - expect(qu.scale_price_to_base_unit(12.34)).to eq([5.14, "L"]) - end -end \ No newline at end of file diff --git a/spec/models/supplier_spec.rb b/spec/models/supplier_spec.rb index 42b4a304..70ba6def 100644 --- a/spec/models/supplier_spec.rb +++ b/spec/models/supplier_spec.rb @@ -11,7 +11,7 @@ describe Supplier do options = { filename: 'foodsoft_file_01.csv' } options[:outlist_absent] = true options[:convert_units] = true - updated_article_pairs, outlisted_articles, new_articles = supplier.sync_from_file(Rails.root.join('spec/fixtures/foodsoft_file_01.csv'), "foodsoft", options) + updated_article_pairs, outlisted_articles, new_articles = supplier.sync_from_file(Rails.root.join('spec/fixtures/foodsoft_file_01.csv'), options) expect(new_articles.length).to be > 0 expect(updated_article_pairs.first[1][:name]).to eq 'Tomaten' expect(outlisted_articles.first).to eq article2 @@ -19,13 +19,9 @@ describe Supplier do end it 'return correct tolerance' do - supplier = create :supplier - articles = create_list(:article, 1, unit_quantity: 1, supplier_id: supplier.id) - supplier.reload + supplier = create :supplier, articles: create_list(:article, 1, unit_quantity: 1) expect(supplier.has_tolerance?).to be false - supplier2 = create :supplier - articles = create_list(:article, 1, unit_quantity: 2, supplier_id: supplier2.id) - supplier.reload + supplier2 = create :supplier, articles: create_list(:article, 1, unit_quantity: 2) expect(supplier2.has_tolerance?).to be true end diff --git a/spec/requests/api/article_categories_spec.rb b/spec/requests/api/article_categories_spec.rb deleted file mode 100644 index 4c079ff2..00000000 --- a/spec/requests/api/article_categories_spec.rb +++ /dev/null @@ -1,53 +0,0 @@ -require 'swagger_helper' - -describe 'Article Categories', type: :request do - include ApiHelper - - path '/article_categories' do - get 'article categories' do - tags 'Category' - produces 'application/json' - pagination_param - let(:order_article) { create(:order, article_count: 1).order_articles.first } - let(:stock_article) { create(:stock_article) } - let(:stock_order_article) { create(:stock_order, article_ids: [stock_article.id]).order_articles.first } - - response '200', 'success' do - schema type: :object, properties: { - article_categories: { - type: :array, - items: { - '$ref': '#/components/schemas/ArticleCategory' - } - } - } - run_test! - end - - it_handles_invalid_token - end - end - - path '/article_categories/{id}' do - get 'find article category by id' do - tags 'Category' - produces 'application/json' - id_url_param - - response '200', 'article category found' do - schema type: :object, properties: { - article_categories: { - type: :array, - items: { - '$ref': '#/components/schemas/ArticleCategory' - } - } - } - let(:id) { create(:article_category, name: 'dairy').id } - run_test! - end - it_handles_invalid_token_with_id - it_cannot_find_object - end - end -end diff --git a/spec/requests/api/configs_spec.rb b/spec/requests/api/configs_spec.rb deleted file mode 100644 index 75f48ceb..00000000 --- a/spec/requests/api/configs_spec.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'swagger_helper' - -describe 'Config', type: :request do - include ApiHelper - - path '/config' do - get 'configuration variables' do - tags 'General' - produces 'application/json' - let(:api_scopes) { ['config:user'] } - - response '200', 'success' do - schema type: :object, properties: {} - run_test! - end - - it_handles_invalid_token_and_scope - end - end -end diff --git a/spec/requests/api/financial_transaction_classes_spec.rb b/spec/requests/api/financial_transaction_classes_spec.rb deleted file mode 100644 index 1eaf046f..00000000 --- a/spec/requests/api/financial_transaction_classes_spec.rb +++ /dev/null @@ -1,54 +0,0 @@ -require 'swagger_helper' - -describe 'Financial Transaction Classes', type: :request do - include ApiHelper - - path '/financial_transaction_classes' do - get 'financial transaction classes' do - tags 'Category' - produces 'application/json' - pagination_param - let(:financial_transaction_class) { create(:financial_transaction_class) } - - response '200', 'success' do - schema type: :object, properties: { - meta: { '$ref' => '#/components/schemas/Meta' }, - financial_transaction_class: { - type: :array, - items: { - '$ref': '#/components/schemas/FinancialTransactionClass' - } - } - } - - run_test! - end - - it_handles_invalid_token - end - end - - path '/financial_transaction_classes/{id}' do - get 'Retrieves a financial transaction class' do - tags 'Category' - produces 'application/json' - id_url_param - - response '200', 'financial transaction class found' do - schema type: :object, properties: { - financial_transaction_classes: { - type: :array, - items: { - '$ref': '#/components/schemas/FinancialTransactionClass' - } - } - } - let(:id) { create(:financial_transaction_class).id } - run_test! - end - - it_handles_invalid_token_with_id - it_cannot_find_object 'financial transaction class not found' - end - end -end diff --git a/spec/requests/api/financial_transaction_types_spec.rb b/spec/requests/api/financial_transaction_types_spec.rb deleted file mode 100644 index 82a30f83..00000000 --- a/spec/requests/api/financial_transaction_types_spec.rb +++ /dev/null @@ -1,52 +0,0 @@ -require 'swagger_helper' - -describe 'Financial Transaction types', type: :request do - include ApiHelper - - path '/financial_transaction_types' do - get 'financial transaction types' do - tags 'Category' - produces 'application/json' - pagination_param - let(:financial_transaction_type) { create(:financial_transaction_type) } - response '200', 'success' do - schema type: :object, properties: { - meta: { '$ref' => '#/components/schemas/Meta' }, - financial_transaction_type: { - type: :array, - items: { - '$ref': '#/components/schemas/FinancialTransactionType' - } - } - } - run_test! - end - - it_handles_invalid_token - end - end - - path '/financial_transaction_types/{id}' do - get 'find financial transaction type by id' do - tags 'Category' - produces 'application/json' - id_url_param - - response '200', 'financial transaction type found' do - schema type: :object, properties: { - financial_transaction_types: { - type: :array, - items: { - '$ref': '#/components/schemas/FinancialTransactionType' - } - } - } - let(:id) { create(:financial_transaction_type).id } - run_test! - end - - it_handles_invalid_token_with_id - it_cannot_find_object 'financial transaction type not found' - end - end -end diff --git a/spec/requests/api/financial_transactions_spec.rb b/spec/requests/api/financial_transactions_spec.rb deleted file mode 100644 index 1d3ef2b9..00000000 --- a/spec/requests/api/financial_transactions_spec.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'swagger_helper' - -describe 'Financial Transaction', type: :request do - include ApiHelper - let!(:finance_user) { create(:user, groups: [create(:workgroup, role_finance: true)]) } - let!(:api_scopes) { ['finance:read', 'finance:write'] } - let(:api_access_token) { create(:oauth2_access_token, resource_owner_id: finance_user.id, scopes: api_scopes&.join(' ')).token } - let(:financial_transaction) { create(:financial_transaction, user: user) } - - path '/financial_transactions' do - get 'financial transactions' do - tags 'Financial Transaction' - produces 'application/json' - pagination_param - - response '200', 'success' do - schema type: :object, properties: { - meta: { '$ref' => '#/components/schemas/Meta' }, - financial_transaction: { - type: :array, - items: { - '$ref': '#/components/schemas/FinancialTransaction' - } - } - } - - run_test! - end - it_handles_invalid_token_and_scope - end - end - - path '/financial_transactions/{id}' do - get 'Retrieves a financial transaction ' do - tags 'Financial Transaction' - produces 'application/json' - id_url_param - - response '200', 'financial transaction found' do - schema type: :object, properties: { - financial_transaction: { - type: :array, - items: { - '$ref': '#/components/schemas/FinancialTransaction' - } - } - } - let(:id) { FinancialTransaction.create(user: user).id } - run_test! - end - it_handles_invalid_token_with_id - it_handles_invalid_scope_with_id - it_cannot_find_object 'financial transaction not found' - end - end -end diff --git a/spec/requests/api/navigations_spec.rb b/spec/requests/api/navigations_spec.rb deleted file mode 100644 index c2312437..00000000 --- a/spec/requests/api/navigations_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -require 'swagger_helper' - -describe 'Navigation', type: :request do - include ApiHelper - - path '/navigation' do - get 'navigation' do - tags 'General' - produces 'application/json' - - response '200', 'success' do - schema type: :object, properties: { - navigation: { - '$ref' => '#/components/schemas/Navigation' - } - } - - run_test! - end - - it_handles_invalid_token - end - end -end diff --git a/spec/requests/api/order_articles_spec.rb b/spec/requests/api/order_articles_spec.rb deleted file mode 100644 index 17feefa6..00000000 --- a/spec/requests/api/order_articles_spec.rb +++ /dev/null @@ -1,115 +0,0 @@ -require 'swagger_helper' - -describe 'Order Articles', type: :request do - include ApiHelper - - path '/order_articles' do - get 'order articles' do - tags 'Order' - produces 'application/json' - pagination_param - q_ordered_url_param - - let(:api_scopes) { ['orders:read', 'orders:write'] } - let(:order) { create(:order, article_count: 4) } - let(:order_articles) { order.order_articles } - - before do - order_articles[0].update! quantity: 0, tolerance: 0, units_to_order: 0 - order_articles[1].update! quantity: 1, tolerance: 0, units_to_order: 0 - order_articles[2].update! quantity: 0, tolerance: 1, units_to_order: 0 - order_articles[3].update! quantity: 0, tolerance: 0, units_to_order: 1 - end - - response '200', 'success' do - schema type: :object, properties: { - meta: { '$ref' => '#/components/schemas/Meta' }, - order_articles: { - type: :array, - items: { - '$ref': '#/components/schemas/OrderArticle' - } - } - } - describe '(unset)' do - run_test! - end - - describe 'all' do - let(:q) { { q: { ordered: 'all' } } } - - run_test! do |response| - json_order_articles = JSON.parse(response.body)['order_articles'] - json_order_article_ids = json_order_articles.map { |d| d['id'].to_i } - expect(json_order_article_ids).to match_array order_articles[1..2].map(&:id) - end - end - - describe 'when ordered by supplier' do - let(:q) { { q: { ordered: 'supplier' } } } - - run_test! do |response| - json_order_articles = JSON.parse(response.body)['order_articles'] - json_order_article_ids = json_order_articles.map { |d| d['id'].to_i } - expect(json_order_article_ids).to match_array [order_articles[3].id] - end - end - - describe 'when ordered by member' do - let(:q) { { q: { ordered: 'member' } } } - - run_test! do |response| - json_order_articles = JSON.parse(response.body)['order_articles'] - expect(json_order_articles.count).to eq 0 - end - end - - context 'when ordered by user' do - let(:user) { create(:user, :ordergroup) } - let(:go) { create(:group_order, order: order, ordergroup: user.ordergroup) } - - before do - create(:group_order_article, group_order: go, order_article: order_articles[1], quantity: 1) - create(:group_order_article, group_order: go, order_article: order_articles[2], tolerance: 0) - end - - describe 'member' do - let(:q) { { q: { ordered: 'member' } } } - - run_test! do |response| - json_order_articles = JSON.parse(response.body)['order_articles'] - json_order_article_ids = json_order_articles.map { |d| d['id'].to_i } - expect(json_order_article_ids).to match_array order_articles[1..2].map(&:id) - end - end - end - end - - it_handles_invalid_token_and_scope - end - end - - path '/order_articles/{id}' do - get 'order articles' do - tags 'Order' - produces 'application/json' - id_url_param - let(:api_scopes) { ['orders:read', 'orders:write'] } - - response '200', 'success' do - schema type: :object, properties: { - order_article: { - '$ref': '#/components/schemas/OrderArticle' - } - } - let(:order) { create(:order, article_count: 1) } - let(:id) { order.order_articles.first.id } - - run_test! - end - - it_handles_invalid_token_and_scope - it_cannot_find_object 'order article not found' - end - end -end diff --git a/spec/requests/api/orders_spec.rb b/spec/requests/api/orders_spec.rb deleted file mode 100644 index c0505d7f..00000000 --- a/spec/requests/api/orders_spec.rb +++ /dev/null @@ -1,55 +0,0 @@ -require 'swagger_helper' - -describe 'Orders', type: :request do - include ApiHelper - let(:api_scopes) { ['orders:read'] } - - path '/orders' do - get 'orders' do - tags 'Order' - produces 'application/json' - pagination_param - let(:order) { create(:order) } - - response '200', 'success' do - schema type: :object, properties: { - meta: { '$ref' => '#/components/schemas/Meta' }, - ordes: { - type: :array, - items: { - '$ref': '#/components/schemas/Order' - } - } - } - - run_test! - end - - it_handles_invalid_token_and_scope - end - end - - path '/orders/{id}' do - get 'Order' do - tags 'Order' - produces 'application/json' - id_url_param - - let(:order) { create(:order) } - - response '200', 'success' do - schema type: :object, properties: { - order: { '$ref' => '#/components/schemas/Order' } - } - let(:id) { order.id } - - run_test! do |response| - expect(JSON.parse(response.body)['order']['id']).to eq order.id - end - end - - it_handles_invalid_token_and_scope - it_cannot_find_object 'order not found' - end - end -end diff --git a/spec/requests/api/user/financial_transactions_spec.rb b/spec/requests/api/user/financial_transactions_spec.rb deleted file mode 100644 index 4fb69cd6..00000000 --- a/spec/requests/api/user/financial_transactions_spec.rb +++ /dev/null @@ -1,109 +0,0 @@ -require 'swagger_helper' - -describe 'User', type: :request do - include ApiHelper - - let(:api_scopes) { ['finance:user'] } - let(:user) { create :user, groups: [create(:ordergroup)] } - let(:other_user2) { create :user } - let(:ft) { create(:financial_transaction, user: user, ordergroup: user.ordergroup) } - - before do - ft - end - - path '/user/financial_transactions' do - post 'create new financial transaction (requires enabled self service)' do - tags 'Financial Transaction' - consumes 'application/json' - produces 'application/json' - - parameter name: :financial_transaction, in: :body, schema: { - type: :object, - properties: { - amount: { type: :integer }, - financial_transaction_type: { type: :integer }, - note: { type: :string } - } - } - - let(:financial_transaction) { { amount: 3, financial_transaction_type_id: create(:financial_transaction_type).id, note: 'lirum larum' } } - - response '200', 'success' do - schema type: :object, properties: { - financial_transaction: { '$ref': '#/components/schemas/FinancialTransaction' } - } - run_test! - end - - it_handles_invalid_token_with_id - it_handles_invalid_scope_with_id 'user has no ordergroup, is below minimum balance, self service is disabled, or missing scope' - - response '404', 'financial transaction type not found' do - schema '$ref' => '#/components/schemas/Error404' - let(:financial_transaction) { { amount: 3, financial_transaction_type_id: 'invalid', note: 'lirum larum' } } - run_test! - end - - # TODO: fix controller to actually send a 422 for invalid params? - # Expected response code '200' to match '422' - # Response body: {"financial_transaction":{"id":316,"user_id":599,"user_name":"Lisbeth ","amount":-3.0,"note":"-2","created_at":"2022-12-12T13:05:32.000+01:00","financial_transaction_type_id":346,"financial_transaction_type_name":"aut est iste #9"}} - # - # response '422', 'invalid parameter value' do - # # schema '$ref' => '#/components/schemas/Error422' - # let(:financial_transaction) { { amount: -3, financial_transaction_type_id: create(:financial_transaction_type).id, note: -2 } } - # run_test! - # end - end - - get "financial transactions of the member's ordergroup" do - tags 'User', 'Financial Transaction' - produces 'application/json' - pagination_param - - response '200', 'success' do - schema type: :object, properties: { - meta: { '$ref': '#/components/schemas/Meta' }, - financial_transaction: { - type: :array, - items: { - '$ref': '#/components/schemas/FinancialTransaction' - } - } - } - - run_test! do |response| - data = JSON.parse(response.body) - expect(data['financial_transactions'].first['id']).to eq(ft.id) - end - end - - it_handles_invalid_token_and_scope - end - end - - path '/user/financial_transactions/{id}' do - get 'find financial transaction by id' do - tags 'User', 'Financial Transaction' - produces 'application/json' - id_url_param - - response '200', 'success' do - schema type: :object, properties: { - financial_transaction: { - '$ref': '#/components/schemas/FinancialTransaction' - } - } - let(:id) { ft.id } - run_test! do |response| - data = JSON.parse(response.body) - expect(data['financial_transaction']['id']).to eq(ft.id) - end - end - - it_handles_invalid_token_with_id - it_handles_invalid_scope_with_id 'user has no ordergroup or missing scope' - it_cannot_find_object 'financial transaction not found' - end - end -end diff --git a/spec/requests/api/user/group_order_articles_spec.rb b/spec/requests/api/user/group_order_articles_spec.rb deleted file mode 100644 index 205a4070..00000000 --- a/spec/requests/api/user/group_order_articles_spec.rb +++ /dev/null @@ -1,192 +0,0 @@ -require 'swagger_helper' - -describe 'User', type: :request do - include ApiHelper - - let(:api_scopes) { ['group_orders:user'] } - let(:user) { create :user, groups: [create(:ordergroup)] } - let(:other_user2) { create :user } - let(:order) { create(:order, article_count: 4) } - let(:order_articles) { order.order_articles } - let(:group_order) { create :group_order, ordergroup: user.ordergroup, order_id: order.id } - let(:goa) { create :group_order_article, group_order: group_order, order_article: order_articles.first } - - before do - goa - end - - path '/user/group_order_articles' do - get 'group order articles' do - tags 'User', 'Order' - produces 'application/json' - pagination_param - q_ordered_url_param - - response '200', 'success' do - schema type: :object, properties: { - meta: { '$ref': '#/components/schemas/Meta' }, - group_order_article: { - type: :array, - items: { - '$ref': '#/components/schemas/GroupOrderArticle' - } - } - } - - run_test! do |response| - data = JSON.parse(response.body) - expect(data['group_order_articles'].first['id']).to eq(goa.id) - end - end - - it_handles_invalid_token - it_handles_invalid_scope 'user has no ordergroup or missing scope' - end - - post 'create new group order article' do - tags 'User', 'Order' - consumes 'application/json' - produces 'application/json' - parameter name: :group_order_article, in: :body, - description: 'group order article to create', - required: true, - schema: { '$ref': '#/components/schemas/GroupOrderArticleForCreate' } - - let(:group_order_article) { { order_article_id: order_articles.last.id, quantity: 1, tolerance: 2 } } - response '200', 'success' do - schema type: :object, properties: { - group_order_article: { - '$ref': '#/components/schemas/GroupOrderArticle' - }, - order_article: { - '$ref': '#/components/schemas/OrderArticle' - } - } - run_test! - end - - it_handles_invalid_token_with_id - it_handles_invalid_scope_with_id 'user has no ordergroup, order not open, is below minimum balance, has not enough apple points, or missing scope' - - response '404', 'order article not found in open orders' do - let(:group_order_article) { { order_article_id: 'invalid', quantity: 1, tolerance: 2 } } - schema '$ref' => '#/components/schemas/Error404' - run_test! - end - - response '422', 'invalid parameter value or group order article already exists' do - let(:group_order_article) { { order_article_id: goa.order_article_id, quantity: 1, tolerance: 2 } } - schema '$ref' => '#/components/schemas/Error422' - run_test! - end - end - end - - path '/user/group_order_articles/{id}' do - get 'find group order article by id' do - tags 'User', 'Order' - produces 'application/json' - id_url_param - - response '200', 'success' do - schema type: :object, properties: { - group_order_article: { - '$ref': '#/components/schemas/GroupOrderArticle' - }, - order_article: { - '$ref': '#/components/schemas/OrderArticle' - } - } - - let(:id) { goa.id } - run_test! do |response| - data = JSON.parse(response.body) - expect(data['group_order_article']['id']).to eq(goa.id) - end - end - - it_handles_invalid_scope_with_id - it_handles_invalid_token_with_id - it_cannot_find_object 'group order article not found' - end - - patch 'update a group order article (but delete if quantity and tolerance are zero)' do - tags 'User', 'Order' - consumes 'application/json' - produces 'application/json' - id_url_param - parameter name: :group_order_article, in: :body, - description: 'group order article update', - required: true, - schema: { '$ref': '#/components/schemas/GroupOrderArticleForUpdate' } - - let(:id) { goa.id } - let(:group_order_article) { { order_article_id: goa.order_article_id, quantity: 2, tolerance: 2 } } - - response '200', 'success' do - schema type: :object, properties: { - group_order_article: { - '$ref': '#/components/schemas/GroupOrderArticle' - } - } - run_test! - end - - response 401, 'not logged-in' do - schema '$ref' => '#/components/schemas/Error401' - let(:Authorization) { 'abc' } - run_test! - end - - response 403, 'user has no ordergroup, order not open, is below minimum balance, has not enough apple points, or missing scope' do - let(:api_scopes) { ['none'] } - schema '$ref' => '#/components/schemas/Error403' - run_test! - end - - response '404', 'order article not found in open orders' do - schema type: :object, properties: { - group_order_article: { - '$ref': '#/components/schemas/GroupOrderArticle' - } - } - let(:id) { 'invalid' } - run_test! - end - - response '422', 'invalid parameter value' do - let(:group_order_article) { { order_article_id: 'invalid', quantity: -5, tolerance: 'invalid' } } - schema '$ref' => '#/components/schemas/Error422' - run_test! - end - end - - delete 'remove group order article' do - tags 'User', 'Order' - consumes 'application/json' - produces 'application/json' - id_url_param - let(:api_scopes) { ['group_orders:user'] } - - response '200', 'success' do - schema type: :object, properties: { - group_order_article: { - '$ref': '#/components/schemas/GroupOrderArticle' - } - } - let(:id) { goa.id } - run_test! - end - - it_handles_invalid_token_with_id - - response 403, 'user has no ordergroup, order not open, is below minimum balance, has not enough apple points, or missing scope' do - let(:api_scopes) { ['none'] } - schema '$ref' => '#/components/schemas/Error403' - run_test! - end - - it_cannot_find_object 'order article not found in open orders' - end - end -end diff --git a/spec/requests/api/user/users_spec.rb b/spec/requests/api/user/users_spec.rb deleted file mode 100644 index 0d3196bc..00000000 --- a/spec/requests/api/user/users_spec.rb +++ /dev/null @@ -1,103 +0,0 @@ -require 'swagger_helper' - -describe 'User', type: :request do - include ApiHelper - - path '/user' do - get 'info about the currently logged-in user' do - tags 'User' - produces 'application/json' - let(:api_scopes) { ['user:read'] } - let(:other_user1) { create :user } - let(:user) { create :user } - let(:other_user2) { create :user } - - response '200', 'success' do - schema type: :object, - properties: { - user: { - type: :object, - properties: { - id: { - type: :integer - }, - name: { - type: :string, - description: 'full name' - }, - email: { - type: :string, - description: 'email address' - }, - locale: { - type: :string, - description: 'language code' - } - }, - required: %w[id name email] - } - } - - run_test! do |response| - data = JSON.parse(response.body) - expect(data['user']['id']).to eq(user.id) - end - end - - it_handles_invalid_token_and_scope - end - end - - path '/user/financial_overview' do - get 'financial summary about the currently logged-in user' do - tags 'User', 'Financial Transaction' - produces 'application/json' - let(:user) { create :user, :ordergroup } - let(:api_scopes) { ['finance:user'] } - FinancialTransactionClass.create(name: 'TestTransaction') - - response 200, 'success' do - schema type: :object, - properties: { - financial_overview: { - type: :object, - properties: { - - account_balance: { - type: :number, - description: 'booked accout balance of ordergroup' - }, - available_funds: { - type: :number, - description: 'fund available to order articles' - }, - financial_transaction_class_sums: { - type: :array, - properties: { - id: { - type: :integer, - description: 'id of the financial transaction class' - }, - name: { - type: :string, - description: 'name of the financial transaction class' - }, - amount: { - type: :number, - description: 'sum of the amounts belonging to the financial transaction class' - } - }, - required: %w[id name amount] - } - }, - required: %w[account_balance available_funds financial_transaction_class_sums] - } - } - - run_test! - end - - it_handles_invalid_token_and_scope - end - end -end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 41894406..8b1c6ace 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -21,10 +21,6 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f } RSpec.configure do |config| # We use capybara with webkit, and need database_cleaner - config.before(:suite) do - DatabaseCleaner.clean_with(:truncation) - end - config.before(:each) do DatabaseCleaner.strategy = (RSpec.current_example.metadata[:js] ? :truncation : :transaction) DatabaseCleaner.start diff --git a/spec/support/api_helper.rb b/spec/support/api_helper.rb index 86e2ca07..ee0225f5 100644 --- a/spec/support/api_helper.rb +++ b/spec/support/api_helper.rb @@ -5,60 +5,21 @@ module ApiHelper let(:user) { create(:user) } let(:api_scopes) { [] } # empty scopes for stricter testing (in reality this would be default_scopes) let(:api_access_token) { create(:oauth2_access_token, resource_owner_id: user.id, scopes: api_scopes&.join(' ')).token } - let(:Authorization) { "Bearer #{api_access_token}" } + let(:api_authorization) { "Bearer #{api_access_token}" } - def self.it_handles_invalid_token + def self.it_handles_invalid_token(method, path, params_block = -> { api_auth }) context 'with invalid access token' do - let(:Authorization) { 'abc' } + let(:api_access_token) { 'abc' } - response 401, 'not logged-in' do - schema '$ref' => '#/components/schemas/Error401' - run_test! - end + it { is_expected.to validate(method, path, 401, instance_exec(¶ms_block)) } end end - def self.it_handles_invalid_token_with_id - context 'with invalid access token' do - let(:Authorization) { 'abc' } - let(:id) { 42 } # id doesn't matter here - - response 401, 'not logged-in' do - schema '$ref' => '#/components/schemas/Error401' - run_test! - end - end - end - - def self.it_handles_invalid_scope(description = 'missing scope') + def self.it_handles_invalid_scope(method, path, params_block = -> { api_auth }) context 'with invalid scope' do let(:api_scopes) { ['none'] } - response 403, description do - schema '$ref' => '#/components/schemas/Error403' - run_test! - end - end - end - - def self.it_handles_invalid_scope_with_id(description = 'missing scope') - context 'with invalid scope' do - let(:api_scopes) { ['none'] } - let(:id) { 42 } # id doesn't matter here - - response 403, description do - schema '$ref' => '#/components/schemas/Error403' - run_test! - end - end - end - - def self.it_cannot_find_object(description = 'not found') - let(:id) { 'invalid' } - - response 404, description do - schema '$ref' => '#/components/schemas/Error404' - run_test! + it { is_expected.to validate(method, path, 403, instance_exec(¶ms_block)) } end end @@ -66,25 +27,13 @@ module ApiHelper it_handles_invalid_token(*args) it_handles_invalid_scope(*args) end + end - def self.id_url_param - parameter name: :id, in: :path, type: :integer, required: true - end - - def self.pagination_param - parameter name: :per_page, in: :query, type: :integer, required: false - parameter name: :page, in: :query, type: :integer, required: false - end - - def self.q_ordered_url_param - parameter name: :q, in: :query, required: false, - description: "'member' show articles ordered by the user's ordergroup, 'all' by all members, and 'supplier' ordered at the supplier", - schema: { - type: :object, - properties: { - ordered: { '$ref' => '#/components/schemas/q_ordered' } - } - } - end + # Add authentication to parameters for {Swagger::RspecHelpers#validate} + # @param params [Hash] Query parameters + # @return Query parameters with authentication header + # @see Swagger::RspecHelpers#validate + def api_auth(params = {}) + { '_headers' => { 'Authorization' => api_authorization } }.deep_merge(params) end end diff --git a/spec/support/spec_test_helper.rb b/spec/support/spec_test_helper.rb index 58a1c0ef..f3737c15 100644 --- a/spec/support/spec_test_helper.rb +++ b/spec/support/spec_test_helper.rb @@ -2,7 +2,7 @@ module SpecTestHelper def login(user) - user = User.where(:nick => user.nick).first if user.is_a?(Symbol) + user = User.find_by_nick(user.nick) session[:user_id] = user.id session[:scope] = FoodsoftConfig[:default_scope] # Save scope in session to not allow switching between foodcoops with one account session[:locale] = user.locale @@ -16,13 +16,8 @@ module SpecTestHelper params['foodcoop'] = FoodsoftConfig[:default_scope] get action, params: params, xhr: xhr, format: format end - - def post_with_defaults(action, params: {}, xhr: false, format: nil) - params['foodcoop'] = FoodsoftConfig[:default_scope] - post action, params: params, xhr: xhr, format: format - end end RSpec.configure do |config| - config.include SpecTestHelper, :type => :controller + config.include SpecTestHelper, type: :controller end diff --git a/spec/swagger_helper.rb b/spec/swagger_helper.rb deleted file mode 100644 index 912504b8..00000000 --- a/spec/swagger_helper.rb +++ /dev/null @@ -1,513 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.configure do |config| - # Specify a root folder where Swagger JSON files are generated - # NOTE: If you're using the rswag-api to serve API descriptions, you'll need - # to ensure that it's configured to serve Swagger from the same folder - config.swagger_root = Rails.root.join('swagger').to_s - - # Define one or more Swagger documents and provide global metadata for each one - # When you run the 'rswag:specs:swaggerize' rake task, the complete Swagger will - # be generated at the provided relative path under swagger_root - # By default, the operations defined in spec files are added to the first - # document below. You can override this behavior by adding a swagger_doc tag to the - # the root example_group in your specs, e.g. describe '...', swagger_doc: 'v2/swagger.json' - config.swagger_docs = { - 'v1/swagger.yaml' => { - openapi: '3.0.3', - info: { - title: 'API V1', - version: 'v1' - }, - paths: {}, - components: { - schemas: { - pagination: { - type: :object, - properties: { - recordCount: { type: :integer }, - pageCount: { type: :integer }, - currentPage: { type: :integer }, - pageSize: { type: :integer } - }, - required: %w(recordCount pageCount currentPage pageSize) - }, - Order: { - type: :object, - properties: { - id: { - type: :integer - }, - name: { - type: :string, - description: "name of the order's supplier (or stock)" - }, - starts: { - type: :string, - format: 'date-time', - description: 'when the order was opened' - }, - ends: { - type: :string, - nullable: true, - format: 'date-time', - description: 'when the order will close or was closed' - }, - boxfill: { - type: :string, - nullable: true, - format: 'date-time', - description: 'when the order will enter or entered the boxfill phase' - }, - pickup: { - type: :string, - nullable: true, - format: :date, - description: 'pickup date' - }, - is_open: { - type: :boolean, - description: 'if the order is currently open or not' - }, - is_boxfill: { - type: :boolean, - description: 'if the order is currently in the boxfill phase or not' - } - } - }, - Article: { - type: :object, - properties: { - id: { - type: :integer - }, - name: { - type: :string - }, - supplier_id: { - type: :integer, - description: 'id of supplier, or 0 for stock articles' - }, - supplier_name: { - type: :string, - nullable: true, - description: 'name of the supplier, or null for stock articles' - }, - unit: { - type: :string, - description: 'amount of each unit, e.g. "100 g" or "kg"' - }, - unit_quantity: { - type: :integer, - description: 'units can only be ordered from the supplier in multiples of unit_quantity' - }, - note: { - type: :string, - nullable: true, - description: 'generic note' - }, - manufacturer: { - type: :string, - nullable: true, - description: 'manufacturer' - }, - origin: { - type: :string, - nullable: true, - description: 'origin, preferably (starting with a) 2-letter ISO country code' - }, - article_category_id: { - type: :integer, - description: 'id of article category' - }, - quantity_available: { - type: :integer, - description: 'number of units available (only present on stock articles)' - } - }, - required: %w[id name supplier_id supplier_name unit unit_quantity note manufacturer origin article_category_id] - }, - OrderArticle: { - type: :object, - properties: { - id: { - type: :integer - }, - order_id: { - type: :integer, - description: 'id of order this order article belongs to' - }, - price: { - type: :number, - format: :float, - description: 'foodcoop price' - }, - quantity: { - type: :integer, - description: 'number of units ordered by members' - }, - tolerance: { - type: :integer, - description: 'number of extra units that members are willing to buy to fill a box' - }, - units_to_order: { - type: :integer, - description: 'number of units to order from the supplier' - }, - article: { - '$ref': '#/components/schemas/Article' - } - } - }, - ArticleCategory: { - type: :object, - properties: { - id: { - type: :integer - }, - name: { - type: :string - } - }, - required: %w[id name] - }, - FinancialTransaction: { - allOf: [ - { '$ref': '#/components/schemas/FinancialTransactionForCreate' }, - { - type: :object, - properties: { - id: { - type: :integer - }, - amount: { - type: :number, - format: :float, - description: 'amount credited (negative for a debit transaction)' - }, - financial_transaction_type_id: { - type: :integer, - description: 'id of the type of the transaction' - }, - note: { - type: :string, - description: 'note entered with the transaction' - }, - user_id: { - type: :integer, - nullable: true, - description: 'id of user who entered the transaction (may be null for deleted users or 0 for a system user)' - }, - user_name: { - type: :string, - nullable: true, - description: 'name of user who entered the transaction (may be null or empty string for deleted users or system users)' - }, - financial_transaction_type_name: { - type: :string, - description: 'name of the type of the transaction' - }, - created_at: { - type: :string, - format: 'date-time', - description: 'when the transaction was entered' - } - }, - required: %w[id user_id user_name financial_transaction_type_name created_at] - } - ] - }, - FinancialTransactionForCreate: { - type: :object, - properties: { - amount: { - type: :number, - format: :float, - description: 'amount credited (negative for a debit transaction)' - }, - financial_transaction_type_id: - { - type: :integer, - description: 'id of the type of the transaction' - }, - note: { - type: :string, - description: 'note entered with the transaction' - } - }, - required: %w[amount note user_id] - }, - FinancialTransactionClass: { - type: :object, - properties: { - id: { - type: :integer - }, - name: { - type: :string - } - }, - required: %w[id name] - }, - FinancialTransactionType: { - type: :object, - properties: { - id: { - type: :integer - }, - name: { - type: :string - }, - name_short: { - type: :string, - nullable: true, - description: 'short name (used for bank transfers)' - }, - bank_account_id: { - type: :integer, - nullable: true, - description: 'id of the bank account used for this transaction type' - }, - bank_account_name: { - type: :string, - nullable: true, - description: 'name of the bank account used for this transaction type' - }, - bank_account_iban: { - type: :string, - nullable: true, - description: 'IBAN of the bank account used for this transaction type' - }, - financial_transaction_class_id: { - type: :integer, - description: 'id of the class of the transaction' - }, - financial_transaction_class_name: { - type: :string, - description: 'name of the class of the transaction' - } - }, - required: %w[id name financial_transaction_class_id financial_transaction_class_name] - }, - GroupOrderArticleForUpdate: { - type: :object, - properties: { - quantity: - { - type: :integer, - description: 'number of units ordered by the users ordergroup' - }, - tolerance: - { - type: :integer, - description: 'number of extra units the users ordergroup is willing to buy for filling a box' - } - } - }, - GroupOrderArticleForCreate: { - allOf: [ - { '$ref': '#/components/schemas/GroupOrderArticleForUpdate' }, - { - type: :object, - properties: { - order_article_id: - { - type: :integer, - description: 'id of order article' - } - } - } - ] - }, - GroupOrderArticle: { - allOf: [ - { '$ref': '#/components/schemas/GroupOrderArticleForCreate' }, - { - type: :object, - properties: { - id: { - type: :integer - }, - result: { - type: :number, - format: :float, - description: 'number of units the users ordergroup will receive or has received' - }, - total_price: - { - type: :number, - format: :float, - description: 'total price of this group order article' - }, - order_article_id: - { - type: :integer, - description: 'id of order article' - } - }, - required: %w[order_article_id] - } - ] - }, - q_ordered: { - type: :object, - properties: { - ordered: { - type: :string, - enum: %w[member all supplier] - } - } - }, - Meta: { - type: :object, - properties: { - page: { - type: :integer, - description: 'page number of the returned collection' - }, - per_page: { - type: :integer, - description: 'number of items per page' - }, - total_pages: { - type: :integer, - description: 'total number of pages' - }, - total_count: { - type: :integer, - description: 'total number of items in the collection' - } - }, - required: %w[page per_page total_pages total_count] - }, - Navigation: { - type: :array, - items: { - type: :object, - properties: { - name: { - type: :string, - description: 'title' - }, - url: { - type: :string, - description: 'link' - }, - items: { - '$ref': "#/components/schemas/Navigation" - } - }, - required: ['name'], - minProperties: 2 # name+url or name+items - } - }, - Error: { - type: :object, - properties: { - error: { - type: :string, - description: 'error code' - }, - error_description: { - type: :string, - description: 'human-readable error message (localized)' - } - } - }, - Error401: { - type: :object, - properties: { - error: { - type: :string, - description: 'unauthorized' - }, - error_description: { - '$ref': '#/components/schemas/Error/properties/error_description' - } - } - }, - Error403: { - type: :object, - properties: { - error: { - type: :string, - description: 'forbidden or invalid_scope' - }, - error_description: { - '$ref': '#/components/schemas/Error/properties/error_description' - } - } - }, - Error404: { - type: :object, - properties: { - error: { - type: :string, - description: 'not_found' - }, - error_description: { - '$ref': '#/components/schemas/Error/properties/error_description' - } - } - }, - Error422: { - type: :object, - properties: { - error: { - type: :string, - description: 'unprocessable entity' - }, - error_description: { - '$ref': '#/components/schemas/Error/properties/error_description' - } - } - } - }, - securitySchemes: { - oauth2: { - type: :oauth2, - flows: { - implicit: { - authorizationUrl: 'http://localhost:3000/f/oauth/authorize', - scopes: { - 'config:user': 'reading Foodsoft configuration for regular users', - 'config:read': 'reading Foodsoft configuration values', - 'config:write': 'reading and updating Foodsoft configuration values', - 'finance:user': 'accessing your own financial transactions', - 'finance:read': 'reading all financial transactions', - 'finance:write': 'reading and creating financial transactions', - 'user:read': 'reading your own user profile', - 'user:write': 'reading and updating your own user profile', - offline_access: 'retain access after user has logged out' - } - } - } - } - } - }, - servers: [ - { - url: 'http://{defaultHost}/f/api/v1', - variables: { - defaultHost: { - default: 'localhost:3000' - } - } - } - ], - security: [ - oauth2: [ - 'user:read' - ] - ] - } - } - - # Specify the format of the output Swagger file when running 'rswag:specs:swaggerize'. - # The swagger_docs configuration option has the filename including format in - # the key, this may want to be changed to avoid putting yaml in json files. - # Defaults to json. Accepts ':json' and ':yaml'. - config.swagger_format = :yaml -end diff --git a/vendor/javascript/.keep b/vendor/javascript/.keep deleted file mode 100644 index e69de29b..00000000