diff --git a/Gemfile b/Gemfile index d35748de34..434fd083f4 100644 --- a/Gemfile +++ b/Gemfile @@ -118,7 +118,7 @@ gem 'jquery-rails', '3.0.4' gem 'jquery-ui-rails', '~> 4.0.0' gem 'select2-rails', '~> 3.4.7' -# gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c' +gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', branch: 'ofn-rails-4' group :production, :staging do gem 'ddtrace' diff --git a/Gemfile.lock b/Gemfile.lock index 26bc8064bf..58068e8222 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,6 +13,13 @@ GIT paypal-sdk-merchant (= 1.106.1) spree_core (~> 2.1.0) +GIT + remote: https://github.com/openfoodfoundation/ofn-qz.git + revision: 467f6ea1c44529c7c91cac4c8211bbd863588c0b + branch: ofn-rails-4 + specs: + ofn-qz (0.1.0) + GIT remote: https://github.com/openfoodfoundation/spree.git revision: 95d3ccb32f2e4016d0fc73f39446d1739da56c50 @@ -737,6 +744,7 @@ DEPENDENCIES momentjs-rails nokogiri (~> 1.6.8.1) oauth2 (~> 1.4.4) + ofn-qz! oj order_management! paper_trail (~> 5.2.3)