Article Versions squash

.eslintrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "jquery": true,
+        "es6": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": 6
+    },
+    "rules": {
+      "no-unused-vars": ["error", { "vars": "local" }]
+    }
+}

.rubocop_todo.yml

@@ -830,7 +830,7 @@ Rails/HasManyOrHasOneDependent:
   Exclude:
     - 'app/models/article.rb'
     - 'app/models/article_category.rb'
-    - 'app/models/article_price.rb'
+    - 'app/models/article_version.rb'
     - 'app/models/financial_link.rb'
     - 'app/models/financial_transaction.rb'
     - 'app/models/group_order.rb'

Dockerfile-dev

@@ -1,7 +1,7 @@
 FROM ruby:2.6
 
 # Install dependencies
-RUN deps='libmagic-dev chromium' && \
+RUN deps='libmagic-dev chromium nodejs' && \
     apt-get update && \
     apt-get install --no-install-recommends -y $deps && \
     rm -Rf /var/lib/apt/lists/* /var/cache/apt/*

Gemfile

@@ -75,6 +75,7 @@ group :development do
   gem 'mailcatcher'
   gem 'web-console'
   gem 'listen'
+  gem 'byebug'
 
   # Better error output
   gem 'better_errors'

Gemfile.lock

@@ -144,6 +144,7 @@ GEM
     bullet (7.0.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
+    byebug (11.1.3)
     capybara (3.36.0)
       addressable
       matrix
@@ -577,6 +578,7 @@ DEPENDENCIES
   bootsnap
   bootstrap-datepicker-rails
   bullet
+  byebug
   capybara
   connection_pool
   daemons

HACKATHON_TODOS.md

@@ -0,0 +1,12 @@
+# TODO-no-upstream - whole file
+- Replace all remaining occurrences of `.unit_quantity`
+- Receive orders page:
+  * Determine +/- button functionality for very small or non-existant pack sizes
+  * BE validation of order amount
+  * Investigate total_balance hidden field meaning (old issue)
+  * Formatting: Alignment breaks with numbers that have more than one digit (old issue; but renewed importance due to floats)
+  * Article (version) Field translations of new / moved fields
+
+# POST-merge:
+
+* Close https://github.com/foodcoops/foodsoft/issues/396

Procfile

@@ -1,4 +1,5 @@
-web: bundle exec rails server --binding=0.0.0.0 --port=$PORT
+# TODO-no-upstream:
+web: bundle exec rails server --binding=0.0.0.0 --port=$PORT; tail -f log/development.log
 worker: QUEUE=* bundle exec rake resque:work
 mail: bundle exec rake foodsoft:reply_email_smtp_server
 cron: supercronic crontab

app/assets/javascripts/application.js

@@ -15,14 +15,30 @@
 //= require i18n
 //= require i18n/translations
 //= require_self
-//= require ordering
+//= require units-converter
+//= require article-form
+//= require unit-conversion-field
+//= require group-order-form
+//= require receive-order-form
 //= require stupidtable
 //= require touchclick
 //= require delta_input
 //= require recurring_select
 
 $.fn.select2.defaults.set('theme', 'bootstrap');
 
+// on first focus (bubbles up to document), open the menu
+$(document).on('focus', '.select2-selection.select2-selection--single', function () {
+  $(this).closest(".select2-container").siblings('select:enabled').select2('open');
+});
+
+// steal focus during close - only capture once and stop propogation
+$('select.select2').on('select2:closing', function (e) {
+  $(e.target).data("select2").$selection.one('focus focusin', function (e) {
+    e.stopPropagation();
+  });
+});
+
 // Load following statements, when DOM is ready
 $(function() {
 
@@ -121,6 +137,10 @@ $(function() {
     // Handle ajax errors
     //     render json: {error: "can't except this!"}, status: :unprocessable_entity
     $(document).ajaxError(function(ev, xhr, settings, exception) {
+        if (xhr.statusText === 'abort') {
+          return;
+        }
+
         try {
             msg = xhr.responseJSON.error;
         } catch(err) {