raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 453 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Brett
75f827aee9 Merge pull request #8120 from openfoodfoundation/dependabot/bundler/test-prof-1.0.7 
Bump test-prof from 1.0.6 to 1.0.7
 2021-09-03 17:35:32 -07:00
Andy Brett
b2f8d978c6 Merge pull request #8107 from openfoodfoundation/dependabot/bundler/rubocop-1.20.0 
Bump rubocop from 1.19.1 to 1.20.0
 2021-09-03 12:05:28 -07:00
Matt-Yorkley
54987dd622 Merge pull request #8099 from jibees/8097-test-stimulus 
Add jest and stimulusjs testing
 2021-09-03 16:16:16 +02:00
Jean-Baptiste Bellet
ec4d5bd9a2 Remove babel warning 2021-09-03 14:14:25 +02:00
Jean-Baptiste Bellet
149c0d4de4 Add yarn jest to the github workflow 2021-09-03 14:14:25 +02:00
Jean-Baptiste Bellet
7cdf09322c First test for toggle_controller 2021-09-03 14:14:25 +02:00
Jean-Baptiste Bellet
310c3c4005 Define each file to be tested by jest 2021-09-03 14:14:25 +02:00
Jean-Baptiste Bellet
195464361d Install needed dependencies 2021-09-03 14:14:25 +02:00
Matt-Yorkley
86da71d6c0 Update all locales with the latest Transifex translations v4.1.0 2021-09-03 10:33:33 +01:00
Matt-Yorkley
fe99a5cc55 Merge pull request #8129 from Matt-Yorkley/searchable 
Searchable attributes
 2021-09-03 09:43:25 +02:00
Matt-Yorkley
72d494c640 Merge pull request #8127 from Matt-Yorkley/session-uri-parsing 
Strip subdomains from session cookie host
 2021-09-03 09:38:11 +02:00
Matt-Yorkley
fbdc38b6c4 Merge pull request #8111 from jibees/4582-remove-units-on-quantity-column- 
Display variant quantity on the quantity column on the edit order page in backoffice
 2021-09-02 20:45:22 +02:00
Matt-Yorkley
0459071ce3 Set RAILS_ENV=test in test suite 2021-09-02 17:29:26 +01:00
Matt-Yorkley
dc8939c35f Strip subdomains from session cookie host 2021-09-02 17:29:26 +01:00
vishaldeepak
b13b2b9b95 Customer Information on mail show be displayed depending on order cycle coordinator's customer names flag 2021-09-02 18:59:28 +05:30
Matt-Yorkley
3fc0278776 Whitelist searchable attributes on primary models 2021-09-02 14:06:15 +01:00
Matt-Yorkley
b25759670e Implement ransackable whitelisting 2021-09-02 13:43:22 +01:00
Jean-Baptiste Bellet
97fd7e3d78 Improve look and feel by adding some responsive margins 2021-09-01 17:16:30 +02:00
Jean-Baptiste Bellet
1b7c36664e Add missing i18n key for Devise 
and update tests as well:
 - from feature to system
 - Add the reset password scenario
 - Add some errors scenario to the reset password scenario: token expired, token invalid, and not the same password
 2021-09-01 17:16:29 +02:00
Matt-Yorkley
fd8de65749 Merge pull request #8123 from openfoodfoundation/dependabot/bundler/view_component-2.39.0 
Bump view_component from 2.38.0 to 2.39.0
 2021-09-01 16:52:05 +02:00
Matt-Yorkley
cab470bd86 Merge pull request #8122 from openfoodfoundation/dependabot/npm_and_yarn/tar-6.1.11 
Bump tar from 6.1.5 to 6.1.11
 2021-09-01 16:51:00 +02:00
Matt-Yorkley
9d6e5e9420 Remove currently unused code 2021-09-01 15:04:53 +01:00
Matt-Yorkley
1fca7d2a6c Remove error-clearing from edit action 2021-09-01 15:04:53 +01:00
Matt-Yorkley
4cff185b4b Extract params handling to service 2021-09-01 15:04:53 +01:00
Matt-Yorkley
57504f42d8 Move validations to state transitions 2021-09-01 15:04:53 +01:00
Matt-Yorkley
6acb1f6484 Tidy up view variables 2021-09-01 15:04:33 +01:00
Matt-Yorkley
9800483433 Simplify displaying selected shipping method 2021-09-01 15:04:33 +01:00
Matt-Yorkley
b7e1882bd8 Simplify setting address params 2021-09-01 15:04:33 +01:00
Matt-Yorkley
3fabe308cd Extract #shipping_and_billing_match? helper 2021-09-01 15:04:33 +01:00
Matt-Yorkley
ac4d721de0 Extract #set_payment_amount method 2021-09-01 15:04:33 +01:00
Matt-Yorkley
2786fb30ba Simplify order advancing process 2021-09-01 15:04:33 +01:00
Matt-Yorkley
978c882ed9 Don't select a random shipping method in Shipment 2021-09-01 15:04:33 +01:00
Matt-Yorkley
3dd8ed85b4 Implement manual shipping method selection 2021-09-01 14:16:32 +01:00
Matt-Yorkley
ebe2923512 Improve form outputs and error handling 2021-09-01 14:16:32 +01:00
Jean-Baptiste Bellet
19d7ca70b4 Add devise-i18n gem to handle i18nization inside devise controllers 2021-09-01 12:10:07 +02:00
dependabot[bot]
6d16b66a76 Bump view_component from 2.38.0 to 2.39.0 
Bumps [view_component](https://github.com/github/view_component) from 2.38.0 to 2.39.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.38.0...v2.39.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-01 09:03:48 +00:00
dependabot[bot]
cd75fcf6c2 Bump tar from 6.1.5 to 6.1.11 
Bumps [tar](https://github.com/npm/node-tar) from 6.1.5 to 6.1.11.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.5...v6.1.11)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-31 23:01:16 +00:00
Matt-Yorkley
aaf45afbfe Merge pull request #8090 from Matt-Yorkley/session-storage 
Allow sessions to work across subdomains
 2021-08-31 22:11:44 +02:00
dependabot[bot]
1bebe96df6 Bump test-prof from 1.0.6 to 1.0.7 
Bumps [test-prof](https://github.com/test-prof/test-prof) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/test-prof/test-prof/releases)
- [Changelog](https://github.com/test-prof/test-prof/blob/master/CHANGELOG.md)
- [Commits](https://github.com/test-prof/test-prof/compare/v1.0.6...v1.0.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-31 09:03:23 +00:00
Andy Brett
fba7699d0b select shipping method when advancing to payment 2021-08-31 11:00:54 +02:00
Jean-Baptiste Bellet
a1438f91e9 Display error on email (triggered by advance_order_state method) 2021-08-31 11:00:54 +02:00
Andy Brett
69ec17ef92 do not require phone number on orders 2021-08-31 10:59:13 +02:00
Matt-Yorkley
c72e0f7268 Merge pull request #8117 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-2.3.3 
Bump rack-mini-profiler from 2.3.2 to 2.3.3
 2021-08-31 10:15:30 +02:00
dependabot[bot]
2554083557 Bump rack-mini-profiler from 2.3.2 to 2.3.3 
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.3.2 to 2.3.3.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.3.2...v2.3.3)

---
updated-dependencies:
- dependency-name: rack-mini-profiler
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-30 09:03:59 +00:00
dependabot[bot]
ae46863d77 Bump paper_trail from 12.0.0 to 12.1.0 
Bumps [paper_trail](https://github.com/airblade/paper_trail) from 12.0.0 to 12.1.0.
- [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/v12.0.0...v12.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-30 09:02:50 +00:00
François Turbelin
9aba846112 Add webpacker config 2021-08-29 21:49:26 +02:00
François Turbelin
4e03874e2b Update the jobs starter with sidekiq command 2021-08-29 21:49:26 +02:00
Andy Brett
ca7da94fd8 Merge pull request #8088 from jibees/8087-select-unselect-orders-in-admin 
Handle select/unselect all orders in the admin orders page
 2021-08-28 11:34:20 -07:00
Jean-Baptiste Bellet
5c05be22f5 As it is a quantity column, display variant quantity 
(this column was confused, and was understood like a simply quantity column not the item quantity separated according to its "state")

Update specs as well
 2021-08-27 15:15:14 +02:00
Cillian O'Ruanaidh
e1478e3ae8 Eager load the EnterpriseRelationship :permissions association on the enterprise permissions page 
For #8028
 2021-08-27 12:01:25 +01:00