Merge branch 'master' into 2-0-stable-nov-8th

2026-02-19 00:27:25 +00:00 · 2018-11-08 11:18:54 +00:00
parent fae0617639 51a94c8194
commit fcdb5cd7af
101 changed files with 4970 additions and 760 deletions
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -188,7 +188,7 @@ namespace :openfoodnetwork do
                             name: 'Pickup',
                             zone: zone,
                             require_ship_address: true,
-                             calculator_type: 'OpenFoodNetwork::Calculator::Weight',
+                             calculator_type: 'Calculator::Weight',
                             distributors: [enterprise2])
      enterprise2.payment_methods << Spree::PaymentMethod.last
      enterprise2.save!