Andy Brett
dfabc5fa06
Update all locales with the latest Transifex translations
2020-12-02 21:41:18 -08:00
Luis Ramos
7a5a4f956a
Replace use of Faker with FFaker
2020-12-02 11:40:50 -08:00
Luis Ramos
720edb4b05
Relax ffaker version requirement so that upgrades come as possible
2020-12-02 11:40:50 -08:00
dependabot-preview[bot]
3ec1af104f
Bump ffaker from 1.32.1 to 2.11.0
...
Bumps [ffaker](https://github.com/ffaker/ffaker ) from 1.32.1 to 2.11.0.
- [Release notes](https://github.com/ffaker/ffaker/releases )
- [Changelog](https://github.com/ffaker/ffaker/blob/master/Changelog.md )
- [Commits](https://github.com/ffaker/ffaker/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-12-02 11:40:50 -08:00
dependabot-preview[bot]
80d034706c
Bump test-unit from 3.3.6 to 3.3.7
...
Bumps [test-unit](https://github.com/test-unit/test-unit ) from 3.3.6 to 3.3.7.
- [Release notes](https://github.com/test-unit/test-unit/releases )
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.6...3.3.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-12-02 11:40:04 -08:00
Andy Brett
902f8caea9
direct specifically to shop tab
2020-12-02 11:39:02 -08:00
Andy Brett
14091cd106
fix #6415
2020-12-02 11:39:02 -08:00
Andy Brett
936f5c1a0c
remove extraneous page call
2020-12-02 11:38:10 -08:00
Andy Brett
8963a787d6
only validate unit_value presence if "items" is not chosen
2020-12-02 11:38:10 -08:00
Andy Brett
59cab902f0
add numericality validation
2020-12-02 11:38:10 -08:00
Andy Brett
4d2c93930b
resolve merge conflict
2020-12-02 11:38:10 -08:00
Tsara Sudrajat
fb769d37f9
Fix error when setting stock for new product
2020-12-02 11:38:10 -08:00
Andy Brett
65f6f1febf
rearrange css
2020-12-02 11:37:25 -08:00
Andy Brett
99b5d9e0c5
use white-space: nowrap on variant prices
2020-12-02 11:37:25 -08:00
Andy Brett
c4cd574242
fix currency spec
2020-12-02 11:37:25 -08:00
Andy Brett
a3a6205343
fix #6252
2020-12-02 11:37:25 -08:00
Maikel
25c363feba
Merge pull request #6356 from openfoodfoundation/dependabot/bundler/stringex-2.8.5
...
Bump stringex from 1.5.1 to 2.8.5
2020-12-02 16:39:00 +11:00
Luis Ramos
839278fc75
Add dependendabot config to increase limit to 10 PRs
2020-12-01 12:40:24 -08:00
Matt-Yorkley
1cab9e473b
Merge pull request #6378 from openfoodfoundation/dependabot/bundler/webmock-3.10.0
...
Bump webmock from 3.9.5 to 3.10.0
2020-12-01 11:58:01 +01:00
dependabot-preview[bot]
93a73b4823
Bump stringex from 1.5.1 to 2.8.5
...
Bumps [stringex](https://github.com/rsl/stringex ) from 1.5.1 to 2.8.5.
- [Release notes](https://github.com/rsl/stringex/releases )
- [Commits](https://github.com/rsl/stringex/compare/v1.5.1...v2.8.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-12-01 09:58:08 +00:00
Matt-Yorkley
7408c45980
Merge pull request #6297 from openfoodfoundation/rails-4-1
...
[Rails 4.1] Merge Rails 4.1 branch into master
2020-12-01 10:56:08 +01:00
Matt-Yorkley
fe4b20dd7b
Merge pull request #6354 from openfoodfoundation/rails-4-2-rebased
...
Rails 4.2 upgrade
2020-12-01 10:55:25 +01:00
Pau Pérez Fabregat
3c71b7f6be
Merge pull request #6428 from coopdevs/upgrade-brakeman-dependencies
...
Upgrade Ruby and Ubuntu to latest in GH action
2020-11-30 21:13:25 +01:00
Pau Perez
259e139c47
Update all locales with the latest Transifex translations
2020-11-30 09:21:13 +01:00
Pau Perez
8c1e222788
Upgrade Ruby and Ubuntu to latest in GH action
...
It was asked for in
https://github.com/openfoodfoundation/openfoodnetwork/pull/6163/ to use
the latest stable Ruby version. It's also better to use Ubuntu's latest
as well.
2020-11-30 09:11:41 +01:00
Pau Pérez Fabregat
4ca930bdad
Merge pull request #6163 from openfoodfoundation/luisramos0-patch-2
...
Add brakeman config
2020-11-30 09:08:32 +01:00
Pau Pérez Fabregat
f0a052b65b
Merge pull request #6357 from Matt-Yorkley/secret-key-base
...
Update secret key base
2020-11-27 17:32:14 +01:00
Pau Pérez Fabregat
07a72eccd4
Merge pull request #6391 from Matt-Yorkley/paypal-stock-clashes
...
Paypal stock clashes
2020-11-27 17:08:15 +01:00
Matt-Yorkley
b04a76e8bf
Update payments_report totals
2020-11-27 14:00:29 +00:00
Matt-Yorkley
1ceb6ac916
Update orders_and_fulfilment report totals
2020-11-27 14:00:29 +00:00
Andy Brett
049f66c2aa
address #6411
2020-11-27 14:00:29 +00:00
Matt-Yorkley
9c41c296e4
Remove default comments from ApplicationResponder
2020-11-27 14:00:29 +00:00
Matt-Yorkley
d299c8cf01
Update test setup in Packer spec.
...
This is the correct way to set a variant's weight.
2020-11-27 14:00:29 +00:00
Matt-Yorkley
2b2f1ac0cd
Improve specificity of expectation in reset password email test
2020-11-27 14:00:29 +00:00
Matt-Yorkley
d2998f1190
Remove spaces in payments report
2020-11-27 14:00:29 +00:00
Matt-Yorkley
c6c20dc0f6
Add ActionController::ConditionalGet to Api::BaseController
...
This was added in Spree around the time of Rails 4.2 and seems to fix some of the response errors around the `responders` gem.
2020-11-27 14:00:29 +00:00
Matt-Yorkley
60aaf8100a
Fix some Rubocop offences
2020-11-27 14:00:29 +00:00
Matt-Yorkley
98f42a1f81
Fix output of Package#inspect
2020-11-27 14:00:29 +00:00
Matt-Yorkley
f589d278cf
Add failing spec for Package#inspect
2020-11-27 14:00:29 +00:00
Matt-Yorkley
2b884be8dd
Update specs to work with ActionMailer::DeliveryJob
2020-11-27 14:00:29 +00:00
Matt-Yorkley
64153c5072
Remove #handle_asyncronously and update to recommended asyncronous devise mail method
2020-11-27 14:00:29 +00:00
Matt-Yorkley
9de3370a8a
Fix precision in adjustment form display
...
The tests here were looking for values with a format like "10.00" but the output had changed to "10.0"
2020-11-27 14:00:29 +00:00
Matt-Yorkley
63fb46f440
Delete some dead code
...
There are some really weird issues in the spec here, and this module is not in use anywhere.
2020-11-27 14:00:29 +00:00
Matt-Yorkley
aa718824d8
Fix touch spec
...
The behavior in #change blocks ironically seems to have changed
2020-11-27 14:00:29 +00:00
Matt-Yorkley
4394d2fe43
Fix tag_rules ForbiddenAttributes errors
...
Example error:
Tag Rules creating allows creation of rules of each type
Failure/Error: expect(tag_rule.preferred_shipping_method_tags).to eq "volunteers-only"
expected: "volunteers-only"
got: ""
(compared using ==)
# ./spec/features/admin/tag_rules_spec.rb:81:in `block (3 levels) in <top (required)>'
2020-11-27 14:00:29 +00:00
Matt-Yorkley
ea5c7c5990
Fix broken redirect after bulk product update
...
Error:
As an Administrator
I want to be able to manage products in bulk
updating when a filter has been applied
Failure/Error: expect(page.find("#status-message")).to have_content "Changes saved."
expected to find text "Changes saved." in "Saving.."
# ./spec/features/admin/bulk_product_update_spec.rb:451:in `block (2 levels) in <top (required)>'
2020-11-27 14:00:29 +00:00
Matt-Yorkley
2905267142
Fix broken variant weight assignment in spec
...
OrderManagement::Stock::Packer builds a package with all the items
Failure/Error: expect(package.weight).to be_positive
expected `0.0 (#<BigDecimal:7f156c99fda8,'0.0',9(18)>).positive?` to be truthy, got false
# ./engines/order_management/spec/services/order_management/stock/packer_spec.rb:19:in `block (2 levels) in <module:Stock>'
2020-11-27 14:00:29 +00:00
Matt-Yorkley
71c6cee94c
Fix "modifying frozen string" error in Package#inspect
2020-11-27 14:00:29 +00:00
Matt-Yorkley
7ef0056225
Fix invoice rendering issue
...
Setting `locals: { :@order => order }` no longer works; `@order` is not set as expected in the partial. Fixes various errors eg:
Failure/Error: = "#{@order.number}"
ActionView::Template::Error:
undefined method `number' for nil:NilClass
# ./app/views/spree/admin/orders/invoice.html.haml:14:in `_app_views_spree_admin_orders_invoice_html_haml__1740595365701113578_70025078036080'
# ./app/services/invoice_renderer.rb:3:in `render_to_string'
# ./app/controllers/spree/admin/orders_controller.rb:89:in `invoice'
2020-11-27 14:00:29 +00:00
Matt-Yorkley
b512d3ce21
Fix column preferences spec
...
Failure/Error: expect(preferences.map(&:column_name)).to eq [:col1, :col2, :col3]
expected: [:col1, :col2, :col3]
got: ["col1", "col2", "col3"]
(compared using ==)
Diff:
@@ -1 +1 @@
-[:col1, :col2, :col3]
+["col1", "col2", "col3"]
# ./spec/models/column_preference_spec.rb:56:in `block (4 levels) in <top (required)>'
2020-11-27 14:00:29 +00:00
Matt-Yorkley
98c99de835
Use ActiveJob::Testhelper where needed
2020-11-27 14:00:29 +00:00
Matt-Yorkley
1aa2b7274b
Fix test mailer delivery
2020-11-27 14:00:29 +00:00
Matt-Yorkley
ae33df946e
Fix StateMachine specs
2020-11-27 14:00:29 +00:00
Matt-Yorkley
54ad90e071
Replace deprecated ActiveRecord::ConnectionAdapters::Column#value_to_boolean
...
This method has been removed in Rails 4.2
2020-11-27 14:00:29 +00:00
Matt-Yorkley
e1c1574931
Refactor BulkInvoiceService to use ActiveJob
...
Removes use of #handle_asynchronously, which we need to do elsewhere. Fixes:
BulkInvoiceService#start_pdf_job starts a background process to create a pdf with multiple invoices
Failure/Error:
expect do
service.start_pdf_job [1, 2]
end.to enqueue_job Delayed::PerformableMethod
expected to enqueue exactly 1 jobs, but enqueued 0
# ./spec/services/bulk_invoice_service_spec.rb:8:in `block (3 levels) in <top (required)>'
2020-11-27 14:00:29 +00:00
Matt-Yorkley
8f8973b6f9
Call #deliver in user_mailer_spec so mail is sent
2020-11-27 14:00:29 +00:00
Matt-Yorkley
3c74541145
Fix misbehaving params in Api::ProductsController
...
In some cases the given params were being deleted here.
2020-11-27 14:00:29 +00:00
Matt-Yorkley
1ab62fddcb
Patch Paranoia#delete to resolve ActiveRecord::ConnectionAdapters::NullTransaction errors
...
Patches Paranoia gem to fix a conflict with transactions in Rspec: https://github.com/rubysherpas/paranoia/issues/274
Example error:
```
Failure/Error: order.line_items.first.variant.tap(&:delete)
NoMethodError:
undefined method `state' for #<ActiveRecord::ConnectionAdapters::NullTransaction:0x0000564117dddd18>
```
2020-11-27 14:00:29 +00:00
Matt-Yorkley
1e8d400534
Add Paranoia#delete (original)
2020-11-27 14:00:29 +00:00
Matt-Yorkley
1a4e292178
Fix json "empty body" expectations
2020-11-27 14:00:29 +00:00
Matt-Yorkley
49081e171e
Fix PG::UndefinedTable errors
...
The logic of #includes has changed slightly in Rails 4.2 and now usually needs the #references method as well.
PG::UndefinedTable:
# ERROR: missing FROM-clause entry for table "enterprises"
# LINE 1: SELECT "spree_users".* FROM "spree_users" WHERE (enterprises...
# ^
# ./spec/models/spree/user_spec.rb:125:in `block (4 levels) in <top (required)>'
2020-11-27 14:00:29 +00:00
Matt-Yorkley
a5472d6b64
Convert ConfirmSignupJob to ActiveJob
2020-11-27 14:00:29 +00:00
Matt-Yorkley
62b80043ba
Fix mailer specs
...
These methods are not actually called now until the email is being delivered.
2020-11-27 14:00:29 +00:00
Matt-Yorkley
eb040de422
Fix expectation in base_helper_spec
...
The attribute on this element are now rendered in alphabetical order
2020-11-27 14:00:29 +00:00
Matt-Yorkley
b36b0eddee
Fix Rubocop issues
2020-11-27 14:00:29 +00:00
Matt-Yorkley
aaf7a90f8b
Convert OrderCycleNotificationJob to ActiveJob
2020-11-27 14:00:29 +00:00
Matt-Yorkley
9e334a4c1e
Convert ConfirmOrderJob to ActiveJob
2020-11-27 14:00:29 +00:00
Matt-Yorkley
56f2d38714
Use "raise_in_transactional_callbacks"
...
https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#error-handling-in-transaction-callbacks
2020-11-27 14:00:29 +00:00
Matt-Yorkley
6b3da4ac89
Fix "PG::ProtocolViolation: ERROR: bind message supplies 0 parameters" errors
2020-11-27 14:00:28 +00:00
Matt-Yorkley
31415d00e6
TEMP - Fix deprecated cache store naming
2020-11-27 14:00:28 +00:00
Matt-Yorkley
e155b00ab9
Fix undefined constant Spree::Responder
2020-11-27 14:00:28 +00:00
Matt-Yorkley
3c0172c507
Fix Spree::Preferences cache issue
...
In some cases this method was trying to delete a Rails.cache entry with `nil` as the key, leading to lots of errors.
2020-11-27 14:00:28 +00:00
Matt-Yorkley
3cba9a16aa
Use ActionController::Base for Api::BaseController
...
It looks like ActionController::Metal does not play nicely with the big changes to controller responders: https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#responders
2020-11-27 14:00:28 +00:00
Matt-Yorkley
58350ed338
Set ActiveJob configs and convert WelcomeEnterpriseJob to new format
...
This needs to be done for all jobs.
Docs: https://guides.rubyonrails.org/v4.2/active_job_basics.html
2020-11-27 14:00:28 +00:00
Matt-Yorkley
54a4952dc5
Fix ForbiddenAttributesError on tag rules
2020-11-27 14:00:28 +00:00
Matt-Yorkley
34bfd877cc
Fix #bulk_update in EnterprisesController
2020-11-27 14:00:28 +00:00
Matt-Yorkley
16cc0afe8f
Replace removed method #retrieve_collector_from_mimes
...
https://apidock.com/rails/v4.1.8/ActionController/MimeResponds/retrieve_collector_from_mimes
2020-11-27 14:00:28 +00:00
Matt-Yorkley
ccaff08928
Re-add ForbiddenAttributesError debugging helper
2020-11-27 14:00:28 +00:00
Matt-Yorkley
91908a0e4c
Switch from state_machine to state_machines gem
...
The old version is completely unmaintained and does not work with Rails 4.2
2020-11-27 14:00:28 +00:00
Matt-Yorkley
6b45208cf1
Define Capybara server
...
The server type now has to be set explicitly for Capybara
2020-11-27 14:00:28 +00:00
Matt-Yorkley
fb333c37e7
Fix Api controller setup for responders gem
2020-11-27 14:00:28 +00:00
Matt-Yorkley
3090cfa909
Add setup for responders gem
2020-11-27 14:00:28 +00:00
Matt-Yorkley
9205c85d4d
Run rake db:migrate
2020-11-27 14:00:28 +00:00
Matt-Yorkley
ff9f6c3317
Remove foreigner gem
...
https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#foreign-key-support
2020-11-27 14:00:28 +00:00
Matt-Yorkley
25dd47e511
Add responders gem
...
https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#responders
2020-11-27 14:00:28 +00:00
Matt-Yorkley
ece3e7aa69
Update gems to Rails 4.2
2020-11-27 14:00:28 +00:00
Luis Ramos
ff8d935699
Fix problem in enterprises controller
2020-11-27 13:59:46 +00:00
Luis Ramos
1d32ecab98
Fix spec by adding necessary references statement
2020-11-27 13:59:46 +00:00
Luis Ramos
ff17ced101
Fix enterprises spec by adding needed references statement
2020-11-27 13:59:46 +00:00
Luis Ramos
fa6cf0f281
Fix prod importer spec in rails 4.1
2020-11-27 13:59:46 +00:00
Luis Ramos
7e39d78733
Fix Long Method rubocop issue
2020-11-27 13:59:46 +00:00
Luis Ramos
0152b4da55
Fix rubocop issues
2020-11-27 13:59:46 +00:00
Luis Ramos
2a03e42f2a
Update deep_munge patch to rails 4.1 where the code is now in ActionDispatch::Request::Utils
2020-11-27 13:59:46 +00:00
Matt-Yorkley
01a726d9bd
Fix stubbing of stock totals
...
Recent changes to the way count_on_hand is summed in Spree::Stock::Quantifier mean the old method here will not work. Error:
```
2) Spree::Variant#in_stock? when stock_items are not backorderable when stock_items out of stock return false if stock_items out of stock
Failure/Error: expect(variant.in_stock?).to be_falsy
expected: falsey value
got: true
# ./spec/models/spree/variant_spec.rb:241:in `block (5 levels) in <module:Spree>'
```
2020-11-27 13:59:46 +00:00
Matt-Yorkley
93fe8dbc5f
Replace #scoped, which is now deprecated and removed in Rails 4.1
2020-11-27 13:59:46 +00:00
Matt-Yorkley
5c5a6361bf
Fix nasty json encoding issue
...
The enterprise id returned by these json endpoints was being returned in *unicode* format, so where Angular was expecting a simple integer it was instead getting strings like: "\u0017"
2020-11-27 13:59:46 +00:00
Matt-Yorkley
0f2cbe8a52
Fix API exception response handling
...
For some reason when using `render text:` instead of `render json:` for this response, the status code being returned was 200 instead of the clearly explicitly defined 422 (:unprocessable_entity). I absolutely have no idea why!
2020-11-27 13:59:46 +00:00
Matt-Yorkley
f1002b953d
Disable Javascript CSRF protection on EnterprisesController#check_permalink route
...
This route checks if an enterprise permalink is taken or not. Allowing the route to be accessed via Javascript without strict CSRF protection is reasonable. Fixes the following errors:
ActionController::InvalidCrossOriginRequest: Security warning: an embedded <script> tag on another site requested protected JavaScript. If you know what you're doing, go ahead and disable forgery protection on this action to permit cross-origin JavaScript embedding.
2020-11-27 13:59:46 +00:00
Luis Ramos
3ebc8145df
Avoid calling update with nil values
2020-11-27 13:59:46 +00:00
Luis Ramos
edc1773676
Fix some calls to sum in reports code
2020-11-27 13:59:46 +00:00
Luis Ramos
6814eb663f
Fix respond_with error
2020-11-27 13:59:46 +00:00
Luis Ramos
78cfcd905f
Adapt more & and no & when using sum
2020-11-27 13:59:46 +00:00
Luis Ramos
9bbef16804
Converting all calls to ActiveRelation#sum to use a symbol with &
...
This is only applicable to database columns, if we are summing using a method in the model than the & is required!
2020-11-27 13:59:46 +00:00
Luis Ramos
974240fd4b
Fix two sum calls in checkout helper
2020-11-27 13:59:46 +00:00
Luis Ramos
7472b7cc27
Fix sum call in quantifier
2020-11-27 13:59:46 +00:00
Eduardo
a8a933d73a
change from render json to render plain due to template missing issue
2020-11-27 13:59:46 +00:00
Luis Ramos
bcd07e1791
Upgrade to rails 4.1
2020-11-27 13:59:46 +00:00
Luis Ramos
ecb29ec830
Add state machine patch to fix error with state machine
...
See here for details: https://github.com/pluginaweek/state_machine/issues/251#issuecomment-32133267
2020-11-27 13:59:46 +00:00
Luis Ramos
202aa3e5b7
Use reflections instead of, now gone, reflections
2020-11-27 13:59:46 +00:00
Luis Ramos
a05f43000a
ActionView was extracted from ActionPack in rails 4.1 so we need to use ActionView
2020-11-27 13:59:46 +00:00
Luis Ramos
61708e5deb
AbstractController::ViewPaths was moved to ActionView::ViewPaths in rails 4.1
2020-11-27 13:59:46 +00:00
Matt-Yorkley
27586d072d
Merge pull request #6423 from openfoodfoundation/revert-6277-controllers
...
Revert "Move Spree::Admin::BaseController to Admin::BaseController"
2020-11-27 14:29:15 +01:00
Matt-Yorkley
3bfa903912
Revert "Move Spree::Admin::BaseController to Admin::BaseController"
2020-11-27 14:11:57 +01:00
Matt-Yorkley
0ba670b180
Ensure order is cleanly reset to cart state when redirecting to cart
2020-11-27 11:42:46 +00:00
Matt-Yorkley
c4cfc1dc05
Improve order test in paypal controller spec
2020-11-27 11:42:06 +00:00
Pau Pérez Fabregat
17957ed6c0
Merge pull request #6408 from openfoodfoundation/transifex
...
Transifex
2020-11-27 10:31:56 +01:00
Pau Pérez Fabregat
8b6a08457a
Merge pull request #6293 from luisramos0/subs_debug
...
Add task to print Subscriptions debug info
2020-11-27 10:17:57 +01:00
Maikel
9e2a3d6973
Merge pull request #6277 from luisramos0/controllers
...
Move Spree::Admin::BaseController to Admin::BaseController
2020-11-27 16:13:55 +11:00
Icker
55b21310e4
Added introductory information for testing.
2020-11-25 09:44:02 -08:00
Transifex-Openfoodnetwork
1266a37ac5
Updating translations for config/locales/en_NZ.yml
2020-11-25 05:39:17 +11:00
Transifex-Openfoodnetwork
54feb2f57d
Updating translations for config/locales/en_AU.yml
2020-11-24 07:31:32 +11:00
Transifex-Openfoodnetwork
e9eb90507e
Updating translations for config/locales/ca.yml
2020-11-24 07:22:28 +11:00
Transifex-Openfoodnetwork
ee44159c83
Updating translations for config/locales/es.yml
2020-11-24 07:19:47 +11:00
Transifex-Openfoodnetwork
8861f5c6aa
Updating translations for config/locales/ca.yml
2020-11-24 07:19:18 +11:00
Matt-Yorkley
b089404891
Merge pull request #6362 from coopdevs/remove-unused-truncate-html-gem
...
Remove unused truncate_html gem
2020-11-23 00:49:34 +01:00
Matt-Yorkley
2fa2a30c67
Add spec coverage, refactor, avoid double-render errors
...
👍
2020-11-22 18:37:31 +00:00
Matt-Yorkley
cabec7e73f
Fix Rubocop warnings and tidy up
2020-11-22 18:02:54 +00:00
Matt-Yorkley
87df44764f
Extract stock-check logic to controller concern and inject prior to final Paypal payment confirmation.
2020-11-22 18:02:52 +00:00
Andy Brett
8f25568530
Merge pull request #6390 from jhsu802701/qtest
...
SIMPLE: added scripts for running test suite in quiet mode
2020-11-20 12:15:04 -08:00
Andy Brett
b1b422b90e
fix/silence rubocop styles
2020-11-20 10:41:31 -08:00
Andy Brett
85d99f3bf2
Merge branch 'master' into controllers
2020-11-20 08:12:03 -08:00
Andy Brett
c6b3a615f1
Merge pull request #6385 from jhsu802701/update_db_schema
...
SIMPLE: updated db/schema.rb with 'bundle exec rake db:migrate'
2020-11-20 08:03:27 -08:00
Matt-Yorkley
5429bd8d7a
Update all locales with the latest Transifex translations
2020-11-19 23:13:09 +00:00
Matt-Yorkley
300e87648b
Merge pull request #6394 from openfoodfoundation/transifex
...
Transifex
2020-11-20 00:11:03 +01:00
Matt-Yorkley
4a9ac62d91
Merge branch 'master' into transifex
2020-11-20 00:10:48 +01:00
Luis Ramos
d7a1d7769c
Merge pull request #6258 from luisramos0/s3_with_region
...
Upgrade aws-sdk and switch to S3 virtual host style URLs
2020-11-19 22:59:57 +00:00
Transifex-Openfoodnetwork
cd20d2612d
Updating translations for config/locales/cy.yml
2020-11-19 22:09:04 +11:00
Transifex-Openfoodnetwork
446007e283
Updating translations for config/locales/cy.yml
2020-11-19 22:05:56 +11:00
Transifex-Openfoodnetwork
7bc59512fd
Updating translations for config/locales/cy.yml
2020-11-19 22:02:49 +11:00
Pau Pérez Fabregat
8c9960854f
Merge pull request #6343 from Matt-Yorkley/api-controllers
...
API controllers: strong paramaters
2020-11-19 09:04:16 +01:00
Matt-Yorkley
242c1a2715
Add new Paypal feature spec
2020-11-19 01:44:53 +00:00
Matt-Yorkley
21d67a0723
Extract some more paypal-specific test code to new helper
2020-11-19 01:44:38 +00:00
Jason Hsu
59b3bfa161
Added scripts for running test suite in quiet mode and updated docker/README.md
2020-11-18 16:25:03 -06:00
Transifex-Openfoodnetwork
9fc3ff0250
Updating translations for config/locales/en_GB.yml
2020-11-19 05:14:36 +11:00
Transifex-Openfoodnetwork
7ddbc10c19
Updating translations for config/locales/en_GB.yml
2020-11-19 05:11:27 +11:00
Matt-Yorkley
41a5787830
Extract paypal response stubbing to helper
2020-11-18 15:39:01 +00:00
Matt-Yorkley
010c1c799d
Add some notes on paypal checkout flow
2020-11-18 14:55:29 +00:00
Matt-Yorkley
2faea65f82
Bring in Spree::PaypalController#confirm method
...
Original method from the gem. This handles the post-payment response from paypal.
2020-11-18 14:51:23 +00:00
Matt-Yorkley
dd8f139c1b
Memoize Spree::PaypalController#payment_method
...
This gets called 4 or 5 times in a single request just to read basic attributes from the object. The query doesn't need to be repeated each time
2020-11-18 13:45:14 +00:00
Matt-Yorkley
6d0d4b5096
Bring in Spree::PaypalController#payment_method
...
Original method from the gem. Modified in preceding commit.
2020-11-18 13:45:13 +00:00
Matt-Yorkley
b0a70f0ba3
Improve TaxonController strong params handling
2020-11-17 19:48:27 +00:00
Matt-Yorkley
0b18b0dc0a
Include Calculator attributes in PaymentMethod nested attributes and DRY repeated code
2020-11-17 19:04:26 +00:00
Matt-Yorkley
d225294b6b
Extract to PermittedAttributes::Calculator
2020-11-17 18:51:48 +00:00
Matt-Yorkley
3547b9fe56
Add missing calculator params
2020-11-17 18:51:48 +00:00
Matt-Yorkley
1766f33d46
Use ActionController::Metal and include StrongParameters
2020-11-17 18:51:48 +00:00
Matt-Yorkley
cbdb6126a6
Fix strong_params in API enterprises_controller
2020-11-17 18:51:48 +00:00
Matt-Yorkley
6a26c9da8c
Fix strong_params in API products_controller
2020-11-17 18:51:48 +00:00
Matt-Yorkley
36f4f40e84
Refactor and fix PaymentMethod strong params
2020-11-17 18:51:48 +00:00
Matt-Yorkley
787f29105c
Fix ForbiddenAttribute errors for bulk update of enterprise fees and order cycles
...
Example error:
As an administrator
I want to manage simple order cycles
updating many order cycle opening/closing times at once
Failure/Error: raise ActiveModel::ForbiddenAttributesError, params.to_s
ActiveModel::ForbiddenAttributesError:
{"order_cycle_set"=>{"collection_attributes"=>{"0"=>{"id"=>62, "name"=>"Updated Order Cycle 1", "orders_open_at"=>"2040-12-01 12:00:00", "orders_close_at"=>"2040-12-01 12:00:01"}, "1"=>{"id"=>63, "name"=>"Updated Order Cycle 2", "orders_open_at"=>"2040-12-01 12:00:02", "orders_close_at"=>"2040-12-01 12:00:03"}, "2"=>{"id"=>64, "name"=>"Updated Order Cycle 3", "orders_open_at"=>"2040-12-01 12:00:04", "orders_close_at"=>"2040-12-01 12:00:05"}}}, "controller"=>"admin/order_cycles", "action"=>"bulk_update", "format"=>"json", "order_cycle"=>{}}
# ./app/controllers/application_controller.rb:20:in `print_params'
# ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
# ------------------
# --- Caused by: ---
# ActiveModel::ForbiddenAttributesError:
# ActiveModel::ForbiddenAttributesError
# ./app/models/model_set.rb:29:in `block in collection_attributes='
2020-11-17 18:51:48 +00:00
Matt-Yorkley
642a294844
Fix broken order edit shipment
...
As an administrator
I want to create and edit orders
as an enterprise manager viewing the edit page with different shipping methods can edit shipping method
Failure/Error: expect(page).to have_content "Shipping: #{different_shipping_method_for_distributor1.name}"
expected to find text "Shipping: Different" in "Logged in as : owen@romaguera.ca Account Logout Store DASHBOARD PRODUCTS ORDER CYCLES ORDERS REPORTS ENTERPRISES CUSTOMERS Order # R813516688 CANCEL ACTIONS BACK TO ORDER LIST John Doe - ADD PRODUCT NAME OR SKU (ENTER AT LEAST FIRST 4 CHARACTERS OF PRODUCT NAME) Select a variant 100 - PENDING ITEM DESCRIPTION PRICE QUANTITY TOTAL Product #3 - 9924 - 1g, S $10.00 1 x none $10.00 Product #4 - 5548 - 1g, S $10.00 1 x none $10.00 Product #5 - 8080 - 1g, S $10.00 1 x none $10.00 Product #6 - 3591 - 1g, S $10.00 1 x none $10.00 Product #7 - 6461 - 1g, S $10.00 1 x none $10.00 Product #8 - 4071 - 1g, S $110.00 1 x none $110.00 SHIPPING METHOD Different $0.00 Normal $0.00 Different $0.00 Tracking: U10000 LINE ITEM ADJUSTMENTS NAME AMOUNT Tax 1 10.0%: $10.00 ORDER ADJUSTMENTS NAME AMOUNT Transaction fee: $0.00 ORDER TOTAL $160.00 DISTRIBUTION Distributor: Enterprise 4 Order cycle: Order Cycle 2 UPDATE AND RECALCULATE FEES or BACK ORDER INFORMATION STATUS COMPLETE TOTAL : $160.00 SHIPMENT : PENDING PAYMENT : BALANCE DUE DATE COMPLETED : November 08, 2020 1:51 AM ORDER DETAILS CUSTOMER DETAILS ADJUSTMENTS PAYMENTS RETURN AUTHORIZATIONS"
# ./spec/features/admin/order_spec.rb:291:in `block (5 levels) in <top (required)>'
2020-11-17 18:51:48 +00:00
Matt-Yorkley
7401e34c52
Fix credit cards strong params
2020-11-17 18:51:48 +00:00
Matt-Yorkley
ca41bbcee7
Fix Api::VariantsController ForbiddenAttributesError
2020-11-17 18:51:48 +00:00
Matt-Yorkley
c374bf5e49
Fix strong_params in API taxons_controller
2020-11-17 18:51:48 +00:00
Matt-Yorkley
417c4d9aea
Inherit from ActionController::Base in API Controllers
2020-11-17 18:51:48 +00:00
Jason Hsu
b85f8d4b45
Updated db/schema.rb with 'bundle exec rake db:migrate'
2020-11-16 18:23:00 -06:00
Maikel Linke
315a5f0fd9
Update translations
2020-11-17 10:17:08 +11:00
Transifex-Openfoodnetwork
4ca8c220e9
Updating translations for config/locales/fr_CA.yml
2020-11-17 09:06:27 +11:00
Transifex-Openfoodnetwork
442dbaa7d7
Updating translations for config/locales/en_CA.yml
2020-11-17 08:49:15 +11:00
Matt-Yorkley
c080c1f1d6
Merge pull request #6382 from Matt-Yorkley/menu-fix
...
Fix the user menu
2020-11-16 22:20:12 +01:00
Matt-Yorkley
3b92df42c3
Fix the menu!
...
🙈
2020-11-16 19:05:08 +00:00
Matt-Yorkley
e2dbb150e5
Update all locales with the latest Transifex translations
2020-11-16 16:02:40 +00:00
Luis Ramos
ca29604ff8
Merge pull request #6377 from luisramos0/repeat_calculator_migrations
...
Repeat calculator migrations to clean up existing data
2020-11-16 10:46:42 +00:00
Transifex-Openfoodnetwork
57bc146de9
Updating translations for config/locales/it.yml
2020-11-14 21:08:20 +11:00
dependabot-preview[bot]
66799bad46
Bump webmock from 3.9.5 to 3.10.0
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.9.5 to 3.10.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.5...v3.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-13 19:16:37 +00:00
Luis Ramos
e5b7c036d5
Repeat calculator migrations to clean up existing data
2020-11-13 16:35:22 +00:00
Pau Pérez Fabregat
6f1d8664ac
Merge pull request #6355 from coopdevs/install-gems-on-docker-boot
...
Install any missing gems when booting docker
2020-11-13 13:32:27 +01:00
Pau Pérez Fabregat
8d5e90e40f
Merge pull request #6365 from Matt-Yorkley/mail-settings
...
Allow mail_auth_type to be set
2020-11-13 13:30:17 +01:00
Pau Pérez Fabregat
6db80e837b
Merge pull request #6361 from andrewpbrett/fix-gateway-error-error
...
move gateway_error require to lib/spree/core.rb
2020-11-13 13:15:13 +01:00
Matt-Yorkley
cec295a113
Merge pull request #6373 from andrewpbrett/fix-admin-users
...
specify Spree routes for pagination, fix 500 on admin/users
2020-11-13 11:30:16 +01:00
Maikel Linke
a553547403
Update translations
2020-11-13 14:15:45 +11:00
Maikel
1e4edc671a
Merge pull request #6364 from openfoodfoundation/transifex
...
Transifex
2020-11-13 14:05:12 +11:00
Maikel
b2113c96a2
Merge pull request #6317 from openfoodfoundation/dependabot/bundler/kaminari-0.17.0
...
Bump kaminari from 0.14.1 to 0.17.0
2020-11-13 13:58:25 +11:00
Maikel
408103516e
Merge pull request #6321 from openfoodfoundation/dependabot/bundler/awesome_nested_set-3.2.1
...
Bump awesome_nested_set from 3.0.3 to 3.2.1
2020-11-13 13:30:18 +11:00
Maikel
d96216b8d7
Merge pull request #6268 from yihyang/master-yy-added-product-sorting
...
Sort products alphabetically in OC edit/create page
2020-11-13 13:29:54 +11:00
Maikel
d4ff9055c0
Merge pull request #6351 from efgalvao/issue#6249
...
Fixes Issue#6249
2020-11-13 13:28:55 +11:00
Maikel
591ba34eb6
Merge pull request #6335 from cillian/reset-on-demand-on-inventory-import
...
When resetting stock to 0 on absent products in inventory import also reset the on demand setting
2020-11-13 13:28:17 +11:00
Andy Brett
8dfd3f624d
paginate zones using spree routes as well
2020-11-12 14:24:04 -08:00
Andy Brett
9cf30b431a
specify Spree routes for pagination
2020-11-12 14:09:59 -08:00
Pau Pérez Fabregat
777cedd90d
Merge pull request #6305 from efgalvao/issue#6292
...
Fixed issue #6292 .
2020-11-12 17:42:42 +01:00
Transifex-Openfoodnetwork
b80d15b672
Updating translations for config/locales/pt_BR.yml
2020-11-13 02:43:56 +11:00
Transifex-Openfoodnetwork
228c7cc13a
Updating translations for config/locales/pt_BR.yml
2020-11-13 02:40:55 +11:00
Pau Pérez Fabregat
7c4691ab33
Merge pull request #6339 from andrewpbrett/fix-instance-unit-picker
...
Fix #6304 (Product edit: Cannot change Variant unit scale of an existing product)
2020-11-12 16:15:00 +01:00
Pau Pérez Fabregat
692adb0113
Merge pull request #6336 from coopdevs/fix-shop-layout
...
Fix .top-bar-section not to wrap the icons-menu
2020-11-11 17:29:53 +01:00
Matt-Yorkley
58e34b5ad6
Allow mail_auth_type to be set
2020-11-11 15:51:08 +00:00
Transifex-Openfoodnetwork
694bc6a598
Updating translations for config/locales/ar.yml
2020-11-12 02:18:05 +11:00
Transifex-Openfoodnetwork
e06b82f335
Updating translations for config/locales/ar.yml
2020-11-12 02:14:55 +11:00
Pau Perez
f9869d4360
Remove unused truncate_html gem
...
It seems that we don't use this gem in OFN. It was used in Spree in
https://github.com/openfoodfoundation/spree/blob/2-1-0-stable/core/app/helpers/spree/orders_helper.rb
to truncate the product description. We don't because we show it in
the product modal, and there's no trace of that helper method in our
codebase nor I see the gem used at all.
2020-11-11 13:18:23 +01:00
Matt-Yorkley
1cad631bdb
Replace secret_token and update comments
...
`secret_token` is apparently still called directly in other places...
2020-11-11 01:30:52 +00:00
Andy Brett
17202ff39c
move gateway_error require to lib/spree/core.rb
2020-11-10 14:55:56 -08:00
Matt-Yorkley
03d49c7987
Update secret key base
...
`secret_token` is no longer used in Rails 4+
2020-11-10 20:46:15 +00:00
Andy Brett
d5037abbe7
add specs for new/edit product pages
2020-11-10 10:49:14 -08:00
Pau Perez
5ddfc54b2b
Install any missing gems when booting docker
...
This runs `bundle install` if there are any missing gems when booting
the containers. `bundle check` ensures we don't unnecessarily run
`bundle install`, which is rather slow.
This avoids having to build the entire image (painfully slow) or having
to bring up a container just to install the gems. I used to do this
with `docker-compose run --rm web bundle install`.
2020-11-10 18:08:34 +01:00
Pau Pérez Fabregat
bea8982085
Merge pull request #6329 from openfoodfoundation/transifex
...
Transifex
2020-11-10 17:37:00 +01:00
Pau Pérez Fabregat
fc06cc242b
Merge pull request #6210 from ipalo/feature/update-docker-image-to-ubuntu-20-04
...
Update the base Ubuntu Docker image from 18.04 to 20.04
2020-11-10 17:30:03 +01:00
Pau Pérez Fabregat
b70c349b05
Merge pull request #6352 from openfoodfoundation/dependabot/bundler/webmock-3.9.5
...
Bump webmock from 3.9.4 to 3.9.5
2020-11-10 16:47:44 +01:00
Pau Perez
634ab5ca6a
Don't scale logo image
...
The trick using `width: 100%` and a set `max-width` doesn't work if we
can't know the image width as it can be uploaded by superadmins. There's
no need though because the media query breakpoint triggers just before that.
2020-11-10 09:51:41 +01:00
Matt-Yorkley
a802fe29be
Fix typo in initializer
2020-11-10 00:07:06 +00:00
Luis Ramos
88ac5dc955
Fix rubocop issues by refactoring code
2020-11-10 00:03:34 +00:00
Luis Ramos
e879aa1bed
Switch to s3_alias_url that enabble virtual host type of path
2020-11-10 00:03:33 +00:00
Luis Ramos
94a815a9ef
Upgrade aws-sdk and set s3 host name using the provided url config.
...
This will enable us to set hostnames with the s3 region defined and that
will make our image upload work for all s3 regions.
2020-11-10 00:03:33 +00:00
Luis Ramos
c7c5a95407
Merge pull request #6345 from Matt-Yorkley/flaky-oc-spec
...
Improve flaky order cycle spec
2020-11-09 21:59:41 +00:00
dependabot-preview[bot]
1825c90a5f
Bump webmock from 3.9.4 to 3.9.5
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.9.4 to 3.9.5.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.4...v3.9.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-09 19:14:30 +00:00
efgalvao
307b1ca9f9
Fixes Issue#6249
2020-11-09 14:06:37 -03:00
Pau Perez
17abb3e345
Fix feature specs
...
The underlying markup and CSS changed but the tests did not.
2020-11-09 15:43:54 +01:00
Pau Perez
1903c575ff
Reorder properties alphabetically
...
As Hound demands.
2020-11-09 15:40:25 +01:00
Pau Perez
9a885173b9
Remove element from class selector
...
Fixes Hound error `Avoid qualifying class selectors with an element.`.
2020-11-09 15:39:09 +01:00
Transifex-Openfoodnetwork
3167e5ae2b
Updating translations for config/locales/ru.yml
2020-11-10 01:29:44 +11:00
Transifex-Openfoodnetwork
7f968b2b10
Updating translations for config/locales/ru.yml
2020-11-10 01:26:34 +11:00
Transifex-Openfoodnetwork
b08299e83a
Updating translations for config/locales/ru.yml
2020-11-10 01:23:23 +11:00
Matt-Yorkley
d9e2a80a4f
Improve flaky order cycle spec
...
There are various points in this spec where content is dynamically added to the DOM, but Capybara is jumping ahead to start interacting with it before it as actually finished loading.
2020-11-09 11:26:12 +00:00
dependabot-preview[bot]
863702ed4b
Bump awesome_nested_set from 3.0.3 to 3.2.1
...
Bumps [awesome_nested_set](https://github.com/collectiveidea/awesome_nested_set ) from 3.0.3 to 3.2.1.
- [Release notes](https://github.com/collectiveidea/awesome_nested_set/releases )
- [Changelog](https://github.com/collectiveidea/awesome_nested_set/blob/master/CHANGELOG )
- [Commits](https://github.com/collectiveidea/awesome_nested_set/commits/v3.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-07 08:58:44 +00:00
Luis Ramos
6114dfb4ef
Merge pull request #6337 from openfoodfoundation/dependabot/bundler/webmock-3.9.4
...
Bump webmock from 3.9.3 to 3.9.4
2020-11-07 08:57:13 +00:00
Luis Ramos
f39008f3d3
Merge pull request #6338 from openfoodfoundation/dependabot/bundler/highline-2.0.3
...
Bump highline from 1.6.18 to 2.0.3
2020-11-07 08:57:02 +00:00
Andy Brett
99301e1fb2
fix #6304
2020-11-06 12:49:07 -08:00
dependabot-preview[bot]
cb0b7ed030
Bump highline from 1.6.18 to 2.0.3
...
Bumps [highline](https://github.com/JEG2/highline ) from 1.6.18 to 2.0.3.
- [Release notes](https://github.com/JEG2/highline/releases )
- [Changelog](https://github.com/JEG2/highline/blob/master/Changelog.md )
- [Commits](https://github.com/JEG2/highline/commits/v2.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-06 19:17:11 +00:00
dependabot-preview[bot]
7d9948f5b6
Bump webmock from 3.9.3 to 3.9.4
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.9.3 to 3.9.4.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.3...v3.9.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-06 19:14:43 +00:00
Transifex-Openfoodnetwork
18a7bdc631
Updating translations for config/locales/de_DE.yml
2020-11-07 05:32:48 +11:00
Transifex-Openfoodnetwork
6083d61ba7
Updating translations for config/locales/de_DE.yml
2020-11-07 05:29:38 +11:00
Transifex-Openfoodnetwork
9e2054dcd4
Updating translations for config/locales/de_DE.yml
2020-11-07 05:26:28 +11:00
Pau Perez
b5f27d48df
Fix .top-bar-section not to wrap the icons-menu
...
This line-wrap makes the icons-menu overlap the OC selector. The menu's
background is transparent, what makes it look even more broken.
The fix involves refactoring the `.top-bar-section` into using flexbox
instead of this highly coupled CSS and floats. With flexbox it becomes
as easy as telling the browser to space the three sections evenly
filling-up the window, while scaling down the logo if there's not enough
room.
The root cause is that every instance uses a custom logo, which wasn't
the one we used while designing and implementing. This is why using
fixed-sizes in pixels won't work.
2020-11-06 17:35:24 +01:00
Cillian O'Ruanaidh
89d63dfbb9
When resetting stock to 0 on absent products in inventory import also reset the on demand setting
...
Before when you imported inventory and clicked the 'Set stock to zero for all existing products not present in the file' option it would set the on hand stock to 0 but if the variant override was also set to be on demand the inventory would still be available for sale. This change makes sure the on demand setting is turned off too.
Fixes #6289 .
2020-11-06 14:57:31 +00:00
Matt-Yorkley
73995d1aff
Merge pull request #6334 from Matt-Yorkley/hound2
...
Switch to rubocop_styleguide.yml as style source
2020-11-06 12:55:23 +01:00
Matt-Yorkley
f5a9c6f3f4
Switch to rubocop_styleguide.yml as style source
2020-11-06 11:53:56 +00:00
Matt-Yorkley
f6aeb04b14
Merge pull request #6322 from Matt-Yorkley/hound
...
Add HoundCI config
2020-11-06 12:20:03 +01:00
Matt-Yorkley
00320e4387
Use .scss-lint.yml with HoundCI
2020-11-06 10:18:35 +00:00
Matt-Yorkley
ebd7409f70
Add scss-lint configs to .scss-lint.yml
2020-11-06 10:18:34 +00:00
Transifex-Openfoodnetwork
e86d84e10f
Updating translations for config/locales/en_FR.yml
2020-11-06 19:26:16 +11:00
Transifex-Openfoodnetwork
b7a503a848
Updating translations for config/locales/fr.yml
2020-11-06 19:26:04 +11:00
Luis Ramos
28570cded2
Update all locales with the latest Transifex translations
2020-11-06 04:20:08 +00:00
Luis Ramos
c0bb9aad5e
Merge pull request #6286 from openfoodfoundation/transifex
...
Transifex
2020-11-06 04:18:56 +00:00
Luis Ramos
b281e7e9e5
Merge pull request #6312 from mkllnk/variant-override-loading
...
Avoid loading variant overrides for no reason
2020-11-06 03:59:33 +00:00
Matt-Yorkley
3011bdb87d
Add HoundCI config
2020-11-06 00:27:32 +00:00
Matt-Yorkley
66b531ddf6
Merge pull request #6310 from luisramos0/acts_as_list
...
Bump acts_as_list to 0.3.0
2020-11-05 23:03:02 +01:00
Transifex-Openfoodnetwork
213f3cf072
Updating translations for config/locales/ar.yml
2020-11-06 07:43:38 +11:00
Transifex-Openfoodnetwork
e1962419c2
Updating translations for config/locales/ar.yml
2020-11-06 07:40:32 +11:00
Transifex-Openfoodnetwork
bb6f5cb3a7
Updating translations for config/locales/en_US.yml
2020-11-06 07:06:15 +11:00
dependabot-preview[bot]
2d90fa4723
Bump kaminari from 0.14.1 to 0.17.0
...
Bumps [kaminari](https://github.com/kaminari/kaminari ) from 0.14.1 to 0.17.0.
- [Release notes](https://github.com/kaminari/kaminari/releases )
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kaminari/kaminari/compare/v0.14.1...v0.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-05 19:15:53 +00:00
Matt-Yorkley
db3576f469
Merge pull request #6308 from luisramos0/translations
...
Fix some missing translations in orders edit page
2020-11-05 18:33:51 +01:00
Matt-Yorkley
c2362921fa
Merge pull request #6272 from tsara27/fix-alignment-order
...
Align center order adjustment and order total title
2020-11-05 18:33:08 +01:00
Matt-Yorkley
0668dd2591
Merge pull request #6307 from efgalvao/issue#6262
...
Fixes issue #6262 .
2020-11-05 18:31:49 +01:00
Matt-Yorkley
d8f9dead8b
Merge pull request #6270 from Matt-Yorkley/paperclip-handlers
...
Remove Paperclip URL handlers
2020-11-05 18:29:20 +01:00
Matt-Yorkley
bc96ad9515
Merge pull request #6299 from Matt-Yorkley/admin-image-edit
...
Fix display issue in product image edit page
2020-11-05 18:28:10 +01:00
Luis Ramos
bd4da3b5ce
Merge pull request #6247 from cillian/deep-munge-issue
...
Patch Rails :deep_munge issue so empty array parameters don't get converted to nil
2020-11-05 13:25:39 +00:00
Pau Pérez Fabregat
8e3f0d2152
Merge pull request #6134 from Matt-Yorkley/webmock-helper
...
Improve Webmock debugging
2020-11-05 13:11:02 +01:00
Pau Pérez Fabregat
1ea503ed5d
Merge pull request #6306 from SerenaWhite/update-handbook-reference
...
Update reference to OFN Handbook in README.md
2020-11-05 13:05:39 +01:00
Transifex-Openfoodnetwork
719007ecb4
Updating translations for config/locales/es.yml
2020-11-05 22:57:29 +11:00
Transifex-Openfoodnetwork
bd06f898a3
Updating translations for config/locales/ca.yml
2020-11-05 22:55:21 +11:00
Transifex-Openfoodnetwork
246a1f368b
Updating translations for config/locales/de_DE.yml
2020-11-05 21:59:09 +11:00
Transifex-Openfoodnetwork
f6443f00e5
Updating translations for config/locales/en_FR.yml
2020-11-05 19:23:26 +11:00
Transifex-Openfoodnetwork
fd52800d2c
Updating translations for config/locales/fr.yml
2020-11-05 19:21:40 +11:00
Maikel Linke
4b1f5ae060
Avoid loading variant overrides for no reason
2020-11-05 14:31:19 +11:00
Transifex-Openfoodnetwork
31a34fc9d2
Updating translations for config/locales/en_NZ.yml
2020-11-05 10:00:28 +11:00
Transifex-Openfoodnetwork
3fc0d1bcb9
Updating translations for config/locales/en_NZ.yml
2020-11-05 09:57:27 +11:00
Luis Ramos
bb89557beb
Bump acts_as_list to 0.3.0
2020-11-04 22:13:24 +00:00
Luis Ramos
0ae3bf985a
Fix some missing translations in orders edit page
2020-11-04 21:54:27 +00:00
Luis Ramos
387326b9b4
Merge pull request #5978 from luisramos0/bye_bye_spree
...
Bye bye spree - final PR 🎉
2020-11-04 21:27:28 +00:00
Luis Ramos
cb80f67dc6
Merge pull request #5885 from luisramos0/variants
...
[Bye bye Spree] Bring models product, variant, price from spree_core
2020-11-04 21:26:07 +00:00
efgalvao
5260c01f16
Update registration.html.haml
...
Removed spaces.
2020-11-04 17:37:11 -03:00
Matt-Yorkley
3170db9532
Remove Paperclip URL handlers
...
See ofn-security issue #33 for details.
2020-11-04 16:49:01 +00:00
efgalvao
42d5f377e0
Fixes issue #6262 .
2020-11-04 13:11:37 -03:00
Ren White
f513d888a3
Update reference to OFN handbook in README.md
2020-11-04 06:57:06 -07:00
Luis Ramos
5cde085241
Fix a number of spree translations
2020-11-04 13:55:36 +00:00
Luis Ramos
23956726e9
Add missing translation
2020-11-04 12:37:55 +00:00
efgalvao
1f1da3eb6d
Fixed issue #6292 .
2020-11-04 09:37:51 -03:00
Luis Ramos
f6d0905517
Add s3_support require to image.rb
2020-11-04 12:15:45 +00:00
Luis Ramos
c2591104ee
Fix typo in application setup
...
This was forcing env test in all environments breaking payment methods that are activated by environment
2020-11-04 12:15:45 +00:00
Luis Ramos
3beea43143
Switch to a version of better_paypal_express that does not define
...
routes and define those routes on the OFN side
2020-11-04 12:15:45 +00:00
Luis Ramos
8f2d52b9e3
Revert "Do not reload routes and make spree routes append instead of draw in"
...
This reverts commit cdf4c795c7c7ae18006eb24af9336941361b6b81.
2020-11-04 12:15:45 +00:00
Luis Ramos
eada388534
Add handle_extensions to get Spree.translations (archaic spree js translations) in handlebars templates
...
This is all legacy from spree that can be cleaned up at some point, we only have two handlebars templates in OFN
2020-11-04 12:15:45 +00:00
Luis Ramos
f6f4faf146
Move test setup to application.rb
...
Without spree_core, the test environment file loads before the Spree engine is loaded
2020-11-04 12:15:45 +00:00
Luis Ramos
5c4ea1a6be
Fix tax rates spec
2020-11-04 12:15:45 +00:00
Luis Ramos
72c454a211
Fix reference to Spree bug
2020-11-04 12:15:45 +00:00
Luis Ramos
543a9592c7
Adapt spec to routes without spree
2020-11-04 12:15:45 +00:00
Luis Ramos
2ce96f4bbe
Registration path is working correctly again without spree
2020-11-04 12:15:45 +00:00
Luis Ramos
00d121ebfc
Add misssing translation
2020-11-04 12:15:45 +00:00
Luis Ramos
c785d0d1d7
Make engine's routes append to main app instead of prepend
2020-11-04 12:15:45 +00:00
Luis Ramos
80cbe6b30f
Add route helper to call to sort_link so that it can find the necessary routes
2020-11-04 12:15:45 +00:00
Luis Ramos
09aef524f3
Make route helpers use spree helper
2020-11-04 12:15:45 +00:00
Luis Ramos
805b4d243e
Fix missing translations
2020-11-04 12:15:45 +00:00
Luis Ramos
a07029f660
Add require so that model is available when needed
2020-11-04 12:15:45 +00:00
Luis Ramos
ccab133d63
Make sample data use OFN's calculators
2020-11-04 12:15:45 +00:00
Luis Ramos
a51645f316
Remove deleted file
2020-11-04 12:15:45 +00:00
Luis Ramos
4125fe1690
Fix problem with string matchers
2020-11-04 12:15:45 +00:00
Luis Ramos
6950d7717f
Add missing translation
2020-11-04 12:15:45 +00:00
Luis Ramos
ab53db0c61
Merge ability and ability decorator
2020-11-04 12:15:45 +00:00
Luis Ramos
1b4a4a8113
Bring code from spree_paypal_express to make it use spree url_helper
2020-11-04 12:15:45 +00:00
Luis Ramos
66fb3a9cf3
Remove code related to spree promotions
2020-11-04 12:15:45 +00:00
Luis Ramos
79a7cf9b39
Add default spree logo
2020-11-04 12:15:45 +00:00
Luis Ramos
a18a198812
Fix locations of requires in admin js all.js
2020-11-04 12:15:45 +00:00
Luis Ramos
0ca71ce0a9
Do not reload routes and make spree routes append instead of draw in
...
case thee routes are already defined elsewhere, for example, by the
paypal express gem
2020-11-04 12:15:45 +00:00
Luis Ramos
b7aa04353c
Fix requires of product duplicator
2020-11-04 12:15:45 +00:00
Luis Ramos
bfeebccbc5
Load Spree engine before configuring it
2020-11-04 12:15:45 +00:00
Luis Ramos
4b21667974
Move initializers from Spree engine to the OFN application
2020-11-04 12:15:45 +00:00
Luis Ramos
9bbeec5031
Require code from spree/core explicitly
2020-11-04 12:15:45 +00:00
Luis Ramos
af3057f55f
Remove spree requires that are not needed in OFN
2020-11-04 12:15:45 +00:00
Luis Ramos
e8381304f9
Remove spree_core dependency
2020-11-04 12:15:45 +00:00
Luis Ramos
58a476751b
Remove code from the spree engine that is not needed in OFN
2020-11-04 12:15:45 +00:00
Luis Ramos
3320a3f0bc
Fix some more rubocop issues
2020-11-04 12:15:45 +00:00
Luis Ramos
4c6708267a
Run rubocop -a
2020-11-04 12:15:45 +00:00
Luis Ramos
2f0d61d54f
Bring Spree engine.rb from spree_core
2020-11-04 12:15:45 +00:00
Luis Ramos
451d8488d9
Run rubocop -a
2020-11-04 12:15:45 +00:00
Luis Ramos
bcca2eee9d
Bring user and ability related files from spree_core
2020-11-04 12:15:45 +00:00
Luis Ramos
1bce516a45
Make specs load product duplicator
...
This makes the ofn version of the product duplicator be used instead of the spree one
2020-11-04 12:15:45 +00:00
Luis Ramos
f6195f1159
Remove duplicate_extra logic from ProductDuplicator
2020-11-04 12:15:23 +00:00
Luis Ramos
503c17f896
Move Spree::ProductDuplicator to Spree::Core namespace
2020-11-04 12:15:23 +00:00
Luis Ramos
795b7101ab
Remove spree requires that are not needed in OFN
2020-11-04 12:15:23 +00:00
Luis Ramos
9d4a15b0e0
Add required product scopes from spree_core product_scopes
2020-11-04 12:15:23 +00:00
Luis Ramos
459959c068
Remove code related to spree promotions
2020-11-04 12:15:23 +00:00
Luis Ramos
ba16de6627
Move product duplicator to lib/spree/core, it's where spree_core is currently loading it from
2020-11-04 12:15:23 +00:00
Luis Ramos
72a39fdf54
Add required factory from spree_core
2020-11-04 12:15:23 +00:00
Luis Ramos
4b8515358c
Remove reference to FactoryGirl, it's FactoryBot that is used in OFN
2020-11-04 12:15:23 +00:00
Luis Ramos
cf7d8067df
Fix easy rubocop issues
2020-11-04 12:15:23 +00:00
Luis Ramos
d4e4669e49
Run transpec
2020-11-04 12:15:23 +00:00
Luis Ramos
e9f76cb339
Remove some dead code (Config.track_inventory_levels), remove variant.cost_price= so that localized number is seen, and fix specs
2020-11-04 12:15:23 +00:00
Luis Ramos
b68c5ee0f9
Remove dead code (prototypes) and fix specs
2020-11-04 12:15:23 +00:00
Luis Ramos
072cd2bd54
Run rubocop autocorrect in specs
2020-11-04 12:15:23 +00:00
Luis Ramos
2f8198eecc
Fix some easy rubocop issues
2020-11-04 12:15:23 +00:00
Luis Ramos
f85044e035
Run rubocop autocorrect
2020-11-04 12:15:23 +00:00
Luis Ramos
751beceb34
Merge decorators with original spree files
2020-11-04 12:15:23 +00:00
Luis Ramos
8cb75fc6d8
Bring models from spree_core: Spree::Product and Spree::Variant!
...
EPIC COMMIT ALERT :-)
2020-11-04 12:15:23 +00:00
Matt-Yorkley
d147996af6
Fix display issue in product image edit page
2020-11-03 18:41:09 +00:00
Transifex-Openfoodnetwork
daff0a250c
Updating translations for config/locales/pt_BR.yml
2020-11-04 03:32:20 +11:00
Transifex-Openfoodnetwork
65bccb9236
Updating translations for config/locales/ru.yml
2020-11-03 20:36:52 +11:00
Transifex-Openfoodnetwork
efe5a4700a
Updating translations for config/locales/en_FR.yml
2020-11-03 19:13:11 +11:00
Transifex-Openfoodnetwork
0103cc3a2f
Updating translations for config/locales/fr.yml
2020-11-03 19:13:06 +11:00
Transifex-Openfoodnetwork
2a2c7bdc4e
Updating translations for config/locales/es.yml
2020-11-03 08:49:53 +11:00
Transifex-Openfoodnetwork
ad76f3e91e
Updating translations for config/locales/ca.yml
2020-11-03 08:48:11 +11:00
Pau Pérez Fabregat
201c9c109d
Merge pull request #6281 from Matt-Yorkley/missing-translation-ordering
...
Add missing translation key for enterprise taxon ordering
2020-11-02 22:15:43 +01:00
Pau Pérez Fabregat
4911bb6613
Merge pull request #6274 from luisramos0/rubocop
...
Use rubocop auto correct to fix a number of issues
2020-11-02 22:13:36 +01:00
Luis Ramos
c07215552e
Add log entries to log
2020-11-02 20:59:57 +00:00
Luis Ramos
2b01c80c54
Add subs debug task that prints out basic info about a specific Order Cycle
2020-11-02 20:59:57 +00:00
Pau Pérez Fabregat
9de74500cd
Merge pull request #6288 from andrewpbrett/fix-cookies-banner
...
update template path for cookies banner, fix #6284
2020-11-02 20:52:46 +01:00
Andy Brett
04f5249176
update template path for cookies banner, fix #6284
2020-11-02 07:45:30 -08:00
Transifex-Openfoodnetwork
5c81f645c9
Updating translations for config/locales/fr.yml
2020-11-02 20:38:38 +11:00
Transifex-Openfoodnetwork
6ff8cadb26
Updating translations for config/locales/en_FR.yml
2020-11-02 20:27:13 +11:00
Transifex-Openfoodnetwork
04358dfa39
Updating translations for config/locales/en_FR.yml
2020-11-02 20:24:09 +11:00
Transifex-Openfoodnetwork
b23d6674b5
Updating translations for config/locales/ru.yml
2020-11-02 18:59:12 +11:00
Transifex-Openfoodnetwork
8904273bea
Updating translations for config/locales/ru.yml
2020-11-02 18:56:03 +11:00
Luis Ramos
1bb7fd9ec8
Merge pull request #6280 from Matt-Yorkley/eastern-slavic-plurals
...
Add missing translation keys for Eastern Slavic plurals
2020-10-31 23:13:54 +00:00
Matt-Yorkley
0af20e48b0
Add missing translation key for enterprise taxon ordering
2020-10-31 19:17:19 +00:00
Matt-Yorkley
bc40088eaf
Add missing translation keys for Eastern Slavic plurals
...
There are multiple forms of pluralisation here, with different translations for each.
перевод сложен !
2020-10-31 16:58:15 +00:00
Luis Ramos
fa77204e14
Adapt spec to the move of the controller, in prod the call to request.env['PATH_INFO'] will work correctly
2020-10-31 10:44:19 +00:00
Luis Ramos
af713385d8
Add frozen string literal
2020-10-31 10:16:37 +00:00
Luis Ramos
c9972189d0
Change usage of Spree::Admin::BaseController to Admin::BaseController
2020-10-31 09:56:59 +00:00
Luis Ramos
eb07a91acb
Adapt code from Spree::Admin::BaseController to Admin::BaseController
2020-10-31 09:52:34 +00:00
Luis Ramos
66ba9ff73d
Move Spree::Admin::BaseController to Admin::BaseController
2020-10-31 09:51:37 +00:00
Pau Perez
1abdd0112e
Update all locales with the latest Transifex translations
2020-10-31 10:46:12 +01:00
Pau Pérez Fabregat
bc6ffe3b0c
Merge pull request #6242 from openfoodfoundation/transifex
...
Transifex
2020-10-31 10:36:12 +01:00
Luis Ramos
eea73aa989
Merge pull request #5919 from luisramos0/injector_refactor_for_rails41
...
[Rails 4.1, works in master] Convert relations with to_a so that they work in rails 4.1
2020-10-31 09:33:27 +00:00
Pau Pérez Fabregat
03b0ce430d
Merge branch 'master' into transifex
2020-10-31 10:05:27 +01:00
Luis Ramos
bfce012a4b
Update manual rubocop todo
2020-10-30 17:56:13 +00:00
Luis Ramos
fb3dd0aa18
Update rubocop manual list for MethodLength and AbcSize cops
2020-10-30 17:46:49 +00:00
Luis Ramos
01320105ea
Update rubocop_todo
2020-10-30 17:32:47 +00:00
Luis Ramos
c2c12b34f9
Fix more rubocop issues with auto correct
2020-10-30 17:10:23 +00:00
Luis Ramos
c71ebc38bb
Fix Layout/ArgumentAlignment
2020-10-30 17:06:08 +00:00
Luis Ramos
4b03dec119
Update manual todo for Line Length
2020-10-30 17:01:38 +00:00
Luis Ramos
ca1373a366
Fix Style/RescueStandardError and Style/RegexpLiteral
2020-10-30 16:50:37 +00:00
Luis Ramos
b0e889be2a
Fix Style/RandomWithOffset
2020-10-30 16:50:37 +00:00
Luis Ramos
b3196295e6
Fix Style/RaiseArgs
2020-10-30 16:50:37 +00:00
Luis Ramos
75cec3b606
Fix issue Style/HashSyntax
2020-10-30 16:50:37 +00:00
Luis Ramos
92417d849c
Fix rubocop issue Rails/DynamicFindBy
2020-10-30 16:50:37 +00:00
Luis Ramos
bf5fcde885
Fix Lint/UnusedMethodArgument
2020-10-30 16:50:37 +00:00
Luis Ramos
40f8c785a2
Fix Lint/UnusedBlockArgument
2020-10-30 16:50:37 +00:00
Luis Ramos
403384dbb1
Fix rubocop isssues, trailing whitespaces and empty lines
2020-10-30 16:50:37 +00:00
Luis Ramos
c30cba8bfe
Fix issue Layout/SpaceInsideHashLiteralBraces
2020-10-30 16:50:37 +00:00
Luis Ramos
e8138e8c23
Fix rubocop issues in models/payment_spec
2020-10-30 16:50:37 +00:00
Luis Ramos
4845cde20f
Fix rubocop issue Layout/HashAlignment
2020-10-30 16:50:37 +00:00
Luis Ramos
a8265aff89
Fix rubocop issue Layout/FirstHashElementIndentation
2020-10-30 16:50:37 +00:00
Luis Ramos
9cb3b0b14a
Fix rubocop issue Layout/FirstArrayElementIndentation
2020-10-30 16:50:37 +00:00
Luis Ramos
06433b1be3
Fix rubocop issue Layout/ExtraSpacing
2020-10-30 16:50:37 +00:00
Luis Ramos
d4c52ce122
Fix rubocop issue Layout/EmptyLinesAroundBlockBody
2020-10-30 16:50:37 +00:00
Luis Ramos
eb4e732c1a
Fix rubocop issue Layout/EmptyLines
2020-10-30 16:50:37 +00:00
Luis Ramos
3fe2684270
Fix rubocop issue Layout/BlockAlignment
2020-10-30 16:50:37 +00:00
Luis Ramos
3e6e338e3d
Fix rubocop issue Layout/ArgumentAlignment
2020-10-30 16:50:37 +00:00
Luis Ramos
ad14f7f9b0
Merge pull request #6203 from luisramos0/rubocop_fix
...
Fix ~80 rubocop issues in serializers/api/admin
2020-10-30 16:48:22 +00:00
Luis Ramos
7cc7c62232
Fix long lines
2020-10-30 16:14:39 +00:00
Luis Ramos
b6dc46a911
Fix rubocop issue by nesting module and class declarations
...
No file contents changed
2020-10-30 16:14:34 +00:00
Luis Ramos
0b70c67908
Merge pull request #5994 from openfoodfoundation/tcs_checkbox
...
Terms and Conditions checkbox on checkout
2020-10-30 15:10:06 +00:00
Luis Ramos
71a181341b
Fix bug in terms_and_conditions_helper related to guest checkout where current_user is nil and T&Cs must be shown all the time
2020-10-30 15:09:13 +00:00
Luis Ramos
cf3f511f4d
Add directive spec to validate the dialog template is loaded on element click
2020-10-30 15:09:13 +00:00
Luis Ramos
1d1067ebc1
Add coverage to T&Cs file opening on a new tab and also for the upload timestamp now displayed in the page
2020-10-30 15:09:13 +00:00
Luis Ramos
bd4d0ba5d3
Make the warning message work for first upload and for changes
2020-10-30 15:09:13 +00:00
Luis Ramos
3b682bc47f
Add warning when uploading a file
2020-10-30 15:09:13 +00:00
Luis Ramos
be35f97622
Add tooltip icon to terms and conditions
2020-10-30 15:09:13 +00:00
Luis Ramos
ca79270ba3
Show T&Cs warning when uploading a new file
2020-10-30 15:09:13 +00:00
Luis Ramos
2cf7b1b36c
Make label translatable
2020-10-30 15:09:13 +00:00
Luis Ramos
f7c07f492c
Make TCs file input onoy accept pdf files
2020-10-30 15:09:13 +00:00
Luis Ramos
9f17e4fd8f
Add upload timestamp to TCs upload form in enterprise business details
2020-10-30 15:09:13 +00:00
Luis Ramos
c980d22826
Make TCs link open in a new tab in the backoffice
2020-10-30 15:09:13 +00:00
Luis Ramos
ceee89fad0
Make Checkout form submit read terms_and_conditions_accepted from the checkout form checkbox
2020-10-30 15:09:13 +00:00
Luis Ramos
a942218708
Fix post checkout actions spec
2020-10-30 15:09:13 +00:00
Luis Ramos
26946ec102
Fix edge case and some specs in post checkout actions
2020-10-30 15:09:13 +00:00
Luis Ramos
dd31cbe014
Cover case where enterprise uploads new T&Cs file and customer has already accepted before
2020-10-30 15:09:13 +00:00
Luis Ramos
46733d0c0d
Add feature spec to cover T&Cs ticked by default if customer has already accepted them
2020-10-30 15:09:13 +00:00
Luis Ramos
57a9d6e1e2
Make customer terms_and_conditions_accepted_at be set to current time
...
after a successful checkout
2020-10-30 15:09:13 +00:00
Luis Ramos
ad592785cf
Rename methods to follwo ruby convention and improve readability
2020-10-30 15:09:13 +00:00
Luis Ramos
f3ba0ebdbb
Move code to a new helper
2020-10-30 15:09:13 +00:00
Luis Ramos
4d64bf6ece
Add column to customers table to register last time enterprise terms and
...
conditions were accepted so customer doesnt have to accept terms on all
checkouts but only when the enterprise updates the terms file
2020-10-30 15:09:13 +00:00
Luis Ramos
3c9c5862d1
Verify terms and conditions updated_at timestamp is touched every time the file name changes.
...
We will need this to check if user already accepted the terms and
conditions of this enterprise.
2020-10-30 15:08:26 +00:00
Luis Ramos
78a8f53d8d
Change default translations to what's been requested on the issue
2020-10-30 15:08:26 +00:00
Luis Ramos
806c8b943d
Move small class to label so that rule is actually applied
2020-10-30 15:08:26 +00:00
Luis Ramos
85096a997f
Add a checkbox to checkout to tick for Terms and Conditions
...
Checkout button should be disabled if checkbox is not ticked
2020-10-30 15:08:26 +00:00
Transifex-Openfoodnetwork
19b6cb13f1
Updating translations for config/locales/pt_BR.yml
2020-10-31 01:36:45 +11:00
Transifex-Openfoodnetwork
dd228cc750
Updating translations for config/locales/ar.yml
2020-10-30 22:39:44 +11:00
Cillian O'Ruanaidh
5aa8c783b1
Use Rspec syntax instead of Test::Unit in ActionDispatch::Request spec.
2020-10-30 11:12:36 +00:00
Cillian O'Ruanaidh
5a66c855bc
Add :frozen_string_literal magic comment and underscore prefix to unused block argument for Rubocop
2020-10-30 11:12:36 +00:00
Cillian O'Ruanaidh
ea3c456d3b
Patch Rails :deep_munge issue so empty array parameters don't get converted to nil
...
Before people were unable to remove coordinator fees from an order cycle because Rails was converting the empty :coordinator_fee_ids array paramter into nil. This issue was introduced to Rails in v4.0.0.beta1 and isn't fixed until v5.0.0.beta1
Another way to fix this could be to do something like 'params[:coordinator_fee_ids] ||= []' but it seems like this issue could problems in other parts of the app so a more general fix might be better.
Fixes #6224
2020-10-30 11:12:36 +00:00
Luis Ramos
586e8a9abe
Fix some more rubocop issues
2020-10-30 10:13:16 +00:00
Luis Ramos
1847b62cf4
Fix some rubocop issues
2020-10-30 10:12:56 +00:00
Luis Ramos
0618c9e4dd
Fix line_items_decorator spec
2020-10-30 10:12:56 +00:00
Luis Ramos
d15301021a
Rename inject_json_list to inject_json_array
2020-10-30 10:12:56 +00:00
Luis Ramos
55e8dace44
Fix sort_by issue on relation by calling to_a
2020-10-30 10:12:56 +00:00
Luis Ramos
9a9b455e66
Fix problem in default_tax related to sum in active record
2020-10-30 10:12:56 +00:00
Luis Ramos
399fe2c01b
Make code work for relations and arrays
2020-10-30 10:12:56 +00:00
Luis Ramos
3aeb87debc
Make it work with both relations and arrays
2020-10-30 10:12:56 +00:00
Luis Ramos
7b06fdd943
Convert to array before using sort_by!
2020-10-30 10:12:56 +00:00
Luis Ramos
6755354196
Convert relation to_a to be able to use sum
2020-10-30 10:12:56 +00:00
Luis Ramos
440e69e156
Convert relation to array to be able to use sum
2020-10-30 10:12:47 +00:00
Luis Ramos
a53223aefc
Convert relation to array before using array only method sort_by!
2020-10-30 10:10:54 +00:00
Luis Ramos
cc1b4123b7
Make model_set handle collections that are relations and not arrays
2020-10-30 10:10:54 +00:00
Luis Ramos
65ce183830
Make checkout_adjustments_for handle adjustments if a relation is given
2020-10-30 10:10:54 +00:00
Luis Ramos
7e606471e4
Make tag_rulee_applicator and available_payment_methods_filter handle case where a relation is given instead of an array
2020-10-30 10:10:54 +00:00
Luis Ramos
1dace1f0e3
Make quantifier use stock_items relation and not an array because sum will behave differently with an array in rails 4.1
2020-10-30 10:10:54 +00:00
Luis Ramos
08d26102d2
Separate injection methods so that we can have a separate behaviour for lists without having to check their types
...
This change is required for rails 4.1 where the relations api changed
2020-10-30 10:10:54 +00:00
Transifex-Openfoodnetwork
35790b3cca
Updating translations for config/locales/en_FR.yml
2020-10-30 19:29:20 +11:00
Transifex-Openfoodnetwork
2ce05d48bf
Updating translations for config/locales/fr.yml
2020-10-30 19:29:05 +11:00
Tsara Sudrajat
f4c7a0b2a2
Align center order adjustment and order total title
2020-10-30 11:29:38 +07:00
Luis Ramos
6b826423c1
Merge pull request #6145 from andrewpbrett/instance-unit-picker
...
Allow instances to choose available units for products/variants
2020-10-29 22:22:33 +00:00
Luis Ramos
412457bb19
Merge pull request #6122 from luisramos0/customer_total
...
Add Customer balance to customer list
2020-10-29 22:06:05 +00:00
Andy Brett
2605b9cdf0
refactor unitScales function
2020-10-29 09:18:24 -07:00
Andy Brett
867947f6b2
refactor availableUnitScales into unitScales
2020-10-29 09:18:24 -07:00
Andy Brett
8d9b33abe8
update spec with new param structure
2020-10-29 09:18:24 -07:00
Andy Brett
57fe1db10e
guard against nil params[:available_units]
2020-10-29 09:18:24 -07:00
Andy Brett
18d2599075
indicate block argument is unused
2020-10-29 09:18:24 -07:00
Andy Brett
292b33b4ea
simplify available units params (and remove regex!)
2020-10-29 09:18:24 -07:00
Andy Brett
8591934c19
extract availableUnits to separate method
2020-10-29 09:18:24 -07:00
Andy Brett
9bf84bd5a8
provide default availableUnits to specs
2020-10-29 09:18:24 -07:00
Andy Brett
67a603f77f
inject available_units for new variant creation
2020-10-29 09:18:24 -07:00
Andy Brett
331ac28b71
inject available units to edit variants page
2020-10-29 09:18:24 -07:00
Andy Brett
3ead050a56
provide availableUnits to VariantUnitManager spec
2020-10-29 09:18:24 -07:00
Andy Brett
23dd09eaad
remove extra debugger statement 🤦
2020-10-29 09:18:23 -07:00
Andy Brett
8585e6c7f0
add available units injection to BOM page
2020-10-29 09:18:19 -07:00
Andy Brett
866452383d
rubocop fix
2020-10-29 09:17:49 -07:00
Andy Brett
402fc902ff
remove non-default units from expected options array
2020-10-29 09:17:49 -07:00
Andy Brett
8f21b66b96
add controller spec for updating available units
2020-10-29 09:17:49 -07:00
Andy Brett
c9b540677c
refactor general settings controller to handle available_units params
2020-10-29 09:17:49 -07:00
Andy Brett
4f579facfe
move all_units to admin helper
2020-10-29 09:17:49 -07:00
Andy Brett
fa62ec0bff
only show available units for products
2020-10-29 09:17:49 -07:00
Andy Brett
cb3ea133e9
add available units to instance prefs page
2020-10-29 09:17:31 -07:00
Luis Ramos
10490536e2
Merge pull request #6244 from cillian/configurable-geocoder-service
...
Allow Geocoder to be configured to use different APIs
2020-10-29 16:12:52 +00:00
Yih Yang
b477ed4a0a
added products variable
2020-10-29 23:37:56 +08:00
Yih Yang
f7ee08855a
updated implementation
2020-10-29 22:07:11 +08:00
Yih Yang
e3d1f5256b
added product sorting
2020-10-29 22:06:35 +08:00
Luis Ramos
a43737af8b
Merge pull request #6266 from jhsu802701/rubocop_web_helper
...
Exempted spec/support/request/web_helper.rb from Metrics/AbcSize
2020-10-29 13:52:15 +00:00
Luis Ramos
0138f04506
Add spec to cover new customer balances on customers list
2020-10-29 13:38:36 +00:00
Luis Ramos
4a2684e3d9
Fix rubocop issues
2020-10-29 13:38:36 +00:00
Luis Ramos
e860e2ca57
Add label to customer balance so it's clear to the manager what's the balance status: credit owed or balance due
2020-10-29 13:38:36 +00:00
Luis Ramos
da69dca471
Make customer balance serialize with the currency
2020-10-29 13:38:36 +00:00
Luis Ramos
e4f3aae7c0
Add customer balance to customer list
2020-10-29 13:38:36 +00:00
Luis Ramos
72ae7ea8a2
Merge pull request #6267 from jhsu802701/rubocop_shopworkflow_2
...
Removed variant argument from click_add_bulk_max_to_cart
2020-10-29 13:36:58 +00:00
Jason Hsu
8f95de10bc
Removed variant argument from click_add_bulk_max_to_cart; updated spec/features/consumer/shopping/shopping_spec.rb to reflect this
2020-10-29 00:35:49 -05:00
Jason Hsu
cbe1b53189
Exempted spec/support/request/web_helper.rb from Metrics/AbcSize; reduces the number of offenses from 122 to 121
2020-10-29 00:23:30 -05:00
Transifex-Openfoodnetwork
9c30c3c0ed
Updating translations for config/locales/ar.yml
2020-10-29 11:15:12 +11:00
Luis Ramos
9a03428412
Merge pull request #6197 from cillian/reset-on-demand-on-absent-products
...
When resetting stock to 0 on absent products in product import also reset the on demand setting
2020-10-29 00:09:49 +00:00
Luis Ramos
76afc0b407
Merge pull request #6202 from cillian/sort-admin-products-by-name-fix
...
Fix sorting of admin products by name
2020-10-29 00:09:31 +00:00
Luis Ramos
200e9c5078
Merge pull request #6246 from tsara27/fix-shipping-method-translation
...
Add new translation for shipping method
2020-10-29 00:09:14 +00:00
Luis Ramos
caea5b2aa8
Merge pull request #6264 from openfoodfoundation/dependabot/bundler/bugsnag-6.18.0
...
Bump bugsnag from 6.17.0 to 6.18.0
2020-10-28 21:11:15 +00:00
Luis Ramos
3730d76b44
Merge pull request #6155 from arku/perf/model-specs
...
Improve model specs' performance
2020-10-28 21:06:10 +00:00
Transifex-Openfoodnetwork
28c25cff2c
Updating translations for config/locales/en_IE.yml
2020-10-29 07:08:18 +11:00
Pau Pérez Fabregat
20edcfab26
Merge pull request #6217 from santakadev/docker-open-db-port
...
Open PostgreSQL port in docker-compose
2020-10-28 17:56:49 +01:00
Pau Pérez Fabregat
642787b95a
Merge branch 'master' into reset-on-demand-on-absent-products
2020-10-28 17:28:53 +01:00
Transifex-Openfoodnetwork
a1438d3b2e
Updating translations for config/locales/ru.yml
2020-10-29 02:23:55 +11:00
dependabot-preview[bot]
fc8e3d1ece
Bump bugsnag from 6.17.0 to 6.18.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.17.0 to 6.18.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.17.0...v6.18.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-27 17:41:49 +00:00
Transifex-Openfoodnetwork
21991515df
Updating translations for config/locales/ar.yml
2020-10-27 22:56:03 +11:00
Luis Ramos
3534559fbf
Merge pull request #6235 from Matt-Yorkley/flaky-tag-rules
...
[Flaky Specs] Fix tag_rules and select2 issues
2020-10-27 11:40:04 +00:00
Matt-Yorkley
f1373b902c
Merge pull request #6256 from luisramos0/rubocop_specs
...
Relax ModuleLength rubocop rule for specs
2020-10-26 22:41:30 +01:00
Luis Ramos
e5e67fbdf0
Merge pull request #6255 from jhsu802701/fix_docker_up
...
Added yarn install to docker-compose up
2020-10-26 21:16:09 +00:00
Transifex-Openfoodnetwork
f1e80e92de
Updating translations for config/locales/it.yml
2020-10-27 07:18:57 +11:00
Luis Ramos
c5186c2412
Fix rubocop_specs file path
2020-10-26 17:27:38 +00:00
Luis Ramos
52f56baa8c
Remove specs with more than 100 lines but less than 300 from rubocop exceptions list
2020-10-26 17:03:54 +00:00
Luis Ramos
0b51d8b297
Add rubocop config to allow specs to be 300 lines long
2020-10-26 17:03:50 +00:00
Luis Ramos
0f5aa11f05
Nest spec in module declaration
2020-10-26 16:50:29 +00:00
Jason Hsu
00624d1b96
Added yarn install to docker-compose up; allows the app to work properly in the Docker environment
2020-10-26 11:07:01 -05:00
Transifex-Openfoodnetwork
7e8aaaa5f9
Updating translations for config/locales/fr.yml
2020-10-27 01:27:40 +11:00
Transifex-Openfoodnetwork
49b8dcb880
Updating translations for config/locales/en_FR.yml
2020-10-27 01:24:49 +11:00
Transifex-Openfoodnetwork
479520bf97
Updating translations for config/locales/fr.yml
2020-10-27 01:24:35 +11:00
Luis Ramos
b66b50cd56
Merge pull request #6125 from tsara27/fix-translation
...
Fix translation for password reset instruction mailer subject
2020-10-26 12:01:47 +00:00
Matt-Yorkley
a296710f78
Update all locales *again* with the latest translations, before publishing
2020-10-26 10:55:17 +00:00
Transifex-Openfoodnetwork
50cbc971a1
Updating translations for config/locales/pt_BR.yml
2020-10-26 10:13:53 +11:00
Transifex-Openfoodnetwork
7178a69a54
Updating translations for config/locales/pt_BR.yml
2020-10-26 10:10:47 +11:00
Luis Ramos
ebd7e9599b
Merge pull request #6248 from Matt-Yorkley/s3-credentials
...
Fix #s3_credentials
2020-10-25 19:47:57 +00:00
Matt-Yorkley
df3ac0394c
Fix #s3_credentials
2020-10-25 14:04:33 +00:00
Matt-Yorkley
822c82fa9d
Merge pull request #6204 from jhsu802701/remove_docker_md
...
Removed DOCKER.md (redundant)
2020-10-25 13:20:35 +01:00
Matt-Yorkley
e06e8fc460
Improve flaky form interaction process in #fill_in_tag
2020-10-25 10:17:16 +00:00
Matt-Yorkley
ee402db734
Refactor and DRY tag-rule-filling-in to #fill_in_tag method
2020-10-25 09:01:04 +00:00
Matt-Yorkley
3f1e496731
Fix select2 capybara issues
2020-10-24 23:53:02 +01:00
Matt-Yorkley
f22c7fcdfb
Merge pull request #6151 from luisramos0/stripe_save_cards
...
Stripe Feature Tests: checkout with saved a card
2020-10-24 23:29:29 +02:00
Transifex-Openfoodnetwork
494f0d8ff6
Updating translations for config/locales/ru.yml
2020-10-24 23:18:00 +11:00
Transifex-Openfoodnetwork
15715f9bb4
Updating translations for config/locales/it.yml
2020-10-24 22:28:59 +11:00
Tsara Sudrajat
4baf53a0a9
Add new translation for shipping method
2020-10-24 17:06:19 +07:00
Transifex-Openfoodnetwork
8041111886
Updating translations for config/locales/ar.yml
2020-10-24 07:34:19 +11:00
Transifex-Openfoodnetwork
adc2bcb442
Updating translations for config/locales/es.yml
2020-10-24 01:40:48 +11:00
Transifex-Openfoodnetwork
8a51c5cb5d
Updating translations for config/locales/es.yml
2020-10-24 01:37:39 +11:00
Transifex-Openfoodnetwork
e114d58ff2
Updating translations for config/locales/ca.yml
2020-10-24 01:36:14 +11:00
Transifex-Openfoodnetwork
b7fc3df86a
Updating translations for config/locales/fr_CA.yml
2020-10-23 23:18:11 +11:00
Transifex-Openfoodnetwork
01fe12e72b
Updating translations for config/locales/fr_CA.yml
2020-10-23 23:15:02 +11:00
Cillian O'Ruanaidh
c5e125747f
Allow Geocoder to be configured to use different APIs.
...
This gives instances the option to use other geocoding services, for example MapBox because instances may not have a Google Maps API key if they are using Open Street Map for their map instead of Google.
2020-10-23 13:09:59 +01:00
Transifex-Openfoodnetwork
3baaa5cc40
Updating translations for config/locales/en_CA.yml
2020-10-23 23:06:57 +11:00
Cillian O'Ruanaidh
e29d6048c2
Add a test for sorting admin products by name
2020-10-23 10:53:30 +01:00
Matt-Yorkley
9b72f7e45c
Merge pull request #6234 from Matt-Yorkley/fix-ordercyle-layout
...
Fix minor ordercyle selector layout regression
2020-10-23 10:52:25 +02:00
Transifex-Openfoodnetwork
c4ba8db7ed
Updating translations for config/locales/en_FR.yml
2020-10-23 19:12:20 +11:00
Transifex-Openfoodnetwork
764169c9ca
Updating translations for config/locales/fr.yml
2020-10-23 19:12:17 +11:00
Transifex-Openfoodnetwork
30a1832302
Updating translations for config/locales/en_FR.yml
2020-10-23 19:09:10 +11:00
Transifex-Openfoodnetwork
a07f64f8a8
Updating translations for config/locales/fr.yml
2020-10-23 19:09:07 +11:00
Matt-Yorkley
21a48f14f4
Update all locales with the latest Transifex translations
2020-10-22 21:03:11 +01:00
Matt-Yorkley
7d604884bf
Merge pull request #6201 from openfoodfoundation/transifex
...
Transifex
2020-10-22 22:01:20 +02:00
Matt-Yorkley
5edd562691
Merge pull request #6238 from openfoodfoundation/mobile-5-product-listings
...
Merge Product Listings to master
2020-10-22 21:55:42 +02:00
Transifex-Openfoodnetwork
ec1b5c228d
Updating translations for config/locales/nb.yml
2020-10-23 05:58:25 +11:00
Matt-Yorkley
176021b201
Fix minor ordercyle selector layout regression
2020-10-22 19:57:32 +01:00
Transifex-Openfoodnetwork
828df9fd43
Updating translations for config/locales/ar.yml
2020-10-23 03:14:52 +11:00
Matt-Yorkley
28590fdad4
Merge pull request #6223 from luisramos0/image_default_styles
...
Update image default styles
2020-10-22 17:54:32 +02:00
Luis Ramos
61cfdb4038
Merge pull request #6114 from mbudm/issue/6031
...
Add matomo tag to admin pages
2020-10-22 15:24:34 +01:00
Matt-Yorkley
489529d30e
Merge pull request #5729 from luisramos0/image_settings
...
Remove Image settings page and standardise Paperclip styles
2020-10-22 15:58:14 +02:00
Luis Ramos
a4f21be99a
Merge pull request #6237 from openfoodfoundation/dependabot/bundler/ddtrace-0.42.0
...
Bump ddtrace from 0.41.0 to 0.42.0
2020-10-22 13:48:15 +01:00
Matt-Yorkley
4dbe966fcf
Add subtle hover effect on clickable image
2020-10-22 10:37:11 +01:00
Matt-Yorkley
857ecaf680
Update "noimage" placeholder for :small size to 227x227px
2020-10-22 10:02:59 +01:00
Matt-Yorkley
01adf459b1
Replace top padding on product list
2020-10-22 09:59:16 +01:00
Matt-Yorkley
fb482fc1c7
Quickfix: unwanted border-right on bulk buy buttons
2020-10-22 15:46:49 +11:00
Maikel Linke
db53848092
Enable switching language of "Price breakdown"
...
And move translation to its own context.
2020-10-22 15:46:49 +11:00
Maikel Linke
2887751098
Move translation to its own section
2020-10-22 15:46:49 +11:00
Maikel Linke
e0a7f50626
Standardise new grey colour
2020-10-22 15:46:49 +11:00
Maikel Linke
db321da02a
Fade "From" producer label
2020-10-22 15:46:49 +11:00
Maikel Linke
d5f0fb10f4
Distinguish unit size more from variant name
2020-10-22 15:46:49 +11:00
Maikel Linke
f6f029666a
Remove gaps in multi-line variant name
2020-10-22 15:46:49 +11:00
Maikel Linke
23454ba3bf
Show product property description nub on mobile
2020-10-22 15:46:49 +11:00
Maikel Linke
a3e83f2f70
Grey out disabled bulk quantity buttons
...
Since they are further away from each other, the colour difference has
to be stronger to be recognised.
2020-10-22 15:46:49 +11:00
Maikel Linke
ec1887544e
Reduce bulk input modal size
...
This brings the related elements closer together.
2020-10-22 15:46:49 +11:00
Maikel Linke
e37fedc435
Add bulk ribbon to bulk products
2020-10-22 15:46:49 +11:00
Maikel Linke
ed902e7489
Reduce price breakdown size
...
It doesn't need as much space. This brings related text closer together
and hides less of the page, e.g. the add-to-cart button.
2020-10-22 15:46:49 +11:00
Maikel Linke
68777039bf
Adjust padding in the price breakdown modal
2020-10-22 15:46:48 +11:00
Maikel Linke
bbe2ce9cba
Add "Price breakdown" heading to pop-up
...
The translation key was already present even though it was unused.
2020-10-22 15:46:48 +11:00
Maikel Linke
450e5cc5e3
Remove indent of product description on iPhone
...
Our HTML formatting plugin for product descriptions adds whitespace to
the beginning of the description text. While that shouldn't be rendered
in HTML, Safari on iPhone was showing a whitespace and therefore moving
the text a bit to the right.
2020-10-22 15:46:48 +11:00
Maikel Linke
36ead3fdba
Remove margin between products and search bar on mobile
2020-10-22 15:46:48 +11:00
Maikel Linke
30bfb1a7bd
Fix clickable area when opening price breakdown
...
Once a price breakdown has been opened, the nub was over the bottom half
of the pie button. It made half of the pie unclickable.
And when you closed the breakdown, it became invisible but stayed
present, absorbing all clicks in that area. So other pie buttons were
unclickable as well.
2020-10-22 15:46:48 +11:00
Maikel Linke
0268782b5e
Align price pie with product name
...
Moving it a bit to the right on mobile.
And giving the variant name a bit more space.
2020-10-22 15:46:48 +11:00
Maikel Linke
152835335d
Pre-calculate product image size in layout
...
Giving a percentage is simpler than the whole formula.
2020-10-22 15:46:48 +11:00
Maikel Linke
fd14d61213
Adjust product separator color
...
The original design contains grey-100: e6e6e6
Also removed not needed comment.
2020-10-22 15:46:48 +11:00
Maikel Linke
05add9e530
Enlarge product pictures flexibly for devices
...
This change will need a change of the `small` image size. The new format
should be `227x227#`. The `#` crops the center of an image to make it
square if necessary. All old images should then be regenerated:
rake paperclip:refresh:thumbnails CLASS=Spree::Image
2020-10-22 15:46:48 +11:00
Maikel Linke
de9b10b227
Darken add-button on hover
2020-10-22 15:46:48 +11:00
Maikel Linke
41ab84c8f9
Add padding to product tags
2020-10-22 15:46:48 +11:00
Maikel Linke
cb5089a69a
Increase space for variant name on mobile
2020-10-22 15:46:48 +11:00
Maikel Linke
15c7dad5f2
Left-align prices on mobile
2020-10-22 15:46:48 +11:00
Maikel Linke
b57c912aa0
Add space between products and filters
2020-10-22 15:46:48 +11:00
Maikel Linke
66d5f8d5c1
Align first product flush to the search bar
2020-10-22 15:46:47 +11:00
Maikel Linke
1e3ff141f0
Reduce margin below product description
2020-10-22 15:46:47 +11:00
Maikel Linke
c053ae951b
Style product header
...
Reduce font size.
Adjust margins.
2020-10-22 15:46:47 +11:00
Maikel Linke
3a3ec4e45e
Close price breakdown on click outside
2020-10-22 15:46:47 +11:00
Maikel Linke
6bb48c0954
Adjust active colour of price breakdown button
2020-10-22 15:46:47 +11:00
Maikel Linke
1fd4dc471a
Position the price breakdown below the button
2020-10-22 15:46:47 +11:00
Maikel Linke
2ce65472ec
Remove obsolete styles
...
I think that this was overlooked when replacing the cart code in
be8c0f3600
2020-10-22 15:46:47 +11:00
Maikel Linke
230d3e76a1
Label plus and minus symbols as special
2020-10-22 15:46:47 +11:00
Maikel Linke
650686c262
Adjust alignment of variant name with unit
2020-10-22 15:46:47 +11:00
Maikel Linke
cdbbcfd1fe
Better naming for translation keys
2020-10-22 15:46:47 +11:00
Maikel Linke
e45941276e
Better naming of translation keys
...
Also splitting one key for two different uses.
2020-10-22 15:46:47 +11:00
Maikel Linke
d2600b1d40
Avoid translation errors by hardcoding symbols
...
The fullwidth plus and minus signs are well understood in all countries
(that participate in the development of OFN). It's more likely that a
translator enters a normal plus or minus than that they want to change
the symbol. A normal + or - sign doesn't fill a whole character space
and is therefore not well aligned in the design.
2020-10-22 15:46:47 +11:00
Matt-Yorkley
b79d9bd75b
Fix screen-width bug for desktop down
...
The width of these elements was ~105% of total screen width, adding horizontal scrollbars and whitespace on the left hand side
2020-10-22 15:46:47 +11:00
Matt-Yorkley
6bcf11e308
Adjust layout of variant rows for better use of vertical space
2020-10-22 15:46:47 +11:00
Matt-Yorkley
e39a15ed30
Remove margin-bottom with !important from product
2020-10-22 15:46:46 +11:00
Matt-Yorkley
98e581c059
Remove pad-top class from products from to match alignment with filter sidebar
2020-10-22 15:46:46 +11:00
Matt-Yorkley
e968a091f9
Match right and left row padding on phablet down
2020-10-22 15:46:46 +11:00
Matt-Yorkley
a2f710db1e
Improve vertical alignment of variant form elements
2020-10-22 15:46:46 +11:00
Matt-Yorkley
898492c409
Remove borders from graph button
2020-10-22 15:46:46 +11:00
Matt-Yorkley
a89c81a033
Hide description paragraph if product has no description
...
Improves the appearance of the layout when no description is present
2020-10-22 15:46:46 +11:00
Maikel Linke
9da91576ac
Fix height of invisible "in cart" text
...
While the text "x in cart" isn't visible, the item quantity is not set.
A missing variable leads to longer text that is taken up more space. In
this case it was two lines instead of one line. The resulting extra line
of margin disappeared when adding to the cart and the rest of the page
jumped up.
2020-10-22 15:46:46 +11:00
Maikel Linke
57178659c3
Remove bulk icon as per design
2020-10-22 15:46:46 +11:00
Maikel Linke
81cc951ed4
Name symbols on quantity buttons in specs
2020-10-22 15:46:46 +11:00
Maikel Linke
d337561ea8
Move ShopVariantCtrl to own file and spec it
2020-10-22 15:46:46 +11:00
Maikel Linke
755773e5ad
Style code
2020-10-22 15:46:46 +11:00
Maikel Linke
58f4d7393c
Make quantity labels translatable
2020-10-22 15:46:46 +11:00
Maikel Linke
01c4882759
Replace bulk buy inputs with add-remove-buttons
2020-10-22 15:46:46 +11:00
Maikel Linke
59c13b97ea
Replace quantity input with add-remove buttons
...
The new mobile friendly design contains a nice "Add" button to add
variants to your cart. Once you have the variant in you cart, it's
replaced by plus and minus buttons to adjust the quantity.
Other languages have longer words than "Add" which need to fit on the
button. Since the add button and the +/- buttons should have the same
width, I widened them a little bit so that they fit the longest words
Aggiungi and Добавить.
2020-10-22 15:46:46 +11:00
Maikel Linke
35747dc2b1
Emphasize first identifying name of a variant
...
That can be a variant name or the unit if the name is missing. Putting
the second and third element in the background consistently.
2020-10-22 15:46:45 +11:00
Maikel Linke
7660116792
Display variant name only when set
...
The previous method was falling back to the product name which is
displayed already.
2020-10-22 15:46:45 +11:00
Maikel Linke
8734fb1776
Override *active* states for product properties w/o tooltip
2020-10-22 15:46:45 +11:00
Maikel Linke
9379e21bca
Increase margin between product summary and variants
2020-10-22 15:46:45 +11:00
Maikel Linke
4ab2375832
Reduce margin on the right of product listing
2020-10-22 15:46:45 +11:00
Maikel Linke
1fb544b803
Remove margin of product listing on mobile and tablet
2020-10-22 15:46:45 +11:00
Maikel Linke
96cd5ca1fe
Fix "Place price-breakdown and price in the middle"
2020-10-22 15:46:45 +11:00
Maikel Linke
e1a3c351e5
Fix "Removal of category icon"
2020-10-22 15:46:45 +11:00
Maikel Linke
4f6e900327
Fix "Remove background and border colors from product list"
2020-10-22 15:46:45 +11:00
Maikel Linke
615678db56
Align inline graph vertically
2020-10-22 15:46:45 +11:00
Maikel Linke
526d4f53ad
Remove red overlay and icon on product image hover
2020-10-22 15:46:45 +11:00
Maikel Linke
ca1cb50314
Adjust margins
2020-10-22 15:46:45 +11:00
Maikel Linke
8006870b66
Adjust column widths
2020-10-22 15:46:45 +11:00
Maikel Linke
d02ab109f2
Show product images on mobile
2020-10-22 15:46:45 +11:00
Maikel Linke
fe1618cada
Add description to product listing
...
It's truncated to one line and a click reveals the modal.
2020-10-22 15:46:45 +11:00
Maikel Linke
afed46531c
Remove second line between products, leave one
2020-10-22 15:46:44 +11:00
Maikel Linke
893b6660fc
Change price-breakdown colour to grey
2020-10-22 15:46:44 +11:00
Maikel Linke
3e789fdb84
Show only tabular price breakdown, no graph
2020-10-22 15:46:44 +11:00
Maikel Linke
065314f0e4
Revert "Remove popover indicator"
...
This reverts commit 0bef97a46710c50b8519752009ca9e8c811f8326.
2020-10-22 15:46:44 +11:00
Maikel Linke
952c39f736
Remove popover indicator
2020-10-22 15:46:44 +11:00
Maikel Linke
2b982cfc2e
Show price breakdown on all screens
2020-10-22 15:46:44 +11:00
Maikel Linke
e29be51c45
Place price-breakdown and price in the middle
2020-10-22 15:46:44 +11:00
Maikel Linke
c15828061f
Move unit under name
2020-10-22 15:46:44 +11:00
Maikel Linke
52c8c19dfc
Remove black background from variant name on mobile
...
table-cell gave it a black background.
Also display it on the same line as the quantity input.
2020-10-22 15:46:44 +11:00
Maikel Linke
61d55ff16f
Remove per-variant subtotal from mobile view
2020-10-22 15:46:44 +11:00
Maikel Linke
25e309b8cc
Update link colors to orange and teal
2020-10-22 15:46:44 +11:00
Maikel Linke
9f5cec6d08
Remove tractor in front of producer name
2020-10-22 15:46:44 +11:00
Maikel Linke
03d8ccfe2e
Remove modal open indicator
2020-10-22 15:46:44 +11:00
Maikel Linke
f05563b30f
Removal of category icon
2020-10-22 15:46:44 +11:00
Maikel Linke
b34449832b
Remove background and border colors from product list
2020-10-22 15:46:43 +11:00
Maikel Linke
0febc9e8c2
Remove unused mixin styles
2020-10-22 15:46:43 +11:00
dependabot-preview[bot]
20777bb80f
Bump ddtrace from 0.41.0 to 0.42.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.41.0 to 0.42.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases )
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.41.0...v0.42.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-22 01:14:35 +00:00
Luis Ramos
032075c04a
Merge pull request #6119 from arku/chore/fire-event-removal
...
Remove fire_event method usage
2020-10-21 21:21:35 +01:00
Transifex-Openfoodnetwork
6e6dd233e8
Updating translations for config/locales/ru.yml
2020-10-22 02:30:07 +11:00
Matt-Yorkley
eb026f2e22
Use "sRBG" colourspace.
...
This seems to be the correct setting, and fixes a bug with the colouring of uploaded images. Further details:
https://imagemagick.org/script/color-management.php
https://www.imagemagick.org/discourse-server/viewtopic.php?t=20501
2020-10-21 14:26:26 +01:00
Matt-Yorkley
92d6168a14
Don't restrict image filetypes to JPG
2020-10-21 13:42:07 +01:00
Luis Ramos
78651012bb
Merge pull request #6177 from santakadev/fix-docker-setup
...
Fix docker local environment setup
2020-10-21 08:45:07 +01:00
Luis Ramos
d01f9b7aa1
Merge pull request #6227 from jhsu802701/fix_docker_scripts
...
docker-compose run --rm web -> docker-compose run web
2020-10-21 08:44:37 +01:00
Transifex-Openfoodnetwork
af9aa6a8db
Updating translations for config/locales/en_FR.yml
2020-10-21 18:35:58 +11:00
Transifex-Openfoodnetwork
2539507df9
Updating translations for config/locales/en_FR.yml
2020-10-21 18:32:58 +11:00
Transifex-Openfoodnetwork
d8b36c5966
Updating translations for config/locales/fr.yml
2020-10-21 18:30:35 +11:00
Jason Hsu
a9feb53294
docker-compose run --rm web -> docker-compose run web
2020-10-20 17:48:46 -05:00
Matt-Yorkley
f5ce0d501d
Merge pull request #5870 from luisramos0/prefs
...
[Bye bye Spree] Bring models app_configuration and preference from spree_core
2020-10-20 21:12:54 +02:00
Luis Ramos
b267f542d1
Merge pull request #5980 from luisramos0/spree_clean_up
...
[Bye bye spree] Some clean up fixes to make it all work without spree
2020-10-20 18:52:54 +01:00
Luis Ramos
9f568c1e9d
Merge pull request #5928 from luisramos0/spree_core_js
...
[Bye bye spree] Bring final bits of js and css from spree_core
2020-10-20 13:20:41 +01:00
Luis Ramos
3dc3e0970e
Update image default styles
2020-10-20 11:31:01 +01:00
Luis Ramos
10ed1f04c1
Revert default styles to what they were before, we can do this in a separate PR
2020-10-20 11:25:55 +01:00
Luis Ramos
16f9ef4ace
Simplify method
2020-10-20 11:20:37 +01:00
Luis Ramos
f4d8bdc17e
Fix easy rubocop issues
2020-10-20 11:20:37 +01:00
Luis Ramos
f3490e5668
Replace Spree::Image with self
2020-10-20 11:20:37 +01:00
Luis Ramos
7cf6518175
Set default values for styles directly in the attachment property without using Spree::Config
...
Only use ENV vars for attachment path and url coming from ofn-install
2020-10-20 11:20:37 +01:00
Luis Ramos
d15abe14d1
Join reformat styles and set attachement definitions and explain why we need to run them every time Spree::Image is loaded although this is also done in the spree initializer
2020-10-20 11:20:37 +01:00
Luis Ramos
6151c7420b
Move S3 attachment definitions to Spree::Image
2020-10-20 11:20:37 +01:00
Luis Ramos
fdd7049857
Reuse Spree::Image.set_attachment_definitions
2020-10-20 11:20:37 +01:00
Luis Ramos
b66ad71017
Move image settings config out of Spree::config initialization
2020-10-20 11:20:37 +01:00
Luis Ramos
98c5fdcf26
Reuse some code from Spree::Image in the spree initializer and extract some code to a class method so we can reuse afterwards
2020-10-20 11:20:37 +01:00
Luis Ramos
25ab5f7f24
Move reformat_styles to initializer, it's the only place where it is used
2020-10-20 11:20:37 +01:00
Luis Ramos
a5a55b3c10
Add settings initialization from previous image settings controller to spree initializer
2020-10-20 11:20:37 +01:00
Luis Ramos
0f06195baa
Remove Image settings page, these settings will come from ofn-install now
2020-10-20 11:20:37 +01:00
Luis Ramos
bebffcc90f
Set new S3 and attachments configs from ofn-install
2020-10-20 11:20:37 +01:00
Luis Ramos
c291639962
Merge pull request #6156 from razanjoshi/add_simplecov
...
Add coverage threshold for simplecov.
2020-10-20 09:40:07 +01:00
Transifex-Openfoodnetwork
de4aab6cf7
Updating translations for config/locales/en_US.yml
2020-10-20 02:03:21 +11:00
Luis Ramos
c0880a1b9a
Merge pull request #6191 from mkllnk/draft-release
...
Add script to draft release notes
2020-10-19 12:22:24 +01:00
Arun Kumar Mohan
b0fa1464f8
Remove fire_event method usage
2020-10-18 20:36:38 -05:00
Luis Ramos
e6baca37c4
Merge pull request #6215 from Matt-Yorkley/states-filepath
...
Fix deployments
2020-10-18 23:16:53 +01:00
Matt-Yorkley
58c0d90575
Fix error in countries.rb
2020-10-18 19:49:48 +01:00
Matt-Yorkley
dc06f60d2c
Merge pull request #6211 from openfoodfoundation/dependabot/bundler/webmock-3.9.3
...
Bump webmock from 3.9.2 to 3.9.3
2020-10-18 12:22:07 +02:00
Daniel Santamaría
ca2d66eacf
Open PostgreSQL port in docker-compose
2020-10-18 08:45:08 +02:00
Arun Kumar Mohan
c65108731c
Define supplier_ids in inventory_reset_strategy specs for clarity
2020-10-17 20:12:14 -05:00
Arun Kumar Mohan
5928eba767
Use build to validate objects from the shipping method factory
2020-10-17 19:59:21 -05:00
Arun Kumar Mohan
874d33caaa
Convert multiline blocks to single-line ones
2020-10-17 19:44:57 -05:00
Matt-Yorkley
4cd645b60e
Merge pull request #6150 from openfoodfoundation/luisramos0-patch-1
...
Make the release notes intructions a bit more clear so new contributors make them short
2020-10-18 00:44:06 +02:00
Matt-Yorkley
961fbd22cf
Merge pull request #6183 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.7
...
Bump activerecord-import from 1.0.6 to 1.0.7
2020-10-18 00:42:17 +02:00
Matt-Yorkley
b7c8bae9e8
Merge pull request #6185 from openfoodfoundation/dependabot/bundler/i18n-js-3.8.0
...
Bump i18n-js from 3.7.1 to 3.8.0
2020-10-18 00:41:09 +02:00
Matt-Yorkley
3612386463
Make loading of Zones in db:seed idempotent (and avoid fatal errors if run twice)
2020-10-17 18:08:28 +01:00
Matt-Yorkley
e9e7bdc6cd
Set Spree::Config[:default_country_id]` from ENV vars if default country specified.
2020-10-17 17:54:48 +01:00
Matt-Yorkley
d1c066d360
Move states.yml back to it's former filepath
2020-10-17 17:14:26 +01:00
Rajan Joshi
13fe8b6198
Add more directories to filter.
2020-10-17 15:55:22 +01:00
Tsara Sudrajat
66be86cca9
Fix translation on reset password mailer
2020-10-17 17:59:54 +07:00
dependabot-preview[bot]
b2e14b36dd
Bump webmock from 3.9.2 to 3.9.3
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.9.2 to 3.9.3.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.2...v3.9.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-17 07:47:24 +00:00
Jason Hsu
f9f054c611
Removed DOCKER.md (redundant)
2020-10-16 11:31:48 -05:00
Paolo Rossi
4a60d7ef0e
Update the base Ubuntu Docker image from 18.04 to 20.04
2020-10-16 17:26:08 +02:00
Transifex-Openfoodnetwork
9445093ea8
Updating translations for config/locales/en_FR.yml
2020-10-17 01:26:13 +11:00
Transifex-Openfoodnetwork
a4f00f0152
Updating translations for config/locales/fr.yml
2020-10-17 01:25:38 +11:00
Cillian O'Ruanaidh
35110eaf4a
Make sure :sorting parameter is nested inside the :q parameter to fix sorting of admin products
...
Fixes #6105 .
2020-10-16 15:21:15 +01:00
Luis Ramos
2711139420
Re-use existing stripe stub
2020-10-16 12:37:44 +01:00
Luis Ramos
cf319d3f05
Extract customers stripe stub to StripeStubs helper
2020-10-16 12:37:44 +01:00
Luis Ramos
f5f9a733fb
Fix rubocop issue, long module, by extracting StripeStubs to a separate helper module
2020-10-16 12:37:42 +01:00
Cillian O'Ruanaidh
c62f1bd550
Exclude products_reset_strategy_spec.rb from Rubocop's Metrics/ModuleLength check
2020-10-16 12:13:55 +01:00
Luis Ramos
05bb75db00
Merge pull request #6089 from luisramos0/seed_data
...
[Bye bye spree] Prepare seed data for bye bye spree
2020-10-16 11:55:27 +01:00
Cillian O'Ruanaidh
2cc751cb30
When resetting stock to 0 on absent products in product import also reset the on demand setting
...
Before when you imported products and clicked the 'Set stock to zero for all existing products not present in the file' option it would set the on hand stock to 0 but if the variant was also set to be on demand the product would still be available for sale. This change makes sure the on demand setting is turned off too.
Fixes #6064 .
2020-10-16 11:38:49 +01:00
Luis Ramos
487aaf4862
Extract stub to StripeHelper
2020-10-16 11:12:44 +01:00
Luis Ramos
f13ebf8f21
DRY StripeHelper
2020-10-16 11:09:52 +01:00
Luis Ramos
7e80ddf1e5
Add step to checkout with the previously saved card
2020-10-16 10:24:49 +01:00
Luis Ramos
7efc52075e
First attempt at adding a spec to checkout and save a credit card
2020-10-16 09:26:19 +01:00
Luis Ramos
22bd0f3a52
Merge pull request #6187 from jhsu802701/spec_support_request_stripe_helper
...
Updated RuboCop (spec/support/request/stripe_helper.rb)
2020-10-16 08:49:17 +01:00
Luis Ramos
94713522e5
Merge pull request #6189 from jhsu802701/update_db_schema
...
Updated db/schema.rb by running database migrations
2020-10-16 08:40:18 +01:00
Luis Ramos
49947614b3
Merge pull request #6190 from jhsu802701/rubocop_calculator_factory
...
Updated spec/factories/calculator_factory.rb for RuboCop
2020-10-16 08:36:53 +01:00
Jason Hsu
c39e238e83
Updated spec/factories/calculator_factory.rb to remove unnecessary space; reduces number of RuboCop offenses from 91 to 90
2020-10-16 00:08:19 -05:00
Maikel Linke
6c1139c296
Add script to draft release notes
2020-10-16 16:03:26 +11:00
Jason Hsu
0119d9d0eb
Updated db/schema.rb by running bundle exec rake db:migrate
2020-10-15 23:56:43 -05:00
Maikel Linke
3679e0fac9
Copy all translations from Transifex
2020-10-16 15:34:24 +11:00
Maikel
960da1e7e9
Merge pull request #6179 from openfoodfoundation/transifex
...
Transifex
2020-10-16 15:33:11 +11:00
Maikel
8c65498661
Merge pull request #5998 from andrewpbrett/shipping-per-pound
...
Per-pound shipping calculator
2020-10-16 15:27:57 +11:00
Maikel
07780c5663
Merge pull request #6146 from openfoodfoundation/dependabot/bundler/geocoder-1.6.4
...
Bump geocoder from 1.6.3 to 1.6.4
2020-10-16 15:26:41 +11:00
Jason Hsu
bdf0cb1364
Exclude spec/support/request/stripe_helper.rb from Metrics/ModuleLength cop; reduces number of offenses from 90 to 89
2020-10-15 23:25:32 -05:00
Matt-Yorkley
f260a2d114
Merge pull request #6141 from Matt-Yorkley/mobile-shops-list
...
Make shops index page usable on mobile
2020-10-16 03:21:32 +02:00
Matt-Yorkley
25ee38cb9a
Merge pull request #6128 from luisramos0/stripe_bo
...
Add feature specs to stripe payments in the BackOffice
2020-10-16 02:53:42 +02:00
Matt-Yorkley
248633e14f
Merge pull request #6161 from Matt-Yorkley/add-polish-momentjs
...
Add polish translations with momentjs
2020-10-16 01:49:51 +02:00
dependabot-preview[bot]
66cde06cf8
Bump i18n-js from 3.7.1 to 3.8.0
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.7.1 to 3.8.0.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.1...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-15 23:24:41 +00:00
dependabot-preview[bot]
4fa6070353
Bump activerecord-import from 1.0.6 to 1.0.7
...
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import ) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/zdennis/activerecord-import/releases )
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.6...v1.0.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-15 23:14:21 +00:00
Luis Ramos
6bacc2f627
Fix group_buy_report_spec by avoiding orders with duplicate line items
2020-10-15 18:33:56 +01:00
Luis Ramos
4c9e4ee926
Fix problem in calculator spec
...
I am not sure why this started failing on this branch only and not in master but this fix is correct because line_items are created with order defined already, an order.reload is enough to load them into the order
2020-10-15 17:19:39 +01:00
Matt-Yorkley
7de98e74b8
Use #setup_stripe helper in tests to ensure Stripe keys are present
2020-10-15 17:09:24 +01:00
Luis Ramos
5141723b21
Re-add restart checkout specs
...
These were breaking because of the class_evals on the checkout_spec
2020-10-15 16:06:27 +01:00
Luis Ramos
fb3f35100f
Remove specs related to subsclassing the order class
...
This is not something we will do
2020-10-15 16:06:27 +01:00
Luis Ramos
249b4d124f
Remove more specs related to dynamic order checkout workflow
2020-10-15 16:06:27 +01:00
Luis Ramos
07b3c100e8
Remove code and specs related to dynamic checkout workflow, we have a static workflow defines in the Order class
2020-10-15 16:06:27 +01:00
Andy Brett
ca24068d37
use case-insensitive sql query
2020-10-15 07:55:19 -07:00
Transifex-Openfoodnetwork
5bd7000f58
Updating translations for config/locales/en_US.yml
2020-10-16 01:19:20 +11:00
Transifex-Openfoodnetwork
d9c107f282
Updating translations for config/locales/en_US.yml
2020-10-16 01:16:13 +11:00
Luis Ramos
6046b0f6e4
Fix typo
2020-10-15 14:54:42 +01:00
Luis Ramos
62a54e5f17
Add spec to cover stripe SCA refunds in the backoffice
2020-10-15 14:54:42 +01:00
Luis Ramos
bce81d27dd
Move spec to end of file so we can extend this case with refunds and cancelations
2020-10-15 14:54:42 +01:00
Luis Ramos
a6ed003cb9
Extract redirect stub to stripe_helper
2020-10-15 14:54:42 +01:00
Luis Ramos
b341f593e7
Improve method names
2020-10-15 14:54:42 +01:00
Luis Ramos
59b4e425b6
Fix some rubocop issues
2020-10-15 14:54:42 +01:00
Luis Ramos
4ab2a8ddd1
Add spec to cover stripe payment that fails on card registration with a request/redirect for extra SCA authorization
2020-10-15 14:54:42 +01:00
Luis Ramos
a5dbdaf228
Add spec to cover stripe payment that fails on capture
2020-10-15 14:54:42 +01:00
Luis Ramos
76a9271d9e
Add spec to cover payments in the backoffice for an order in the payment state
2020-10-15 14:54:42 +01:00
Luis Ramos
0178d3f1e6
Add spec that takes a stripe payment in the BO
2020-10-15 14:54:42 +01:00
Luis Ramos
cfed6a7048
Split payments_spec so that we can add more stripe specific specs
2020-10-15 14:54:42 +01:00
Luis Ramos
c664181266
Update PULL_REQUEST_TEMPLATE.md
2020-10-15 14:39:20 +01:00
Luis Ramos
945ea476fc
Merge pull request #6176 from openfoodfoundation/dependabot/bundler/timecop-0.9.2
...
Bump timecop from 0.9.1 to 0.9.2
2020-10-15 13:50:53 +01:00
Luis Ramos
9e4e72bec3
Merge pull request #6167 from jhsu802701/rubocop_spec_support_request
...
Updated files in the spec/support/request directory for RuboCop compliance
2020-10-15 13:48:12 +01:00
Daniel Santamaría
3fe7638dd6
Fix docker local environment setup
2020-10-15 12:28:07 +02:00
Pau Pérez Fabregat
981c17b6a5
Merge pull request #6169 from luisramos0/rubocop_refresh
...
Refresh Rubocop exception files
2020-10-15 12:06:41 +02:00
Pau Pérez Fabregat
55b6e7fa89
Merge pull request #6164 from openfoodfoundation/dependabot/bundler/webmock-3.9.2
...
Bump webmock from 3.9.1 to 3.9.2
2020-10-15 10:23:46 +02:00
Luis Ramos
d54ddacc05
Merge pull request #5887 from luisramos0/orders
...
[Bye bye Spree] Bring models order, line_item and other related from spree_core
2020-10-15 08:49:05 +01:00
dependabot-preview[bot]
b009c8675b
Bump timecop from 0.9.1 to 0.9.2
...
Bumps [timecop](https://github.com/travisjeffery/timecop ) from 0.9.1 to 0.9.2.
- [Release notes](https://github.com/travisjeffery/timecop/releases )
- [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md )
- [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.1...v0.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-14 17:34:03 +00:00
Luis Ramos
2b6b2c1b65
Update rubocop manual according to latest state of the codebase
2020-10-14 10:11:56 +01:00
Luis Ramos
6ea021a561
Update rubocop_todo.yml
2020-10-14 09:59:08 +01:00
Jason Hsu
a8eaabc5da
Used guard clause in spec/support/request/checkout_helper.rb instead of an if statement with two actions; reduces the number of RuboCop offenses from 108 to 107
2020-10-13 12:14:15 -05:00
Jason Hsu
0d051b7c7d
Added '# frozen_string_literal: true' to spec/support/request/checkout_helper.rb; reduces number of RuboCop offenses from 109 to 108
2020-10-13 12:05:50 -05:00
Jason Hsu
c6d6b6f65a
Removed empty trailing line in spec/support/request/stripe_helper.rb; reduces RuboCop offenses from 110 to 109
2020-10-13 12:01:11 -05:00
Luis Ramos
dbd41e9d31
Use ruby 2.4 as github actions do not support ruby 2.3.
2020-10-13 10:31:26 +01:00
Luis Ramos
87327dcf57
Add brakeman config
2020-10-13 10:31:13 +01:00
dependabot-preview[bot]
7c3da77ad6
Bump webmock from 3.9.1 to 3.9.2
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.1...v3.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-13 09:07:36 +00:00
Pau Pérez Fabregat
f1e2040ce3
Merge pull request #6061 from arku/fix/sleep-removal
...
Remove sleep calls from select2 helper
2020-10-13 09:42:25 +02:00
Pau Pérez Fabregat
536f54d6a7
Merge pull request #6092 from jhsu802701/docker_scripts
...
Added Docker scripts in the new Docker directory
2020-10-13 09:36:12 +02:00
Arun Kumar Mohan
2ec35b6306
Remove unnecessary let declaration
2020-10-13 01:22:11 -05:00
Arun Kumar Mohan
e963ab4bd4
Replace FactoryBot.create with create
2020-10-13 01:21:47 -05:00
Matt-Yorkley
32999e6be4
Add polish translations with momentjs
2020-10-12 23:05:43 +01:00
Jason Hsu
03b33e99cf
Merge branch 'master' into docker_scripts
2020-10-12 11:36:49 -05:00
Luis Ramos
9545c57969
Merge pull request #6049 from luisramos0/momentjs
...
Use yarn and move Momentjs from gemfile to yarn
2020-10-12 15:28:23 +01:00
Luis Ramos
9288250194
Merge pull request #5981 from luisramos0/spree_ability
...
[Bye bye spree] Bring classes related to abilities to OFN
2020-10-12 15:26:30 +01:00
Rajan Joshi
8b64fbe80e
Reduce coverage threshold to 54 inorder to pass CI.
2020-10-11 19:18:24 +01:00
Rajan Joshi
fbadf25043
Add coverage threshold for simplecov.
2020-10-11 17:18:50 +01:00
Arun Kumar Mohan
14eee1c9e4
Improve product specs' performance
2020-10-11 01:10:11 -05:00
Arun Kumar Mohan
ff049d33e7
Improve variant stock specs' performance
2020-10-10 00:43:27 -05:00
Arun Kumar Mohan
b02e25af0e
Improve shipment specs' performance
2020-10-09 23:28:32 -05:00
Arun Kumar Mohan
76293c335b
Improve payment specs' performance
2020-10-09 23:05:14 -05:00
Arun Kumar Mohan
01d2c3cb9e
Improve variant specs' performance
2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
80c76606df
Improve line items specs' performance
2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
b07fbec8c6
Improve credit card specs' performance
2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
c4205fce34
Improve enterprise specs' performance
2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
a959f8e745
Improve inventory reset strategy specs' performance
2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
437c39f795
Improve taxon specs' performance
2020-10-09 22:11:34 -05:00
Arun Kumar Mohan
27f1aeb803
Improve shipping method specs' performance
2020-10-09 22:11:31 -05:00
Jason Hsu
c53d4cf8ea
Corrected typos in docker/seed
2020-10-08 23:24:54 -05:00
Jason Hsu
e5d97e37f1
Moved docker network prune -f command from docker/nukec to docker/nuke
2020-10-08 14:46:12 -05:00
Jason Hsu
71ad109f78
Changed docker/exec to docker/run; updated docker/README.md to reflect this
2020-10-08 14:43:30 -05:00
Jason Hsu
d9476ec87d
Corrected the docker-compose commands in docker/cop, docker/seed, and docker/test-log
2020-10-08 14:38:49 -05:00
Jason Hsu
74980401b5
Synced to master; moved section about troubleshooting Docker in Windows to docker/README.md
2020-10-08 14:06:54 -05:00
Arun Kumar Mohan
1c4ef87654
Fix product import date filter spec
...
The spec was failing because the date in the spec had a couple of
spaces after the month name (October 9, 2020) but in the filter,
the two spaces were converted to a single space (October 9, 2020)
and the select2 helper wasn't able to select the option.
2020-10-08 13:29:23 -05:00
Luis Ramos
559af5076d
Make the release notes intructions a bit more clear so new contributors make them short
2020-10-08 10:37:39 +01:00
Luis Ramos
6806035a45
Update all locales with the latest Transifex translations
2020-10-08 10:15:26 +01:00
Luis Ramos
b1dbf4fe0e
Merge pull request #6147 from openfoodfoundation/transifex
...
Transifex
2020-10-08 10:13:00 +01:00
Luis Ramos
0829eaf0fb
Merge pull request #6148 from openfoodfoundation/luisramos0-patch-1
...
Add break line troubleshooting to docker guide
2020-10-08 09:24:27 +01:00
Luis Ramos
da2e3c7cd1
Merge pull request #6144 from arku/fix/adjustment-metadata-spec
...
Fix adjustment metadata spec
2020-10-08 08:59:52 +01:00
Luis Ramos
d5f793f451
Add break line troubleshooting to docker guide
2020-10-08 08:40:14 +01:00
Transifex-Openfoodnetwork
8269665a7c
Updating translations for config/locales/en_NZ.yml
2020-10-08 16:53:14 +11:00
Arun Kumar Mohan
4b7d4ad960
Refactor select2 specs
2020-10-07 21:56:43 -05:00
Arun Kumar Mohan
ead1419583
Remove sleep calls from select2 helper
2020-10-07 21:56:43 -05:00
Luis Ramos
1e7a3d7f46
Merge pull request #6123 from openfoodfoundation/mkllnk-patch-1
...
Create an initial Code of Conduct placeholder file
2020-10-07 23:36:59 +01:00
dependabot-preview[bot]
4ecfeaee4c
Bump geocoder from 1.6.3 to 1.6.4
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.6.3 to 1.6.4.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.6.3...v1.6.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-07 22:03:07 +00:00
Luis Ramos
6c95444339
Merge pull request #6020 from andresgutgon/fix/admin-menu-in-multiple-lines
...
Fixed admin header buttons dropping multiple lines.
2020-10-07 21:24:48 +01:00
Luis Ramos
48ea804615
Merge pull request #6121 from cillian/fix-shop-variant-search
...
When searching for shop products check the variant :display_name and :display_as fields too
2020-10-07 21:22:46 +01:00
Luis Ramos
8626e7b433
Merge pull request #6094 from andrewpbrett/fix-inventory-import
...
Fix #6090 (Inventory import fails for products with units other than "g")
2020-10-07 21:21:40 +01:00
Luis Ramos
88b17372af
Merge pull request #6131 from Snick555/issue-6118
...
Show product description in creation form after errors appeared
2020-10-07 21:21:13 +01:00
Luis Ramos
961e559a31
Merge pull request #6083 from luisramos0/shop_tabs_style
...
Make shop tabs black and capitalized in smaller screens
2020-10-07 14:39:23 +01:00
Pau Pérez Fabregat
85cee9e8cb
Merge pull request #6091 from luisramos0/vat_rates_cache
...
Delete dead code brought from spree
2020-10-07 11:58:26 +02:00
Pau Pérez Fabregat
1e6fa1666c
Merge pull request #6113 from openfoodfoundation/dependabot/bundler/knapsack-1.19.0
...
Bump knapsack from 1.18.0 to 1.19.0
2020-10-07 11:57:12 +02:00
Pau Pérez Fabregat
ce856750aa
Merge pull request #6116 from openfoodfoundation/dependabot/bundler/ddtrace-0.41.0
...
Bump ddtrace from 0.40.0 to 0.41.0
2020-10-07 11:56:45 +02:00
Pau Pérez Fabregat
07e625ec32
Merge pull request #6104 from openfoodfoundation/dependabot/bundler/haml-5.2.0
...
Bump haml from 5.1.2 to 5.2.0
2020-10-07 11:56:12 +02:00
Arun Kumar Mohan
a20762a1f2
Fix adjustment metadata spec
2020-10-06 19:02:59 -05:00
Andy Brett
0edd341d46
add unit test for inventory import entry_validation
2020-10-06 10:17:30 -07:00
Luis Ramos
c31380cd1d
Merge pull request #6132 from Matt-Yorkley/stripe-multiple-payments-spec
...
Stripe Tests: multiple attempted payments
2020-10-06 17:17:25 +01:00
Jason Hsu
3985e0e4bc
Merge branch 'master' into docker_scripts
2020-10-06 10:53:33 -05:00
Matt-Yorkley
a04c2ccd6e
Make producers and groups pages usable on mobile
2020-10-06 14:18:41 +01:00
Matt-Yorkley
469e4a4c87
Make shops index page usable on mobile
2020-10-06 14:18:39 +01:00
Luis Ramos
a4c8380d7e
Remove removal of transition to confirm as confirm does not exist anymore
2020-10-06 13:00:43 +01:00
Matt-Yorkley
0c109d6384
Merge pull request #6103 from openfoodfoundation/dependabot/bundler/dalli-2.7.11
...
Bump dalli from 2.7.10 to 2.7.11
2020-10-06 11:15:37 +02:00
Pau Pérez Fabregat
427d1aaeff
Merge pull request #6079 from arku/perf/test-prof-setup
...
Set up test_prof gem
2020-10-06 10:30:43 +02:00
Matt-Yorkley
6d169c1b08
Improve Webmock debugging
2020-10-05 17:11:34 +01:00
Matt-Yorkley
3b130327a5
DRY error_message variable used multiple times
2020-10-05 00:51:01 +01:00
Matt-Yorkley
ced5329835
Add Stripe spec for multiple attempted payments at checkout
2020-10-05 00:50:59 +01:00
dependabot-preview[bot]
ee6f0f7951
Bump ddtrace from 0.40.0 to 0.41.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.40.0 to 0.41.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases )
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.40.0...v0.41.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-04 19:18:47 +00:00
dependabot-preview[bot]
6149a79038
Bump knapsack from 1.18.0 to 1.19.0
...
Bumps [knapsack](https://github.com/ArturT/knapsack ) from 1.18.0 to 1.19.0.
- [Release notes](https://github.com/ArturT/knapsack/releases )
- [Changelog](https://github.com/ArturT/knapsack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ArturT/knapsack/compare/v1.18.0...v1.19.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-04 19:15:57 +00:00
ivoloshy
7321e4ef89
show product description in creation form after errors appeared
2020-10-04 20:44:57 +03:00
Matt-Yorkley
76def3a74f
Merge pull request #6124 from luisramos0/stripe_specs
...
Add more checkout feature specs covering stripe SCA cases
2020-10-03 18:24:06 +02:00
Luis Ramos
a5309627b7
Fix a typo
2020-10-03 15:46:29 +01:00
Luis Ramos
80ea80f26e
DRY stripe spec
2020-10-03 11:50:04 +01:00
Luis Ramos
14f5ecfe0b
Add spec to cover StripeSCA extra auth with redirect and failed auth
2020-10-03 11:39:56 +01:00
Luis Ramos
df4ec67974
Add feature spec that covers stripe_sca redirect case
2020-10-03 11:09:24 +01:00
Maikel
4b1e1afa69
Create an initial Code of Conduct placeholder file
2020-10-03 08:48:15 +10:00
Luis Ramos
ef70c1fc5c
Make helper more flexible and use it in a spec
2020-10-02 19:20:32 +01:00
Luis Ramos
83456f94e3
Simplify test by re-using helper stripe mock
2020-10-02 19:12:56 +01:00
Luis Ramos
ff9f374950
Merge pull request #6050 from Matt-Yorkley/stripe-checkout-spec
...
Stripe checkout spec
2020-10-02 18:57:22 +01:00
Cillian O'Ruanaidh
6c22ee43a7
When searching for shop products check the variant :display_name and :display_as fields too.
...
Fixes #5757
2020-10-02 16:05:48 +01:00
Luis Ramos
6a2e49b9e7
Update all locales with the latest Transifex translations
2020-10-02 12:54:45 +01:00
Luis Ramos
ab0ecfb203
Merge pull request #6106 from openfoodfoundation/transifex
...
Transifex
2020-10-02 12:46:56 +01:00
Luis Ramos
db2e760c4c
Merge pull request #6120 from luisramos0/restart_checkout
...
Comment 2 broken specs until we manage to fix them
2020-10-02 12:39:04 +01:00
Luis Ramos
da82df39c2
Comment 2 broken specs until we manage to fix them
2020-10-02 11:59:38 +01:00
Luis Ramos
98fb60a5e0
Merge pull request #6110 from filipefurtad0/content_spec.rb
...
content_spec.rb improvement
2020-10-01 23:22:04 +01:00
Andy Brett
854916907e
add feature spec for inventory import in kg
2020-10-01 13:27:57 -07:00
Matt-Yorkley
1cc950a4d9
DRY StripeHelper methods
2020-10-01 15:54:16 +01:00
Steve Roberts
8679e438e8
Add matomo tag to admin pages
2020-10-01 21:37:05 +10:00
Arun Kumar Mohan
4858f5fb80
Improve order specs' performance
2020-10-01 01:43:08 -05:00
Arun Kumar Mohan
350a3c0e1e
Improve order checkout specs' performance
2020-10-01 01:43:08 -05:00
Arun Kumar Mohan
b850f10d2e
Improve classification specs' performance
2020-10-01 01:43:08 -05:00
Arun Kumar Mohan
362ab8a605
Improve variant override specs' performance
2020-10-01 01:43:08 -05:00
Arun Kumar Mohan
f5985de802
Improve order cycle specs' performance
2020-10-01 01:43:08 -05:00
Arun Kumar Mohan
6c27ac5f99
Improve filter shipping methods tag rule specs' performance
2020-10-01 01:43:08 -05:00
Arun Kumar Mohan
bb38523767
Improve filter products tag rule specs' performance
2020-10-01 01:43:08 -05:00
Arun Kumar Mohan
e109ed6be7
Improve filter payment methods tag rule specs' performance
2020-10-01 01:43:08 -05:00
Arun Kumar Mohan
780f31f98e
Improve filter order cycles tag rule specs' performance
2020-10-01 01:43:05 -05:00
François Turbelin
eda904337b
Merge pull request #5810 from pacodelaluna/improve-dfc-standard-integration
...
Improve DFC Provider engine to support version 1.3
2020-09-30 11:13:03 +02:00
filipefurtad0
a85e500bb1
moves content_spec.rb into /configuration and adds an href string, incresing Redcarpet test coverage
2020-09-29 22:39:05 +01:00
Transifex-Openfoodnetwork
8480e16cac
Updating translations for config/locales/tr.yml
2020-09-29 22:33:21 +10:00
Transifex-Openfoodnetwork
2eeba0483c
Updating translations for config/locales/tr.yml
2020-09-29 22:30:18 +10:00
Transifex-Openfoodnetwork
e2ae566e88
Updating translations for config/locales/pl.yml
2020-09-29 22:08:01 +10:00
Transifex-Openfoodnetwork
01c6d5bc9c
Updating translations for config/locales/ru.yml
2020-09-29 20:47:26 +10:00
Transifex-Openfoodnetwork
856ad24c6f
Updating translations for config/locales/ru.yml
2020-09-29 20:44:21 +10:00
dependabot-preview[bot]
678e7acde0
Bump haml from 5.1.2 to 5.2.0
...
Bumps [haml](https://github.com/haml/haml ) from 5.1.2 to 5.2.0.
- [Release notes](https://github.com/haml/haml/releases )
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md )
- [Commits](https://github.com/haml/haml/compare/v5.1.2...v5.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-29 09:32:15 +00:00
dependabot-preview[bot]
4914a0d3a8
Bump dalli from 2.7.10 to 2.7.11
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.10 to 2.7.11.
- [Release notes](https://github.com/petergoldstein/dalli/releases )
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md )
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.10...v2.7.11 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-29 09:29:14 +00:00
Pau Pérez Fabregat
e79187c1df
Merge pull request #6097 from openfoodfoundation/transifex
...
Transifex
2020-09-29 09:22:59 +02:00
Matt-Yorkley
c518e7e0dd
Extract Stripe credit card form filling
2020-09-28 19:59:26 +01:00
Matt-Yorkley
2babfa9a7b
Add rejected card test
2020-09-28 19:55:52 +01:00
Transifex-Openfoodnetwork
c7d6b2782c
Updating translations for config/locales/nb.yml
2020-09-28 22:29:05 +10:00
Transifex-Openfoodnetwork
3d71c2c0b8
Updating translations for config/locales/en_GB.yml
2020-09-28 21:31:02 +10:00
Pau Pérez Fabregat
807f91b0b8
Merge pull request #6093 from openfoodfoundation/RachL-patch-1
...
Hacktoberfest
2020-09-28 12:04:55 +02:00
Jason Hsu
881ace6a85
Merge branch 'master' into docker_scripts
2020-09-27 13:39:40 -05:00
Arun Kumar Mohan
6a722f2bbd
Set up test-prof gem
2020-09-26 15:22:43 -05:00
Luis Ramos
d5ab3b47eb
Merge pull request #6065 from arku/perf/address-specs
...
Replace `create` with `build_stubbed` in address model specs
2020-09-26 21:19:28 +01:00
Luis Ramos
0100963a39
Delete dead code brought from spree
2020-09-26 21:16:27 +01:00
Arun Kumar Mohan
06a3e55348
Replace create with build_stubbed in address model specs
2020-09-25 22:54:58 -05:00
Jason Hsu
ea9d5f7c5a
Removed testc and testm; made the requested changes to the order of the scripts in the summary section
2020-09-25 20:35:24 -05:00
Luis Ramos
bbef0bac5f
Make font size 1em for larger screens
2020-09-25 21:28:22 +01:00
Rachel Arnould
dbe6c316f8
Change typo
...
"participating in" instead of "participating to"
2020-09-25 19:07:33 +02:00
Rachel Arnould
21eef7187b
Hacktoberfest
...
A proposal for the banner on Hacktoberfest.
2020-09-25 18:13:00 +02:00
Andy Brett
4f942db0ba
convert entry's unscaled_units to a float
...
This was coming in as a string, e.g. "1", so when we did "1" * 1000 it returned "11111111111111....." :)
2020-09-25 09:12:19 -07:00
Jason Hsu
2b5a875bac
Added script summary to docker/README.md
2020-09-25 11:00:54 -05:00
Jason Hsu
d2523abe34
Moved contents of DOCKER.md to docker/README.md; removed DOCKER.md; updated link to Docker page in GETTING_STARTED.md
2020-09-25 00:49:44 -05:00
Jason Hsu
97a38865a2
Added docker/testm
2020-09-25 00:30:20 -05:00
Jason Hsu
a46683ef01
Added docker/testc
2020-09-25 00:24:24 -05:00
Jason Hsu
2a902f29bb
Added comments to scripts
2020-09-25 00:12:27 -05:00
Jason Hsu
dff6e5ce38
Merge branch 'master' into docker_scripts
2020-09-24 23:43:28 -05:00
Jason Hsu
423a766463
Added docker/exec
2020-09-24 23:42:00 -05:00
Luis Ramos
9b5bd7bb1c
Merge pull request #6066 from arku/perf/variant-override-specs
...
Replace `create` with `build_stubbed` in variant override model specs
2020-09-24 18:47:08 +01:00
Luis Ramos
c377e316d5
Merge pull request #6068 from arku/perf/coordinator-specs
...
Replace `create` with `build_stubbed` in coordinator model specs
2020-09-24 18:46:45 +01:00
Luis Ramos
aa74b58810
Merge pull request #6067 from arku/perf/tag-rule-specs
...
Remove unnecessary create call in tag rule model specs
2020-09-24 18:45:18 +01:00
Luis Ramos
8919adb6bf
Merge pull request #6074 from arku/perf/shipping-rate-specs
...
Replace `create` with `build_stubbed` in shipping rate model specs
2020-09-24 18:42:30 +01:00
Luis Ramos
e04b85e900
Merge pull request #6078 from arku/perf/per-item-flexi-rate-specs
...
Replace `build` with `build_stubbed` in flexi rate and per item model specs
2020-09-24 18:41:29 +01:00
Luis Ramos
b8fae8e3a3
Merge pull request #6077 from arku/perf/calculator-price-sack-specs
...
Replace `build` with `build_stubbed` in price sack model specs
2020-09-24 18:41:19 +01:00
Luis Ramos
01fdee9dba
Merge pull request #6076 from arku/perf/calculator-flat-percent-item-total-specs
...
Replace `build` with `build_stubbed` in flat percent item total specs
2020-09-24 18:40:55 +01:00
Luis Ramos
dfd54c1cbc
Merge pull request #6075 from arku/perf/calculator-weight-specs
...
Replace `create` with `build_stubbed` in calculator weight model specs
2020-09-24 18:40:31 +01:00
Andy Brett
84eb8e964d
add specs for weight calculators using lbs
2020-09-24 07:03:57 -07:00
Luis Ramos
74161267fd
Prepare seed data for bye bye spree
2020-09-24 12:54:43 +01:00
Jason Hsu
5ced17a94e
Added docker/test and docker/test-log
2020-09-23 23:36:13 -05:00
Jason Hsu
c6fbc1e136
Added docker/cop
2020-09-23 23:27:51 -05:00
Jason Hsu
792127745a
Added docker/server scripts
2020-09-23 23:22:38 -05:00
Jason Hsu
8125a860ea
Merge branch 'master' into docker_scripts
2020-09-23 23:09:26 -05:00
Luis Ramos
1b4e19b32d
Remore preferences not used in OFN
2020-09-23 22:16:56 +01:00
Luis Ramos
3074d3a17a
Customize some defaults to OFN
2020-09-23 22:13:36 +01:00
Luis Ramos
5bf91cb140
Remove unused spree code
2020-09-23 22:13:36 +01:00
Luis Ramos
ce2f0a5b9e
Transpec specs
2020-09-23 22:13:36 +01:00
Luis Ramos
d6862cdbce
Revert rubocop autocorrect change, it breaks some of the tests
2020-09-23 22:13:36 +01:00
Luis Ramos
b9319239d5
Remove configurations that are no longer used as we have moved the code to OFN and fix specs
2020-09-23 22:13:36 +01:00
Luis Ramos
9ebb689370
Fix easy rubocop issues
2020-09-23 22:13:36 +01:00
Luis Ramos
024a64b73a
Fix single rubocop rule: Use nested module definitions instead of compact style
2020-09-23 22:13:36 +01:00
Luis Ramos
25e61897aa
Run rubocop autocorrect
2020-09-23 22:13:36 +01:00
Luis Ramos
ed81ceaffe
Merge decorator with original file
2020-09-23 22:13:36 +01:00
Luis Ramos
8b42543ca3
Bring configuration and preferences code from spree_core
2020-09-23 22:13:36 +01:00
Pau Pérez Fabregat
54a51a4995
Merge pull request #5988 from openfoodfoundation/dependabot/bundler/stripe-5.25.0
...
Bump stripe from 5.22.0 to 5.25.0
2020-09-23 21:14:32 +02:00
Pau Perez
37d113ed78
Update all locales with the latest Transifex translations
2020-09-23 21:09:49 +02:00
Pau Pérez Fabregat
8f6e527f8a
Merge pull request #6044 from openfoodfoundation/transifex
...
Transifex
2020-09-23 21:06:44 +02:00
Jason Hsu
6a6f9be18e
Added build and seeding scripts
2020-09-23 13:55:58 -05:00
Pau Pérez Fabregat
0d259b217e
Merge pull request #6017 from Matt-Yorkley/tidyup
...
Remove old code
2020-09-23 20:47:33 +02:00
Pau Pérez Fabregat
2e5b5eaac5
Merge pull request #6043 from andrewpbrett/imperial-units-product-import
...
Add oz and lb as allowed units in product import
2020-09-23 20:46:54 +02:00
Pau Pérez Fabregat
faaf391892
Merge pull request #6051 from luisramos0/russian
...
Adding the russian language to github
2020-09-23 20:43:22 +02:00
Transifex-Openfoodnetwork
feed9376dd
Updating translations for config/locales/es.yml
2020-09-24 04:36:06 +10:00
Transifex-Openfoodnetwork
b829fea0c2
Updating translations for config/locales/ca.yml
2020-09-24 04:36:01 +10:00
Jason Hsu
06d54a3f4d
Added docker directory and scripts for resetting Docker
2020-09-23 12:46:08 -05:00
Luis Ramos
fb9bcdee7c
Load spree js on OFN side, not the one on Spree's side
2020-09-23 12:45:30 +01:00
Luis Ramos
3af5482960
Make date picker work with karma tests where the old Spree.translations js translations object is not defined
2020-09-23 12:45:30 +01:00
Luis Ramos
bfd4164c0b
Remove handlebar extensions and some dead translations
...
This is not needed, these translations are always used through Spree.translations and this system is deprecated anyway
2020-09-23 12:45:30 +01:00
Luis Ramos
d5d2ae3ce0
Remove some dead code and broken links from comments
2020-09-23 12:45:29 +01:00
Luis Ramos
496f9c106e
Bring the very last bits of js and css from spree_core
2020-09-23 12:45:29 +01:00
Luis Ramos
a2610279d9
Merge pull request #5976 from luisramos0/address_form
...
Fix address state selector and "use billing address" checkbox in order customer details page
2020-09-23 12:42:37 +01:00
Luis Ramos
2234ea6f5a
Make shop tabs black and capitalized
2020-09-22 16:59:42 +01:00
Matt-Yorkley
25a8c44c22
Merge pull request #6018 from Matt-Yorkley/tax-display
...
Tax display
2020-09-22 17:53:04 +02:00
Luis Ramos
7ebdc1d0da
Merge pull request #6059 from andresgutgon/fix/sticky-search-bar-disapears-when-cart-is-open
...
Fix sticky search bar disappearing when cart is open.
2020-09-22 10:52:33 +01:00
Arun Kumar Mohan
bc77b8bcb2
Replace build with build_stubbed in per item model specs
2020-09-21 21:24:38 -05:00
Arun Kumar Mohan
38ab95a9a4
Replace build with build_stubbed in flexi rate model specs
2020-09-21 21:22:59 -05:00
Arun Kumar Mohan
698d8b35fa
Replace build with build_stubbed in price sack model specs
2020-09-21 21:18:36 -05:00
Arun Kumar Mohan
a257a9e9d2
Replace build with build_stubbed in calculator weight model specs
2020-09-21 21:12:30 -05:00
Arun Kumar Mohan
231fbcd11a
Replace build with build_stubbed in flat percent item total specs
2020-09-21 21:04:16 -05:00
Arun Kumar Mohan
c098ba0ce3
Replace create with build_stubbed in calculator weight model specs
2020-09-21 20:46:50 -05:00
Arun Kumar Mohan
f7a9cc63a7
Replace create with build_stubbed in shipping rate model specs
2020-09-21 20:37:35 -05:00
Andy Brett
9ef706a201
update styles on enterprise fee UI
2020-09-21 15:21:18 -07:00
Luis Ramos
5c25d92354
Merge pull request #6069 from arku/perf/adjustment-metadata-specs
...
Replace `create` with `build` in adjustment metadata model specs
2020-09-21 12:22:24 +01:00
Arun Kumar Mohan
0aa5ee081e
Replace create with build in adjustment metadata model specs
2020-09-21 01:54:46 -05:00
Arun Kumar Mohan
317618595c
Replace create with build_stubbed in coordinator model specs
2020-09-21 01:47:19 -05:00
Arun Kumar Mohan
289fd09e20
Remove unnecessary create call in tag rule model specs
2020-09-21 01:09:14 -05:00
Arun Kumar Mohan
239b6e7577
Replace create with build_stubbed in variant override model specs
2020-09-21 00:45:35 -05:00
Matt-Yorkley
5bca561c4a
Refactor Stripe request stubbing to helper
2020-09-20 17:06:03 +01:00
Transifex-Openfoodnetwork
82cf2afec9
Updating translations for config/locales/en_CA.yml
2020-09-20 23:27:52 +10:00
Transifex-Openfoodnetwork
8ea7614353
Updating translations for config/locales/fr_CA.yml
2020-09-20 23:25:11 +10:00
Luis Ramos
714bfafede
Merge pull request #6037 from arku/fix/hash-diff-deprecation
...
Remove Hash#diff from cancan helper
2020-09-19 20:21:24 +01:00
Luis Ramos
8f98fb830a
Merge pull request #6053 from jhsu802701/bundler_1_17_3
...
Upgraded the bundler version in the Dockerfile
2020-09-19 19:33:48 +01:00
Matt-Yorkley
6737270ab7
Rename partial
2020-09-19 15:49:14 +01:00
Matt-Yorkley
70bd2161ba
Rename Stripe Connect factory for clarity
2020-09-19 12:55:31 +01:00
Matt-Yorkley
1d01fc955d
Include StripeJS fixture and refactor to partial
2020-09-19 12:20:55 +01:00
Matt-Yorkley
4080e7daa4
Add comments in StripeJS mock
2020-09-19 12:20:55 +01:00
Matt-Yorkley
cca8f9faf6
Add missing behaviour in StripeJS mock
2020-09-19 12:20:55 +01:00
andresgutgon
636da229ad
Fix sticky search bar disappearing when cart is open.
...
So I think the issue is that all the HTML is wrapped on an
`off-canvas-wrap` class that is used for doing the sidebar car open over
main content. The problem is that when this car sidebar is open body of
HTML overflow is changed to `overflow: hidden` and search bar use CSS
`position: sticky;` which doesn't work when its parent has overflow
hidden. The issue was that `off-canvas-wrap` had an `overflow: inherit`
which means when body is set to overflow hidden this div inherits it and
break search bar position sticky when cart sidebar is opened. The
solution is to use `position: initial` which means use what a div has as
default value for `overflow` which I think it's `visible`. This class is
overriding the same class that comes from Foundation Framework that set
this div to be `overflow: hidden`. The override was added when [we added
search sticky](ff69389bb0https://css-tricks.com/dealing-with-overflow-and-position-sticky/ ) also info about [position initial vs inherit](https://stackoverflow.com/a/29661356 )
2020-09-19 12:21:24 +02:00
andresgutgon
ef85ac3e27
Fixed admin header buttons dropping multiple lines.
2020-09-19 11:37:09 +02:00
Matt-Yorkley
368772dad2
Add another missing method to StripeJS mock
...
Our Angular code calls this method in some tests and expects a Promise object with a hash describing a payment method.
2020-09-19 00:39:39 +01:00
Matt-Yorkley
857f4e3a37
Add missing method to StripeJS mock
...
Our Angular code calls this method for interacting with live form validations and messages. We don't really need to use in tests, it just needs to exist otherwise the specs fail.
2020-09-19 00:39:39 +01:00
Matt-Yorkley
67d136548f
Update form elements to more accurately reflect actual Stripe form
...
These attributes more closely reflect the actual form injected by Stripe. The additional attributes are also useful for selecting elements in tests
2020-09-19 00:39:39 +01:00
Matt-Yorkley
4c77c41533
Remove unused postal field from form
2020-09-19 00:39:39 +01:00
Matt-Yorkley
49bd9bd778
Import StripeJS mock from fake_stripe gem
...
This is the original from https://github.com/thoughtbot/fake_stripe/blob/v0.3.0/lib/fake_stripe/assets/v3.js
2020-09-19 00:39:39 +01:00
Matt-Yorkley
0ba3977422
Add new Stripe checkout spec
2020-09-19 00:39:32 +01:00
Andy Brett
edefe1d4bc
use correct cache key for old preference
2020-09-18 14:35:51 -07:00
Matt-Yorkley
4ed34bb942
Add javascript debug option to test suite
2020-09-18 21:20:47 +01:00
Jason Hsu
560577827f
Upgraded the bundler version in the Dockerfile to be consistent with that specified in Gemfile.lock
2020-09-18 15:07:44 -05:00
Andy Brett
b9ee945062
fix nomethod error by interpolating integer inside string
2020-09-18 10:10:27 -07:00
Andy Brett
dc7b9ed8fa
use sql query to update weight calculator prefs
2020-09-18 09:55:29 -07:00
Luis Ramos
9c1a7c13dc
Adding the russian language
2020-09-18 16:43:57 +01:00
Luis Ramos
fe7d7b54d1
Make version number 1.0.0 as we dont want to mantain the app version here and update AGPL to v3
2020-09-18 16:20:09 +01:00
Luis Ramos
2fae7e0df3
Use moment js min and locale files from node_modules
...
In this commit fil and nl-be are also added
We could use moment/min/locales.min.js but that would add all locales available in moment which would be a move in size from current 30k in moment locales to 300k
2020-09-18 16:18:24 +01:00
Luis Ramos
d4c4bcaa50
Make node_modules available for code in app/assets
2020-09-18 15:53:34 +01:00
Luis Ramos
5b3f700fb4
Move momentjs from a Gemfile dependeny to a package.jons dependency and upgrade it from 2.20.1 to 2.28.0
2020-09-18 15:29:38 +01:00
Luis Ramos
a872667912
Add yarn.lock after yarn was added in ofn-install and installed in all servers, every ofn deploy will run yarn install now
2020-09-18 15:28:43 +01:00
Transifex-Openfoodnetwork
9cb7275250
Updating translations for config/locales/ar.yml
2020-09-18 19:49:55 +10:00
Transifex-Openfoodnetwork
3bf98e295d
Updating translations for config/locales/en_FR.yml
2020-09-18 17:36:38 +10:00
Transifex-Openfoodnetwork
678e0be0a5
Updating translations for config/locales/fr.yml
2020-09-18 17:36:29 +10:00
Andy Brett
843f43eb78
delete cached per_kg preference for all weight calculators
2020-09-17 17:30:43 -07:00
Andy Brett
96fb65600e
refactor views to oneliners without single letter variable names
2020-09-17 16:45:55 -07:00
Andy Brett
fdb1019ee2
fix styles per rubocop
2020-09-17 16:41:49 -07:00
Andy Brett
0ef4dec15e
specs for product import using pounds and ounces
2020-09-17 09:34:22 -07:00
Andy Brett
bd25e8b40d
Revert "schema update"
...
This reverts commit 73149dc695
2020-09-17 08:46:03 -07:00
Andy Brett
66099239aa
add translation for calculator preferred unit error
2020-09-17 08:42:08 -07:00
Andy Brett
988abf7a8c
update preference field interface to be more clear
2020-09-17 08:27:45 -07:00
Transifex-Openfoodnetwork
880ef9cf4f
Updating translations for config/locales/es.yml
2020-09-18 01:01:34 +10:00
Transifex-Openfoodnetwork
095633f21e
Updating translations for config/locales/ca.yml
2020-09-18 00:59:40 +10:00
Pau Pérez Fabregat
3a894a1cdb
Merge pull request #6002 from openfoodfoundation/dependabot/bundler/unicorn-5.7.0
...
Bump unicorn from 5.6.0 to 5.7.0
2020-09-17 16:57:16 +02:00
Transifex-Openfoodnetwork
ee862891c1
Updating translations for config/locales/en_FR.yml
2020-09-18 00:51:30 +10:00
Transifex-Openfoodnetwork
9dccb641c7
Updating translations for config/locales/fr.yml
2020-09-18 00:50:02 +10:00
Andy Brett
73149dc695
schema update
2020-09-17 07:36:38 -07:00
Andy Brett
977e4e46f3
remove explicit raise from convert_weight
2020-09-17 07:36:28 -07:00
Andy Brett
6466829bdc
fix typo in weight calculator migration
2020-09-17 07:17:25 -07:00
Andy Brett
d1a87f7ba0
add oz and lb as allowed units in product import
2020-09-17 06:34:07 -07:00
Luis Ramos
455111093d
Fix easy rubocop issues
2020-09-17 14:18:51 +01:00
Luis Ramos
ecdba1fa4e
For some reason the factory create(:admin_user) is not working here, this new version works
2020-09-17 14:18:51 +01:00
Luis Ramos
8234ad0906
Ensure test order cycle coordinator is really an enterprise not managed by the user instead of relying on the factory logic
2020-09-17 14:18:51 +01:00
Luis Ramos
60ef32300b
No need to test code with different ability setup, this was a good spec for spree, in ofn we use and test the static auth config in Ability
2020-09-17 14:18:51 +01:00
Luis Ramos
405b317726
Merge ability and ability decorator
2020-09-17 14:18:45 +01:00
Luis Ramos
22eac6200c
Add needed fake ability
2020-09-17 14:10:37 +01:00
Luis Ramos
32649cb25a
Transpec ability_spec
2020-09-17 14:10:37 +01:00
Luis Ramos
895ab62ba9
Bring ability helpers from spree_core and fix ability_spec
2020-09-17 14:10:37 +01:00
Luis Ramos
37c7d254e1
Fix rubocop issues
2020-09-17 14:10:37 +01:00
Luis Ramos
051ee0fd14
Run rubocop -a
2020-09-17 14:10:37 +01:00
Luis Ramos
c00c03737e
Bring user and ability related files from spree_core
2020-09-17 14:10:37 +01:00
Luis Ramos
a16dc4d720
Move ability decorator specs to specific file
2020-09-17 14:10:36 +01:00
Luis Ramos
4b597ada12
Fix easy rubocop issues
2020-09-17 14:06:51 +01:00
Luis Ramos
fe7cf0cf44
Remove reference to FactoryGirl
2020-09-17 14:06:51 +01:00
Luis Ramos
f81d4596aa
Use correct updater
2020-09-17 14:06:51 +01:00
Luis Ramos
e0d731b92b
Remove unused email validator
2020-09-17 14:06:51 +01:00
Luis Ramos
a5ff4d6853
Remove unneeded setup code and remove unnecessary reference to FactoryGirl
2020-09-17 14:06:51 +01:00
Luis Ramos
03419bbc35
Remove all and use find_each instead!
2020-09-17 14:06:51 +01:00
Luis Ramos
c49dbec85a
Adapt order_spec to new updater code
2020-09-17 14:06:51 +01:00
Luis Ramos
7884dbfeb1
Revert rubocop autocorrect, each is needed here for find_each is not available for Arrays
2020-09-17 14:06:51 +01:00
Luis Ramos
4215dcb927
Run transpec on the new specs from spree_core
2020-09-17 14:06:50 +01:00
Luis Ramos
31f9cd3caf
Fix spec/models/spree/order specs
2020-09-17 14:06:50 +01:00
Luis Ramos
8643cbd8ce
Delete unused order.merge! and fix specs
2020-09-17 14:06:50 +01:00
Luis Ramos
2753e86325
Run rubocop autocorrect
2020-09-17 14:06:50 +01:00
Luis Ramos
2cd066237d
Fix easy rubocop issues
2020-09-17 14:06:50 +01:00
Luis Ramos
94ad02abbe
Run rubocop autocorrect
2020-09-17 14:06:50 +01:00
Luis Ramos
3c5a35df27
Remove original email validator and keep only previous OFN validator
2020-09-17 14:06:50 +01:00
Luis Ramos
82a116a92f
We always define Spree.user_class
2020-09-17 14:06:50 +01:00
Luis Ramos
cc87e8c9a2
Remove code related to promotions
2020-09-17 14:06:50 +01:00
Luis Ramos
2a6d83b4dd
Remove confirm checkout step and it's additional removal
2020-09-17 14:06:50 +01:00
Luis Ramos
6900f7a46f
Merge decorators with original files from spree_core
...
EPIC COMMIT ALERT :-)
2020-09-17 14:06:50 +01:00
Luis Ramos
47d2f698ef
Bring models related to Order from spree_core
...
EPIC COMMIT ALERT :-)
2020-09-17 14:05:29 +01:00
Matt-Yorkley
77eaebc2a7
Merge pull request #5888 from andrewpbrett/imperial-auto-units
...
Allow US units on products/variants
2020-09-17 15:04:15 +02:00
Luis Ramos
1a513567f2
Fix easy rubocop issues
2020-09-17 13:59:41 +01:00
Luis Ramos
1df7890a0d
Use spree url_helpers
2020-09-17 13:59:41 +01:00
Luis Ramos
a2435d29af
Add missing translation
2020-09-17 13:59:41 +01:00
Luis Ramos
d5d62894a5
Use spree url helpers
2020-09-17 13:59:41 +01:00
Luis Ramos
da19fa5f80
Add missing translations
2020-09-17 13:59:41 +01:00
Luis Ramos
a34c18451c
Add spree helper
2020-09-17 13:59:41 +01:00
Luis Ramos
27fa04114e
Add require for gateway error
2020-09-17 13:59:41 +01:00
Luis Ramos
ec8dfd668d
Use ofn's calculator in all tests and add missing translation
2020-09-17 13:59:41 +01:00
Luis Ramos
bec6e8e604
Add missing translation
2020-09-17 13:59:41 +01:00
Luis Ramos
66f27aad32
Explicitly use spree url helpers for spree routes
2020-09-17 13:59:41 +01:00
Luis Ramos
739917ca46
Add require for spree responder
2020-09-17 13:58:45 +01:00
Luis Ramos
e0cb7a29bf
Add helper prefix to helper calls
2020-09-17 13:58:45 +01:00
Luis Ramos
b6a374ab66
Remove spree require that is not needed in OFN
2020-09-17 13:58:10 +01:00
Luis Ramos
37f3861233
Remove require of a file no longer needed
2020-09-17 13:58:10 +01:00
Luis Ramos
a5dd1526f7
Delete dead code ProductFilters
2020-09-17 13:58:10 +01:00
Luis Ramos
8707f51214
Remove unused helper
2020-09-17 13:58:10 +01:00
Luis Ramos
b84212023b
Require code from spree/core explicitly
2020-09-17 13:58:10 +01:00
Luis Ramos
01daf63fc6
Fix some problems with code that was relying on spree code
2020-09-17 13:57:05 +01:00
Matt-Yorkley
3ececb04c5
Update all locales with the latest Transifex translations
2020-09-17 13:33:53 +01:00
Matt-Yorkley
0aa515101b
Merge pull request #6015 from openfoodfoundation/transifex
...
Transifex
2020-09-17 14:31:41 +02:00
Luis Ramos
c6139a975a
Merge pull request #6028 from openfoodfoundation/dependabot/bundler/webmock-3.9.1
...
Bump webmock from 3.8.3 to 3.9.1
2020-09-17 12:19:08 +01:00
Luis Ramos
212820b3da
Merge pull request #5912 from luisramos0/tcs
...
Terms and Conditions - upload PDF in the Enterprise Business Details and read them on Checkout
2020-09-17 12:01:45 +01:00
Luis Ramos
f1358dfa9a
Merge pull request #5722 from rioug/4206-back-from-Edit-Product-removed-filters-products-page
...
4206 back from edit product removed filters products page
2020-09-17 11:51:58 +01:00
Luis Ramos
f061545a92
Merge pull request #5995 from andresgutgon/fix/datetime-picker-ui-pick-the-right-translations-on-order-cycles
...
Fix date time picker translations on Order cycles screen
2020-09-17 11:50:37 +01:00
Luis Ramos
e99fdeb972
Merge pull request #5996 from andresgutgon/fix/iframe-shop-failing-because-jquery-is-not-loaded
...
Fix embedded shops failing javascript because jQuery is try to be accessed before being loaded
2020-09-17 11:32:08 +01:00
Transifex-Openfoodnetwork
875eb292be
Updating translations for config/locales/ar.yml
2020-09-17 08:42:12 +10:00
Arun Kumar Mohan
08604ae8fd
Remove Hash#diff usage from cancan helper
2020-09-16 12:14:37 -05:00
Luis Ramos
87d6a73e54
Merge pull request #5878 from luisramos0/shipping
...
[Bye bye Spree] Bring models shipping_method, shipping_rates, address and shipping_category from spree_core
2020-09-16 14:58:39 +01:00
Luis Ramos
f566c2127d
Merge pull request #5924 from luisramos0/basic_spree_core
...
[Bye bye spree] Bring base_helper and log_entry from spree core
2020-09-16 14:57:41 +01:00
Transifex-Openfoodnetwork
2573e3b7c5
Updating translations for config/locales/es_CO.yml
2020-09-16 23:24:39 +10:00
Transifex-Openfoodnetwork
7fe876266e
Updating translations for config/locales/es_CO.yml
2020-09-16 23:21:34 +10:00
Luis Ramos
8d5ed630d6
Merge pull request #6035 from arku/fix/adjustment-metadata-spec
...
Fix uninitialized constant error when running model specs
2020-09-16 10:15:46 +01:00
Luis Ramos
66d206ecb3
Merge pull request #6036 from arku/fix/pr-template
...
Fix typo in the PR template
2020-09-16 10:15:00 +01:00
Arun Kumar Mohan
fd0a7971e9
Fix typo in the PR template
2020-09-15 20:30:23 -05:00
Arun Kumar Mohan
ed3cb56c11
Fix uninitialized constant error when running model specs
2020-09-15 20:23:05 -05:00
Transifex-Openfoodnetwork
a367c3720c
Updating translations for config/locales/en_US.yml
2020-09-16 10:21:50 +10:00
Luis Ramos
6eb43053e9
Merge pull request #5925 from luisramos0/spree_core_user
...
[Bye bye spree] Bring classes related to users to OFN
2020-09-15 17:13:27 +01:00
Pau Pérez Fabregat
7006b0af4c
Merge pull request #6021 from Matt-Yorkley/concerns
...
Move concern to concerns directory
2020-09-15 17:45:24 +02:00
Transifex-Openfoodnetwork
d86b879972
Updating translations for config/locales/nb.yml
2020-09-15 20:46:33 +10:00
Transifex-Openfoodnetwork
fd339488e6
Updating translations for config/locales/es.yml
2020-09-15 20:38:08 +10:00
Transifex-Openfoodnetwork
b6f5eab6e1
Updating translations for config/locales/ca.yml
2020-09-15 20:37:51 +10:00
dependabot-preview[bot]
ced29c1f3d
Bump webmock from 3.8.3 to 3.9.1
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.8.3 to 3.9.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.3...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-15 09:49:14 +00:00
Pau Pérez Fabregat
27ffe9edb2
Merge pull request #5971 from luisramos0/testing
...
Remove some old spree test helpers that are not needed
2020-09-15 09:13:20 +02:00
Luis Ramos
0d7b5cd32c
Merge pull request #5868 from luisramos0/taxonomies
...
[Bye bye Spree] Bring models taxon and taxonomy from spree_core
2020-09-14 20:45:04 +01:00
Matt-Yorkley
276fea6942
Fix rubocop offenses
2020-09-14 15:14:16 +01:00
Matt-Yorkley
c45dcad975
Move concern to concerns directory
2020-09-14 13:23:21 +01:00
Andy Brett
246934d8ba
update preference name in factor and specs
2020-09-12 14:49:42 -07:00
Andy Brett
37cfe65688
migrate existing weight calculators
2020-09-12 12:32:06 -07:00
Andy Brett
4123eb7c10
update specs; add specs to validate weight calculator preference is kg or lb
2020-09-12 11:53:45 -07:00
Transifex-Openfoodnetwork
f32d8e2678
Updating translations for config/locales/en_GB.yml
2020-09-13 04:29:16 +10:00
Andy Brett
d32ed6b48f
improve styling on calculators UI
2020-09-12 10:43:14 -07:00
Transifex-Openfoodnetwork
a9a05debba
Updating translations for config/locales/en_CA.yml
2020-09-13 02:30:11 +10:00
Matt-Yorkley
9481876595
Fix line_item tax sum in OrderTaxAdjustmentsFetcher
2020-09-12 15:41:29 +01:00
Matt-Yorkley
cdf4e88e21
Add failing spec for OrderTaxAdjustmentsFetcher with multiple line items
2020-09-12 15:40:06 +01:00
Matt-Yorkley
7ddc53bb5b
Remove temporary debugging helpers added during the Rails 4 upgrade.
2020-09-12 12:25:43 +01:00
Transifex-Openfoodnetwork
b9f6dc6de5
Updating translations for config/locales/en_FR.yml
2020-09-12 00:25:49 +10:00
Transifex-Openfoodnetwork
811985cf0f
Updating translations for config/locales/fr.yml
2020-09-12 00:25:36 +10:00
Luis Ramos
175b78b51f
Merge pull request #5827 from jeduardo824/bug/remove-environment-column-when-user-is-not-super-admin
...
Bug/4592 - Hide Environment column on Payment Methods page when user is not admin
2020-09-11 10:47:10 +01:00
Maikel Linke
e82aa0c89a
Update translations
2020-09-11 15:25:52 +10:00
Maikel Linke
8be05e94bd
Update release issue template
2020-09-11 15:25:24 +10:00
Maikel
7317347fd6
Merge pull request #6012 from openfoodfoundation/transifex
...
Transifex
2020-09-11 15:25:04 +10:00
Maikel
c5c542069f
Merge pull request #5951 from mkllnk/5785-js-error-reporting
...
5785 Notify Bugsnag when sending card to Stripe fails during checkout
2020-09-11 15:12:47 +10:00
Maikel
dc9e3aa1a0
Merge pull request #6010 from mkllnk/fix-module-declaration
...
Fix module declaration
2020-09-11 09:12:08 +10:00
Luis Ramos
a48b57f7a7
Merge pull request #5883 from luisramos0/taxs
...
[Bye bye Spree] Bring models tax_rate, tax_categories, adjustments and calculator from spree_core
2020-09-10 23:10:26 +01:00
Luis Ramos
6f59158153
Remove useless TODOs
2020-09-10 17:36:25 +01:00
Transifex-Openfoodnetwork
f501d48caa
Updating translations for config/locales/fr.yml
2020-09-11 01:54:06 +10:00
Pau Pérez Fabregat
2429b186ce
Merge pull request #6008 from openfoodfoundation/dependabot/bundler/ddtrace-0.40.0
...
Bump ddtrace from 0.39.0 to 0.40.0
2020-09-10 17:10:56 +02:00
Pau Pérez Fabregat
7df2759475
Merge pull request #5907 from Matt-Yorkley/data-cleanup
...
Data cleanup
2020-09-10 17:06:20 +02:00
Pau Pérez Fabregat
681cb34c48
Merge pull request #6009 from openfoodfoundation/transifex
...
Transifex
2020-09-10 14:01:49 +02:00
Maikel Linke
94b903179e
Fix module declaration
...
Running script/prepare_imported_db.rb failed because
Spree::PaymentMethodDistributors couldn't be found. This problem is
described in the Rubocop docs:
https://rubystyle.guide/#namespace-definition
2020-09-10 16:12:17 +10:00
Maikel Linke
59070712d9
Update rubocop todo list
2020-09-10 16:08:18 +10:00
Transifex-Openfoodnetwork
76aebf329e
Updating translations for config/locales/ar.yml
2020-09-10 02:13:08 +10:00
dependabot-preview[bot]
b2b5606f2e
Bump ddtrace from 0.39.0 to 0.40.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.39.0 to 0.40.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases )
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.39.0...v0.40.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-09 15:32:14 +00:00
Pau Perez
f890c4a31d
Fix LogEntry spec
2020-09-08 14:12:17 +02:00
Pau Pérez Fabregat
b087f8da19
Merge pull request #6001 from openfoodfoundation/transifex
...
Transifex
2020-09-08 13:19:28 +02:00
Pau Perez
e3c1159c17
Start with 6 months data retention
...
As discussed in code review.
2020-09-08 12:49:58 +02:00
Pau Perez
14054f0e70
Move retention period to constant
...
There's no need to reevaluate the date 3 times, potentially leading to
edge cases.
2020-09-08 12:48:30 +02:00
Pau Perez
d525ddfe14
Move missing statements to where + delete_all
...
And fix the specs
2020-09-08 12:47:42 +02:00
Pau Pérez Fabregat
df0b997258
Use where + delete_all to increase readability
...
Co-authored-by: Maikel <maikel@email.org.au >
2020-09-08 12:26:47 +02:00
Pau Pérez Fabregat
ffbb0d26a4
Unhardcode class name
2020-09-08 12:26:21 +02:00
dependabot-preview[bot]
5eb64f431a
Bump unicorn from 5.6.0 to 5.7.0
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.6.0 to 5.7.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-08 09:20:12 +00:00
Andy Brett
c618ba3b2c
style fixes
2020-09-07 13:44:42 -07:00
Andy Brett
5a5cbbd318
add drop down list for unit preference
2020-09-07 13:26:09 -07:00
Transifex-Openfoodnetwork
3da14233bf
Updating translations for config/locales/en_US.yml
2020-09-08 02:55:31 +10:00
Pau Pérez Fabregat
940c067b60
Merge pull request #5992 from openfoodfoundation/transifex
...
Transifex
2020-09-07 18:46:48 +02:00
Andy Brett
adb29a9c8f
add preferred_unit to weight shipping calculator
2020-09-07 08:41:48 -07:00
Andy Brett
5793f0103d
Revert "Add a per-pound calculator and a spec for it"
...
This reverts commit e8eadcbf39
2020-09-07 07:50:59 -07:00
Andy Brett
e8eadcbf39
Add a per-pound calculator and a spec for it
2020-09-06 09:03:06 -07:00
andresgutgon
2297e20c78
Fix embedded shops failing javascript because jQuery is try to be
...
accessed before being loaded
Show we check for $.ready when jQuery is not downloaded yet in the
browser. The solution is to check if document is ready with plain DOM
javascript event `DOMContentLoaded`
2020-09-06 15:24:22 +02:00
andresgutgon
d1331ac78a
Fix datetime picker translations on Order cycles screen
...
So the thing is we initialize jQuery plugin on `admin/util.js.erb` but
then we override those defaults on order_cycles.js.erb.coffe. Now both
plugin initializations use the same defaults. Also added 3 missing
translations for `Done`, `Now` and `Time` copies on that timepicker popover
2020-09-06 13:43:35 +02:00
Luis Ramos
6e8fe080cb
Fix easy rubocop issues
2020-09-05 18:39:56 +01:00
Luis Ramos
5521b4bb04
Remove unused product filters
2020-09-05 16:43:27 +01:00
Luis Ramos
4183dda27e
Fix long line
2020-09-05 16:43:27 +01:00
Luis Ramos
fcbb883244
Transpec taxon_spec
2020-09-05 16:43:27 +01:00
Luis Ramos
c35b330d25
Fix taxon_spec
2020-09-05 16:43:27 +01:00
Luis Ramos
57e74a4980
Fix rubocop issues
2020-09-05 16:43:27 +01:00
Luis Ramos
a1b64fe27b
Rubocop auto-correct
2020-09-05 16:43:27 +01:00
Luis Ramos
49060892e8
Merge decorators into original files from spree_core
2020-09-05 16:43:27 +01:00
Luis Ramos
9175504bc1
Bring taxon, taxonomy and classification from spree_core
2020-09-05 16:43:27 +01:00
Luis Ramos
8867ec977c
Bring missing factory from spree_core and use ofn's calculator
2020-09-05 16:38:37 +01:00
Luis Ramos
4931edc67c
Remove code related to promotions, we dont have promotions in OFN
2020-09-05 16:38:37 +01:00
Luis Ramos
51ed9a6b78
Fix comment and point out that it's a fix to a spree issue
2020-09-05 16:38:36 +01:00
Luis Ramos
e96428e7e2
Transpec adjustment_spec
2020-09-05 16:38:36 +01:00
Luis Ramos
b629a4f912
Make new specs pass
2020-09-05 16:38:36 +01:00
Luis Ramos
967380c542
Fix easy rubocop issues
2020-09-05 16:38:36 +01:00
Luis Ramos
ff0aa377a1
Run rubocop autocorrect
2020-09-05 16:38:36 +01:00
Luis Ramos
da683e3ecf
Merge decorators with original code from spree_core
2020-09-05 16:38:36 +01:00
Luis Ramos
aa46a4b5da
Bring models related to taxes and adjustments from spree_core
2020-09-05 16:38:36 +01:00
Transifex-Openfoodnetwork
61dad61ef7
Updating translations for config/locales/en_GB.yml
2020-09-05 02:37:15 +10:00
Luis Ramos
60e241b2c8
Merge pull request #5984 from openfoodfoundation/transifex
...
Transifex
2020-09-04 17:19:37 +01:00
Luis Ramos
d8165aeec1
Merge pull request #5987 from luisramos0/spree_core_without_ctrl_hlpers
...
Depend on version of spree without controller helpers
2020-09-04 17:18:17 +01:00
Pau Pérez Fabregat
c7bcd61755
Merge pull request #5990 from coopdevs/dont-require-overrides
...
Do not require view overrides
2020-09-04 17:20:04 +02:00
Luis Ramos
9c0c324835
Add some requires now required as spree does not contain controller helpers
2020-09-04 14:30:17 +01:00
Luis Ramos
874cb78809
Depend on version of spree without controller helpers, which are already on OFN side. This way we avoid conflicts
2020-09-04 12:48:22 +01:00
Eduardo
71876ca23a
change spec to use new authentication helper and user factory
2020-09-04 08:48:16 -03:00
Eduardo
07e5f8ed8d
fix typo on title of specs
2020-09-04 08:45:58 -03:00
Eduardo
11684dae65
hide environment on payment methods when user is not admin
2020-09-04 08:45:57 -03:00
Pau Perez
4499bc7313
Do not require view overrides
...
View overrides were removed long ago, so no need to require an empty
list.
The next step will be class decorators.
2020-09-04 13:27:38 +02:00
Luis Ramos
e44efd3db2
Change test of attachment from present? to file?
2020-09-04 10:06:41 +01:00
Luis Ramos
4fe24da3ec
Merge pull request #5748 from mbudm/issue/5072
...
Add redirect to shop on order cycle change
2020-09-04 10:03:07 +01:00
dependabot-preview[bot]
cb61c83688
Bump stripe from 5.22.0 to 5.25.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 5.22.0 to 5.25.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v5.22.0...v5.25.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-03 17:49:28 +00:00
Luis Ramos
d80a44ade0
Merge pull request #5867 from luisramos0/stock
...
[Bye bye Spree] Bring models stock_location and stock_movement from spree_core
2020-09-03 18:35:55 +01:00
Transifex-Openfoodnetwork
42d90465b1
Updating translations for config/locales/fr_CA.yml
2020-09-04 03:21:50 +10:00
Transifex-Openfoodnetwork
457dfdd18a
Updating translations for config/locales/en_CA.yml
2020-09-04 03:13:22 +10:00
Luis Ramos
e413920335
Move both OptionValueNamer and VariantAndLineItemNaming to app/services/variant_units
2020-09-03 09:11:00 -07:00
Luis Ramos
83ae13d7c7
Extract method to make code easier to read
2020-09-03 09:11:00 -07:00
Luis Ramos
9204687e4d
Fix rubocop issues
2020-09-03 09:11:00 -07:00
Luis Ramos
c6741dda36
Fix rubocop complexity issues by making code easier to read
2020-09-03 09:11:00 -07:00
Andy Brett
55f9fef2c3
denote that weight is in grams on the bulk order management page
2020-09-03 09:11:00 -07:00
Andy Brett
4bc3101f4d
Add specs for shipping weight calculations using lbs and oz
2020-09-03 09:11:00 -07:00
Andy Brett
404d7bbc43
add test for options_text using g/lb
2020-09-03 09:11:00 -07:00
Andy Brett
55e448897f
use fewer sigfigs for ounces; add spec to option_value_namer
2020-09-03 09:11:00 -07:00
Andy Brett
2fe9f4abc8
style updates for rubocop
2020-09-03 09:11:00 -07:00
Andy Brett
d7a8873ee9
return empty string for unitName if no scale matches
2020-09-03 09:11:00 -07:00
Andy Brett
a2993652c1
get only compatible scales in option_value_namer.js.coffee
2020-09-03 09:11:00 -07:00
Andy Brett
08e6e5a459
add compatibleUnitScales function and spec
2020-09-03 09:11:00 -07:00
Andy Brett
0018ef6eb4
refactor variant_unit_manager.coffee and add systems to scales
2020-09-03 09:11:00 -07:00
Andy Brett
9b9b6ded09
add each scales system in option_value_namer.rb
2020-09-03 09:11:00 -07:00
Andy Brett
e5e7e12a32
green tests for sorted scales
2020-09-03 09:11:00 -07:00
Andy Brett
2f216039ac
update variantunitmanager test expectation
2020-09-03 09:11:00 -07:00
Andy Brett
e99799bca2
add ounces and round up for lbs
2020-09-03 09:11:00 -07:00
Zee Spencer
f5e300a5de
Presenting a line item or variants options_text uses overriden values
...
This changes how we display the description of weight, but it doesn't
change the `Spree::OptionValue`s that are being created when someone
adds a product to their cart.
This takes us closer by making the UI look more correct; but it feels
odd compared to settiong the `Spree::OptionValue` to the correct
unit on creation.
But on the other hand, that could possibly make things worse for the
shipping calculation bits.
2020-09-03 09:10:59 -07:00
Zee Spencer
ae0b76e610
Support imperial units when scaling the unit value
...
We are pretty sure this is not the correct final implementation, but
we wanted to get some tests failing so we can start to fix them.
2020-09-03 09:10:59 -07:00
Zee Spencer
cb09c935dc
WIP: Products may be created with pounds for their weight unit_converter
...
See: https://community.openfoodnetwork.org/t/hubs-managers-can-choose-the-adapted-weight-and-measure-units-for-their-shops-given-their-own-local-situation/1289/11
We're not entirely sure what needs to be changed in order for this to
accurately work with shipping and other parts of the eCommerce platform.
We are assuming that so long as we canonically store the weight scale
in grams, that the shipping calculation will be able to do what it needs
to. So if we put in values for "oz" as grams, we may not need to do
much else in order to let product(s) be sold by the pound (or ounce).
Next steps appear to be:
- [ ] When looking at an order as a customer, do we want to show pounds
instead of grams? (See: http://localhost:3000/orders/R125684626 )
- [ ] Compile a list of tests that are worth writing (because we have
no confidence that we know what we are supposed to be doing in
order for this feature to be "ready" to be used by people.)
- [ ] Write a test that demonstrates when we create a product with a
variant in pound that the product's shipping weight is correctly
calculated?
- [ ] Do we want to think about i18n?
2020-09-03 09:10:59 -07:00
Transifex-Openfoodnetwork
8f896a806a
Updating translations for config/locales/es.yml
2020-09-03 23:36:07 +10:00
Transifex-Openfoodnetwork
71b1c5a3b3
Updating translations for config/locales/ca.yml
2020-09-03 23:35:02 +10:00
Luis Ramos
8256a20aea
Update all locales with the latest Transifex translations
2020-09-03 13:27:16 +01:00
Luis Ramos
07e17d7931
Merge pull request #5979 from mkllnk/fix-locale-for-transifex
...
Add required plural form to locale
2020-09-03 13:21:13 +01:00
Luis Ramos
e177ba5e29
Merge pull request #5977 from openfoodfoundation/transifex
...
Transifex
2020-09-03 13:19:33 +01:00
Transifex-Openfoodnetwork
d3f48bf684
Updating translations for config/locales/nb.yml
2020-09-03 22:16:04 +10:00
Transifex-Openfoodnetwork
63a6ceede3
Updating translations for config/locales/en_NZ.yml
2020-09-03 19:57:50 +10:00
François Turbelin
52d82d0a96
Use not found instead of 404 for spec descriptions
2020-09-03 00:59:21 +02:00
François Turbelin
d11d67561f
Remove extra delegation in serializers
2020-09-03 00:58:54 +02:00
François Turbelin
d2c147109d
Use Persons instead of People
2020-09-03 00:56:42 +02:00
Luis Ramos
185c246a83
Merge pull request #5965 from coopdevs/ignore-pyenv-file
...
Gitignore pyenv's Python version file
2020-09-02 23:50:42 +01:00
François Turbelin
b60c1c9003
Dry current_enterprise emtod with enterprise_id_param_name
2020-09-03 00:50:23 +02:00
Luis Ramos
83361255aa
Merge pull request #5969 from luisramos0/fungi
...
Replace beef with fungi in sample data 🐮
2020-09-02 23:47:43 +01:00
Luis Ramos
f28241cc5e
Merge duplicate Spree::User#superadmin? into existing Spree::admin?
2020-09-02 22:41:42 +01:00
Luis Ramos
ebf4175662
MErge user class extensions into the User class
2020-09-02 22:41:39 +01:00
Luis Ramos
737fc699ed
Fix rubocop issues
2020-09-02 22:40:46 +01:00
Luis Ramos
caf61e3a7e
Run rubocop -a
2020-09-02 22:40:28 +01:00
Luis Ramos
dfa00a770a
Bring user and ability related files from spree_core
2020-09-02 22:37:27 +01:00
François Turbelin
59fb2abc5d
Fix inheritance issue with specs on Semaphore
2020-09-02 23:08:47 +02:00
François Turbelin
6508897e3d
Introduce current_enterprise with memoization
2020-09-02 22:28:12 +02:00
François Turbelin
1baba5b61c
Introduce current_user with memoization
2020-09-02 22:18:56 +02:00
François Turbelin
4f2b7094d0
Use before_action instead of before_filter
2020-09-02 21:48:13 +02:00
Luis Ramos
b4759ff869
Merge pull request #5869 from luisramos0/images
...
[Bye bye Spree] Bring models image and asset from spree_core
2020-09-02 19:44:40 +01:00
Transifex-Openfoodnetwork
5bc0eca493
Updating translations for config/locales/en_FR.yml
2020-09-02 23:08:34 +10:00
Transifex-Openfoodnetwork
f6eb05a6f1
Updating translations for config/locales/fr.yml
2020-09-02 23:07:46 +10:00
Maikel Linke
cd940bd140
Rewrite error message for failed credit card sending
2020-09-02 15:22:23 +10:00
Maikel Linke
09f0035bbd
Add required plural form to locale
...
Transifex complained:
> Key 'spree.activerecord.models.spree/payment' has the wrong number of plurals
While our application may not need that translation, Transifex won't
accept the source file and our updates were broken.
2020-09-02 15:06:15 +10:00
Luis Ramos
2cb6124b7a
Use existing product factory, the custom product is not needed here
2020-09-01 17:13:07 +01:00
Luis Ramos
653b71dbd4
Remove duplicated spec
2020-09-01 17:10:51 +01:00
Luis Ramos
b36d0bc4f3
Fix easy rubocop isssues
2020-09-01 17:09:22 +01:00
Luis Ramos
b2cf414fb8
Use exiting translation
2020-09-01 17:09:22 +01:00
Luis Ramos
5958c2f68c
Rubocop autocorrect
2020-09-01 17:09:22 +01:00
Luis Ramos
13f0a46bc2
Merge decorator with original file from spree
2020-09-01 17:09:22 +01:00
Luis Ramos
b9f7a98c46
Bring image, asset and images_helper from spree_core
2020-09-01 17:09:22 +01:00
Transifex-Openfoodnetwork
a65bd8edac
Updating translations for config/locales/en_US.yml
2020-09-02 01:28:57 +10:00
Luis Ramos
ea053552b9
Merge pull request #5938 from cillian/bulk-coop-report-filter-fixes
...
Fix the bulk coop report date and distributor filters.
2020-09-01 16:21:31 +01:00
Luis Ramos
52fb3c92f0
Merge pull request #5954 from romale/patch-10
...
Missing translation key en.credit_owed and en.new_adjustment
2020-09-01 16:21:22 +01:00
Luis Ramos
ffac38d934
Remove option to enter state_name for countries without states
...
Thisis not supported in OFN
2020-09-01 16:06:49 +01:00
Luis Ramos
5716ea8611
Fix rubocop issue
2020-09-01 15:55:46 +01:00
Luis Ramos
88d90a37e8
Run transpec
2020-09-01 15:53:18 +01:00
Luis Ramos
ed114f4c4c
Fix rubocop issues
2020-09-01 15:52:36 +01:00
Luis Ramos
ffa0d202be
Add states api endpoint to support existing code on the customer details page when user changes country
2020-09-01 15:46:22 +01:00
Luis Ramos
41d797489d
Make onchange code simpler
2020-09-01 14:52:18 +01:00
Luis Ramos
46623242f7
Make use_billing checkbox work again, missign js code from spree
2020-09-01 14:28:45 +01:00
Luis Ramos
1a39a55009
Fix problem of converting from erb to haml
2020-09-01 14:09:06 +01:00
Luis Ramos
56fb09c006
Remove unused class
2020-09-01 14:03:20 +01:00
Luis Ramos
e4dee8a2fb
Replace hash rockets
2020-09-01 13:57:57 +01:00
Luis Ramos
04f9c5ec5e
Convert address form from erb to haml
2020-09-01 13:53:19 +01:00
Luis Ramos
8c322c1a0f
Move shared address_form partial to the only place where it is used, order customer_details
2020-09-01 13:49:17 +01:00
Luis Ramos
5e49e03477
Merge pull request #5964 from coopdevs/fix-flaky-product-update-spec
...
Check taxon's attribute instead of object identity
2020-09-01 12:06:02 +01:00
Luis Ramos
b35d579f64
Bring stock_movement factory from spree_core
2020-09-01 10:20:51 +01:00
Luis Ramos
3198bbd3cb
Bring required factory from spree_core
2020-09-01 10:17:45 +01:00
Luis Ramos
865a4b3063
Fix base helper spec
2020-09-01 09:46:41 +01:00
Luis Ramos
b413f856a5
Clarify that it's a Spree issue number
2020-09-01 09:46:41 +01:00
Luis Ramos
2f93a06dd5
Run rubocop -a on files brought from spree_core
2020-09-01 09:46:41 +01:00
Luis Ramos
c151195e3a
Merge decorator with original class and delete dead code
2020-09-01 09:46:41 +01:00
Luis Ramos
7ec00cf40a
Bring base files from spree_core
2020-09-01 09:45:11 +01:00
Luis Ramos
bf81b5a305
Remove unnecessary setup code in spec, propagate_all_variants is always true in OFN
2020-09-01 09:42:24 +01:00
Luis Ramos
d87d5d3537
Fix stock_movement and stock_location specs brought from spree_core
...
propagate_all_variants is always true in OFN
2020-09-01 09:42:24 +01:00
Luis Ramos
e0ea25b7a3
track_inventory_levels is always true in OFN
2020-09-01 09:42:24 +01:00
Luis Ramos
8f19ad0646
Delete dead code
2020-09-01 09:42:24 +01:00
Luis Ramos
e89eb8f76c
Fix simepl rubocop issues
2020-09-01 09:42:24 +01:00
Luis Ramos
0b053c18af
Merge decoorator with original file from spree
2020-09-01 09:42:24 +01:00
Luis Ramos
d13bd86e4c
Bring stocck movement and stock location from spree
2020-09-01 09:42:24 +01:00
Pau Pérez Fabregat
c56962b949
Merge pull request #5966 from openfoodfoundation/dependabot/bundler/bugsnag-6.17.0
...
Bump bugsnag from 6.16.0 to 6.17.0
2020-09-01 09:55:11 +02:00
Luis Ramos
208be3ede6
Fix rubocop issues
2020-08-31 20:00:08 +01:00
Luis Ramos
de061b4c54
Make it a keyword argument so it's easier to read
2020-08-31 18:47:24 +01:00
Luis Ramos
c7a5dd65cf
Ensure all specs that change stripe_connect_enable set the value back to what it was before, which should be the default value false
...
This will speed up specs as it ensures the stripe is always disabled and its JS script is not loaded
2020-08-31 18:38:50 +01:00
Luis Ramos
d9a228e5ec
Replace before and after hook with an around hook
2020-08-31 17:47:41 +01:00
Luis Ramos
8a75fe777c
Refactor enterprises controller to reduce code duplication
2020-08-31 17:40:34 +01:00
Luis Ramos
66587ccc00
Allow user to remove terms and conditions file
2020-08-31 17:40:34 +01:00
Luis Ramos
24cdd0c467
Refactor enterprise controller to reduce code duplication
2020-08-31 17:40:34 +01:00
Luis Ramos
a3e9226878
Add option to remove existing terms and conditions file
2020-08-31 17:40:34 +01:00
Luis Ramos
0974c4b2ac
Move enterprise images translations to the correct place using lazylookup on the server and to main js: namespace for js translations
2020-08-31 17:40:34 +01:00
Luis Ramos
5a10a2861e
Reduce the size of the terms and conditions message on the checkout page
2020-08-31 17:40:34 +01:00
Luis Ramos
aedc12e0e3
Add top padding to terms file upload input in enterprises form
2020-08-31 17:40:34 +01:00
Luis Ramos
fc4cc65e07
Merge typography files in css admin
2020-08-31 17:40:34 +01:00
Luis Ramos
07cee32f04
Move enterprisse_console to pages/enterprise_form
2020-08-31 17:40:34 +01:00
Luis Ramos
42d5344179
Fix checkout spec by fixing wrong default value
2020-08-31 17:40:34 +01:00
Luis Ramos
12d18b2825
Add specs to checkout_spec to validate terms and conditions link
2020-08-31 17:40:34 +01:00
Luis Ramos
ad111e837e
Add spec to test terms and conditions link on checkout page
2020-08-31 17:40:34 +01:00
Luis Ramos
746533d3f6
Improve spec titles
2020-08-31 17:40:34 +01:00
Luis Ramos
4ef4a58532
Merge two describe sections with same before method and call it what it is: guest checkout
2020-08-31 17:40:34 +01:00
Luis Ramos
685a5465f1
Simplify checkout stripe spec
2020-08-31 17:40:34 +01:00
Luis Ramos
70e9ef93bb
Extract stripe spec from checkout spec so we can expand stripe tests in checkout
2020-08-31 17:40:34 +01:00
Luis Ramos
86ad31eb5c
Reuse checkout form filling code from CheckoutHelper in checkout paypal spec
2020-08-31 17:40:34 +01:00
Luis Ramos
edfd0fd95c
Move checkout helpers to checkout_helper
2020-08-31 17:40:34 +01:00
Luis Ramos
d1f5828d13
Rename checkout_workflow to checkout_helper
2020-08-31 17:40:34 +01:00
Luis Ramos
785f8ada4d
Refactor checkout_spec by removing unnecessary initial describe section
2020-08-31 17:40:34 +01:00
Luis Ramos
b9511d4f07
Show terms and conditions on checkout if enterprise has an associated PDF file
2020-08-31 17:40:34 +01:00
Luis Ramos
16a475d8af
Fix some rubocop issues
2020-08-31 17:40:34 +01:00
Luis Ramos
1a734aacf8
Allow user to upload terms and conditions PDF file to an enterprise
2020-08-31 17:40:34 +01:00
Luis Ramos
cfdfd82d9a
Replace api controller test helpers with easier existing alternatives
2020-08-31 17:05:51 +01:00
Luis Ramos
b872bf49c5
Replace usage of helper method with a more simple approach
2020-08-31 16:56:48 +01:00
Luis Ramos
3df5a0644f
Make sample data vegetarian
2020-08-31 10:57:07 +01:00
Pau Perez
6bb37a3942
Check taxon's attribute instead of object identity
...
We don't care about the Ruby object instance but the actual DB record it
represents.
2020-08-31 11:05:12 +02:00
Maikel
a029a86f0d
Merge pull request #5893 from arku/chore/resend-button-removal
...
Remove resend button on the orders edit page
2020-08-31 11:18:05 +10:00
François Turbelin
d5800642e7
Map DFC SuppliedProduct with OFN Variant
2020-08-30 23:11:59 +02:00
Luis Ramos
c9758b8b0b
Merge pull request #5957 from coopdevs/improve-stripe-connection-spec
...
Improve StripeAccountsController#connect spec
2020-08-30 22:02:22 +01:00
Arun Kumar Mohan
bf07da6267
Fix the order resend message translation
2020-08-29 20:47:28 -05:00
Arun Kumar Mohan
bb9ab57699
Remove resend button on the orders edit page
2020-08-29 20:47:28 -05:00
dependabot-preview[bot]
7e274868fa
Bump bugsnag from 6.16.0 to 6.17.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.16.0 to 6.17.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.16.0...v6.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-28 15:16:12 +00:00
Pau Pérez Fabregat
7cb49ac9a8
Merge pull request #5866 from luisramos0/ctry_zone
...
[Bye bye Spree] Bring models country, zone and zone_member from spree_core
2020-08-28 13:23:59 +02:00
Cillian O'Ruanaidh
9efee1b0be
In bulk coop report service spec just check array has the same elements but don't check the order.
...
The #table_items methos seems to return line items in different order sometimes making this test a bit flaky. The test passed on Semaphore previously and is passing in development. I don't think the order matters so using :match_array instead of :eq.
2020-08-28 12:20:47 +01:00
Pau Perez
defb6e4fa4
Update all locales with the latest Transifex translations
2020-08-28 13:19:39 +02:00
Pau Perez
96cd40e446
Gitignore pyenv's Python version file
...
I use pyenv to manage the Python version to run the Transifex client.
That's the only bit of Python I use in this repo.
Without this I have to select the version each time and remove the file
after preparing the release. Annoying.
2020-08-28 12:56:17 +02:00
Pau Perez
37bfdf69a9
Bring required state factory
...
It was removed from master in
2abbfad18c
2020-08-28 12:44:30 +02:00
Cillian O'Ruanaidh
a441979649
Pass in :report_type parameter correctly to bulk coop report so different report types are generated
...
Also add tests for each of the different report types. I didn't make these JavaScript tests because not sure that is necessary and they would be slower.
2020-08-28 11:09:34 +01:00
Pau Pérez Fabregat
62339de603
Merge pull request #5963 from coopdevs/fix-payment-translation
...
Fix payment translation
2020-08-28 11:20:24 +02:00
Pau Perez
9b2cb1c3ef
Fix payment translation
...
One in the i18n key refers to singular/plural not the copy itself. Now
we see `Order #R587218174 -> Payment -> Cash on collection` instead of
`Order #R587218174 -> One -> Cash on collection`.
2020-08-28 10:06:19 +02:00
Pau Perez
58c0b1e0fd
Update all locales with the latest Transifex translations
2020-08-28 09:51:53 +02:00
Pau Pérez Fabregat
4984cc9758
Merge branch 'master' into ctry_zone
2020-08-28 09:21:57 +02:00
Maikel
2a71af7c6b
Merge pull request #5944 from romale/patch-9
...
Missing translation key en.spree.activerecord.models.spree/payment.one
2020-08-28 09:48:46 +10:00
Maikel
819a445547
Merge pull request #5712 from mbudm/issue/5208
...
Add payment details to invoice
2020-08-28 09:46:49 +10:00
Maikel
d57f20a542
Merge pull request #4925 from luisramos0/finders
...
Adapt remaining AR finders to rails 4
2020-08-28 09:46:20 +10:00
Matt-Yorkley
28651bbecf
Merge pull request #5941 from luisramos0/no_spree_specs
...
[Bye bye Spree] Make OFN independent of spec helpers under core/lib/testing_support
2020-08-27 17:05:45 +02:00
Pau Pérez Fabregat
06b41a8236
Merge pull request #5908 from Matt-Yorkley/subs-logging
...
Improve subs logging
2020-08-27 16:23:15 +02:00
Pau Pérez Fabregat
2fa8cd54fd
Merge pull request #5769 from Matt-Yorkley/customer-names
...
Customer names in reports
2020-08-27 15:39:47 +02:00
Pau Pérez Fabregat
043e175fa1
Merge pull request #5952 from openfoodfoundation/transifex
...
Transifex
2020-08-27 13:51:31 +02:00
Pau Pérez Fabregat
a1b4c7fdf2
Merge pull request #5923 from openfoodfoundation/dependabot/bundler/jwt-2.2.2
...
Bump jwt from 2.2.1 to 2.2.2
2020-08-27 13:50:44 +02:00
Pau Perez
6e3cfe9c54
Improve StripeAccountsController#connect spec
...
We are manually testing this while this is already covering the
connection of a Stripe account to an OFN instance. This makes it a bit
more comprehensive.
2020-08-27 13:43:54 +02:00
romale
8583ac5573
Update en.yml
2020-08-27 14:38:10 +03:00
Pau Pérez Fabregat
300e12371a
Merge pull request #5918 from luisramos0/stripe_disabled
...
Do not add stripe JS code to layout if stripe is disabled at instance level
2020-08-27 13:27:40 +02:00
romale
8f59b048f3
Update en.yml
2020-08-27 13:53:13 +03:00
Transifex-Openfoodnetwork
8290acfd91
Updating translations for config/locales/es.yml
2020-08-27 18:15:46 +10:00
Transifex-Openfoodnetwork
a8bfedd847
Updating translations for config/locales/ca.yml
2020-08-27 18:15:32 +10:00
Steve Roberts
ef0038a661
Change trigger to update filters after ProductsCtrl is loaded.
2020-08-27 18:02:01 +10:00
Pau Pérez Fabregat
6f33ae586e
Merge pull request #5943 from luisramos0/spree_factories
...
[Bye bye Spree] Make OFN independent of all spree spec factories
2020-08-27 08:54:20 +02:00
Steve Roberts
4e635e114c
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/5072
2020-08-27 14:48:51 +10:00
Maikel Linke
5d48da72c7
Notify Bugsnag on Stripe payment errors
2020-08-27 11:09:16 +10:00
Maikel Linke
9d07295480
DRY error reporting during payment
2020-08-27 11:03:13 +10:00
Maikel Linke
f435039061
Simplify using loading and flash messages together
2020-08-27 11:03:13 +10:00
Maikel
da1569abda
Merge pull request #5914 from romale/patch-8
...
Missing translation key 'listing_reports'
2020-08-27 11:02:40 +10:00
Maikel
7ce9a3f988
Merge pull request #5894 from julesemmac/places-error
...
adding required argument to resolve Places error
2020-08-27 11:01:19 +10:00
Maikel
7a0b036edd
Merge pull request #5899 from andrewpbrett/dashboard-link
...
Update dashboard link to point to enterprise shop
2020-08-27 10:53:43 +10:00
Maikel
d81ed36eef
Merge pull request #5892 from arku/fix/price-i18n
...
Fix price translation in Bulk Order Management
2020-08-27 10:31:38 +10:00
Luis Ramos
5b3e350204
Rename zone.country_list to zone.countries
2020-08-26 23:12:48 +01:00
Luis Ramos
53de04121c
Fix rubocop issue
2020-08-26 23:09:41 +01:00
Luis Ramos
23c86a1937
Replace select2_search usages with faster targetted_select2_search and remove select2_search and dependent code
2020-08-26 23:06:25 +01:00
Luis Ramos
fb88cfedcf
Remove unused helpers
2020-08-26 22:49:52 +01:00
Luis Ramos
94d1d5f3ae
Run rubocop -a on spec/factories
2020-08-26 22:18:40 +01:00
Luis Ramos
f9aac02e13
Run rubocop -a
2020-08-26 22:16:02 +01:00
Luis Ramos
274cdefa26
Remove commented code
2020-08-26 22:14:24 +01:00
Luis Ramos
9264badaaf
Merge pull request #5879 from luisramos0/payments
...
[Bye bye Spree] Bring models payment_method, credit_card and gateway from spree_core
2020-08-26 22:09:16 +01:00
Pau Pérez Fabregat
152eb11913
Merge pull request #5940 from openfoodfoundation/transifex
...
Transifex
2020-08-26 09:12:58 +02:00
Pau Pérez Fabregat
0421d23e7b
Merge pull request #5851 from cillian/osm-tile-provider-updates
...
Open Street Map tile provider updates
2020-08-25 10:51:55 +02:00
Transifex-Openfoodnetwork
5ce51a4abb
Updating translations for config/locales/nb.yml
2020-08-25 18:23:24 +10:00
Transifex-Openfoodnetwork
1c7ce9997a
Updating translations for config/locales/es.yml
2020-08-25 18:21:19 +10:00
Transifex-Openfoodnetwork
489665f3f9
Updating translations for config/locales/ca.yml
2020-08-25 18:21:04 +10:00
Maikel
cad79d74c8
Merge pull request #5696 from jeduardo824/enhancement/5210-action-buttons-on-all-tabs
...
Enhancement/5210 - Add Actions dropdown menu to all pages of Order Details menu
2020-08-25 15:39:50 +10:00
Transifex-Openfoodnetwork
f9e29c5aa7
Updating translations for config/locales/ar.yml
2020-08-25 07:24:29 +10:00
romale
ad9d9afd6a
Update en.yml
2020-08-24 17:51:06 +03:00
Luis Ramos
41d67d8b2e
Fix estimator spec
2020-08-23 18:07:01 +01:00
Luis Ramos
5568fd5826
Fix problem in order factory
...
We dont need the global zone
2020-08-23 17:40:54 +01:00
Luis Ramos
f6277416ce
Simplify stock location factory and fix related issues in several factories
2020-08-23 17:34:02 +01:00
Luis Ramos
4de4cc642d
Fix stock location factory
2020-08-23 17:34:02 +01:00
Luis Ramos
cd22361d13
Fix shipping category factory
2020-08-23 17:34:02 +01:00
Luis Ramos
1ddda92f4d
Move factories from generic factories file to their respective factory file
2020-08-23 14:55:45 +01:00
Luis Ramos
4048957e2e
Bring the final batch of factories from spree_core
2020-08-23 14:51:15 +01:00
Luis Ramos
2abbfad18c
Remove the need to import both :role and :state factory to OFN
2020-08-23 14:47:30 +01:00
Luis Ramos
292199441a
Fix problem with shipment's stock location creation
2020-08-23 14:35:59 +01:00
Luis Ramos
f56fa0b7a5
Bring calculator factories from spree_core
2020-08-23 14:35:59 +01:00
Luis Ramos
a432bbf789
Fix problem with shipping method's shipping category creation
2020-08-23 14:35:59 +01:00
Luis Ramos
6d9250c014
Bring tax category factory from spree_core and fix a problem with the stock location of the product factory
2020-08-23 14:35:59 +01:00
Luis Ramos
6d05de742e
Fix problem with product shipping category factory
2020-08-23 14:35:59 +01:00
Luis Ramos
aa00756f9c
Bring product factory from spree_core and merge with modification
2020-08-23 14:35:59 +01:00
Luis Ramos
ee65b4ba27
Bring taxon and taxonomy factories from spree_core
2020-08-23 14:35:59 +01:00
Luis Ramos
e2a865476d
Bring adjustment factory from spree_core
2020-08-23 14:35:59 +01:00
Luis Ramos
9e7e63cc94
Bring line_item factory from spree_core
2020-08-23 14:35:59 +01:00
Luis Ramos
4dd1a52f8e
Bring random_email and random description from spree_core factories
2020-08-23 14:35:59 +01:00
Luis Ramos
f6f6d9b46f
Bring variant factory from spree_core and merge with modification
2020-08-23 14:35:59 +01:00
Luis Ramos
204e3979d9
Bring user factory from spree_core and merge with modification
2020-08-23 14:35:58 +01:00
Luis Ramos
ad8c41e0ad
Bring shipping_method factory from spree_core and merge with modification
2020-08-23 14:35:58 +01:00
Luis Ramos
acb1c41461
Bring shipment factory from spree_core and merge with modification
2020-08-23 14:35:58 +01:00
Luis Ramos
859d34c235
Remove nice trick to reuse traits by copy pasting the traits to each of
...
the 3 factories
I cannot figure out out to make this work again...
2020-08-23 14:35:58 +01:00
Luis Ramos
8d74c69402
Bring order factory from spree_core and merge with modification
2020-08-23 14:35:58 +01:00
Luis Ramos
4ac6664502
Replace FactoryGirl with FactoryBot weverywhere
2020-08-23 14:35:58 +01:00
Luis Ramos
53a8fec181
Bring shipping_category factory from spree_core and merge with modification
2020-08-23 14:35:58 +01:00
Luis Ramos
313e6e2b45
Bring stock_location factory from spree_core and merge with modification
2020-08-23 14:35:58 +01:00
Luis Ramos
6819042489
Bring options factories from spree_core and merge with modification
2020-08-23 14:35:58 +01:00
Luis Ramos
e1fb13b491
Bring payment method factory from spree_core and merge with modification
2020-08-23 14:35:58 +01:00
Luis Ramos
aa9054659e
Bring payment factory from spree_core and merge with modification
2020-08-23 14:35:56 +01:00
Luis Ramos
172a12d7d9
Bring credit_card factory from spree_core and merge with modification
2020-08-23 13:13:50 +01:00
Luis Ramos
e561bcc895
Bring address factory from spree_core and merge with modification
2020-08-23 13:13:11 +01:00
Luis Ramos
9390fd6ccb
Remove all factories from spree so we can see exactly what factories we need to bring from spree_core
2020-08-23 13:10:00 +01:00
Luis Ramos
b227c78aeb
Fix rubocop issues
2020-08-22 18:14:53 +01:00
Luis Ramos
a44d0f7af6
Add WebHelper where necessary
2020-08-22 18:14:53 +01:00
Luis Ramos
41a7e26fcd
Remove unused helper
2020-08-22 18:14:53 +01:00
Luis Ramos
5cd40cb19f
Remove dependency to Spree::TestingSupport code
2020-08-22 18:14:53 +01:00
Luis Ramos
907afe3131
Remove dependency to BarAbility from spree_core
2020-08-22 18:14:53 +01:00
Luis Ramos
261269bd57
Bring core/lib/spree/testing_support/i18n from spree_core to ofn as i18n_translations_checker
2020-08-22 18:14:53 +01:00
Luis Ramos
d0c07b931a
Bring Spree::TestingSupport::Preferences from spree_core to ofn as PreferencesHelper
2020-08-22 16:50:12 +01:00
Luis Ramos
b6adef38e5
Remove unused auth helpers
2020-08-22 16:50:12 +01:00
Luis Ramos
0ca4d0842a
Remove capybara_ext from spree and bring its helpers that are required in ofn
2020-08-22 16:50:12 +01:00
Transifex-Openfoodnetwork
e5395709cc
Updating translations for config/locales/en_NZ.yml
2020-08-22 21:18:58 +10:00
Transifex-Openfoodnetwork
2515b1ae2c
Updating translations for config/locales/en_IE.yml
2020-08-22 00:58:13 +10:00
Cillian O'Ruanaidh
cdd09e8f97
Fix the bulk coop report date and distributor filters.
...
Before the date and distributor filters would have no effect. This is because the BulkCoopReport is still generated using an older style method, and isn't generated using the newer method like in the EnterpriseFeeSummaryReport. This older style report expects to receive a :q parameter but it actually received the newer style :report parameter so the filters were not being applied.
This keeps the newer style report params but converts them, after they are authorised as safe, into the older style in the controller.
2020-08-21 15:08:58 +01:00
Luis Ramos
9fd8613107
Update all locales with the latest Transifex translations
2020-08-21 14:56:26 +01:00
Luis Ramos
bea8c2035f
Merge pull request #5909 from openfoodfoundation/transifex
...
Transifex
2020-08-21 14:54:49 +01:00
Luis Ramos
e616e32bbc
Merge pull request #5931 from Matt-Yorkley/customer-totals-fees
...
Customer totals fee calculations
2020-08-21 14:09:00 +01:00
Luis Ramos
19b5a004dd
Merge pull request #5877 from Matt-Yorkley/bugsnagger
...
BugsnagJS checkout errors
2020-08-21 14:01:48 +01:00
Luis Ramos
4a5a6a2242
Merge pull request #5906 from Matt-Yorkley/checkout_flash_errors
...
Fix flash error issues in checkout requests
2020-08-21 13:03:30 +01:00
Luis Ramos
d1b60e3778
Merge pull request #5905 from mkllnk/lost-decorators
...
Load previously lost decorator code and don't delete orders
2020-08-21 12:34:37 +01:00
Matt-Yorkley
2f1fdc5852
Simplify conditional statement
2020-08-21 12:12:30 +01:00
Maikel
31fe8850b5
Merge pull request #5913 from openfoodfoundation/luisramos0-patch-1
...
Remove spree upgrade section from the PR template ❤️
2020-08-21 16:35:09 +10:00
Maikel
0309a20cb1
Merge pull request #5904 from Matt-Yorkley/favicon
...
Fix broken favicon path
2020-08-21 14:05:00 +10:00
Gaetan Riou
6564ea7b00
rename ProductFiltersService to ProductFiltersUrl
2020-08-21 12:13:16 +10:00
Gaetan Riou
f71013c514
rename query filter where it was missed, fix bulk_update_product spec
2020-08-21 11:46:36 +10:00
Gaetan Riou
44487af2c8
remove dead filter code
2020-08-21 11:40:48 +10:00
Gaetan Riou
c3279941f5
Remove product filter helper spec as it's not needed anymore
2020-08-21 10:42:02 +10:00
Gaetan Riou
7356d0fe77
move url filter functionality to service ProductFiltersService
2020-08-21 10:42:02 +10:00
Gaetan Riou
bba683469b
add product filter parameters on the group buy options and search pages, so that the bulk import product page filters can be preserved
2020-08-21 10:39:43 +10:00
Gaetan Riou
c6e1f458cc
add product filter parameters on the various product properties pages, so that the bulk import product page filters can be preserved
2020-08-21 10:39:43 +10:00
Gaetan Riou
9bc928fd48
update product variants feature test to use ulr helpers
2020-08-21 10:39:43 +10:00
Gaetan Riou
a6444e76a5
add product filter parameters on the various product image pages, so that the bulk import product page filters can be preserved
2020-08-21 10:29:07 +10:00
Gaetan Riou
9b26ff2fa4
move product filter helper to a service
2020-08-21 10:29:07 +10:00
Gaetan Riou
684ae2ca22
update product feature test to use ulr helpers
2020-08-21 10:29:07 +10:00
Gaetan Riou
459708dbc8
add product filter parameters on the various product variants pages, so that the bulk import product page filters can be preserved
2020-08-21 10:29:07 +10:00
Gaetan Riou
f75aaf0b45
extract product filter functionality to a helper
2020-08-21 10:19:53 +10:00
Gaetan Riou
1a186affcf
refactor create and update to get rid of respond_override
2020-08-21 10:19:53 +10:00
Gaetan Riou
6e5c168d3b
add filter parameters to link leading back to bulk import product page and preserve filter parameters when updating product
2020-08-21 10:19:53 +10:00
Gaetan Riou
39564e612f
on admin product page, add selected filter to url and apply filter from url on page load
2020-08-21 10:19:53 +10:00
Matt-Yorkley
07b819ab4b
Adjust payment state conditional
...
The `Spree::Order#paid?` method actually includes orders with `payment_state == "credit_owed"`, which was breaking the desired display logic here.
2020-08-20 17:16:20 +01:00
Steve Roberts
50fd3656ef
Fix tests - the move of payments to shared has wider impact than first thought (yay tests)
2020-08-20 17:16:20 +01:00
Steve Roberts
4243ff293f
Update invoice2 to also use the shared payment partial
2020-08-20 17:16:20 +01:00
Steve Roberts
c79f2326fc
Fix some more issues raised by semaphore
2020-08-20 17:16:20 +01:00
Steve Roberts
ac69bef459
Fix issues raised by linter
2020-08-20 17:16:20 +01:00
Steve Roberts
debbf9b361
Modify payment_list partial to be shared
...
- Partial is used by both the invoice pdf and the order confirmation email
- separate scss file for new payment list table
- extracted outstanding balance logic (also changed in payments view.. admin/orders/RXXX/payments)
- translations in shared.payments_list and lazy loaded
2020-08-20 17:16:20 +01:00
Steve Roberts
1f470830c8
add vars to email.scss
2020-08-20 17:16:20 +01:00
Steve Roberts
a00e964eb6
Clean up scss - picked up by codeclimate
2020-08-20 17:16:20 +01:00
Steve Roberts
8e5cfdeb97
Add more details on payments to invoice.
2020-08-20 17:16:20 +01:00
Matt-Yorkley
9d772dbcc9
Merge pull request #5935 from luisramos0/fix_build
...
Fix master build - fix mail interceptor spec
2020-08-20 18:15:37 +02:00
Luis Ramos
0abcbc7b8f
Fix specs in mail interceptor spec
...
This was due to an incompatibility between two recent PRs: 5763 and
5733. PR 5733 did not take into account 5763 (the confirm email method was removed) and so the specs introduced
were broken.
2020-08-20 12:52:54 +01:00
Matt-Yorkley
3badaa07d2
Fix adjustment calculations; only "eligible" adjustments should be regarded as applied to an order.
...
When an order is submitted and the payment fails, the failed payment's adjustments (payment fees) are set to `eligible: false` to indicate they do not apply. These should not be counted as being included in an order's adjustments.
2020-08-19 22:50:37 +01:00
Matt-Yorkley
977ab26b00
Add failing spec for payment fee calculation in customer totals report
2020-08-19 22:50:35 +01:00
Luis Ramos
d6160b5759
Merge pull request #5758 from luisramos0/order_updater
...
Bring Order Updater from spree_core
2020-08-19 20:47:27 +01:00
Luis Ramos
40d4ed2c95
Merge pull request #5733 from luisramos0/base_ctrl
...
Move lib/spree to OFN
2020-08-19 18:35:17 +01:00
Luis Ramos
72f5b1b251
Revert "Remove unreachable order recovery code"
...
This reverts commit 355c5f5c55
2020-08-19 17:36:36 +01:00
Luis Ramos
eb2d8e65ed
Merge pull request #5910 from Matt-Yorkley/silky-mooth-sidebar-scrolling-for-danni
...
Add scrolling animate on sidebar hide
2020-08-19 11:47:39 +01:00
Maikel Linke
355c5f5c55
Remove unreachable order recovery code
...
Every page load creates a cart order if none is present. So when a user
logs in, they always have an order stored in their session. And
therefore, we never got to recover an old order.
We could have fixed the code to restore old orders. But as far as I can
tell, order recovery hasn't been working for years and I couldn't find
any issue requesting this feature.
If we wanted to implement order recovery, it should probably be designed
more carefully and included in the `current_order` method.
2020-08-19 12:06:58 +10:00
dependabot-preview[bot]
eb420d9eed
Bump jwt from 2.2.1 to 2.2.2
...
Bumps [jwt](https://github.com/jwt/ruby-jwt ) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/jwt/ruby-jwt/releases )
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.2.1...v2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-19 00:52:03 +00:00
Maikel Linke
bb3f958dd2
Remove redundant includes
2020-08-19 10:37:18 +10:00
Luis Ramos
d1ef0e0a0b
Do not add stripe JS code to layout if stripe is disabled at instance level
2020-08-18 16:41:29 +01:00
romale
0efcf1536f
Update en.yml
2020-08-17 23:10:43 +03:00
Luis Ramos
b367d4328e
Remove spree upgrade section from the PR template ❤️
2020-08-17 18:28:23 +01:00
Matt-Yorkley
ed346b3b54
Add scrolling animate on sidebar hide
2020-08-17 13:41:06 +01:00
Matt-Yorkley
290120d015
Fix broken favicon path
...
Ensures the non-fingerprinted version of the favicon will be used directly from `/public/favicon.ico`. Needed after recent changes to the Rails asset pipeline.
2020-08-17 11:59:22 +01:00
Matt-Yorkley
0fd163602d
Rename method for clarity
2020-08-17 11:17:42 +01:00
Transifex-Openfoodnetwork
4c3a3d5d1a
Updating translations for config/locales/en_GB.yml
2020-08-17 18:19:09 +10:00
Luis Ramos
f8146fb946
Adapt finders to rails 4
2020-08-16 16:50:54 +01:00
Luis Ramos
9771fd7f13
Merge pull request #5902 from openfoodfoundation/dependabot/bundler/bugsnag-6.16.0
...
Bump bugsnag from 6.15.0 to 6.16.0
2020-08-16 16:19:36 +01:00
Luis Ramos
6a61bf7656
Merge pull request #5898 from mkllnk/remove-diffy
...
Remove unused dependency diffy
2020-08-16 16:04:42 +01:00
Luis Ramos
9754d8d754
Merge pull request #5616 from openfoodfoundation/dependabot/bundler/paper_trail-7.1.3
...
Bump paper_trail from 5.2.3 to 7.1.3
2020-08-15 21:53:33 +01:00
Matt-Yorkley
91789494b0
Fix error: Unpermitted attribute: order_cycle_ids
2020-08-15 17:03:19 +01:00
Matt-Yorkley
2eda8789d1
Add user id logging to OrderCycle an Schedule PaperTrail entries
2020-08-15 14:49:08 +01:00
Matt-Yorkley
67a00173f8
Replace one-letter-variables in old spec and wrap long lines
2020-08-15 12:26:59 +01:00
Matt-Yorkley
5f8fc64b31
Move layout adjustment from view to CSS
2020-08-15 12:18:41 +01:00
Matt-Yorkley
97ae4def98
Schedule cleanup task to run once per month
2020-08-15 11:39:55 +01:00
Matt-Yorkley
91501f05f2
DRY date usage
2020-08-15 11:19:24 +01:00
Matt-Yorkley
93601ca556
Extract #remove_transient_data from TruncateData
2020-08-15 11:19:24 +01:00
Matt-Yorkley
2f5efc86ee
Add missing include
2020-08-14 20:48:33 +01:00
Matt-Yorkley
102df28e97
Extract data masking to service
2020-08-14 20:48:33 +01:00
Matt-Yorkley
0b91991919
Add explanatory user message for viewing customer names
2020-08-14 20:48:33 +01:00
Matt-Yorkley
9a9538dace
Don't hide customer names if enterprise has enabled :allow_customer_names perference
2020-08-14 20:48:33 +01:00
Matt-Yorkley
23bb72faa6
Add Enterprise shop preference to allow customer names in reports
2020-08-14 20:48:32 +01:00
Matt-Yorkley
ce5bcaaa20
Explicitly notify Bugsnag on checkout failure
2020-08-14 18:06:30 +01:00
Matt-Yorkley
de22ad0000
Fix flash error issues in checkout requests
2020-08-14 12:41:56 +01:00
Maikel Linke
23706ec1d6
Load our version of the Spree environment
...
We didn't actually change any logic in our version of the Spree
environment file but if we do that in the future, we want to be sure
that it takes effect. Our file was ignored and not loaded before.
2020-08-14 15:38:10 +10:00
Maikel Linke
c3e0f45f1a
Remove unused Report class from lib
...
Also removing related unused classes and their specs.
2020-08-14 15:38:10 +10:00
Maikel Linke
0a1947ae34
Remove unused module from lib
...
I was looking for library files that may be used but are not loaded.
I would then add the missing `require` statements. But I found that this
module isn't used any more.
Usage removed in:
310d1b3726
2020-08-14 15:38:10 +10:00
Maikel Linke
b79c568b08
Load our spree overrides instead of the originals
...
We changed some of Spree's logic and want to use that. And once we
remove the spree_core gem, we need to load those files before using
them.
2020-08-14 15:38:00 +10:00
Maikel Linke
e8139d3948
Keep old incomplete (cart) orders
...
We used to delete old cart orders so that they wouldn't re-appear after
a successful checkout of another order. Keeping them ensures that we
don't remove an order that is still used by another device. It also
makes sure that we keep references of failed payments.
2020-08-14 10:02:48 +10:00
François Turbelin
c3cf08156d
Add People controller
2020-08-13 11:49:45 +02:00
François Turbelin
8d4587506b
Add SuppliedProducts controller
2020-08-13 11:46:48 +02:00
François Turbelin
99e905c768
Simplify enterprise check logic
2020-08-13 11:02:31 +02:00
Maikel Linke
5761014205
Restore Spree customisations for controllers
2020-08-13 16:59:15 +10:00
Maikel Linke
90bf4f312b
Document and spec current controller behaviour
...
When we imported and merged Spree's controller modules with our
decorators, Rails started using Spree's original code again.
This was first included in v3.2.0 and deployed on 28 July 2020.
2020-08-13 16:59:15 +10:00
Maikel Linke
63a9765fea
Update rubocop todo lists
2020-08-13 16:33:47 +10:00
dependabot-preview[bot]
5c6cb4840e
Bump bugsnag from 6.15.0 to 6.16.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.15.0 to 6.16.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.15.0...v6.16.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-13 01:56:14 +00:00
Maikel Linke
271d1ec103
Update translations from Transifex
2020-08-13 10:52:55 +10:00
Maikel
2271a57ffe
Merge pull request #5880 from openfoodfoundation/transifex
...
Transifex
2020-08-13 10:35:00 +10:00
Andy Brett
7c223a43fc
remove unused key from en.yml
2020-08-12 12:59:38 -07:00
Andy Brett
d46fad3a02
remove map reference
2020-08-12 12:33:15 -07:00
Andy Brett
c75a864ff2
link to the enterprise's shop instead of a full map
2020-08-12 12:21:07 -07:00
François Turbelin
46d38930d9
Add some ajustements
2020-08-12 20:53:02 +02:00
François Turbelin
a4e8982351
Rename ProductsController into CatalogItemsController
2020-08-12 19:51:12 +02:00
François Turbelin
13e15f823e
Add Read action for Enterprise and CatalogItem
2020-08-12 19:43:20 +02:00
Transifex-Openfoodnetwork
95e048b37f
Updating translations for config/locales/en_CA.yml
2020-08-13 02:50:37 +10:00
François Turbelin
508ecd6bf7
Adjust with Rubocop suggestions
2020-08-12 13:46:23 +02:00
François Turbelin
d10fda6227
Put context inside serializer
2020-08-12 13:37:48 +02:00
François Turbelin
2a8268ca73
Use ActiveModelSerializer for DFC serialization
2020-08-12 13:37:01 +02:00
Maikel Linke
99ca0adf64
Remove unused dependency diffy
...
It was used to show differences in the product cache. But we removed the
cache in ab330e882e
2020-08-12 13:10:51 +10:00
Maikel
a8207128df
Merge pull request #5889 from Matt-Yorkley/suppress-selenium-warings
...
Suppress Selenium warnings in test log output.
2020-08-12 11:29:30 +10:00
Transifex-Openfoodnetwork
47bde1e77c
Updating translations for config/locales/tr.yml
2020-08-12 00:50:03 +10:00
Matt-Yorkley
0edeb82c32
Update spec/spec_helper.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2020-08-11 14:02:49 +02:00
julesemmac
dee34d1f26
adding required argument to resolve Places error
2020-08-10 23:19:21 -04:00
Transifex-Openfoodnetwork
acf984699e
Updating translations for config/locales/en_US.yml
2020-08-11 12:02:26 +10:00
Arun Kumar Mohan
13bf7497a9
Fix price translation in Bulk Order Management
2020-08-10 18:26:09 -05:00
Pau Pérez Fabregat
70e2fb759c
Merge pull request #5751 from luisramos0/subs_jobs
...
Add rescue statements with bugsnag alerts to subs jobs
2020-08-10 12:50:54 +02:00
Eduardo
a860b5ea42
remove unnecessary code
2020-08-09 20:45:33 -03:00
Matt-Yorkley
74252e9d13
Suppress Selenium warnings in test log output.
2020-08-09 14:02:07 +01:00
Luis Ramos
09b7aa134b
Ammend payment method spec and specify a calculator so that the default calculator is not the spree one that is based on a calculator that does not exist in OFN: Spree::Calculator::FlatRate
2020-08-07 18:36:59 +01:00
Luis Ramos
78fbac8ff2
Merge pull request #5882 from coopdevs/fix-doc-ocd
...
Fix docs OCD in Gemfile
2020-08-07 16:38:40 +01:00
Pau Perez
4e22787386
Fix docs OCD in Gemfile
...
@luisramos0 and I can't cope with reading TWO and seeing THREE items listed.
2020-08-07 17:20:14 +02:00
Transifex-Openfoodnetwork
f6c85af4da
Updating translations for config/locales/fr.yml
2020-08-08 00:21:32 +10:00
Luis Ramos
49a60374e6
Remove dead method in payment method, it's a scope in OFN and remove unnecessary comments about spree
2020-08-07 14:14:46 +01:00
Luis Ramos
2d3578bb30
Fix address_spec
2020-08-07 14:05:36 +01:00
Luis Ramos
1b66a72c7f
Run transpec
2020-08-07 14:03:15 +01:00
Luis Ramos
798194c03e
Fix payment_method spec
2020-08-07 14:02:05 +01:00
Luis Ramos
b21a969502
Fix new credit_card_spec
2020-08-07 13:45:25 +01:00
Luis Ramos
d746ae3d9e
Fix easy rubocop issues
2020-08-07 13:28:09 +01:00
Luis Ramos
621e2a3132
Run rubocop autocorrect
2020-08-07 13:16:38 +01:00
Luis Ramos
142bab8c35
Merge decorators with original spree files
2020-08-07 13:13:43 +01:00
Luis Ramos
abaa66cc14
Bring models from spree_core
2020-08-07 13:06:16 +01:00
Matt-Yorkley
1123e08a98
Update BugsnagJS to latest version and update initialization syntax
2020-08-07 12:59:33 +01:00
Luis Ramos
02f50774bb
Run transpec
2020-08-07 12:47:44 +01:00
Luis Ramos
ff8735d7a4
Make new specs pass
2020-08-07 12:45:06 +01:00
Luis Ramos
51a499d5c9
Revert rubocop autocorrect so that spec keeps working
2020-08-07 10:45:15 +01:00
Matt-Yorkley
3a2802f5aa
Merge pull request #5871 from coopdevs/fix-paypal-ssl-error
...
Point better_spree_paypal_express to its latest commit
2020-08-07 11:43:52 +02:00
Luis Ramos
086c521a27
Fix easy rubocop issues
2020-08-07 10:28:41 +01:00
Luis Ramos
7cefdda579
Run rubocop autocorrect
2020-08-07 10:21:09 +01:00
Luis Ramos
ba859111de
Merge decorators with original files brought from spree
2020-08-07 10:17:30 +01:00
Luis Ramos
fd9479f720
Bring modesl from spree_core
2020-08-07 10:06:08 +01:00
Luis Ramos
0c7a0e3e96
Bring modesl from spree_core
2020-08-07 10:06:04 +01:00
Matt-Yorkley
766b7449d8
Update all locales with the latest Transifex translations
2020-08-07 10:00:21 +01:00
Matt-Yorkley
2caa559869
Merge pull request #5860 from openfoodfoundation/transifex
...
Transifex
2020-08-07 10:58:25 +02:00
Luis Ramos
04feccaef3
Merge pull request #5863 from romale/patch-7
...
Missing translation key 'item', 'qty'
2020-08-07 09:22:34 +01:00
Pau Pérez Fabregat
dfc31b9338
Merge pull request #5864 from openfoodfoundation/dependabot/bundler/ddtrace-0.39.0
...
Bump ddtrace from 0.38.0 to 0.39.0
2020-08-07 08:22:17 +02:00
Pau Perez
2ccb7c3eb0
Point spree_paypal_express to its latest commit
...
This brings in the fix for the intermittent PayPal connection failures
due to SSL verification failed. Checkout that gem's commit for details.
2020-08-07 08:18:24 +02:00
Luis Ramos
6f17b80bb8
Move address factory modification to address_factory file and make it always create a state and country in the address if they dont exist in the DB
2020-08-06 10:11:47 +01:00
Transifex-Openfoodnetwork
f92d05656c
Updating translations for config/locales/en_FR.yml
2020-08-06 17:17:36 +10:00
Transifex-Openfoodnetwork
1e2c092b70
Updating translations for config/locales/fr.yml
2020-08-06 17:14:33 +10:00
Luis Ramos
43e64f3555
Delete dead code
2020-08-06 01:41:28 +01:00
Luis Ramos
73e1530a30
Fix specs
2020-08-06 01:35:09 +01:00
Luis Ramos
b09a9c5b8b
Fix easy rubocop issues
2020-08-06 01:22:31 +01:00
Luis Ramos
00ae3a25f7
Fix easy rubocop issues
2020-08-06 01:18:43 +01:00
Luis Ramos
14358256ed
Bring country, zone, state and zone_member from spree together with respective specs
2020-08-06 01:09:35 +01:00
dependabot-preview[bot]
6e626447d0
Bump ddtrace from 0.38.0 to 0.39.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.38.0 to 0.39.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases )
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.38.0...v0.39.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-05 23:48:20 +00:00
Luis Ramos
f14bb280c1
Merge pull request #5680 from cillian/prevent-blank-open-street-map
...
If no enterprises have been geocoded yet make sure Open Street Map displays correctly
2020-08-05 20:27:40 +01:00
Luis Ramos
f093656c6b
Merge pull request #5763 from luisramos0/mailers
...
Bring Mailers from Spree and make order shipped email translatable
2020-08-05 18:09:12 +01:00
romale
dd86e00913
Update en.yml
2020-08-05 18:17:14 +03:00
Transifex-Openfoodnetwork
b2309f8673
Updating translations for config/locales/en_FR.yml
2020-08-06 00:21:16 +10:00
Transifex-Openfoodnetwork
5404efcbce
Updating translations for config/locales/fr.yml
2020-08-06 00:21:09 +10:00
Luis Ramos
d8acf90240
Merge pull request #5770 from openfoodfoundation/revert-5601-enhancement/5454-links-to-shops-in-new-tabs
...
Revert "Enhancement/5454 make links to shops under Groups > Producers open in new tab"
2020-08-05 11:51:48 +01:00
Luis Ramos
6cc296926c
Merge pull request #5847 from rmklaus12/5579-missing-translation-subscriptions
...
5579 missing translation subscriptions
2020-08-05 11:29:34 +01:00
François Turbelin
8687e0199d
Apply cosmetics
2020-08-05 08:20:14 +02:00
Pau Pérez Fabregat
6e1dd78e9f
Merge pull request #5828 from luisramos0/ent_user
...
Clean up AuthenticationWorkflow spec helper
2020-08-04 12:07:54 +02:00
Pau Perez
6e39ab779c
Make RSpec infer the file type from its location
...
Apparently, although we tend to add the type of spec file some RSpec
methods are not working without it. We're getting:
```
NoMethodError:
undefined method `helper' for RSpec::ExampleGroups::SpreeSharedOrderDetailsHtmlHaml:Class
```
```
NameError:
undefined local variable or method `controller' for #<RSpec::ExampleGroups::SpreeAdminUsersController::AuthorizeAdmin:0x00007fa8b32addf8>
# ./spec/controllers/spree/admin/users_controller_spec.rb:10:in `block (3 levels) in <top (required)>'
```
It needs more investigation but another day.
2020-08-04 11:24:49 +02:00
Transifex-Openfoodnetwork
8792ec1de3
Updating translations for config/locales/es.yml
2020-08-04 18:14:45 +10:00
Transifex-Openfoodnetwork
b91f1578c9
Updating translations for config/locales/ca.yml
2020-08-04 18:14:27 +10:00
Pau Pérez Fabregat
9b91c490cb
Merge pull request #5859 from openfoodfoundation/transifex
...
Transifex
2020-08-04 10:13:37 +02:00
Transifex-Openfoodnetwork
e8ba44f958
Updating translations for config/locales/en_FR.yml
2020-08-04 17:27:10 +10:00
Transifex-Openfoodnetwork
800ac0cabf
Updating translations for config/locales/fr.yml
2020-08-04 17:26:53 +10:00
Pau Perez
9ef59f440b
Remove commented out includes
2020-08-04 08:50:14 +02:00
Pau Perez
61c14cb61d
Remove unneeded RSpec config block
...
Spec files individually include the module and we specify the type of
spec in each RSpec's describe so none of this settings are needed. They
are just Spree's legacy I bet.
2020-08-04 08:48:08 +02:00
Pau Pérez Fabregat
467fa7e566
Merge pull request #5856 from openfoodfoundation/transifex
...
Transifex
2020-08-04 08:37:32 +02:00
Pau Pérez Fabregat
ef48187332
Merge pull request #5745 from openfoodfoundation/dependabot/bundler/rswag-2.3.1
...
Bump rswag from 2.2.0 to 2.3.1
2020-08-04 08:00:32 +02:00
Luis Ramos
425901fa7a
Add some paragraphs and breaklines to the tempalte that used to be text and is now html
...
This template needs to be revisited, this is just a quick fix
2020-08-03 16:43:11 +01:00
Luis Ramos
6e57e1ad56
Fix conflict between unused Spree::CheckoutHelper in spree_core and the required ::CheckoutHelper in OFN
...
The OFN checkoutHelper was not being included and instead the Spree::CheckoutHelper, that doesnt have the necessary helpers, was used
2020-08-03 16:25:18 +01:00
Luis Ramos
6b4a518371
Merge pull request #5845 from romale/patch-6
...
Missing translation key for "height", "width", "depth"
2020-08-03 16:02:20 +01:00
Cillian O'Ruanaidh
e6ab2ae753
Remove unused positiveAngles and negativeAngles arrays from map centre calculator service.
...
I forgot to remove these when I was refactoring this earlier.
2020-08-03 15:12:40 +01:00
Transifex-Openfoodnetwork
c97fc45109
Updating translations for config/locales/nb.yml
2020-08-03 22:53:31 +10:00
Transifex-Openfoodnetwork
1d44d463e7
Updating translations for config/locales/tr.yml
2020-08-03 22:48:36 +10:00
Luis Ramos
13b72154fa
Merge pull request #5852 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.6
...
Bump activerecord-import from 1.0.5 to 1.0.6
2020-08-03 11:54:00 +01:00
dependabot-preview[bot]
619e13ccba
Bump rswag from 2.2.0 to 2.3.1
...
Bumps [rswag](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-03 08:32:45 +00:00
Pau Pérez Fabregat
bc66c10a52
Merge pull request #5848 from openfoodfoundation/transifex
...
Transifex
2020-08-03 09:59:12 +02:00
Pau Pérez Fabregat
06e77372be
Merge pull request #5842 from openfoodfoundation/dependabot/bundler/bugsnag-6.15.0
...
Bump bugsnag from 6.14.0 to 6.15.0
2020-08-03 09:58:52 +02:00
Eduardo
422958ed6f
create specific spec for order links partial
2020-08-02 20:02:36 -03:00
Eduardo
51f39ee89d
move coffee directive to partial
2020-08-02 20:01:49 -03:00
dependabot-preview[bot]
e615674541
Bump bugsnag from 6.14.0 to 6.15.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.14.0 to 6.15.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.14.0...v6.15.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-01 14:57:18 +00:00
Luis Ramos
327d6c43d9
Merge pull request #4084 from openfoodfoundation/dependabot/bundler/devise-3.5.10
...
[Security] Bump devise from 2.2.8 to 3.5.10
2020-08-01 15:55:19 +01:00
Luis Ramos
cc7363d9e7
Merge pull request #5824 from luisramos0/improve_checkout
...
Reset order state to cart in case the stripe SCA authorization step fails
2020-08-01 15:53:41 +01:00
dependabot-preview[bot]
ff82a1b73f
Bump activerecord-import from 1.0.5 to 1.0.6
...
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import ) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/zdennis/activerecord-import/releases )
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.5...v1.0.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-01 07:31:53 +00:00
Cillian O'Ruanaidh
ef7c7a3e73
Upgrade vendored :leaflet-providers JS to 1.10.2 to update available OSM tile providers and fix deprecated MapBox endpoint.
...
Before MapBox could no longer be used as an OSM tile provider as they recently deprecated their tile API endpoint (https://blog.mapbox.com/deprecating-studio-classic-styles-d8892ac38cb4 )
This update of leaflet-providers from 1.9.1 to 1.10.2 uses the new MapBox endpoint, it also adds new tile providers and removes some ones no longer supported. See https://github.com/leaflet-extras/leaflet-providers/blob/master/CHANGELOG.md#1102-2020-07-31
2020-07-31 20:18:15 +01:00
Cillian O'Ruanaidh
3c23952fd6
Don't double escape :open_street_map_provider_options so they are parsed into a JS object rather than a string.
...
Before if you entered '{ accessToken: secret }' into the open street map provider options field in the admin content settings the 'JSON.parse(openStreetMapConfig.open_street_map_provider_options)' call in the open_street_map directive was converting them into a string because they were double escaped. They need to be converted into a JS object in order to set the Leaflet provider options.
2020-07-31 20:08:09 +01:00
Luis Ramos
b025d5a600
Merge pull request #5822 from luisramos0/improve_ocs_perf
...
Performance improvement of the outgoing products page when editing OCs
2020-07-31 16:07:16 +01:00
Luis Ramos
2aa6c70dc6
Remove select from relation
...
This relation is only used above for a call to empty? so we don't need to worry about the select part of the query, specially not introducing an expensive DISTINCT
2020-07-31 09:26:04 +01:00
Luis Ramos
d052a7b796
Verify the user is confirmed before returning a reset password token
...
Co-authored-by: Maikel <maikel@email.org.au >
2020-07-31 09:14:07 +01:00
Transifex-Openfoodnetwork
9d1e12da68
Updating translations for config/locales/en_FR.yml
2020-07-31 18:11:19 +10:00
Transifex-Openfoodnetwork
aae0a6533a
Updating translations for config/locales/fr.yml
2020-07-31 18:10:57 +10:00
Luis Ramos
7c498a573c
Make shopfront redirect work when logging out by storing it outside session data
2020-07-31 09:05:42 +01:00
Luis Ramos
86afa6f413
Adapt to devise 3.2 and use after_confirmation callback to send welcome email
2020-07-31 09:05:42 +01:00
Luis Ramos
ca9898839a
Confirm! is deprecated and only redirects to confirm now in devise 3.5
2020-07-31 09:05:42 +01:00
Luis Ramos
f31d790714
Add auth spec to cover case where user tries to reset password before confirming their email
2020-07-31 09:05:42 +01:00
Luis Ramos
0f29806198
Adapt code to devise 3.2 where the reset_password_token stored in the db is a encrypted version of the token sent in the email
...
In this particular case, the user confirmations controller is redirecting to the reset password page but it doesnt know what is the raw reset_password_token
So we regenerate the reset password token so that it can know what's the raw value for the redirect
The method User#regenerate_reset_password_token is a proxy to the protected method in Devise::Recoverable
2020-07-31 09:05:42 +01:00
Luis Ramos
c0f9f8c8bf
Remove comment refering to old spree upgrade
2020-07-31 09:05:42 +01:00
Luis Ramos
a2ae78bde9
Replay commit from spree_auth_devise that upgrades to devise 3
...
fe7941f674
2020-07-31 09:05:42 +01:00
Luis Ramos
26ca374a76
Adpat user mailer to devise v3
2020-07-31 09:05:42 +01:00
Luis Ramos
40e065eada
Add gem for Devise::TokenAuthenticatable and configure it
2020-07-31 09:05:42 +01:00
dependabot-preview[bot]
f7ee6ce6c5
[Security] Bump devise from 2.2.8 to 3.5.10
...
Bumps [devise](https://github.com/plataformatec/devise ) from 2.2.8 to 3.5.10. **This update includes a security fix.**
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/v3.5.10/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v2.2.8...v3.5.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-31 09:05:42 +01:00
Luis Ramos
85e9819c3b
Make more translation keys use lazy look ups
2020-07-31 09:00:48 +01:00
Transifex-Openfoodnetwork
1ea06763f8
Updating translations for config/locales/es.yml
2020-07-31 17:00:19 +10:00
Transifex-Openfoodnetwork
5064769717
Updating translations for config/locales/ca.yml
2020-07-31 16:59:55 +10:00
Robin Klaus
581a246b4f
Added translation key for subscriptions heading
2020-07-31 16:29:04 +10:00
Maikel Linke
bee7990c60
Update translations
2020-07-31 15:58:04 +10:00
romale
27404872de
Missing translation key for "height", "width", "depth"
...
When edit product in path admin/products/PRODUCT_NAME/varians/NN/edit
2020-07-31 00:20:55 +03:00
Luis Ramos
1e9b11d209
Merge pull request #5807 from romale/patch-5
...
Add Russian to list of momentJS locales
2020-07-30 19:01:38 +01:00
Luis Ramos
df465cf45b
Merge pull request #5698 from rmklaus12/5575-backofficepay-missing-translation
...
Added translation key to locale/en.yml for backoffice admin payment
2020-07-30 19:01:11 +01:00
Luis Ramos
f524560624
Merge pull request #5800 from romale/patch-4
...
Missing translation key for "permalink" and "shipping_categories"
2020-07-30 18:00:45 +01:00
Luis Ramos
7af47df570
Merge pull request #5843 from andrewpbrett/master
...
Update Docker instructions to recommend creating your own fork
2020-07-30 17:57:33 +01:00
dependabot-preview[bot]
18cb0e0980
Bump paper_trail from 5.2.3 to 7.1.3
...
Bumps [paper_trail](https://github.com/airblade/paper_trail ) from 5.2.3 to 7.1.3.
- [Release notes](https://github.com/airblade/paper_trail/releases )
- [Changelog](https://github.com/paper-trail-gem/paper_trail/blob/master/CHANGELOG.md )
- [Commits](https://github.com/airblade/paper_trail/compare/v5.2.3...v7.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-30 16:56:15 +00:00
Luis Ramos
354b76205e
Merge pull request #5839 from openfoodfoundation/dependabot/bundler/oj-3.10.8
...
Bump oj from 3.10.7 to 3.10.8
2020-07-30 17:54:12 +01:00
Luis Ramos
fbc7eea1a5
Merge pull request #5811 from jttyeung/master
...
Fix #5730 content header overlap with long product names
2020-07-30 17:53:09 +01:00
Luis Ramos
0359d103b2
Improve code comments on dodgy and/but critical checkout process method
2020-07-30 17:18:34 +01:00
Luis Ramos
1400b3667b
Merge pull request #5788 from romale/patch-2
...
Missing translation key for shipping_method and new_order
2020-07-30 16:54:07 +01:00
Luis Ramos
e739c5185e
Add specs to verify that Spree::Core::Gateway exceptions are handled correctly
2020-07-29 23:56:52 +01:00
Luis Ramos
2136eecd09
Avoid reloading the payment every time, so that in-memory data is not wiped out
...
When checkout fails and the payment states dont match (inside the if), in-memory data of the failed payment can be lost but updating the payment state is the fundamental part here so that further checkout attempts work. We may improve this update statement so that all the data of the failed payment is persisted
2020-07-29 22:50:30 +01:00
Luis Ramos
9e9e0d0bd8
Remove rescue_from and just add the rescue to the edit action, the update action has a different logic where there is a generic rescue StandardError after the GatewayError rescue
2020-07-29 22:50:25 +01:00
Luis Ramos
da4abf6617
Add a comment to explain the necessity of the first rescue in the update action
2020-07-29 22:50:20 +01:00
Luis Ramos
ad00971ca8
Improve readability and add bugsnag error (now in the checkout_failed method) when checkout_fails while handling stripe redirect
2020-07-29 22:50:18 +01:00
Andy Brett
54cb479fa1
Update Docker instructions to mention the recommendation to create one's own fork
2020-07-29 13:04:34 -07:00
Pau Pérez Fabregat
e9787552c8
Merge pull request #5713 from Matt-Yorkley/taxon-icons
...
Remove taxon icons
2020-07-29 18:43:06 +02:00
Luis Ramos
bea472623d
Merge pull request #5834 from openfoodfoundation/dependabot/bundler/unicorn-5.6.0
...
Bump unicorn from 5.5.5 to 5.6.0
2020-07-29 14:33:04 +01:00
Pau Perez
84178c637e
Add missing momentjs languages to back-office
2020-07-29 13:02:46 +02:00
Pau Perez
9bf58a8258
Add missing Catalan, Arabic & Turkish for momentjs
2020-07-29 12:53:34 +02:00
Pau Perez
c923edd3bb
Replace hardcoded URL with path helper
2020-07-29 11:36:49 +02:00
Pau Pérez Fabregat
bcaa308ac8
Merge pull request #5825 from openfoodfoundation/transifex
...
Transifex
2020-07-29 11:20:56 +02:00
Maikel Linke
fe0c04b650
Complete renaming of AdvanceOrderService to OrderWorkflow
2020-07-29 12:24:18 +10:00
Robin Klaus
4375a34ef8
Updated message to Paypal payments cannot be captured in the Backoffice
2020-07-29 10:18:25 +10:00
Luis Ramos
07005594ff
Move payments persistence code to order workflow service
2020-07-28 23:56:43 +01:00
Luis Ramos
ac5882e3e6
Refactor OrderWorkflow
2020-07-28 23:55:36 +01:00
Luis Ramos
9cbcf14485
Move shipping method id setting code to OrderWorkflow service
2020-07-28 23:50:47 +01:00
Luis Ramos
c3f99050fd
Move advance_order_state from checkout_controller to OrderWorkflow service
2020-07-28 23:43:07 +01:00
Luis Ramos
26eee4631f
Rename AdvanceOrderService to OrderWorkflow
2020-07-28 23:40:49 +01:00
Luis Ramos
734fce5ce7
Add code to persist payments after failed payments. The state machine
...
rollbacks the transactions, with this we keep record of what went wrong.
2020-07-28 23:29:49 +01:00
Luis Ramos
e80337a458
Transpec checkout_spec
2020-07-28 23:29:49 +01:00
Luis Ramos
51de5269dc
Fix specs in checkout_spec
2020-07-28 23:29:49 +01:00
Luis Ramos
e99f0dc6b7
Rubocop autocorrect and easy rubocop issues
2020-07-28 23:29:49 +01:00
Luis Ramos
d8a96c9d34
Bring order checkout workflow and some of its specs from spree_core
2020-07-28 23:29:49 +01:00
dependabot-preview[bot]
555a74c9e6
Bump oj from 3.10.7 to 3.10.8
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.7 to 3.10.8.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.7...v3.10.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-28 21:10:22 +00:00
Pau Perez
be3a10b2b1
Fix some easy rubocop issues
2020-07-28 19:01:14 +02:00
Luis Ramos
275a864e51
Merge pull request #5815 from coopdevs/eager-load-option-values-line-items
...
Eager load spree_option_values_line_items
2020-07-28 17:21:02 +01:00
Luis Ramos
61453968dd
Merge pull request #5833 from luisramos0/pend_payments
...
Add unit tests for order.charge_shipping_and_payment_fees!
2020-07-28 17:18:57 +01:00
Transifex-Openfoodnetwork
8263e2e373
Updating translations for config/locales/es.yml
2020-07-29 00:39:21 +10:00
Transifex-Openfoodnetwork
aff8933d25
Updating translations for config/locales/ca.yml
2020-07-29 00:36:57 +10:00
Pau Pérez Fabregat
d4570240ae
Merge pull request #5826 from openfoodfoundation/luisramos0-patch-1
...
Update GETTING_STARTED.md
2020-07-28 15:59:38 +02:00
dependabot-preview[bot]
d0a7f8e1af
Bump unicorn from 5.5.5 to 5.6.0
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.5 to 5.6.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-27 23:44:40 +00:00
Luis Ramos
d673f278ce
Add unit test to order.charge_shipping_and_payment_fees!
2020-07-27 21:27:23 +01:00
Luis Ramos
a002ec1894
Simplify login_as_admin by using existing factory admin_user
2020-07-27 16:02:59 +01:00
Luis Ramos
ecc58cedd9
Fix navigation problem in spec
2020-07-27 16:02:59 +01:00
Luis Ramos
27ace50eb7
Fix general settings path in specs
2020-07-27 16:02:57 +01:00
Luis Ramos
4df81f0864
Remove unnecesasary and now broken require statement from spec and fix rubocop todo files
2020-07-27 15:32:35 +01:00
Luis Ramos
95a9ca7775
Remove redundant method, login_as is the name of the test helper in warden
2020-07-27 15:32:35 +01:00
Luis Ramos
d6a5ad70a8
Adapt specs in order mgmt engine to new authentication helper
2020-07-27 15:32:35 +01:00
Luis Ramos
a2ebc614d9
Rename AuthenticationWorkflow to AuthenticationHelper
2020-07-27 15:32:35 +01:00
Luis Ramos
10b07aabd9
Rename quick_login_as to login_as
2020-07-27 15:32:35 +01:00
Luis Ramos
5738ec0542
Rename login_to_admin_and_visit to login_as_admin_and_visit
2020-07-27 15:32:34 +01:00
Luis Ramos
c6bb756531
Rename quick_login_as_admin to login_as_admin and also re-use login_to_admin_and_visit when applicable
2020-07-27 15:31:23 +01:00
Luis Ramos
8b04e45ea5
Create login_to_admin_and_visit to avoid loading the admin dashboard unnecessarily
...
This commit removes 19 unnecessary page loads of the admin dashboard
2020-07-27 15:31:11 +01:00
Luis Ramos
f1a3814c0d
Rename login_as_enterprise_user to a more specific name controller_login_as_enterprise_user
2020-07-27 14:44:25 +01:00
Luis Ramos
8e84754f35
Rename login_as_admin to a more specific name controller_login_as_admin
2020-07-27 14:44:25 +01:00
Luis Ramos
81710a2704
Remove now dead create_enterprise_user, the user factory should be used instead
2020-07-27 14:44:25 +01:00
Luis Ramos
1af4bf6994
Replace usage of create_enterprise_user with :user factory
2020-07-27 14:44:23 +01:00
Luis Ramos
3217b3ba86
Delete dead commented code
2020-07-27 12:28:53 +01:00
Luis Ramos
16b9c8c814
Replace usage of create_enterprise_user with :user factory
2020-07-27 12:28:33 +01:00
Transifex-Openfoodnetwork
79aadf5c86
Updating translations for config/locales/tr.yml
2020-07-27 03:23:28 +10:00
Luis Ramos
ec0d06af54
Reuse update_failed method as the code needed is exactly the same
2020-07-25 19:39:46 +01:00
Luis Ramos
b23b707b5d
Notify bugsnag and execute post checkout actions (reset to cart state) whenever there's a payment gateway exceeption raised
2020-07-25 19:39:46 +01:00
Luis Ramos
1bf946d124
Reused code in checkout controller, the reponse for the case when there is a stripe exception anywhere is the same as when the update action fails
2020-07-25 19:39:46 +01:00
Luis Ramos
5266d95910
Move method closer to related/similar methods
2020-07-25 19:39:46 +01:00
Luis Ramos
df22ad46d6
Update GETTING_STARTED.md
...
Clarify users landing on this page that they should use ofn-install for server deployments.
2020-07-25 14:53:35 +01:00
Transifex-Openfoodnetwork
227892b629
Updating translations for config/locales/en_FR.yml
2020-07-25 23:36:58 +10:00
Transifex-Openfoodnetwork
ffc98c63fa
Updating translations for config/locales/fr.yml
2020-07-25 23:36:48 +10:00
Luis Ramos
add7bb489f
Update all locales with the latest Transifex translations
2020-07-25 13:13:35 +01:00
Cillian O'Ruanaidh
702669e61c
Merge branch 'master' into prevent-blank-open-street-map
2020-07-24 16:00:37 +01:00
Cillian O'Ruanaidh
cc317bc8c9
Move the :initialLatitude and :initialLongitude methods from the OpenStreetMap service to the MapCenterCalculator service.
2020-07-24 16:00:30 +01:00
Luis Ramos
752d9e9bb8
Merge pull request #5806 from openfoodfoundation/bring-in-payment-model
...
Bring in payment model
2020-07-24 14:52:20 +01:00
Luis Ramos
d93c1684b9
Merge pull request #5780 from coopdevs/handle-credit-validation-errors
...
Handle credit validation errors
2020-07-24 14:49:52 +01:00
Luis Ramos
603991996f
Merge pull request #5799 from luisramos0/calcs_bug
...
Add migration to fix calculator preferences
2020-07-24 14:22:55 +01:00
Luis Ramos
32d45f6fe5
Merge pull request #5747 from mbudm/issue/5434
...
Make keyboard UI close on iOS when done searching
2020-07-24 13:25:39 +01:00
Luis Ramos
8f4395a6ea
We need to clear Rails cache after updating preferences so that the app picks the new values immediately
2020-07-24 13:17:43 +01:00
Luis Ramos
1b31b727c7
Add migration to fix calculator preferences
2020-07-24 13:17:43 +01:00
Pau Perez
97f551a2dd
Replace literal with AR's 4 #not
2020-07-23 20:24:31 +02:00
Pau Perez
357037e429
Recalculate adjustments when invalidating payments
...
Switching from `#invalidate` to `#update_column` skipped both
validations and callbacks and thus, `#ensure_correct_adjustments` was no
longer called for older payments.
2020-07-23 20:24:31 +02:00
Pau Perez
e6943ce554
Fix simple Rubocop issues
2020-07-23 20:24:31 +02:00
Pau Perez
4d9fbb68d6
Add missing attribute to skip source validation
2020-07-23 20:24:31 +02:00
Pau Perez
813459ee38
Clarify method documentation
2020-07-23 20:24:31 +02:00
Pau Perez
c0f72f89f2
Handle #refund! as we do with #credit!
2020-07-23 20:24:31 +02:00
Pau Perez
0f0a704147
Skip source validation when applying credit
...
The original payment may not be valid because its credit card may be
expired. Stripe gives this as a valid scenario returning a success and
we should do too.
When creating the credit payment we end up validating all sources in
a chain as follows.
```
Payment being persisted -> source payment -> original credit card.
```
The source payment was valid when created (It would not be persisted
otherwise) but its source card may now be expired, and that's legit.
There was also an issue with the `#invalidate_old_payments` callback. It
was causing the original payment to be validated again and thus the
credit payment failed to be persisted due to the original credit card
being expired. Switching this callback to use `#update_column` skips
validations and so we don't validate the source payment. We only care
about the state there, so it should be fine.
2020-07-23 20:24:31 +02:00
Pau Perez
f2b28a198d
Replace before_validation with custom validation
...
No reason to use a callback when custom validation methods can be
defined.
2020-07-23 20:24:31 +02:00
Pau Perez
f2fd426c4a
Fix old Spree specs
...
Given the importance of this code, it doesn't bring me much confidence.
Apparently, this specs where using a non-existent state by mistake and
this went unnoticed because the payment creation was failing silently in
payment/processing.rb.
This unearthed the fact that our `#ensure_correct_adjustment` needs the
order to be persisted to succeed.
2020-07-23 20:24:31 +02:00
Pau Perez
1c026479f5
Replace spec's syntax to RSpec 3
2020-07-23 20:24:31 +02:00
Pau Perez
73b1b1f172
DRY specs and fix rubocop failures
2020-07-23 20:24:31 +02:00
Pau Perez
59da07de66
Handle all errors when dealing with payment event
...
This basically catches ActiveRecord::RecordInvalid caused by an invalid
credit record, for instance, but also other situations we haven't
forseen.
2020-07-23 20:24:31 +02:00
Pau Perez
26ed601996
Test the payment controller handles GatewayError
...
After that, we can TDD a second one that also handles validation errors.
2020-07-23 20:24:31 +02:00
Pau Perez
6ca6938df4
Merge branch 'master' into bring-in-payment-model
...
* master: (91 commits)
Bump ddtrace from 0.37.0 to 0.38.0
Add spec to cover SQL query issue with OCs where the only products from the coordinator inventory are renderer
Remove unnecessary order statement, the relation will only be used for counting products
Move select out of scope visible_for because it is breaking exchange_product queries and it's just not needed there. The only other use of this product's scope visible_for is the enterprise serializer so we add the select to it.
Make OC advanced settings work by permitting the extra parameter
Remove conflicting and duplicate route
Bump bugsnag from 6.13.1 to 6.14.0
Make charges update method update the first pending payment
Move require_login_then_redirect_to to the only place where it is called
Make broken spec fail reliably and set it pending
Updating translations for config/locales/en_GB.yml
Update all locales with the latest Transifex translations
Doc defensive coding needed by pin payments
Make method a little simple by extracting method
Simplify spec, the 2 minutes wait is not necessary anylonger
Make unauthorized in ControllerHelpers::Auth the same as in Spree::Admin::BaseController
Move unauthorized view to HomeController only, all other calls to unauthorized will go through Auth which will redirect to the home controller IF the user is logged in or to login if user is not logged in
Adapt specs to the move of unauthorized route from the spree routes to the main app routes
Delete spree_user_signup which is from spree promotions code that we dont use
Remove try_spree_current_user
...
2020-07-23 20:20:43 +02:00
Joanne Yeung
abc132d3db
Remove trailing whitespace
2020-07-23 09:37:10 -06:00
Joanne Yeung
b16f486dcc
Address missing semi-colon
2020-07-23 09:25:56 -06:00
Luis Ramos
6cc91d457e
Merge pull request #5796 from coopdevs/remove-conlicting-spree-route
...
Remove conflicting and duplicate route
2020-07-23 14:29:12 +01:00
Luis Ramos
438aef1e7a
Merge pull request #5798 from luisramos0/payment_fees_master
...
Make charges update method update the first pending payment
2020-07-23 14:23:03 +01:00
Pau Perez
c8b738cbd5
Eager load spree_option_values_line_items
...
For the BulkCoop report to speed up. We move from an output like
```
web_1 | CACHE (0.3ms) SELECT id FROM "spree_line_items" WHERE "spree_line_items"."order_id" IN (SELECT id FROM "spree_orders" WHERE (("spree_orders"."distributor_id" IN (SELECT enterprises.id FROM "enterprises") OR "spree_orders"."order_cycle_id" IN (SELECT id FROM "order_cycles"))))
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 4]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 6]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 8]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 5]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 7]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 4]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 5]]
web_1 | Rendered engines/order_management/app/views/order_management/reports/_report.html.haml (158.5ms)
web_1 | Rendered engines/order_management/app/views/order_management/reports/bulk_coop/create.html.haml within spree/layouts/admin (187.3ms)
```
to
```
web_1 | CACHE (0.0ms) SELECT id FROM "spree_line_items" WHERE "spree_line_items"."order_id" IN (SELECT id FROM "spree_orders" WHERE (("spree_orders"."distributor_id" IN (SELECT enterprises.id FROM "enterprises") OR "spree_orders"."order_cycle_id" IN (SELECT id FROM "order_cycles"))))
web_1 | CACHE (0.0ms) SELECT "spree_option_types".* FROM "spree_option_types" WHERE "spree_option_types"."id" = $1 ORDER BY spree_option_types.position LIMIT 1 [["id", 1]]
web_1 | Rendered engines/order_management/app/views/order_management/reports/_report.html.haml (101.1ms)
web_1 | Rendered engines/order_management/app/views/order_management/reports/bulk_coop/create.html.haml within spree/layouts/admin (107.9ms)
```
2020-07-23 12:34:39 +02:00
François Turbelin
2549d454ab
Maintain specs
2020-07-23 09:28:32 +02:00
Joanne Yeung
6419036a26
Fix content header overlap with long product names
2020-07-22 15:53:44 -06:00
Luis Ramos
3dc9548fb3
Merge pull request #5775 from luisramos0/oc_inv_bug
...
Make OC advanced settings work by permitting the extra parameter and make the OC edit page work with that option activated
2020-07-22 22:23:28 +01:00
François Turbelin
645b4a9505
Use multiple serializers
2020-07-22 22:45:50 +02:00
François Turbelin
9f02ee3874
Use new serialization
2020-07-22 21:08:25 +02:00
François Turbelin
21fc14a9fe
Use a better products list for catalog
2020-07-22 21:08:25 +02:00
romale
daa3f00302
Update all.js.coffee
2020-07-22 20:30:21 +03:00
romale
77c920daab
Update all.js
2020-07-22 20:29:15 +03:00
Pau Pérez Fabregat
d3296dd5ee
Merge pull request #5801 from openfoodfoundation/dependabot/bundler/ddtrace-0.38.0
...
Bump ddtrace from 0.37.0 to 0.38.0
2020-07-22 17:42:15 +02:00
dependabot-preview[bot]
48efb42b1a
Bump ddtrace from 0.37.0 to 0.38.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.37.0 to 0.38.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases )
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.37.0...v0.38.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-21 21:27:14 +00:00
Luis Ramos
e445fc33a1
Add spec to cover SQL query issue with OCs where the only products from the coordinator inventory are renderer
2020-07-21 20:48:16 +01:00
Luis Ramos
aadbc9ed5d
Remove unnecessary order statement, the relation will only be used for counting products
2020-07-21 19:44:43 +01:00
Luis Ramos
9b5875a7d1
Move select out of scope visible_for because it is breaking exchange_product queries and it's just not needed there. The only other use of this product's scope visible_for is the enterprise serializer so we add the select to it.
2020-07-21 19:44:43 +01:00
Luis Ramos
7ba8c5ace1
Make OC advanced settings work by permitting the extra parameter
2020-07-21 19:44:41 +01:00
Luis Ramos
8d7b383b72
Merge pull request #5794 from openfoodfoundation/dependabot/bundler/bugsnag-6.14.0
...
Bump bugsnag from 6.13.1 to 6.14.0
2020-07-21 17:58:30 +01:00
romale
4d6920bd92
Missing translation key for "permalink" and "shipping_categories"
...
When edit product in path admin/products/PRODUCT_NAME/edit
2020-07-21 18:49:24 +03:00
Pau Pérez Fabregat
426c536750
Merge pull request #5677 from luisramos0/remove_spree_root_path
...
Bring ControllerHelpers from Spree and remove spree root path
2020-07-21 16:15:21 +02:00
Pau Perez
9be199a6cc
Remove conflicting and duplicate route
...
This Spree route conflicts with the one we define:
```
get "/login", to: redirect("/#/login")
```
for whatever reason there are 7 users that managed to hit the Spree one
instead of ours when confirming their signup email. It's not clear to me
though when this `/login?validation=confirmed` is really hit. The
confirmation email link passes a token in the query params and this is
not the case.
The idea is that `GET /login` makes the login modal to show up instead
of Devise's default behaviour (through inheritance) of showing a login
form page. OFN was never prepared to handle this as this bug proofs.
2020-07-21 13:27:06 +02:00
Eduardo
bda47d97ee
add view specs to admin edit page
2020-07-20 21:08:04 -03:00
Eduardo
d43e9b5716
add Actions dropdown to all pages of order details menu
2020-07-20 20:45:50 -03:00
dependabot-preview[bot]
bb178c71b2
Bump bugsnag from 6.13.1 to 6.14.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.13.1 to 6.14.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.13.1...v6.14.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-20 23:35:34 +00:00
Luis Ramos
21227d7482
Make charges update method update the first pending payment
...
Updating the first overall payment could select a failed payment and ignore the pending payment that is about to be processed
2020-07-20 18:23:06 +01:00
Robin Klaus
d43a3ac65e
Added translation key to locale/en.yml for backoffice admin payment and added lazy loading
2020-07-20 13:07:41 +10:00
romale
19c7d11df5
Missing translation key for new_order
...
admin/orders/new
2020-07-19 22:06:07 +03:00
romale
eb2e894802
Missing translation key for shipping_method
...
admin/orders
2020-07-19 21:55:37 +03:00
Luis Ramos
62a3b6b720
Merge pull request #5406 from kristinalim/fix/5300-optimistic_locking_in_stock_items
...
5300 Avoid race conditions in Spree::StockItem
2020-07-17 22:24:59 +01:00
Luis Ramos
152e432f78
Merge pull request #5749 from mbudm/issue/1253
...
Ensure the hero image doesn't pixelate on hamburger menu open
2020-07-17 22:15:46 +01:00
Pau Pérez Fabregat
89906f581d
Merge pull request #5778 from openfoodfoundation/transifex
...
Transifex
2020-07-17 18:37:22 +02:00
Luis Ramos
001d40d691
Move require_login_then_redirect_to to the only place where it is called
...
This fixes a class loading issue where orders controllers was getting a undefined method require_login_then_redirect_to
2020-07-17 14:35:42 +01:00
Maikel
ea1e23abab
Merge pull request #5756 from mkllnk/broken-spec
...
Make broken spec fail reliably and set it pending
2020-07-17 09:56:56 +10:00
Maikel Linke
b0ac188430
Make broken spec fail reliably and set it pending
...
This spec has been broken for a long time, at least eight months. But it
regularly passed because the search filter is applied with a delay and
in that time the content matches. And once the filter is applied, no
products are shown and the negative matchers pass.
2020-07-17 09:28:17 +10:00
Transifex-Openfoodnetwork
f31a1ff59c
Updating translations for config/locales/en_GB.yml
2020-07-17 04:10:57 +10:00
Luis Ramos
2fe37b5237
Update all locales with the latest Transifex translations
2020-07-16 18:07:40 +01:00
Luis Ramos
981f1c0932
Merge pull request #5754 from openfoodfoundation/transifex
...
Transifex
2020-07-16 18:06:17 +01:00
Pau Perez
dd5e679f69
Address code review comments
...
Mostly styling issues.
2020-07-16 15:30:28 +02:00
Steve Roberts
429c88c000
Add watcher to update filter after products are loaded
...
Also remove the other redundant trigger
2020-07-16 12:06:26 +10:00
Maikel
4e3502cce7
Merge pull request #5766 from mkllnk/5764-fix-pin-payments
...
5764 Provide credit card brand to Pin Payments
2020-07-16 10:28:18 +10:00
Matt-Yorkley
19b3041e1d
Merge pull request #5768 from Matt-Yorkley/pin-payments-params
...
Update StrongParams for Pin Payments
2020-07-16 00:01:34 +02:00
Pau Perez
4e00c45782
Doc defensive coding needed by pin payments
...
[skip ci]
2020-07-15 16:46:09 +02:00
Luis Ramos
efacca6292
Revert "Enhancement/5454 make links to shops under Groups > Producers open in new tab"
2020-07-15 15:33:03 +01:00
Luis Ramos
31e072179b
Make method a little simple by extracting method
2020-07-15 15:23:16 +01:00
Luis Ramos
57fd1bdee2
Merge pull request #5744 from openfoodfoundation/dependabot/bundler/i18n-js-3.7.1
...
Bump i18n-js from 3.7.0 to 3.7.1
2020-07-15 15:04:55 +01:00
Luis Ramos
2605c4249b
Simplify spec, the 2 minutes wait is not necessary anylonger
2020-07-15 14:54:53 +01:00
Luis Ramos
3599cb2047
Make unauthorized in ControllerHelpers::Auth the same as in Spree::Admin::BaseController
...
It adapts the method in ControllerHelpers::Auth to also use the after_login mechanism.
Ideally we would remove one of the two after_login mechanisms after_login and spree_user_return_to but they might still be in use.
2020-07-15 14:54:53 +01:00
Luis Ramos
8fac1bc9ca
Move unauthorized view to HomeController only, all other calls to unauthorized will go through Auth which will redirect to the home controller IF the user is logged in or to login if user is not logged in
2020-07-15 14:54:52 +01:00
Luis Ramos
7f1797de58
Adapt specs to the move of unauthorized route from the spree routes to the main app routes
2020-07-15 14:54:52 +01:00
Luis Ramos
bf3150ddc8
Delete spree_user_signup which is from spree promotions code that we dont use
2020-07-15 14:53:35 +01:00
Luis Ramos
1666ffb191
Remove try_spree_current_user
...
This can be done because the method is defined in OFN's ApplicationController, so spree_current_user is available in all controllers
2020-07-15 14:53:35 +01:00
Luis Ramos
144811268e
Adapt require statements to new undecorated classes
2020-07-15 14:53:35 +01:00
Luis Ramos
d2e52f3136
Update rubocop manual todo
2020-07-15 14:53:35 +01:00
Luis Ramos
046c5f6585
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
97f00153ad
Bring controller_helpers/ssl.rb from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
643a82c73c
Fix easy rubocop issues, some early returns make the indentation changes
2020-07-15 14:53:08 +01:00
Luis Ramos
a3ea4b757d
Merge decorator into the class brought from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
1167a1a9bb
Bring ControllerHelpers respond_with from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
20f610fbee
Merge controller_helpers/order with decorator
2020-07-15 14:53:08 +01:00
Luis Ramos
d5744572f7
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
23ff9d6fbb
Bring controller_helpers/order to OFN
2020-07-15 14:53:08 +01:00
Luis Ramos
10849504c3
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
2452202e92
Move lib/spree/core/controller_helpers/common.rb from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
96839a03aa
Move lib/spree/core/controller_helpers.rb from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
4ee30d7cac
Remove spree.root route and respective controller. Also move
...
unauthorized route to main app.
This route is no longer used in OFN
2020-07-15 14:53:08 +01:00
Luis Ramos
7e75581da6
Merge class brought from spree with decorator
2020-07-15 14:53:08 +01:00
Luis Ramos
c8dd841c48
Fix some rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
2ea026ea31
Bring controller helper auth from spree
2020-07-15 14:53:08 +01:00
Pau Perez
70afcee3fc
Fix Spree's spec clashing with a customization
...
`#save_requested_by_customer` is an accessor we added and thus, the
Spree's spec didn't consider.
2020-07-15 14:18:36 +02:00
Pau Perez
3a64cc426a
Reuse #calculate_refund_amount method
2020-07-15 14:01:58 +02:00
Pau Perez
a8af3a27b1
Fix all but Metrics Rubocop cops in processing.rb
2020-07-15 14:01:58 +02:00
Pau Perez
42658b5255
Refactor #process! nested ifs to guard clauses
...
Following Rubocop's indications.
2020-07-15 14:01:58 +02:00
Pau Perez
66dbd85eb4
Run rubocop autocorrect on payment/processing.rb
2020-07-15 14:01:58 +02:00
Pau Perez
3435d5ac97
Fix Rubocop non-metrics issues in payment model
2020-07-15 14:01:30 +02:00
Matt-Yorkley
c009fed6be
Update StrongParams for Pin Payments
2020-07-15 14:00:19 +02:00
dependabot-preview[bot]
5fae2c08c8
Bump i18n-js from 3.7.0 to 3.7.1
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.0...v3.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-15 08:13:42 +00:00
Pau Pérez Fabregat
d4fea5223d
Merge pull request #5762 from openfoodfoundation/dependabot/bundler/oj-3.10.7
...
Bump oj from 3.10.6 to 3.10.7
2020-07-15 10:13:19 +02:00
Maikel Linke
25155cab18
Provide credit card brand to Pin Payments
...
Spree replaced the Ruby code providing the credit card brand with a
jquery plugin providing it on the checkout screen.
I re-added Ruby code because it's easier and more robust than updating
the user interface with new Javascript.
2020-07-15 17:13:46 +10:00
Steve Roberts
79abc191ff
Move location change to PageSelection controller
2020-07-15 15:51:33 +10:00
Steve Roberts
dbc7632c4e
Add inline comment to explain two height properties
2020-07-15 09:52:04 +10:00
Luis Ramos
646f48f0af
Add translation keys for test and shipment emails and make them lazy lookups
2020-07-14 14:35:36 +01:00
Luis Ramos
f66538d2cb
Convert test and shipment email templates to haml
2020-07-14 14:26:05 +01:00
Luis Ramos
55f160c309
Bring test and shipment email templates from spree_core
2020-07-14 14:23:09 +01:00
Luis Ramos
5835a0ee3a
Transpec mailer specs
2020-07-14 14:20:30 +01:00
Luis Ramos
e96d9c1f45
Fix mailer specs brought from spree_core
2020-07-14 14:19:19 +01:00
Luis Ramos
5162964936
Fix easy rubocop issues
2020-07-14 13:46:01 +01:00
Luis Ramos
d12495f3db
Merge decorators with original classes brought from spree and merge order_mailer specs
2020-07-14 13:38:11 +01:00
Luis Ramos
c6cd695b3c
Bring remaing mailers from spree_core
2020-07-14 13:28:11 +01:00
Steve Roberts
c4d7899a99
Use vh units for new browsers and align tagline bg to top.
2020-07-14 19:26:12 +10:00
Transifex-Openfoodnetwork
f79269e96b
Updating translations for config/locales/ca.yml
2020-07-14 17:46:12 +10:00
Steve Roberts
3a722bc697
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/5072
2020-07-14 13:31:53 +10:00
Steve Roberts
60870a1215
Fix linting errors
2020-07-14 12:58:48 +10:00
Steve Roberts
63a080266e
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/1253
2020-07-14 12:45:14 +10:00
dependabot-preview[bot]
f4cb14ab1a
Bump oj from 3.10.6 to 3.10.7
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.6 to 3.10.7.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.6...v3.10.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-14 00:10:40 +00:00
Luis Ramos
9c8318d828
Merge pull request #5613 from luisramos0/calculators
...
Move all Calculators from spree to OFN and out of the Spree namespace
2020-07-13 15:16:15 +01:00
Luis Ramos
d536cc8108
Merge pull request #5755 from Matt-Yorkley/groups-images
...
Fix StrongParameters for groups images
2020-07-13 14:50:24 +01:00
Luis Ramos
ebf9be41bb
Transpec specs
2020-07-11 17:02:03 +01:00
Luis Ramos
95ffff5087
Fix specs brought from spree
2020-07-11 16:59:35 +01:00
Luis Ramos
03bb1f053a
Fix easy rubocop issues
2020-07-11 16:43:42 +01:00
Luis Ramos
2e3702550d
Bring a number of files from spree_core needed in OFN
2020-07-11 16:09:13 +01:00
Luis Ramos
56b83b6bb5
Fix easy rubocop issues
2020-07-11 15:56:08 +01:00
Luis Ramos
e367cbd1e6
Fix one rubocop issues and add the remaining to the manual todo
2020-07-11 15:53:06 +01:00
Luis Ramos
bdf9c1e405
Simplify update_shipment_state based on the fact there's only one shipment per order in OFN
2020-07-11 15:53:06 +01:00
Luis Ramos
2070cfd5bb
Fix easy rubocop issues
2020-07-11 15:44:23 +01:00
Luis Ramos
8001e63f77
Unnest OrderManagement::Order declaration in two module declaration
2020-07-11 15:44:23 +01:00
Luis Ramos
aed384183b
Move Spree::OrderUpdater to OrderManagement engine
2020-07-11 15:44:23 +01:00
Luis Ramos
e453b130e4
Bring core/lib/spree/core/ext/active_record.rb to OFN and add it to Spree::Order, the only place where it is used
2020-07-11 15:44:23 +01:00
Luis Ramos
7e355a3248
Remove hash rockets
2020-07-11 15:44:23 +01:00
Luis Ramos
a8a81f8023
Merge and fix OrderUpdater spec with Spree::OrderUpdater spec
2020-07-11 15:44:23 +01:00
Luis Ramos
d4c48e2b94
Merge OrderUpdate Delegator into Spree::OrderUpdater
2020-07-11 15:44:23 +01:00
Luis Ramos
872cfcfc58
Remove unused promotions code
2020-07-11 15:44:23 +01:00
Luis Ramos
5b3fbe0aed
Merge decorator OrderUpdater
2020-07-11 15:44:23 +01:00
Luis Ramos
ebeeeb7ed3
Fix easy rubocop issues
2020-07-11 15:44:23 +01:00
Luis Ramos
a929d82580
Transpec order_updater_spec
2020-07-11 15:44:23 +01:00
Luis Ramos
1f39731068
Modernize and fix spec brought from spree
2020-07-11 15:44:23 +01:00
Luis Ramos
d2f0d96174
Bring Spree::OrderUpdater spec
2020-07-11 15:44:23 +01:00
Luis Ramos
7218bb0c7d
Bring Spree::OrderUpdater from spree
2020-07-11 15:44:23 +01:00
Luis Ramos
58da11fde7
Bring Environment Calculators and Environment Extension from spree_core
2020-07-11 15:43:20 +01:00
Luis Ramos
2c65cea911
Fix easy rubocop issues
2020-07-11 15:41:26 +01:00
Luis Ramos
95698fac37
Bring responder from spree_core
2020-07-11 15:41:26 +01:00
Luis Ramos
7b30008e8b
Run transpec
2020-07-11 15:41:26 +01:00
Luis Ramos
50e6ce92b3
Fix easy rubocop issues
2020-07-11 15:41:26 +01:00
Luis Ramos
a78d615936
Bring money_spec from spree_core
2020-07-11 15:41:26 +01:00
Luis Ramos
cd8355ea66
Bring money.rb from spree
2020-07-11 15:41:26 +01:00
Luis Ramos
724a88344e
Run transpec
2020-07-11 15:41:26 +01:00
Luis Ramos
9a09f420c1
Modernize spec
2020-07-11 15:41:26 +01:00
Luis Ramos
12a5a266fd
Fix easy rubocop issues
2020-07-11 15:41:26 +01:00
Luis Ramos
efeda61e40
Bring i18n.rb from spree
2020-07-11 15:41:26 +01:00
Luis Ramos
38c5a9e105
Remove coupon applicator, it's not used in ofn
2020-07-11 15:41:26 +01:00
Luis Ramos
89e5221dc5
Fix easy rubocop issues
2020-07-11 15:41:26 +01:00
Luis Ramos
c75341838e
Bring core.rb from spree_core
2020-07-11 15:41:26 +01:00
Luis Ramos
84d7538b1b
Bring i18n code from spree
2020-07-11 15:41:26 +01:00
Luis Ramos
388d575cc8
Remove strong parameters and search helpers, they are not used in OFN
2020-07-11 15:41:26 +01:00
Luis Ramos
fdd21d7d7d
Fix easy rubocop issues
2020-07-11 15:41:26 +01:00
Luis Ramos
ab67a4f80c
Bring base controller from spree
2020-07-11 15:41:26 +01:00
Matt-Yorkley
f450c21308
Merge pull request #5759 from luisramos0/vo_spec
...
Comment very flaky spec
2020-07-10 21:44:03 +02:00
Luis Ramos
eb4d648a23
Comment this very flaky spec for now
2020-07-10 19:27:31 +01:00
Pau Perez
cf64d3a290
Merge skipped callback from decorator into model
...
If we don't want that callback we can just as well remove it now that we
own that code.
2020-07-10 15:07:12 +02:00
Pau Perez
55d52b875f
Run rubocop autocorrect on payment model
2020-07-10 15:04:29 +02:00
Luis Ramos
5afb862ce1
Extract setup and authorize to a new method called prepare_for_payment to fix rubocop ABCsize issue
...
It looks like this rubocop rule weights a raise over a return...
2020-07-10 13:14:07 +01:00
Pau Perez
6389fdb16e
Simplify code related to error handling
2020-07-10 13:14:07 +01:00
Luis Ramos
01ab974a3b
Add rescue statment to failed payment email so that the processing of other orders continues if there is a problem while sending the email
2020-07-10 13:14:07 +01:00
Luis Ramos
7a9f9a5624
Log bugsnag and still send failed payment email when any exception is caught during the confirmation process
2020-07-10 13:14:05 +01:00
Transifex-Openfoodnetwork
50427472c4
Updating translations for config/locales/en_NZ.yml
2020-07-10 20:25:20 +10:00
Pau Perez
683794636b
Rename spec file
2020-07-10 11:57:36 +02:00
Pau Perez
2f4648342f
Merge decorator specs with Spree's ones
...
They are now isolated from each other.
2020-07-10 11:50:20 +02:00
Pau Perez
562f397b22
Isolate Spree's specs into their own context
...
This way we don't mix contexts while merging in our own decorator tests.
2020-07-10 11:46:59 +02:00
Pau Perez
8fbbb0bb64
Bring back our card factory modification
...
Merging Spree's an our factory didn't really work.
2020-07-10 11:42:56 +02:00
Pau Perez
d8b748a851
Merge alias_method method and its original version
2020-07-10 10:41:44 +02:00
Pau Perez
d49068ce66
Move method delegation from decorator to model
2020-07-10 10:41:44 +02:00
Pau Perez
cf6138da66
Replace model method with its decorated version
2020-07-10 10:41:44 +02:00
Pau Perez
3fb6193098
Move adjustments logic from decorator into model
2020-07-10 10:41:44 +02:00
Pau Perez
861726200c
Move localize_number from decorator to model
2020-07-10 10:41:44 +02:00
Pau Perez
48910aeb77
Move #refund! to the processing.rb
2020-07-10 10:41:44 +02:00
Pau Perez
6d9a518616
Move method from decorator to model
2020-07-10 10:41:44 +02:00
Pau Perez
322c4d0f3f
Move decorator's callbacks to model
2020-07-10 10:41:44 +02:00
Pau Perez
eafaa97b0e
Temporarily skip spec
...
I'll move on to other easier issues and get back to it when we're in
a better position.
2020-07-10 10:41:44 +02:00
Pau Perez
31d0d4bcae
Fix error "no parent is saved"
...
The exact error is
```
ActiveRecord::RecordNotSaved:
You cannot call create unless the parent is saved
```
raised from app/models/spree/payment_decorator.rb:29:in `ensure_correct_adjustment'
2020-07-10 10:41:44 +02:00
Pau Perez
9935df9f2d
Move Pin payment method from decorator into model
2020-07-10 10:41:44 +02:00
Pau Perez
0ad8dcc2c5
Fix payment log entries specs
...
The tight coupling between doesn't give other option but to check the
private method is called. The specs successfully stub
`log_entries#create` but for some reason the model instance that gets
evaluated it's not the stubbed one.
2020-07-10 10:41:44 +02:00
Pau Perez
a01f601363
Fix yet another spec
2020-07-10 10:41:44 +02:00
Pau Perez
34de219233
Bring in missing translation
2020-07-10 10:41:44 +02:00
Pau Perez
e1ea5dbcb3
Fix all but the 7 last payment specs
2020-07-10 10:41:44 +02:00
Pau Perez
abacd06f6b
Fix credit card instance in specs
2020-07-10 10:41:44 +02:00
Pau Perez
06aa56164f
Bring in Payment model from Spree
2020-07-10 10:41:44 +02:00
Maikel
c1d700196b
Merge pull request #5739 from Matt-Yorkley/flaky-spec-complex-oc
...
Flaky spec order_cycles/complex_updating_specific_time
2020-07-10 14:59:59 +10:00
Luis Ramos
cc3361aaac
Merge pull request #5659 from dmarcoux/issue-5555
...
Filter orders on inclusive dates in admin/orders
2020-07-09 20:40:45 +01:00
Luis Ramos
ed915006fa
Merge pull request #5738 from openfoodfoundation/dependabot/bundler/wicked_pdf-2.1.0
...
Bump wicked_pdf from 1.4.0 to 2.1.0
2020-07-09 20:40:11 +01:00
Matt-Yorkley
1a132924d2
Fix StrongParameters for groups images
2020-07-09 10:00:02 +02:00
Transifex-Openfoodnetwork
e3980521ea
Updating translations for config/locales/fr_CA.yml
2020-07-09 07:58:41 +10:00
Transifex-Openfoodnetwork
e6a2eb8af9
Updating translations for config/locales/en_CA.yml
2020-07-09 07:53:34 +10:00
Luis Ramos
5648b2e281
Add rescue statements to subs jobs so that when an order placement or confirmation fails, there's a bugsnag alert for it and the job continues processing the rest of the orders
2020-07-08 18:41:14 +01:00
Luis Ramos
fabddbd1c0
Merge pull request #5746 from coopdevs/remove-specs-dead-code
...
Remove dead specs helper method
2020-07-08 12:38:24 +01:00
Steve Roberts
2f562809c0
Ensure the hero image doesn't attempt to use the full height of all page content
...
Not sure exactly why this happens, but when the mobile nav is opened the hero image at #tagline:before uses the height of the full window - often around 4000px. Adding max-height of 100% to the nearest safe parent prevents this behaviour.
2020-07-08 21:31:52 +10:00
Matt-Yorkley
a763a5ee0b
Update all locales with the latest Transifex translations
2020-07-08 12:49:20 +02:00
Matt-Yorkley
d718eb9a23
Merge pull request #5726 from openfoodfoundation/transifex
...
Transifex
2020-07-08 12:33:09 +02:00
Matt-Yorkley
d78db16abe
Merge pull request #5718 from Matt-Yorkley/available-locales-bug
...
Available locales bug
2020-07-08 12:30:18 +02:00
Steve Roberts
7e195c3856
Add redirect to shop on order cycle change
2020-07-08 20:18:21 +10:00
Steve Roberts
eda9293619
Change to new directive that prevents enter default and blurs the input field
2020-07-08 19:19:46 +10:00
Matt-Yorkley
e742069959
Refactor UI interactions for opening exchange product tabs in OC edit
2020-07-08 11:11:39 +02:00
Matt-Yorkley
c8254b8338
Adjust exchange_row assertion to use slightly more specific criteria
2020-07-08 11:11:39 +02:00
Matt-Yorkley
be1e39f0cb
Ensure next page has loaded before interacting with form elements
2020-07-08 11:11:39 +02:00
Pau Perez
a1e8c8ad03
Remove dead specs helper method
...
I found it while reviewing
https://github.com/openfoodfoundation/openfoodnetwork/pull/5718#discussion_r451390809 .
2020-07-08 10:59:13 +02:00
Luis Ramos
312e78ba61
Merge pull request #5742 from Matt-Yorkley/flaky-spec-shopping
...
Fix flaky shopping_spec
2020-07-07 18:11:00 +01:00
Luis Ramos
207c6bc205
Merge pull request #5741 from Matt-Yorkley/flaky-spec-exchange-renderer
...
Re-enable and fix flaky exchange products renderer spec
2020-07-07 18:09:02 +01:00
Luis Ramos
f8f7b30095
Merge pull request #5716 from openfoodfoundation/dependabot/bundler/database_cleaner-1.8.5
...
Bump database_cleaner from 1.7.0 to 1.8.5
2020-07-07 17:29:10 +01:00
Luis Ramos
ebc1ab4469
Merge pull request #5710 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.15
...
Bump mini_racer from 0.2.14 to 0.2.15
2020-07-07 17:28:33 +01:00
Luis Ramos
5e6739c9f7
Fix long lines in new spec
2020-07-07 17:26:24 +01:00
Luis Ramos
99e12b6f07
Convert calculators in new spec
2020-07-07 17:26:24 +01:00
Luis Ramos
0b79e7c48c
Fix rubucop issue in enterprise_fee model
2020-07-07 17:26:24 +01:00
Luis Ramos
d92f97716a
Extract compute_for and thus resolve the rubocop complexity issue
2020-07-07 17:26:24 +01:00
Luis Ramos
68359d4d1a
Remove unnecessary variable (this sum and += come from the original
...
spree code and is not necessary here now)
2020-07-07 17:26:24 +01:00
Luis Ramos
70432e301d
Early exit if max is zero to make method shorted
2020-07-07 17:26:24 +01:00
Luis Ramos
fbe0a3246d
Extract applicable_rate? and thus resolve rubocop complexity issue
2020-07-07 17:26:24 +01:00
Luis Ramos
b096717172
Extract per_order_fees_total out of compute_order
2020-07-07 17:26:24 +01:00
Luis Ramos
21120dd6ab
Extract per_item_fees_total out of compute_order
2020-07-07 17:26:24 +01:00
Luis Ramos
4b12a5f592
Extract line_items_total from compute_order
2020-07-07 17:26:24 +01:00
Luis Ramos
eedf31e449
Make migration a bit easier to read
2020-07-07 17:26:24 +01:00
Luis Ramos
e225c5ce3a
Migrate calculators to outside spree namespace
2020-07-07 17:26:24 +01:00
Luis Ramos
f62546254f
Define DefaultTax calculator outside of spree namespace the tax_rate to be used by the app and make spree specs use calculators outside the spree namespace
2020-07-07 17:26:24 +01:00
Luis Ramos
6a94168ee5
Remove Spree namespace from DefaultTax
2020-07-07 17:26:24 +01:00
Luis Ramos
9c7cb23262
Move calculator specs out of the spree namespace
2020-07-07 17:26:24 +01:00
Luis Ramos
5e8438c446
Move all calculators outside the spree namespace
2020-07-07 17:26:23 +01:00
Luis Ramos
9c3eb3725e
Remove dead code related to promotions, we dont have promotions in OFN
2020-07-07 17:20:22 +01:00
Luis Ramos
a544102b1b
Fix some rubocop issues
2020-07-07 17:20:22 +01:00
Luis Ramos
f2a46d2cef
Merge decorators into original classes brought from spree_core
2020-07-07 17:20:22 +01:00
Luis Ramos
6b04df0dea
Fix indentation and extract Calculator as a separate module declaration
2020-07-07 17:20:22 +01:00
Luis Ramos
c2898ba389
Bring calculators from spree_core
2020-07-07 17:20:22 +01:00
Transifex-Openfoodnetwork
6be0ae543a
Updating translations for config/locales/pt_BR.yml
2020-07-07 21:46:44 +10:00
Matt-Yorkley
f2e0b0f35a
Ensure products list has loaded before interacting with product list UI elements
2020-07-07 13:14:11 +02:00
Matt-Yorkley
0f659d0f5e
Merge pull request #5728 from luisramos0/ams_comment
...
Update ams dependency comment
2020-07-07 12:32:03 +02:00
Matt-Yorkley
30492157f9
Re-enable and fix flaky exchange products renderer spec
...
For some inexplicable reason `order_cycle.exchanges.incoming.first` and `order_cycle.exchanges.incoming.second` were returning the same exchange. Subsequently the inventory items being created were for the same variant, which throws an error due to a uniqueness validation in InventoryItem on variant_id. Changing from #first and #second to #first and #last results in the correct exchanges being assigned.
2020-07-07 11:21:18 +02:00
Luis Ramos
c1fa4fcc85
Merge pull request #5736 from Matt-Yorkley/flaky-spec-embedded
...
Fix flaky embedded shopping spec
2020-07-07 09:36:27 +01:00
dependabot-preview[bot]
4bee038109
Bump wicked_pdf from 1.4.0 to 2.1.0
...
Bumps [wicked_pdf](https://github.com/mileszs/wicked_pdf ) from 1.4.0 to 2.1.0.
- [Release notes](https://github.com/mileszs/wicked_pdf/releases )
- [Changelog](https://github.com/mileszs/wicked_pdf/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mileszs/wicked_pdf/compare/1.4.0...2.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-06 23:50:22 +00:00
Matt-Yorkley
447a873e5c
Fix flaky embedded spec
...
The new cart sidebar takes 300ms to animate in. If we try to click the button on the left during this time, we may click the button on the right as it slides in.
2020-07-07 00:23:43 +02:00
Matt-Yorkley
3d955a952c
Merge pull request #5674 from mkllnk/caching_spec
...
Fix flaky caching spec
2020-07-06 21:56:02 +02:00
Luis Ramos
ce1114556d
Merge pull request #5578 from mbudm/issue/3770-manual-update
...
Update orders swagger spec and fix api_key access to orders endpoint
2020-07-06 20:32:25 +01:00
Luis Ramos
761871c90e
Merge pull request #5715 from luisramos0/ship_method
...
Fix issue in Spree 2.1 and bring Spree::Stock classes to OFN 🎉
2020-07-06 19:15:50 +01:00
Transifex-Openfoodnetwork
2a68e0fbba
Updating translations for config/locales/tr.yml
2020-07-07 03:55:56 +10:00
Luis Ramos
ceac8a5d40
Merge pull request #5725 from Matt-Yorkley/admin-order-images
...
Fix default image display in admin order edit
2020-07-06 14:03:56 +01:00
Luis Ramos
b0dd83b773
Update ams dependency comment
2020-07-05 19:55:53 +01:00
Dany Marcoux
3dfabdc117
Filter orders on inclusive dates in admin/orders
...
Closes #5555
Co-authored-by: Luis Ramos <luisramos0@gmail.com >
2020-07-05 20:12:16 +02:00
Transifex-Openfoodnetwork
b951bcc379
Updating translations for config/locales/en_IN.yml
2020-07-05 04:34:29 +10:00
Transifex-Openfoodnetwork
6f6e8c0c92
Updating translations for config/locales/en_IN.yml
2020-07-05 04:29:50 +10:00
Transifex-Openfoodnetwork
787648eff2
Updating translations for config/locales/en_FR.yml
2020-07-04 23:52:01 +10:00
Transifex-Openfoodnetwork
7a4a673578
Updating translations for config/locales/fr.yml
2020-07-04 23:51:45 +10:00
Matt-Yorkley
96138e9129
Refactor UserLocaleSetter public methods
2020-07-04 10:15:35 +02:00
Matt-Yorkley
f08a530877
Make #valid_locale_for_user an instance method
2020-07-04 09:51:00 +02:00
Luis Ramos
d2adcd20e5
Merge pull request #5719 from coopdevs/index-state-changes
...
Index spree_state_changes.stateful_id column
2020-07-03 23:02:01 +01:00
Luis Ramos
ff9133b7aa
Merge pull request #5699 from coopdevs/fix-order-button-radius
...
Make button border radius consistent
2020-07-03 23:01:14 +01:00
Luis Ramos
b917238d1e
Merge pull request #5446 from luisramos0/sca_refunds
...
Make StripeSCA void action work
2020-07-03 22:45:35 +01:00
Transifex-Openfoodnetwork
45b960a7ee
Updating translations for config/locales/pt_BR.yml
2020-07-04 07:39:50 +10:00
Matt-Yorkley
e2626a0c3b
Add unit tests for UserLocaleSetter service
2020-07-03 23:14:38 +02:00
Matt-Yorkley
46c40bdf33
Fix default image display in admin order edit
2020-07-03 22:58:29 +02:00
Luis Ramos
a472b6525f
Merge pull request #5707 from luisramos0/missing_spaces
...
Add space after translations so that translators dont have to guess a space is needed
2020-07-03 16:10:55 +01:00
Matt-Yorkley
05c1f093b2
Delete dead code
...
There's nothing done in this bit of code that isn't already done somewhere else, and more effectively.
2020-07-03 16:44:37 +02:00
Matt-Yorkley
0c2fd4bfd2
Fix ensure_valid_locale_persisted and change public interface of service
2020-07-03 16:39:24 +02:00
Matt-Yorkley
cc7b5e2df3
Add pending test for setting locale from cookies during login
...
This test currently fails
2020-07-03 16:39:23 +02:00
Luis Ramos
804450bcc5
Fix buggy spec
...
The different shipping method was in the page but only as an option in the dropdown, not as the final selected shipping method! That was the cause of bug #5694 . We now check for the label Shipping which preceeds the final shipping method selection in the order page
2020-07-03 15:35:13 +01:00
Luis Ramos
b883a0eb75
Fix easy rubocop issues in shipment_spec
2020-07-03 13:48:12 +01:00
Luis Ramos
7b89b52ab8
Transpec shipment_spec brough from spree_core
2020-07-03 13:48:12 +01:00
Luis Ramos
07a44cfaf3
Update selected shipping rate if there is an original shipping method to keep and it is different from the one selected through the Estimator process
...
Make sure the shipment is saved (callbacks!) whenever the ship method has changed in the refresh_rates process
2020-07-03 13:48:12 +01:00
Luis Ramos
cd60ee2116
Use flat_map to make ship methods selection faster
2020-07-03 13:48:08 +01:00
Matt-Yorkley
ab63d2234c
Guard against nils in conditions
2020-07-03 14:22:32 +02:00
Matt-Yorkley
078726dcca
Add explanatory comment on saving selected locale in cookies
2020-07-03 14:21:45 +02:00
Matt-Yorkley
dab0add492
Make conditional more concise
2020-07-03 14:20:51 +02:00
Matt-Yorkley
ebffa381c6
Update cookies[:locale] logic
2020-07-03 14:06:05 +02:00
Matt-Yorkley
faa7c0a7c5
Extract save_cookies_from_locale comment-method
2020-07-03 14:03:52 +02:00
Matt-Yorkley
02549d1b0f
Extract all locale-setting logic to a service
2020-07-03 13:44:13 +02:00
Matt-Yorkley
7a00a3ba1e
Rename method and add explanatory comment
2020-07-03 11:52:21 +02:00
Matt-Yorkley
c726340ba3
Extract #save_locale_from_params comment-method
2020-07-03 11:48:39 +02:00
Luis Ramos
fcaa9d1b37
Remove extra space from base translations in closing and welcome to
2020-07-03 10:32:09 +01:00
Matt-Yorkley
d2db9b3a66
Merge pull request #5599 from luisramos0/submit_on_enteer
...
Make Enter submit the form on both products and orders admin
2020-07-03 11:14:57 +02:00
Luis Ramos
91026e6606
Merge pull request #5601 from jeduardo824/enhancement/5454-links-to-shops-in-new-tabs
...
Enhancement/5454 make links to shops under Groups > Producers open in new tab
2020-07-02 23:51:59 +01:00
Luis Ramos
d9ab7a8d49
Merge pull request #5667 from mkllnk/shopping-spec
...
Stabilise shopping specs and open them for change
2020-07-02 23:51:25 +01:00
Luis Ramos
758bb17142
Fix some easy rubocop issues and add some exceptions to to manual todo list
2020-07-02 21:24:15 +01:00
Luis Ramos
659de3d24d
Replay spree commit a4622ee13a723f0dba2943967b445b9989f67fb2 to fix issue introduced in spree 2.1
2020-07-02 21:24:15 +01:00
Luis Ramos
21ec6ccf0d
Remove unused sort packages from prioritizer
2020-07-02 21:24:15 +01:00
Luis Ramos
d323c5bdcb
Simplify packer and coordinator baed on the fact that there's only one stock_location so there will only be one package per order
2020-07-02 21:24:15 +01:00
Luis Ramos
ff046f7a6c
Remove conditionals related to Config.track_inventory_levels, this config is always true in OFN
2020-07-02 21:24:14 +01:00
Luis Ramos
ee937988e8
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
ee66e37521
Move adjuster, estimator, packer and prioritizer to order management engine
2020-07-02 21:24:14 +01:00
Luis Ramos
83974a832c
Move Coordinator from Spree::Stock to OrderManagement::Stock
2020-07-02 21:24:14 +01:00
Luis Ramos
01b1abbd52
Bring method from Spree::Order so that we can move Coordiantor to the order management engine
2020-07-02 21:24:14 +01:00
Luis Ramos
b487185a65
Remove package factory, it is no longer needed, we can just call the Package class in the two places where it is used
2020-07-02 21:24:14 +01:00
Luis Ramos
f0b3ed0d79
Merge Spree::Stock::Package into OrderManagement::Stock::Package
2020-07-02 21:24:14 +01:00
Luis Ramos
943cb7bf05
Move Stock::Package to OrderManagement::Stock::Package
2020-07-02 21:24:14 +01:00
Luis Ramos
1b28592f58
Now that the stock code is on out side we can clean up!
...
Remove everything related to splitters (including bringing environment.rb so we remove the splitters variable from it
2020-07-02 21:24:14 +01:00
Luis Ramos
8e116dd58a
Make ensure_correct_adjustment a public method because we call it in OFN
2020-07-02 21:24:14 +01:00
Luis Ramos
46cf106047
Fix shipment spec brought from spree
2020-07-02 21:24:14 +01:00
Luis Ramos
2e33e02d7f
Remove dead code, this method was removed in spree 2.0.4
2020-07-02 21:24:14 +01:00
Luis Ramos
7a03f57da0
Merge shipment decorator with class brought from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
494251b7cf
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
4e5259f491
Bring shipment from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
55a4021157
Convert to modern rspec syntax
2020-07-02 21:24:14 +01:00
Luis Ramos
bdb40d68e9
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
b7255130b6
Bring Package from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
0ca8b6aab6
Fix easy rubocop issue
2020-07-02 21:24:14 +01:00
Luis Ramos
3e14c9777e
Merge decorator with class brought from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
d505fc2131
Bring availability validator from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
720ad9de0e
Convert specs to modern rsspec syntax
2020-07-02 21:24:14 +01:00
Luis Ramos
feadbb086f
Adapt spec to OFN context
2020-07-02 21:24:14 +01:00
Luis Ramos
b16db2f40e
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
8c3b8c4db5
Bring estimator from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
4711a7469a
Adapt coordinator spec to ofn and remove spec that is not applicable (multi stock locations)
2020-07-02 21:24:14 +01:00
Luis Ramos
69b9cfbad2
Make packer use BasicSplitter by default
2020-07-02 21:24:14 +01:00
Luis Ramos
fdc085f701
Convert to modern rspec and remove specs not applicable to ofn
2020-07-02 21:24:14 +01:00
Luis Ramos
ccf928df12
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
e0f9894b7a
Bring packer from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
ec50a788a6
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
c2ec34ab9f
Bring coordinator from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
a6d7acb6f1
Convert spec to modern rspec syntax
2020-07-02 21:24:14 +01:00
Luis Ramos
eb13595fd3
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
3ae2877d4e
Bring adjuster and prioritizer from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
d18fec7125
Move Base splitter from main app models to order management engine services
2020-07-02 21:24:14 +01:00
Luis Ramos
735ee1e7ed
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
4fce506201
Bring splitter/base from spree
2020-07-02 21:24:14 +01:00
Luis Ramos
658c77f3f5
Merge pull request #5701 from Matt-Yorkley/noimage
...
Noimage
2020-07-02 20:17:04 +01:00
Luis Ramos
510449547f
Merge pull request #5644 from coopdevs/manage-font-with-asset-pipeline
...
Manage OFN's font through the asset pipeline
2020-07-02 20:09:08 +01:00
Matt-Yorkley
8fc407a9d5
Extract repeated variant thumbnail code to a shared partial
2020-07-02 18:36:43 +02:00
Matt-Yorkley
eeb6c57f99
Update missing image paths in other order views
2020-07-02 18:36:27 +02:00
Matt-Yorkley
b10fd99a53
Update all locales with the latest Transifex translations
2020-07-02 16:46:53 +02:00
Matt-Yorkley
e328dc7657
Merge pull request #5717 from openfoodfoundation/transifex
...
Transifex
2020-07-02 16:43:58 +02:00
Pau Perez
dee61e8b82
Index spree_state_changes.stateful_id column
...
This speeds up a great deal one of the most awful queries our DB servers
execute. It's not rare to see traces above 20s in Datadog 😱 .
In staging, with no traffic, we go from
```
EXPLAIN ANALYZE SELECT COUNT ( * )
FROM spree_state_changes
WHERE spree_state_changes . stateful_id = 2024
AND spree_state_changes . stateful_type = 'Spree::Order';
Planning time: 0.142 ms
Execution time: 9.073 ms
```
to
```
EXPLAIN ANALYZE SELECT COUNT ( * )
FROM spree_state_changes
WHERE spree_state_changes . stateful_id = 2024
AND spree_state_changes . stateful_type = 'Spree::Order';
Planning time: 0.284 ms
Execution time: 0.202 ms
```
2020-07-02 15:39:08 +02:00
Matt-Yorkley
4e08d2049f
Ensure a valid locale is persisted during login
...
This action has to be performed here and not in I18nHelper, as spree_current_user is not initialized yet during the other checks / setting the selected locale value in the app
2020-07-02 15:33:19 +02:00
Matt-Yorkley
91880cdbec
Make I18nHelper #available_locale? method public
2020-07-02 14:35:59 +02:00
Matt-Yorkley
d70d61439a
Always return an available locale
2020-07-02 14:35:59 +02:00
Matt-Yorkley
aa6f4d4fb9
Don't set unavailable locales on the current user
2020-07-02 14:35:59 +02:00
Matt-Yorkley
8dfaea629b
Refactor current_user_locale to a new method
2020-07-02 14:35:59 +02:00
Matt-Yorkley
3326366c6e
Add specs for applying stored locales during login
2020-07-02 14:35:58 +02:00
dependabot-preview[bot]
cc34f126ec
Bump mini_racer from 0.2.14 to 0.2.15
...
Bumps [mini_racer](https://github.com/discourse/mini_racer ) from 0.2.14 to 0.2.15.
- [Release notes](https://github.com/discourse/mini_racer/releases )
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG )
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.14...v0.2.15 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-02 11:22:57 +00:00
Pau Pérez Fabregat
4ced16c206
Merge pull request #5709 from luisramos0/empty
...
Replace empty? with blank? and replace unless empty? with if present?
2020-07-02 11:36:37 +02:00
Matt-Yorkley
26c511d47e
Remove taxon icons
...
These icons are inconsistently used across instances and have already been removed in a few places in the app in the mobile UX redesign.
2020-07-02 11:25:17 +02:00
Transifex-Openfoodnetwork
1b8669bb0b
Updating translations for config/locales/en_NZ.yml
2020-07-02 18:28:33 +10:00
Pau Pérez Fabregat
c1b635903c
Merge pull request #5658 from openfoodfoundation/transifex
...
Transifex
2020-07-02 10:05:16 +02:00
dependabot-preview[bot]
eff9d6edd0
Bump database_cleaner from 1.7.0 to 1.8.5
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.7.0 to 1.8.5.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.7.0...v1.8.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-02 00:06:17 +00:00
Luis Ramos
7dcc2bb27c
Merge pull request #5703 from Matt-Yorkley/checkout-addresses
...
Checkout addresses
2020-07-01 19:06:29 +01:00
Luis Ramos
e8417b8be6
Remove specs testing filtering of master variants
...
Master variants are not used in the report
2020-07-01 18:13:30 +01:00
Luis Ramos
6555f8bfba
Add specs to cover stripeSCA refunds
...
Duplication between stripe connect and stripeSCA is done on purpose so we can easily delete stripeConnect code when the migration is done
2020-07-01 18:13:27 +01:00
Pau Pérez Fabregat
66ddde1808
Merge pull request #5682 from Matt-Yorkley/in-digest-ion
...
Move default versions of Paperclip-managed images to /public
2020-07-01 18:02:15 +02:00
Pau Pérez Fabregat
28376b1056
Merge pull request #5561 from coopdevs/defend-from-invoice-without-bill-address
...
Do not print the bill addr. name when there's none
2020-07-01 17:50:09 +02:00
Luis Ramos
2d4326ded3
Replace empty? with blank? which is equivalent but a bit more resilient, returns false for nil
...
Present is not blank, so unless blank? becomes if present?
2020-07-01 14:08:07 +01:00
Luis Ramos
ce493866f9
Extract refunds specs from payments controller spec
2020-07-01 13:19:38 +01:00
Luis Ramos
ecb1920fa9
Move payment_controller_spec to specific folder so we can break it in more specific parts
2020-07-01 13:14:39 +01:00
Luis Ramos
9e4a793b24
Fix rubocop issues
2020-07-01 13:14:39 +01:00
Luis Ramos
2179cc7faf
Make StripeSCA void action make a refund instead
...
StripeSCA does not support voiding confirmed payment intents so we need to make a refund instead
2020-07-01 13:10:56 +01:00
Luis Ramos
63934b7863
Add space after translation so that translators dont have to guess a space is needed after the translation
2020-07-01 11:56:37 +01:00
Pau Pérez Fabregat
819af03239
Merge pull request #5706 from luisramos0/ent
...
Fix admin enterprises controller spec
2020-07-01 12:28:19 +02:00
Pau Pérez Fabregat
5a72526107
Merge pull request #5692 from luisramos0/taxonomies
...
Fix taxonomies flaky spec
2020-07-01 12:26:56 +02:00
Pau Perez
8c371fd0d1
Do not print bill addr. in invoice2 either
2020-07-01 11:27:57 +02:00
Matt-Yorkley
49fb01a3bb
Add assign default value of current time whilst altering NOT NULL constraint
...
This argument in #change_column_null assigns this value where any NULL values are found, but it doesn't alter the table's `:default` value
2020-07-01 10:00:21 +02:00
Luis Ramos
2dce10bec2
Fix admin enterprises controller spec, for some reason the correct controller is not being picked up in the test
2020-06-30 10:49:45 +01:00
Matt-Yorkley
11da385624
Enable pending checkout spec
2020-06-30 11:30:16 +02:00
Matt-Yorkley
3e7f5a4ea9
Update user address tests
...
I considered deleting these tests, as they're not very good and are testing Rails functionality. I decided to leave them in case something explodes in a future upgrade. For reference: there are issues in Rails 4 when using `object.clone.attributes`, and with assigning a hash containing `created_at` and `updated_at` values with `object.update(attributes_hash)`.
2020-06-30 11:30:16 +02:00
Matt-Yorkley
87cd936c94
Blacklist timestamp attributes when assigning for update
...
Doing #clone or #dup of an object's attributes then passing it to an #update/#update_attributes call means we are manually passing values for created_at and updated_at, which can cause problems, especially if the object being duped hasn't been persisted yet: in this case we would be manually attempting to save timestamps with nil values, which is not a good idea. Here they are blacklisted from the attributes hash.
2020-06-30 11:30:16 +02:00
Matt-Yorkley
ce8908f53b
Use #dup when copying attributes hash
...
In Rails 4, #clone behaves differently. The attributes hash of the cloned object is shared with the original, it's not a separate object! https://github.com/rails/rails/blob/4-0-stable/activerecord/lib/active_record/core.rb#L217-L220
2020-06-30 11:30:16 +02:00
Matt-Yorkley
abe96c6f32
Add specs for updating existing default addresses during checkout
...
These specs fail with the "NULL values for created_at / updated_at" errors we've been seeing.
2020-06-30 11:30:14 +02:00
Pau Pérez Fabregat
e69d3e5e0c
Merge pull request #5693 from luisramos0/knapsack
...
Reload knapsack report
2020-06-30 09:43:36 +02:00
Pau Pérez Fabregat
2a1fe3f05f
Merge pull request #5684 from openfoodfoundation/dependabot/bundler/ddtrace-0.37.0
...
Bump ddtrace from 0.36.0 to 0.37.0
2020-06-30 09:41:48 +02:00
Matt-Yorkley
57ba2481c4
Require timestamps
2020-06-30 09:09:35 +02:00
Pau Perez
0c93de8298
Manage OFN's font through the asset pipeline
2020-06-30 09:02:36 +02:00
Pau Perez
23178763b0
Do not print the bill addr. name when there's none
...
The error
```
ActionView::Template::Error: undefined method `full_name' for nil:NilClass
```
happens a few times a day and raises exceptions we don't pay attention to.
They add unnecessary noise that hides other more relevant issues.
This, however, is a symptom of a deeper data integrity problem that needs
solving at some point. This is just a countermeasure.
2020-06-30 08:46:01 +02:00
Luis Ramos
de8b97b2e1
Merge pull request #5526 from cillian/drop-blockenspiel
...
Drop blockenspiel
2020-06-29 20:09:26 +01:00
Matt-Yorkley
be0131b94c
Merge pull request #5645 from coopdevs/fix-scss-deprecation-warning
...
Rename *.css.scss to *.scss
2020-06-29 20:36:42 +02:00
Matt-Yorkley
bd0e4c75c4
Merge pull request #5636 from fatihorhan/make-user-guide-links-consistent
...
Update Sell page to use User Guide links from configuration
2020-06-29 20:33:00 +02:00
Matt-Yorkley
b441ac2644
Update paths to "noimage" images
2020-06-29 20:07:08 +02:00
Matt-Yorkley
5bec887f93
Move /assets/images/noimage/* to /public/noimage/*
2020-06-29 19:58:38 +02:00
Cillian O'Ruanaidh
a9664e103d
Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.
2020-06-29 18:11:08 +01:00
Pau Perez
c892f9c69b
Make button border radius consistent
2020-06-29 12:01:59 +02:00
Transifex-Openfoodnetwork
bb80c81097
Updating translations for config/locales/en_US.yml
2020-06-29 05:22:13 +10:00
Luis Ramos
6516037420
Reload knapsack report
2020-06-27 20:36:33 +01:00
Luis Ramos
10b8c2b789
Relax the assertion and dont check row number so that it passes even if order of elements is not the same
2020-06-27 15:54:58 +01:00
Matt-Yorkley
b325e48957
Update content config spec to use new default image paths
2020-06-27 10:32:38 +02:00
Matt-Yorkley
a5f541b59d
Update admin logo path
2020-06-27 08:53:05 +02:00
Matt-Yorkley
ff8cb43717
Move default versions of Paperclip-managed images to /public
...
Image paths for these files are handled by Paperclip, which (with our current version) does not handle fingerprints on assets. Therefore we need to make these images available under /public
2020-06-27 08:45:59 +02:00
Cillian O'Ruanaidh
1199a356c4
Extract out a JS service for calculating where to centre the map when given a set of coordinates.
...
Also removing the hardcoded default latitude/longitude from open_street_map directive because it's probably not very likely that it will be needed.
2020-06-26 22:26:39 +01:00
dependabot-preview[bot]
032a70fa7e
Bump ddtrace from 0.36.0 to 0.37.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.36.0 to 0.37.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases )
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.36.0...v0.37.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-26 19:16:32 +00:00
Transifex-Openfoodnetwork
4f2d32b262
Updating translations for config/locales/tr.yml
2020-06-27 04:22:14 +10:00
Cillian O'Ruanaidh
c40697cf61
If no enterprises have been geocoded yet make sure Open Street Map still displays correctly.
...
Before it would display a gray/blank div instead of map because the map latitude, longitude couldn't be calculated without geocoded enterprises. This adds a setting so the default coordinates can be set even if no geocoded enterprises present.
2020-06-26 15:45:58 +01:00
Luis Ramos
5e3d7be545
Merge pull request #5630 from openfoodfoundation/dependabot/bundler/ransack-1.8.10
...
Bump ransack from 1.2.3 to 1.8.10
2020-06-26 13:37:03 +01:00
Transifex-Openfoodnetwork
0d5ad6fac3
Updating translations for config/locales/en_IE.yml
2020-06-26 21:04:54 +10:00
Transifex-Openfoodnetwork
a1227d93ae
Updating translations for config/locales/en_GB.yml
2020-06-26 20:27:34 +10:00
Transifex-Openfoodnetwork
f47271ba98
Updating translations for config/locales/fr.yml
2020-06-26 16:59:37 +10:00
Transifex-Openfoodnetwork
1266bcde1b
Updating translations for config/locales/en_FR.yml
2020-06-26 16:56:19 +10:00
Maikel Linke
e567348a69
Ensure that enough time passes for caching spec
2020-06-26 14:24:01 +10:00
Maikel Linke
4b25c2d49a
Correct typo in file naming
2020-06-26 14:21:21 +10:00
Maikel Linke
d7c9bb2e5a
Navigate more efficiently in spec
...
The spec is not supposed to test the navigation to the shop. Going
directly to the shop reduces the test execution time by 7%.
2020-06-26 09:55:57 +10:00
Maikel Linke
70347148a1
Stabilise shopping specs and open them for change
...
The way we add items to the cart will change. Encapsulating that code in
a common place will make the mobile ux work clearer and avoid merge
conflicts.
The waiting for background requests has also been improved and made more
consistent which should make these specs more reliable.
2020-06-26 09:55:57 +10:00
Maikel Linke
a0c7dc2ccb
Remove leftover empty spec context
2020-06-26 09:55:57 +10:00
Luis Ramos
5929b9c1e5
Merge pull request #5627 from openfoodfoundation/dependabot/bundler/geocoder-1.6.3
...
[Security] Bump geocoder from 1.5.2 to 1.6.3
2020-06-25 20:34:19 +01:00
Luis Ramos
2ad2836ac6
Merge pull request #5563 from luchiago/fix-missing-closed-oc-info-i18n
...
add missing i18n key for closed OC
2020-06-25 20:33:55 +01:00
Luis Ramos
93a2e57bc6
Merge pull request #5538 from jeduardo824/bug/4592-payment-methods-table-in-dashboard
...
Fix Payment Methods table to show proper provider name
2020-06-25 20:32:04 +01:00
Luis Ramos
cb2ccf76d2
Merge pull request #5590 from rmklaus12/5558-shippingcategory-translation
...
Added translation key to config/locales/en.yml file for shipping_cat…
2020-06-25 20:31:48 +01:00
Luis Ramos
f44533bbd5
Merge pull request #5589 from rmklaus12/2617-mainmenu-translation
...
Added more key to en.yml to translate More dropdown text
2020-06-25 20:27:46 +01:00
Luis Ramos
bfc134c9e6
Merge pull request #5615 from openfoodfoundation/dependabot/bundler/acts-as-taggable-on-4.0.0
...
Bump acts-as-taggable-on from 3.5.0 to 4.0.0
2020-06-25 20:26:59 +01:00
Pau Pérez Fabregat
7338f196e9
Merge pull request #5663 from luisramos0/constraints
...
Make db timestamps nullable
2020-06-25 13:14:41 +02:00
Luis Ramos
68946a765e
Make timestamps nullable
2020-06-25 08:47:18 +01:00
Transifex-Openfoodnetwork
0b48a53c2f
Updating translations for config/locales/tr.yml
2020-06-25 16:02:01 +10:00
Transifex-Openfoodnetwork
54ce5d8c0f
Updating translations for config/locales/en_CA.yml
2020-06-25 09:15:11 +10:00
Luis Ramos
ba50491c6d
Restructure the spec a little
2020-06-24 16:16:58 +01:00
Luis Ramos
34207fc20f
Bring changes to stock_item from spree 2.1, the previous version was from spree 2.0.4
2020-06-24 16:16:58 +01:00
Luis Ramos
e12e50aa84
Move rubocop exception to rubocop todo
2020-06-24 16:16:58 +01:00
Kristina Lim
20fd3c2642
Reset negative count on hand in existing non backorderable stock items
2020-06-24 16:16:58 +01:00
Kristina Lim
4694f1b21a
Require count on hand in non backorderable StockItem to be positive or zero
...
Fix setting of count on hand in line item specs
2020-06-24 16:16:45 +01:00
Kristina Lim
e53913756c
Add lock_version to Spree::StockItem
2020-06-24 16:15:37 +01:00
Kristina Lim
774b3720d5
Update stock item count on hand in Spree core specs
2020-06-24 16:15:09 +01:00
Kristina Lim
13ecf0ec73
Update specs for StockItem with transpec
2020-06-24 16:15:09 +01:00
Kristina Lim
fb20f220c0
Use break instead of return in StockItem#process_backorders
...
We are not using the return value of this method anywhere.
2020-06-24 16:15:09 +01:00
Kristina Lim
0a1cb71ee4
Ignore Rails/UniqueValidationWithoutIndex for unique index of StockItem#stock_location
2020-06-24 16:15:09 +01:00
Kristina Lim
bc530b92b5
Address violation of Rubocop Rails/Validation:
2020-06-24 16:15:09 +01:00
Kristina Lim
2acf61fd0f
Address violation of Rubocop Rails/Delegate
2020-06-24 16:15:09 +01:00
Kristina Lim
1e8543dfe7
Address violation of Rubocop Rails/ReadWriteAttribute
2020-06-24 16:15:09 +01:00
Kristina Lim
22c0693beb
Address violation of Rubocop Style/NumericPredicate
2020-06-24 16:15:09 +01:00
Kristina Lim
d1725014c4
Auto-correct violationso of Rubocop Layout/*
2020-06-24 16:15:09 +01:00
Kristina Lim
0fd66f9a55
Auto-correct violationso of Rubocop Style/*
2020-06-24 16:15:09 +01:00
Kristina Lim
b783118700
Auto-correct violationso of Rubocop Style/RedundantSelf
2020-06-24 16:15:09 +01:00
Kristina Lim
84d973d383
Specify RSpec.describe in StockItem spec file
2020-06-24 16:15:09 +01:00
Kristina Lim
0e711832fd
Bring Spree::StockItem code from spree_core into the app
2020-06-24 16:15:09 +01:00
Transifex-Openfoodnetwork
8d4a9cba21
Updating translations for config/locales/nb.yml
2020-06-24 23:33:12 +10:00
Steve Roberts
3d2a0d4d67
Remove UI and API engine as we will not host the swagger spec right now
2020-06-24 15:51:08 +10:00
Steve Roberts
9541dbf495
Fix order api spec and add incomplete generated swagger.yml
2020-06-24 15:15:18 +10:00
Steve Roberts
b59dbebba6
Revert Gemfile change to specific version of rubocop
...
Turns out it wasn't necessary. I thought it was needed to install a compatible version of rswag
2020-06-24 13:21:49 +10:00
Steve Roberts
e619ae621c
Add rswag and coverage for orders endpoint
...
Add coverage for core orders endpoint queries (WIP)
2020-06-24 13:21:49 +10:00
Steve Roberts
9e19d79337
Add more detail on the ransack based queries in the description
2020-06-24 13:21:49 +10:00
Steve Roberts
8b79d41b81
Update orders swagger spec and fix api_key access to orders endpoint
2020-06-24 13:21:49 +10:00
Luis Ramos
9e39d970ca
Result of running db:migrate
2020-06-23 19:19:18 +01:00
Pau Pérez Fabregat
9e730e6445
Merge pull request #5660 from coopdevs/fix-spree-preferences
...
Migrate all spree pref. keys to the new format
2020-06-23 18:00:01 +02:00
Transifex-Openfoodnetwork
99096eee2d
Updating translations for config/locales/ca.yml
2020-06-24 01:41:21 +10:00
Pau Perez
a81e17f23c
Flush the cache
...
So all preferences are fetch from DB now that they have changed.
2020-06-23 17:23:22 +02:00
Pau Perez
190797717a
Defend from the running the migration twice
...
We only migrate preferences if there are any to migrate.
2020-06-23 17:22:11 +02:00
Pau Perez
0ffa7b3734
Migrate all spree pref. keys to the new format
...
We realized in Spree v2.1 they follow this format instead and this is
what's causing issues to Katuma production.
This will remove the duplicate ones and convert the current preferences
to the new thus, keeping the values.
2020-06-23 16:21:20 +02:00
Transifex-Openfoodnetwork
923b905a9c
Updating translations for config/locales/en_GB.yml
2020-06-23 22:30:53 +10:00
Pau Pérez Fabregat
973ea2ea2d
Merge pull request #5641 from openfoodfoundation/transifex
...
Transifex
2020-06-23 10:43:26 +02:00
Pau Pérez Fabregat
3939febc2f
Merge pull request #5653 from luisramos0/rubocop_refresher
...
Auto correct rubocop, refresh todo lists and fix some more rubocop issues
2020-06-23 10:25:59 +02:00
Luis Ramos
91fc0cd26f
Adapt specs to new Ar method update that replaces update_attributes
2020-06-22 17:39:20 +01:00
Luis Ramos
f004b3d573
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
b49eef5fa9
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
1c550a594f
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
0ba1642bd2
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
1e5975c6e2
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
aa14fd236c
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
ab59ab45f5
Use auto correct to fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
f54abbd376
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
730959f85f
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
8870dc4b06
Move rubocop exception to code
2020-06-22 17:39:20 +01:00
Luis Ramos
1b5f9f105a
Fix block alignment
2020-06-22 17:39:20 +01:00
Luis Ramos
ed5fc29c44
Fix hash alignment issue
2020-06-22 17:39:20 +01:00
Luis Ramos
ff68303ef6
Fix long lines
2020-06-22 17:39:20 +01:00
Luis Ramos
0f2e07cc2d
Fix long lines
2020-06-22 17:39:20 +01:00
Luis Ramos
0e3b5ad4c3
Revert rubocop auto correct because update! is a method in the adjustment model
2020-06-22 17:39:17 +01:00
Luis Ramos
41ff406e86
Fix rubocop issue by avoiding rails method name update_attributes
2020-06-22 16:51:46 +01:00
Luis Ramos
6a7ed6e0c9
Rebuild .rubocop_manual_todo.yml
2020-06-22 16:51:46 +01:00
Luis Ramos
4e9c21d525
Add new regenerated rubocop_todo
2020-06-22 16:51:46 +01:00
Luis Ramos
b879439d58
Use rubocop auto correct to fix Style/SafeNavigation issue
2020-06-22 16:51:46 +01:00
Luis Ramos
1b6e51c79e
Fix rubocop issue
2020-06-22 16:51:46 +01:00
Luis Ramos
f848a89a00
Rename update_attributes to update #rails4
2020-06-22 16:51:43 +01:00
Luis Ramos
8a61257547
Rename all before_filter to before_action, it's the same function with a new name
2020-06-22 13:11:57 +01:00
Luis Ramos
46a1c1cf26
Fix rubocop issue
2020-06-22 13:08:54 +01:00
Luis Ramos
adfe1f89b6
Revert previous rubocop auto correct fix that breaks the cart spec
2020-06-22 13:08:38 +01:00
Luis Ramos
473fee19eb
Fix rubocop issues
2020-06-22 13:03:18 +01:00
Luis Ramos
6eebb0e399
Use rubocop autocorrect to fix rubocop issue
2020-06-22 12:58:33 +01:00
Luis Ramos
e574e254db
Use rubocop autocorrect to fix rubocop issue
2020-06-22 12:57:12 +01:00
Luis Ramos
3b91dd9dea
Use rubocop auto-correct to fix more issues
2020-06-22 12:51:47 +01:00
Luis Ramos
5d710f1e24
Use ruboccop autocorrect to fix issues
2020-06-22 12:46:07 +01:00
Luis Ramos
fb92745db4
Fix rubocop issues
2020-06-22 12:41:31 +01:00
Luis Ramos
8a9dae0ee2
Run rubocop autocorrect
...
This is the result of bundle exec rubocop --auto-correct
2020-06-22 12:23:10 +01:00
Luis Ramos
15babd8bc4
Merge pull request #5651 from luisramos0/xhr
...
[Rails 4.1] Change for xhr rquest to avoid csrf during testing
2020-06-22 12:20:41 +01:00
Luis Ramos
57d925a7de
Add new rubocop rules and fix the single offence
2020-06-22 12:19:19 +01:00
Lucas Hiago
357c2c7b25
change for xhr to avoid csrf during testing
2020-06-21 20:22:33 +01:00
Transifex-Openfoodnetwork
eb55d00051
Updating translations for config/locales/en_US.yml
2020-06-20 03:34:37 +10:00
Transifex-Openfoodnetwork
c5d3156351
Updating translations for config/locales/fr.yml
2020-06-20 02:37:11 +10:00
Transifex-Openfoodnetwork
28a6f694de
Updating translations for config/locales/en_FR.yml
2020-06-20 02:34:30 +10:00
Pau Pérez Fabregat
dd9d9e3316
Merge pull request #5639 from luchiago/fix-seeds-on-setup
...
FIx setup seed
2020-06-19 16:49:16 +02:00
Pau Perez
f36e08a163
Rename *.css.scss to *.scss
...
This fixes the following deprecation warning
```
DEPRECATION WARNING: Extra .css in SCSS file is unnecessary. Rename /usr/src/app/app/assets/stylesheets/darkswarm/variables.css.scss to /usr/src/app/app/assets/stylesheets/darkswar
m/variables.scss. (called from _app_views_layouts_darkswarm_html_haml___3990351141569700945_46957256630860 at /usr/src/app/app/views/layouts/darkswarm.html.haml:18)
(...)
```
2020-06-19 16:29:08 +02:00
Transifex-Openfoodnetwork
fd6cbe064d
Updating translations for config/locales/tr.yml
2020-06-19 20:27:09 +10:00
Pau Pérez Fabregat
db80992326
Merge branch 'master' into drop-blockenspiel
2020-06-19 12:12:10 +02:00
Lucas Hiago
52da896b03
Fix name when try to search on seed
2020-06-18 21:06:04 -03:00
Eduardo
573f7b1087
make shop links on the producers page open in new tab
2020-06-18 19:55:06 -03:00
Fatih Orhan
27fb3f156c
Update sell.html.haml
2020-06-18 20:36:50 +03:00
dependabot-preview[bot]
9c643447c2
Bump ransack from 1.2.3 to 1.8.10
...
Bumps [ransack](https://github.com/activerecord-hackery/ransack ) from 1.2.3 to 1.8.10.
- [Release notes](https://github.com/activerecord-hackery/ransack/releases )
- [Changelog](https://github.com/activerecord-hackery/ransack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/activerecord-hackery/ransack/compare/v1.2.3...v1.8.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-17 19:15:45 +00:00
dependabot-preview[bot]
d67fa6fa5a
[Security] Bump geocoder from 1.5.2 to 1.6.3
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.5.2 to 1.6.3. **This update includes a security fix.**
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v.1.5.2...v1.6.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-16 23:49:32 +00:00
Lucas Hiago
419b3ef26e
add missing i18n key for check hub ready for checkout
2020-06-16 19:49:43 -03:00
Lucas Hiago
e9e43c985f
add missing i18n key for closed OC
2020-06-16 19:48:24 -03:00
dependabot-preview[bot]
f8c66cae81
Bump acts-as-taggable-on from 3.5.0 to 4.0.0
...
Bumps [acts-as-taggable-on](https://github.com/mbleigh/acts-as-taggable-on ) from 3.5.0 to 4.0.0.
- [Release notes](https://github.com/mbleigh/acts-as-taggable-on/releases )
- [Changelog](https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.5.0...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-16 02:30:03 +00:00
Eduardo
27c76cfae2
add view spec to replace feature spec
2020-06-13 14:24:17 -03:00
Cillian O'Ruanaidh
430e5ea9cc
Permission to view :bulk_coop report is now added in the #add_bulk_coop_abilities method.
2020-06-13 16:57:43 +01:00
Cillian O'Ruanaidh
0ef3a7e24f
Fix some more code climate violations for bulk coop specs which have been moved to the order management engine.
2020-06-13 16:23:11 +01:00
Cillian O'Ruanaidh
fdf0d92366
Move feature spec for bulk coop report to the order management engine.
2020-06-13 15:52:42 +01:00
Cillian O'Ruanaidh
ba126d5afc
Move the bulk coop controller specs to the order management engine.
...
Also deleting old :bulk_coop_report action from the Spree::Admin::ReportsController.
2020-06-13 15:42:26 +01:00
Cillian O'Ruanaidh
c1e57fcc12
Adjust CanCan ability to reflect that the bulk coop report now runs from the order management engine.
2020-06-13 15:41:09 +01:00
Cillian O'Ruanaidh
3abcb5b23c
Don't move the :parameter_not_allowed_error translation to a different scope yet.
...
It will make it harder to merge and deploy this PR if every translation locale file has to be updated too.
2020-06-13 15:37:44 +01:00
Cillian O'Ruanaidh
bcf79ef803
Fix code climate violations related to removing blockenspiel.
2020-06-13 13:27:44 +01:00
Cillian O'Ruanaidh
6dbb6f3f09
Add an underscore before unused method arguments rather than an empty splat operator so it's easier to understand what is being passed in.
2020-06-13 13:09:09 +01:00
Cillian O'Ruanaidh
293e8949a9
Remove unused AuthenticationWorkflow module from the BulkCoopReport specs.
2020-06-13 12:59:23 +01:00
Cillian O'Ruanaidh
bfc6daf076
Remove duplicate PackingReport tests from the BulkCoopReport spec.
...
These tests already exist in spec/lib/open_food_network/packing_report_spec.rb:72
2020-06-13 12:57:14 +01:00
Cillian O'Ruanaidh
ed82c7e3db
BulkCoopReport has been moved to the engines/order_management so move it's spec there too.
2020-06-13 12:51:29 +01:00
Luis Ramos
e6e4b6f95c
Add keypress events to text input fields on orders search page
2020-06-13 12:15:49 +01:00
Luis Ramos
1740879261
Revert directive and just use ng-kkeypress
2020-06-13 12:07:45 +01:00
Luis Ramos
f08b837115
Make enter submit the search form in products list
2020-06-13 11:51:00 +01:00
Eduardo
5ed5ed2873
fix payment methods table to show proper provider name
2020-06-12 18:26:54 -03:00
Robin Klaus
f8ebe11728
Added translation keyt to config/locales/en.yml file for shipping_category
2020-06-12 13:19:15 +10:00
Robin Klaus
b8f228cc3d
Added more key to en.yml to translate More dropdown text
2020-06-12 11:34:22 +10:00
Cillian O'Ruanaidh
f90969134d
Fix a couple of Rubocop violations.
2020-06-05 20:03:17 +01:00
Cillian O'Ruanaidh
bafa8beab3
Use :parameter_not_allowed_error_message to from base Reports::Authorizer.
2020-06-05 17:05:26 +01:00
Cillian O'Ruanaidh
e58852289f
Move the :require_valid_datetime_range method to OrderManagement::Reports::Parameters::Base so it can be reused on multiple reports.
2020-06-05 16:58:56 +01:00
Cillian O'Ruanaidh
9172606780
Allow the order management report partial to be reused on different reports.
2020-06-05 16:51:43 +01:00
Cillian O'Ruanaidh
406309c577
Move BulkCoop reports out of deprecated lib/ directory into OrderManagement engine.
...
The BulkCoop reports are not generated the same way as the EnterpriseFeeSummary report is generated yet so that may need to be updated.
2020-06-05 16:43:38 +01:00
Cillian O'Ruanaidh
d436d18d19
Fix code climate violations in removal of Blockenspiel dependency.
2020-06-05 10:13:06 +01:00
Cillian O'Ruanaidh
d02f64da06
Define bulk coop report summary row and columns with lists of method names instead of Procs.
2020-05-29 11:34:12 +01:00
Cillian O'Ruanaidh
1fba998b9e
Drop Blockenspiel and use :rules/:columns methods instead of :organise/:summary_columns DSL.
...
For https://github.com/openfoodfoundation/openfoodnetwork/issues/3231
2020-05-28 19:04:18 +01:00
