Merge pull request #4866 from Matt-Yorkley/3-0-ofn-qz

[Spree 2.1] ofn-qz
This commit is contained in:
Pau Pérez Fabregat
2020-03-03 10:37:10 +01:00
committed by GitHub
2 changed files with 9 additions and 1 deletions

View File

@@ -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'

View File

@@ -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)