SarvarKhalimov
c202c52d8b
Refactor correct_social_url method in enterprise model and its tests
2021-11-22 23:31:56 +05: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
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
