raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,628 Commits 18 Branches 452 Tags
87da55abb71cfe30fdbbdb99b57f823fbb8ece38
Commit Graph

22628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
87da55abb7 Bump mrujs from 0.6.0 to 0.7.1 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.6.0 to 0.7.1.
- [Release notes](https://github.com/ParamagicDev/mrujs/releases)
- [Changelog](https://github.com/ParamagicDev/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParamagicDev/mrujs/compare/v0.6.0...v0.7.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-29 09:08:30 +00:00
Jean-Baptiste Bellet
7ef976a52a Update all locales with the latest Transifex translations v4.1.9 2021-11-25 13:47:09 +01:00
jibees
fed893eba8 Merge pull request #8504 from openfoodfoundation/transifex 
Transifex
 2021-11-25 13:43:21 +01:00
jibees
b39d3bb7de Merge pull request #8492 from shveikus/8479-tab-behaviour-for-login-modal 
Update TAB behavior for the login modal
 2021-11-25 13:42:25 +01:00
jibees
76176b2482 Merge pull request #8498 from drummer83/drummer83-country_first 
Switch the order of 'state' and 'country' input fields
 2021-11-25 13:41:46 +01:00
jibees
439f4ad24c Merge pull request #8497 from drummer83/drummer83-localize_button 
Place the localize button above the map/below the address
 2021-11-25 13:41:19 +01:00
Nihal M. Kelanthodika
74b87adee3 Merge pull request #8500 from apricot12/8495-Variant-unit-name-shopfront 2021-11-25 16:06:06 +05:30
jibees
2f3d2952d0 Merge pull request #8510 from openfoodfoundation/release-task 
Add more detail to the release task template
 2021-11-25 09:19:20 +01:00
Maikel
6ff7acd496 Merge pull request #8508 from openfoodfoundation/mkllnk-rails-tutorials-link 
Direct beginners to Rails tutorials
 2021-11-25 16:51:49 +11:00
Transifex-Openfoodnetwork
d3131d6e23 Updating translations for config/locales/de_DE.yml 2021-11-25 10:04:12 +11:00
Transifex-Openfoodnetwork
ce69dbd016 Updating translations for config/locales/ru.yml 2021-11-25 07:39:36 +11:00
Nihal M. Kelanthodika
aefb580023 Update unit_to_display spec 2021-11-23 12:59:42 +05:30
Maikel Linke
1da9dbc53e Add more detail to the release task 
New developers need a bit more guidance. And it's actually quite handy
for me, too.

We may want to remove duplication between this document and the wiki.
 2021-11-23 17:21:37 +11:00
Maikel
5f87c30d3e Merge pull request #8465 from jibees/7963-permission-to-delete-relationship-both-ways 
Manager can delete enterprises relationship in both direction
 2021-11-23 09:20:32 +11:00
shveikus
9e75e0e65c Add spec for logging using keyboard 2021-11-22 23:40:22 +03:00
Dmitry Shveikus
9bd604cbe9 Update TAB behaviour for login modal 2021-11-22 23:40:22 +03:00
Maikel
a3dd14906f Direct beginners to Rails tutorials 2021-11-22 17:56:20 +11:00
Transifex-Openfoodnetwork
ba5555a522 Updating translations for config/locales/nb.yml 2021-11-20 00:51:04 +11:00
Nihal M. Kelanthodika
8a42043701 Fixed inconsistency with display of unit name for products sold by item 2021-11-19 13:39:42 +05:30
Maikel
3b082beaab Merge pull request #8493 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.9 
Bump karma from 6.3.8 to 6.3.9
 2021-11-19 16:14:23 +11:00
Maikel Linke
f89263f060 Update translations 2021-11-19 15:43:52 +11:00
Maikel
e2013a9eb9 Merge pull request #8491 from openfoodfoundation/transifex 
Transifex
 2021-11-19 14:31:00 +11:00
Matt-Yorkley
40e67c3907 Merge pull request #8105 from andrewpbrett/void-extra-outstanding-payments 
Void payments requiring auth upon marking order paid
 2021-11-18 16:52:40 +00:00
Matt-Yorkley
bc5c9ff8e2 Merge pull request #8472 from Matt-Yorkley/notify-resumed 
Include items from resumed orders when mailing producers
 2021-11-18 15:20:08 +00:00
Matt-Yorkley
527a53bd0f Merge pull request #8485 from Matt-Yorkley/stripe-addresses 
Checkout address handling
 2021-11-18 15:19:27 +00:00
Maikel
c208700c77 Merge pull request #8070 from jibees/8065-add-tests-to-split-checkout 
Add tests to split checkout
 2021-11-18 11:17:17 +11:00
Konrad
60d1305b0a Add files via upload 2021-11-18 00:28:49 +01:00
Konrad
87b3b6fa36 Add files via upload 2021-11-18 00:23:05 +01:00
Matt-Yorkley
378d3d5ab6 Merge pull request #8476 from Matt-Yorkley/reports-producers-visibility 
Ensure line items are correctly scoped for producers
 2021-11-17 15:07:37 +00:00
dependabot[bot]
be92b8aff8 Bump karma from 6.3.8 to 6.3.9 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.8 to 6.3.9.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.8...v6.3.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-17 09:05:15 +00:00
Matt-Yorkley
8d5dbb1f47 Remove/simplify setup objects and improve old shipping method names 2021-11-17 09:47:13 +01:00
Matt-Yorkley
f3dc1c80cf Update error field counts 2021-11-17 09:47:13 +01:00
Matt-Yorkley
ac317bc3ce Fix Flipper stubs 2021-11-17 09:47:13 +01:00
Matt-Yorkley
1089ded2a2 Move spec under /consumer 2021-11-17 09:47:13 +01:00
Jean-Baptiste Bellet
04ba570875 Add split checkout system test 2021-11-17 09:47:13 +01:00
Jean-Baptiste Bellet
3185033dea Generate id and for on label and input when using rails helper 2021-11-17 09:47:13 +01:00
Maikel
c3076f0316 Merge pull request #8447 from Matt-Yorkley/keyword-args-deprecation 
Fix keyword args deprecations
 2021-11-17 17:09:15 +11:00
Maikel
c5c09dbcf8 Merge pull request #8483 from Matt-Yorkley/guest-token 
Remove dead code: session[:guest_token]
 2021-11-17 17:07:00 +11:00
Maikel
917ca7b0cf Merge pull request #8481 from mkllnk/8474-concurrency-spec 
Test for concurrent checkouts reliably
 2021-11-17 12:26:07 +11:00
Matt-Yorkley
b1c0da9675 Bang! 2021-11-16 17:32:10 +00:00
Transifex-Openfoodnetwork
14eff4adb6 Updating translations for config/locales/en_FR.yml 2021-11-17 03:25:35 +11:00
Transifex-Openfoodnetwork
fa6ce98b71 Updating translations for config/locales/fr.yml 2021-11-17 03:24:15 +11:00
Matt-Yorkley
0efa370211 Merge pull request #8405 from jibees/7961-translate-stripe-error-message 
Translate stripe error messages during payment processing
 2021-11-16 11:49:12 +00:00
Matt-Yorkley
3e02023bf8 Move handling of unused payments to Order::Updater 
An order can be set to paid in various cases that are unrelated to the order being finalized, so this bit of logic needs to be called at the point the order actually gets paid.
 2021-11-15 15:42:04 +00:00
Andy Brett
0b3d78b2a5 void transactions in memory instead of fetching from db 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-11-15 15:42:04 +00:00
Andy Brett
48a867ac99 expect specific payment to receive message 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-11-15 15:42:04 +00:00
Andy Brett
0ef07023ad remove any_instance_of in order_spec 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-11-15 15:42:04 +00:00
Andy Brett
60677bce4f void payments requiring auth upon marking order paid 2021-11-15 15:42:04 +00:00
Matt-Yorkley
b388196ce3 Merge pull request #8471 from jibees/7885-duplicate-product-in-order-cycle 
Use distinct to return unique product list for scope `visible_for`
 2021-11-15 10:05:11 +00:00
Matt-Yorkley
f8349434bf Skip address setup logic if we're coming from Stripe 
The code here runs from a callback which was originally designed to make sure the checkout page was set up correctly in the "normal" checkout workflow. It wasn't really designed to be run when the page is being loaded a second time due to the user being redirected back from Stripe (with SCA). The things it's doing here are necessary in the former case, but a really bad idea in the latter (potentially messing up the order's ship and bill addresses in certain cases like guest checkout).
 2021-11-14 16:54:44 +00:00