raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-21 00:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,002 Commits 18 Branches 454 Tags
768acc4166bdbf3b49570facdb1e13c3e34da805
Commit Graph

22002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yasuhiro Yoshida
768acc4166 Add scope to only allow visible enterprises in group 2021-10-01 15:22:00 +03:00
Yasuhiro Yoshida
ace8c8768f Remove ng-if to filter out invisible enterprises from group 2021-10-01 15:21:13 +03:00
Yasuhiro Yoshida
8090945c34 Change visibilities of hubs on group page 
Issue:
https://github.com/openfoodfoundation/openfoodnetwork/issues/5106

Hubs on group page for consumers are displayed unconditionally.
But they should only appear under the following conditions: Visible.

In addition, those that are active should only be filled with red color
when they have open order cycles.

This commit apply these rules and changes the visibility of each hub on
"Our Hubs" tab of group page for consumers accordingly.
 2021-09-17 17:12:08 +03:00
Andy Brett
82a8eed652 Merge pull request #8165 from openfoodfoundation/dependabot/bundler/view_component-2.40.0 
Bump view_component from 2.39.0 to 2.40.0
 2021-09-13 15:26:55 -07:00
Andy Brett
77ca05ebe5 Merge pull request #8175 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.0 
Bump jest from 27.1.1 to 27.2.0
 2021-09-13 15:26:31 -07:00
Andy Brett
da912d2fdf Merge pull request #8173 from openfoodfoundation/dependabot/bundler/test-unit-3.4.6 
Bump test-unit from 3.4.5 to 3.4.6
 2021-09-13 15:26:08 -07:00
Andy Brett
297dc56fe5 Merge pull request #8174 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.12.2 
Bump rubocop-rails from 2.12.0 to 2.12.2
 2021-09-13 15:25:45 -07:00
dependabot[bot]
b0b91c959e Bump jest from 27.1.1 to 27.2.0 
Bumps [jest](https://github.com/facebook/jest) from 27.1.1 to 27.2.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.1.1...v27.2.0)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-13 09:09:54 +00:00
dependabot[bot]
a7e9acd435 Bump rubocop-rails from 2.12.0 to 2.12.2 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.12.0 to 2.12.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.12.0...v2.12.2)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-13 09:05:04 +00:00
dependabot[bot]
d75b03debd Bump test-unit from 3.4.5 to 3.4.6 
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.4.5 to 3.4.6.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.4.5...3.4.6)

---
updated-dependencies:
- dependency-name: test-unit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-13 09:04:26 +00:00
Andy Brett
1ec9cce439 Merge pull request #8163 from mkllnk/migration-specs 
Remove problematic migration spec
 2021-09-10 10:32:29 -07:00
Nihal M. Kelanthodika
5811b6e3d1 Merge pull request #8064 from apricot12/Kill_stripe_connect 
Kill stripe connect
 2021-09-10 22:57:00 +05:30
Nihal
98a879a0e9 Restore removed spec to profile_storer_spec 2021-09-10 14:43:34 +05:30
Nihal Mohammed
98ff3980f8 Migration of StripeConnect to StripeSCA 2021-09-10 14:43:34 +05:30
Nihal Mohammed
eb17c208f9 Update stripe_stubs to handle stripeSCA 2021-09-10 14:43:34 +05:30
Nihal Mohammed
fa9f6432c3 Fix profile_storer.rb and profile_storer_spec 2021-09-10 14:43:34 +05:30
Nihal Mohammed
6ac835de2e Fix response for payment_profile_id in profile_storer.rb 2021-09-10 14:43:34 +05:30
Nihal Mohammed
696d434979 Removed stripe connect example and fixed JSON generation in profile_storer spec 2021-09-10 14:43:34 +05:30
Nihal Mohammed
48c1312cea Remove expectation to generate clean name for StripeConnect from payment_method_spec 2021-09-10 14:43:34 +05:30
Luis Ramos
0c240cee9a A few more removals of stripe connect related code 2021-09-10 14:43:34 +05:30
Luis Ramos
f90e34bb47 Adapt specs to use stripe_sca_payment_method factory and delete stripe_connect_payment_method 2021-09-10 14:43:34 +05:30
Luis Ramos
9de9b41575 Remove stripe connect spec, there's a similar spec for stripesca below 2021-09-10 14:43:34 +05:30
Luis Ramos
60a8ae6675 Remove Stripe Connect gateway and related code 2021-09-10 14:43:24 +05:30
Luis Ramos
5434b51f75 Switch filter to StripeSCA, this must have been an error, must be tested (manually or automatically) 2021-09-10 14:41:06 +05:30
dependabot[bot]
93118f9c32 Bump view_component from 2.39.0 to 2.40.0 
Bumps [view_component](https://github.com/github/view_component) from 2.39.0 to 2.40.0.
- [Release notes](https://github.com/github/view_component/releases)
- [Changelog](https://github.com/github/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/github/view_component/compare/v2.39.0...v2.40.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-10 09:02:41 +00:00
Maikel Linke
10c2a1c55c Remove problematic migration spec 
Unfortunately, loading the migration code also reloads some Spree models
which causes errors later on. Another spec was failing with:

  1) full-page cart viewing the cart when a product is soft-deleted shows the cart without errors
     Failure/Error: variant.instance_variable_set :@hub, @hub

     FrozenError:
       can't modify frozen NilClass: nil
     # ./lib/open_food_network/scope_variant_to_hub.rb:12:in `instance_variable_set'

The command to reproduce was:

rspec ./spec/features/consumer/shopping/cart_spec.rb[1:1:3:1]\
 ./spec/migrations/migrate_enterprise_fee_tax_amounts_spec.rb[1:1:1:1] --seed 0

I couldn't find a quick solution to make the migration not use app code.
Since the migration is a historical record now, it doesn't need repeated
testing.
 2021-09-10 16:19:40 +10:00
Maikel
9affc6a945 Merge pull request #8108 from Matt-Yorkley/andand 
Remove `andand` gem
 2021-09-10 15:06:00 +10:00
Maikel Linke
e013d81e3d Simplify safe navigation operator use < and [] 2021-09-10 14:40:46 +10:00
Andy Brett
6fea506e05 Update all locales with the latest Transifex translations v4.1.1 2021-09-09 17:52:29 -07:00
Andy Brett
069cb043ee Merge pull request #8148 from jibees/5236-remove-incomplete-orders-from-admin-interface-2 
Only shows order that actually have at least one line_item V2
 2021-09-09 16:49:30 -07:00
Andy Brett
46a3214bc6 Merge pull request #8157 from openfoodfoundation/dependabot/bundler/spring-3.0.0 
Bump spring from 2.1.1 to 3.0.0
 2021-09-09 16:47:42 -07:00
Andy Brett
392ba6f3d1 Merge pull request #7975 from vishaldeepak/mail-customer-information 
Add customer information to mail when we notify producers when required
 2021-09-09 16:10:46 -07:00
Andy Brett
9124e03c11 Merge pull request #8144 from meronokbay/6942-fix-payment-method-fee-bug 
6942 fix payment method fee bug
 2021-09-09 09:28:40 -07:00
Matt-Yorkley
fe57484c03 Merge pull request #8159 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.1.1 
Bump jest from 27.1.0 to 27.1.1
 2021-09-09 14:05:59 +02:00
Matt-Yorkley
29d2fc34ab Merge pull request #8158 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.12.0 
Bump rubocop-rails from 2.11.3 to 2.12.0
 2021-09-09 14:05:35 +02:00
Matt-Yorkley
b352476301 Update app/models/proxy_order.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-09-09 13:39:08 +02:00
dependabot[bot]
f3af4e586c Bump jest from 27.1.0 to 27.1.1 
Bumps [jest](https://github.com/facebook/jest) from 27.1.0 to 27.1.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.1.0...v27.1.1)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-09 09:06:27 +00:00
dependabot[bot]
43f276596a Bump rubocop-rails from 2.11.3 to 2.12.0 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.11.3 to 2.12.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.11.3...v2.12.0)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-09 09:03:55 +00:00
dependabot[bot]
dc75c5139a Bump spring from 2.1.1 to 3.0.0 
Bumps [spring](https://github.com/rails/spring) from 2.1.1 to 3.0.0.
- [Release notes](https://github.com/rails/spring/releases)
- [Changelog](https://github.com/rails/spring/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/spring/compare/v2.1.1...v3.0.0)

---
updated-dependencies:
- dependency-name: spring
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-09 09:03:34 +00:00
Andy Brett
f8486bcbf8 Merge pull request #7769 from Matt-Yorkley/payment-status-checking 
Stripe: payment status debugging
 2021-09-08 15:21:38 -07:00
Andy Brett
afa1861181 pass payment to Stripe Validator instead of the status object 2021-09-08 12:26:56 -07:00
Andy Brett
de29d7e7d7 Merge pull request #8125 from jibees/5782-add-i18n-for-devise 
Add devise-i18n and handle i18nization for devise controllers
 2021-09-08 11:48:12 -07:00
Andy Brett
26e973828f Merge pull request #8151 from Matt-Yorkley/codecov-tasks 
Remove Codecov upload tasks
 2021-09-08 11:11:43 -07:00
Matt-Yorkley
48d4341e2d Merge pull request #8112 from cillian/eager-load-permissions-with-enterprise-relationships 
Eager load the EnterpriseRelationship :permissions association on the enterprise permissions page
 2021-09-08 19:46:14 +02:00
Matt-Yorkley
1d5077061e Remove andand 
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
 2021-09-08 14:28:31 +01:00
Matt-Yorkley
2d2e0a5b24 Add unit test for not_empty scope 2021-09-08 12:18:08 +01:00
Matt-Yorkley
b53371d870 Fix not_empty scope 2021-09-08 12:14:53 +01:00
Matt-Yorkley
2b95ede1a2 Merge pull request #8115 from pacodelaluna/update-docker-configuration 
Update Docker configuration to support sidekiq and webpacker
 2021-09-08 12:06:08 +02:00
Matt-Yorkley
ef02197bab Remove Codecov upload tasks 2021-09-08 10:48:28 +01:00
Jean-Baptiste Bellet
7656f5d20f Add an order with no line_items, should not be returned by API 2021-09-08 10:44:04 +02:00