raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,255 Commits 18 Branches 452 Tags
1ddff2c4bf18bf2bca93608931ccc33bf77f5f00
Commit Graph

23255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
1ddff2c4bf Merge pull request #8678 from Matt-Yorkley/dead-code-js-uri 
Remove outdated jsUri
 2022-01-24 13:15:02 +00:00
Filipe
82b24026a7 Merge pull request #8747 from openfoodfoundation/dependabot/bundler/monetize-1.12.0 
Bump monetize from 1.11.0 to 1.12.0
 2022-01-24 13:01:08 +00:00
Filipe
1120e4e460 Merge pull request #8759 from jibees/8547-use-the-last-payment-in-the-Payment-Method-Report 
Use the last payment method instead of the first for the Payment Method Report
 2022-01-24 12:51:08 +00:00
Filipe
f17226ffbe Merge pull request #8438 from cillian/show-out-of-stock-line-items 
If an order has out of stock line items display them and let admins remove them
 2022-01-24 12:18:19 +00:00
Maikel
205fb630cb Fix typos in release task template 2022-01-24 10:23:51 +11:00
Matt-Yorkley
04e2b8728b Merge pull request #8775 from openfoodfoundation/dependabot/npm_and_yarn/log4js-6.4.0 
Bump log4js from 6.3.0 to 6.4.0
 2022-01-22 10:56:18 +00:00
Matt-Yorkley
658011d574 Merge pull request #8776 from openfoodfoundation/dependabot/npm_and_yarn/nanoid-3.2.0 
Bump nanoid from 3.1.30 to 3.2.0
 2022-01-22 10:47:55 +00:00
dependabot[bot]
5e21ae23c0 Bump nanoid from 3.1.30 to 3.2.0 
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-22 09:49:33 +00:00
dependabot[bot]
30df9e5139 Bump log4js from 6.3.0 to 6.4.0 
Bumps [log4js](https://github.com/log4js-node/log4js-node) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/log4js-node/log4js-node/releases)
- [Changelog](https://github.com/log4js-node/log4js-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/log4js-node/log4js-node/compare/v6.3.0...v6.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-21 22:50:55 +00:00
Filipe
42c6cea78d Merge pull request #8739 from Matt-Yorkley/split-checkout-completion 
Split checkout completion
 2022-01-20 14:38:01 +00:00
Maikel
ae38d94d71 Merge pull request #8743 from openfoodfoundation/transifex 
Transifex
v4.1.14 		2022-01-20 10:54:10 +11:00
Matt-Yorkley
2f7ef33caf Add test for maintaining hub selection after order completion 2022-01-19 22:43:54 +00:00
Matt-Yorkley
0f154de235 Use OrderCompletion in split checkout for #order_completion_reset 2022-01-19 17:51:03 +00:00
Matt-Yorkley
fb8f5ee5ce Increase flexibility in test setup 2022-01-19 17:51:03 +00:00
Matt-Yorkley
49623f6b4a Simplify test setup 2022-01-19 17:51:03 +00:00
Matt-Yorkley
d57e64cf7e Add new order factories for checkout steps 2022-01-19 17:49:05 +00:00
Filipe
2e85783465 Merge pull request #8731 from Matt-Yorkley/split-checkout-default-addresses 
Split checkout: default address saving
 2022-01-19 17:43:51 +00:00
Filipe
7444e2d2f3 Merge pull request #8741 from Matt-Yorkley/guest-checkout-login 
Fix split checkout guest user login
 2022-01-19 16:43:24 +00:00
Filipe
baa3f64839 Merge pull request #8751 from openfoodfoundation/dependabot/bundler/rails-i18n-7.0.1 
Bump rails-i18n from 6.0.0 to 7.0.1
 2022-01-19 15:49:06 +00:00
Transifex-Openfoodnetwork
ec2bb34023 Updating translations for config/locales/ru.yml 2022-01-20 01:30:50 +11:00
Matt-Yorkley
2b960a04c6 Move Order callback entirely into service 2022-01-19 13:40:33 +00:00
Matt-Yorkley
8a944e3e78 Tidy up Order#save_default_addresses 2022-01-19 13:40:33 +00:00
Matt-Yorkley
8f37aa71f2 Save default addresses when requested during checkout 2022-01-19 13:40:33 +00:00
Matt-Yorkley
fb00a51ae8 Merge pull request #8653 from Matt-Yorkley/split-checkout-t-and-c 
Split checkout T&Cs
 2022-01-19 13:39:15 +00:00
Matt-Yorkley
21ed136e00 Enable opening login modal via broadcasted DOM Event 2022-01-19 13:14:10 +00:00
Matt-Yorkley
8ce27bed86 Move guest checkout handling to the frontend 2022-01-19 13:14:10 +00:00
Matt-Yorkley
27c7b16b03 Merge pull request #8748 from openfoodfoundation/dependabot/bundler/ddtrace-0.54.1 
Bump ddtrace from 0.53.0 to 0.54.1
 2022-01-19 09:50:10 +00:00
Maikel
a5b0324f76 Merge pull request #8750 from openfoodfoundation/dependabot/bundler/activerecord-import-1.3.0 
Bump activerecord-import from 1.2.0 to 1.3.0
 2022-01-19 15:13:41 +11:00
Maikel
31341537ff Merge pull request #8749 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.13.2 
Bump rubocop-rails from 2.12.4 to 2.13.2
 2022-01-19 15:12:07 +11:00
Maikel
88be980456 Merge pull request #8746 from openfoodfoundation/dependabot/bundler/stripe-5.42.0 
Bump stripe from 5.39.0 to 5.42.0
 2022-01-19 15:08:24 +11:00
Maikel
273d41fcd8 Merge pull request #8745 from openfoodfoundation/dependabot/bundler/listen-3.7.1 
Bump listen from 3.7.0 to 3.7.1
 2022-01-19 15:07:02 +11:00
Matt-Yorkley
a6408007db Merge pull request #8683 from filipefurtad0/add_specs_split_checkout_1 
Adds additional test coverage on step 1
 2022-01-18 21:12:27 +00:00
Jean-Baptiste Bellet
8455d79f9b Use the last payment method instead of the first for the Payment Method Report 2022-01-18 20:35:08 +01:00
filipefurtad0
9ef8e86e59 Removes xpath within blocks on spec file 2022-01-18 18:09:14 +00:00
filipefurtad0
f250f6dc53 Updates mandatory field error count after merging #8691 2022-01-18 15:12:15 +00:00
filipefurtad0
63ae159091 Changes assertion from URL to page content on spec file 2022-01-18 15:10:31 +00:00
filipefurtad0
3b6bb1c9a8 Removes within blocks; replaces field names by ids 2022-01-18 14:39:24 +00:00
filipefurtad0
ee601bb357 Uses reload to fetch bill/ship address ids 2022-01-18 14:39:24 +00:00
filipefurtad0
25244725e9 Changes assertion from URL to page content 2022-01-18 14:39:24 +00:00
filipefurtad0
ab2d92ab8f Applies helper change on spec file 2022-01-18 14:39:24 +00:00
filipefurtad0
22d9da9edc Changes helper name 2022-01-18 14:39:24 +00:00
filipefurtad0
ec4ec66051 Corrects rubocop offense 2022-01-18 14:39:24 +00:00
filipefurtad0
f3e0799205 Adds DB validation for same ship and bill addresses 2022-01-18 14:39:24 +00:00
filipefurtad0
3ad8e2df4f Adds coverage on mandatory fields - details/billing/shipping 2022-01-18 14:39:24 +00:00
filipefurtad0
0da2d6e469 Adds coverage for required fields - address shipping 2022-01-18 14:39:24 +00:00
filipefurtad0
01f870b818 Adds coverage on ship_address_same_as_billing option 2022-01-18 14:39:24 +00:00
Matt-Yorkley
e1849e5fb6 Merge pull request #8752 from openfoodfoundation/dependabot/bundler/bugsnag-6.24.1 
Bump bugsnag from 6.24.0 to 6.24.1
 2022-01-18 12:09:51 +00:00
jibees
8a3c188f31 Merge pull request #8753 from openfoodfoundation/dependabot/bundler/sidekiq-6.3.1 
Bump sidekiq from 6.2.2 to 6.3.1
 2022-01-18 12:17:20 +01:00
Matt-Yorkley
1f31aed56d Merge pull request #8754 from Matt-Yorkley/json 
Bump json gem back up to 2.6.1
 2022-01-18 10:29:26 +00:00
dependabot[bot]
6884da4f50 Bump sidekiq from 6.2.2 to 6.3.1 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.2.2 to 6.3.1.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.2.2...v6.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 10:26:09 +00:00