raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-15 04:14:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,850 Commits 16 Branches 457 Tags
8b047cd449987ba4cfbf84dcccdb3729bb5839ce
Commit Graph

23850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
SarvarKhalimov
f8c45b3e31 Update app/models/enterprise.rb - optimise delete @ method 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-11-15 13:21:19 +11:00
SarvarKhalimov
6f9fc9f06c Add a new rspec test and optimize existing for correct_social_url 2021-11-15 13:21:04 +11:00
SarvarKhalimov
5d2a5e63ec Fix the issue with 'at' in interprise twitter and insgram 2021-11-15 13:21:04 +11:00
Matt-Yorkley
ac5766b00b Report current order info on all checkout failures 2021-11-14 20:01:32 +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
Matt-Yorkley
f83d0a766f Memoize Checkout#valid_payment_intent_provided? 2021-11-14 14:24:23 +00:00
Matt-Yorkley
bbb47964db Notify Bugsnag if the order loaded at checkout is invalid after being redirected back from Stripe during payment processing. 2021-11-14 13:58:15 +00:00
Matt-Yorkley
1bf4e6fa56 Reorder conditions for performance 
A little micro-optimisation: `@order.checkout_allowed?` requires a database query, whereas `@order.completed?` does not. So in cases where the order is completed we can return early here before hitting the database.
 2021-11-14 13:58:15 +00:00
Matt-Yorkley
8d0cbe886a Rename method for clarity 2021-11-14 13:58:15 +00:00
Matt-Yorkley
48acc0ecd0 Add Bugsnag notice when an OC closes during checkout completion 
This info could be useful to know whilst debugging order completion issues.
 2021-11-14 13:58:15 +00:00
Matt-Yorkley
d0f572b051 Remove dead code: session[:guest_token] 
This `session[:guest_token]` doesn't seem to ever be assigned anywhere in the codebase, and it doesn't seem to be read at any point either..? There are some various places where `current_order.token` is used and `session[:access_token]` is used, but not this.

As far as I can tell: it was part of an old version of Spree and related to the spree_auth_devise gem (which we no longer use).
 2021-11-14 12:02:07 +00:00
Matt-Yorkley
00862844d5 Memoize Checkout#valid_payment_intent_provided? 2021-11-14 11:39:36 +00:00
Jean-Baptiste Bellet
3df304c9d6 Search and match through name + city and state_name 
- Rename enterpriseMatchesNameQueryFilter as well to enterpriseMatchesQueryFilter
 - Update tests as well
 2021-11-12 15:57:28 +01:00
Matt-Yorkley
0a22a3baa6 Merge pull request #8478 from Matt-Yorkley/split-admin-system-tests 
Split admin system tests into two groups
 2021-11-12 10:20:46 +00:00
Jean-Baptiste Bellet
fff2c3ae74 Update spec to take into account the non-duplication of product in inventory 2021-11-12 10:55:47 +01:00
Maikel Linke
4c4691adbb Update translations 2021-11-12 14:48:30 +11:00
Maikel
28b8b9cc55 Merge pull request #8460 from openfoodfoundation/transifex 
Transifex
 2021-11-12 14:38:45 +11:00
Maikel Linke
6212ad18a8 Test for concurrent checkouts reliably 
Apparently, controller specs are not thread safe and we got random test
failures. I converted it into a request spec and fine-tuned it to make
it more reliable.
 2021-11-12 14:09:17 +11:00
Matt-Yorkley
f3d22ba777 Merge pull request #8439 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.6.0 
Bump mrujs from 0.5.11 to 0.6.0
 2021-11-11 16:29:33 +00:00
Matt-Yorkley
6635b59250 Split admin system tests into two groups 2021-11-11 14:49:03 +00:00
Matt-Yorkley
0d8d4db41f Fix keyword args deprecations 
/home/runner/work/openfoodnetwork/openfoodnetwork/lib/spree/core/delegate_belongs_to.rb:75: warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call

/home/runner/work/openfoodnetwork/openfoodnetwork/lib/spree/i18n.rb:20: warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call
 2021-11-11 14:16:37 +00:00
Matt-Yorkley
b1c1284c18 Merge pull request #8450 from filipefurtad0/admin_into_system_3 
Moves/Updates admin into system (cont. III)
 2021-11-11 14:05:19 +00:00
Matt-Yorkley
0683941f88 Ensure line items are correctly scoped for producers 2021-11-11 13:11:19 +00:00
Jean-Baptiste Bellet
7041ec71a4 Translate some error messages during payment processing if exists 
- Stripe error messages aren't translated. But, Stripe send the error code. Use it (if found it, and translation key does exist) to translated the error message
 - Populate the en.yml file with some of the most known errors

Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2021-11-11 12:04:38 +01:00
Matt-Yorkley
fa4751b998 Include items from resumed orders when mailing producers 2021-11-10 15:09:24 +00:00
Jean-Baptiste Bellet
d2dbe6c738 Use distinct to return unique product 
- Product were displayed twice (or more) in certain condition under order cycle incoming products admin interface
 2021-11-10 14:49:19 +01:00
Maikel
d799f446be Merge pull request #8466 from filipefurtad0/admin_into_system_v 
Moves/updates missing admin feature specs into system (cont.)
 2021-11-10 11:30:11 +11:00
Maikel
6cc194a10b Merge pull request #8464 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.8 
Bump karma from 6.3.7 to 6.3.8
 2021-11-10 11:24:56 +11:00
jibees
7bbb68e0c2 Merge pull request #8462 from filipefurtad0/admin_into_features_iv 
Moves/updates subscriptions_spec into system
 2021-11-09 14:56:36 +01:00
filipefurtad0
901d1cbc44 Moves/updates variants_spec into system 2021-11-08 19:15:37 +00:00
filipefurtad0
42992e63a5 Moves/updates users_spec into system 2021-11-08 16:46:41 +00:00
filipefurtad0
05393351f6 Moves/updates unit_price_spec into system 2021-11-08 16:45:32 +00:00
filipefurtad0
7e0d24c784 Moves/updates tax_settings into system 2021-11-08 16:33:25 +00:00
Jean-Baptiste Bellet
6266c3c5ae User can delete relationship between enterprises in both direction 
A permits B
B permits A

Manager for A and B enterprises can delete the two relations.

Update specs as well
 2021-11-08 14:21:42 +01:00
Transifex-Openfoodnetwork
bb23be0909 Updating translations for config/locales/en_GB.yml 2021-11-08 22:02:14 +11:00
dependabot[bot]
de6ebc361a Bump karma from 6.3.7 to 6.3.8 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.7 to 6.3.8.
- [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.7...v6.3.8)

---
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-08 09:07:47 +00:00
filipefurtad0
d646b29573 Comments out drag_to block - not implemented in Cuprite 2021-11-06 19:23:36 +00:00
filipefurtad0
fa4a2dbab4 Moves/updates tag_rules into system 2021-11-06 19:18:42 +00:00
filipefurtad0
151ff59d1b Moves/updates subscriptions_spec into system 2021-11-06 17:11:14 +00:00
Guido Oliveira
db45d7f4eb Cancel empty orders on BOM page 2021-11-06 10:25:34 -03:00
filipefurtad0
6a33ad44f0 Fixes failing example on enterprises spec 2021-11-06 12:33:04 +00:00