Kelly
eda97ef3f7
fixed path
2024-04-23 22:18:45 -04:00
kellyzhangg
00742f6f0b
Merge branch 'openfoodfoundation:master' into 8633-payments-controller-test
2024-04-23 22:15:58 -04:00
Kelly
64a1fd9270
removed changes to routes.rb
2024-04-23 22:15:43 -04:00
Kelly
c64519ae2f
rewrote payments_controller_spec to be of request spec format
2024-04-23 12:02:32 -04:00
filipefurtad0
85e3d5d858
Tests payment intents for offline payments
...
Moves let variables outside shared examples block
Re-records cassettes
2024-04-23 12:24:00 +01:00
kellyzhangg
d875ea044d
Merge branch 'openfoodfoundation:master' into 8633-payments-controller-test
2024-04-23 02:41:19 -04:00
Konrad
8e7f4ff908
Merge pull request #12333 from chahmedejaz/bugfix/12294-wrong-tax-category-display
...
[BUU] Fix Wrong Tax Category Display
2024-04-20 11:42:05 +02:00
Rachel Arnould
2090bc1b47
Merge pull request #12361 from dacook/buu/add-turbo
...
[BUU] Add Turbo for dynamic page loading
2024-04-19 11:44:17 +02:00
David Cook
5b043574a2
Merge pull request #12384 from mkllnk/mail-config
...
Don't pass invalid auth method "None" to net-smtp
2024-04-18 16:51:51 +10:00
Maikel
09ece4b35e
Merge pull request #12396 from openfoodfoundation/dependabot/bundler/stripe-11.1.0
...
chore(deps): bump stripe from 11.0.0 to 11.1.0
2024-04-18 08:56:59 +10:00
Maikel Linke
c4e92e7d8f
Update Stripe API recordings for new version
2024-04-18 08:42:18 +10:00
filipefurtad0
574297343f
Sets pending examples for order edit page subsections
2024-04-17 14:27:56 +01:00
David Cook
acc72514de
Fix spec
2024-04-17 15:17:59 +10:00
David Cook
72ce3a01a9
Ensure search terms and filters are retained when saving
2024-04-17 15:17:59 +10:00
kellyzhangg
adad631efa
Merge branch 'openfoodfoundation:master' into 8633-payments-controller-test
2024-04-16 15:34:21 -04:00
Kelly
954125b7f6
style improvements after running rubocop
2024-04-16 15:30:21 -04:00
Kelly
1ad544820c
completed payments_controller_spec testing
2024-04-16 15:21:49 -04:00
Kelly
7d814e739d
added objects necessary for testing - user, order, payment
2024-04-16 15:09:21 -04:00
Kelly
d163080115
added test for if user isn't logged in for payments_controller
2024-04-16 14:52:17 -04:00
Maikel Linke
5cd53e0b5e
Clean up MailSettings spec
...
Best viewed with whitespace ignored.
2024-04-16 16:44:12 +10:00
Maikel Linke
a41019fbff
Simplify SMTP auth method selection
...
Instead of using the auth method name, let's just not supply username
and password when we don't want to authenticate. The two affected
servers AU and CA don't have credentials set anyway. This is compatible.
The specs needed changing though.
2024-04-16 16:40:50 +10:00
Maikel Linke
d6f2a531aa
Don't pass invalid auth method "None" to net-smtp
...
It's our magic word to not pass username and password on.
2024-04-16 16:18:49 +10:00
Gaetan Craig-Riou
5371258125
Merge pull request #12366 from openfoodfoundation/dependabot/bundler/stripe-11.0.0
...
chore(deps): bump stripe from 10.15.0 to 11.0.0
2024-04-16 09:16:49 +10:00
Maikel Linke
d9ec6e2ca3
Wait longer for real Stripe responses
...
When we re-record cassettes, I noticed this spec failing. We may need to
add this parameter to more specs.
2024-04-12 12:34:26 +10:00
Maikel Linke
e5323c8e82
Update Stripe API recordings for new version
2024-04-12 12:27:02 +10:00
filipefurtad0
fd54a12bcb
Moves methods to end of the file
2024-04-11 12:36:47 +01:00
filipefurtad0
f4108e97c7
Improves regression spec after reviewer feedback
...
Removes shared_examples, defines a separate method
Removes pending to bring spec to green
2024-04-11 12:33:10 +01:00
Konrad
27a4202fa4
Merge pull request #12357 from mkllnk/fix-invoice-order
...
Fix: preserve order of invoices in bulk print
2024-04-11 12:47:14 +02:00
Maikel
dc7c5b6748
Merge pull request #12359 from openfoodfoundation/dependabot/bundler/stripe-10.15.0
...
chore(deps): bump stripe from 10.14.0 to 10.15.0
2024-04-11 16:25:04 +10:00
Maikel
082b1f9411
Merge pull request #12300 from mkllnk/checkout-steps
...
Remove unnecessary method checkout_steps
2024-04-11 15:57:45 +10:00
Maikel Linke
2f3b8c8573
Re-record Stripe cassettes
2024-04-11 11:45:14 +10:00
David Cook
3318c2622d
Merge pull request #12352 from cyrillefr/FixRailsWhereEquals
...
Fix rubocop FixRailsWhereEquals
2024-04-11 11:43:03 +10:00
Maikel Linke
c2c7910357
Reset I18n.local for each spec
...
This avoids a locale setting leaking from one spec to another. It also
means that we don't have to reset the locale in individual specs.
Also:
- `cookies` is reset automatically and we don't need to do that.
- Removed some unused code (German number format and helper methods).
2024-04-11 10:14:52 +10:00
Ahmed Ejaz
b2172ef8d8
12332 - Add around block to apply default_locale on specs
2024-04-11 10:14:52 +10:00
Ahmed Ejaz
693b9bd171
12332 - Fix rubocop Rails/I18nLocaleAssignment errors
...
- use I18n.with_locale method rather than direct locale assignment
2024-04-11 10:13:50 +10:00
Filipe
89033579bd
Merge pull request #12328 from dacook/buu/remove-stimulus-reflex
...
[BUU] Remove Stimulus Reflex from Products screen
2024-04-10 21:59:59 +01:00
Konrad
b3dd51d6ac
Merge pull request #12324 from chahmedejaz/task/12314-fix-rubocop-rails-helper-instance-variable
...
Fix Rubocop Rails/HelperInstanceVariable
2024-04-10 20:17:06 +02:00
David Cook
e78ef120f4
TODO
...
I think this case got lost.
2024-04-10 15:17:56 +01:00
David Cook
129ceb01f0
Fix spec
2024-04-10 15:17:56 +01:00
David Cook
fd8be37a62
Use shared page controls on products screen
...
This has an auto submit and can potentially work with Turbo, like on the Orders screen.
2024-04-10 15:17:56 +01:00
David Cook
0fc3d39106
Ensure pagination is retained when saving or discarding
...
But we have more work to do.
2024-04-10 15:17:56 +01:00
David Cook
2c71f7f1ed
Discard changes by reloading the page
...
Now there's a popup asking to confirm, which I think is worth keeping!
2024-04-10 15:17:56 +01:00
David Cook
8696e05e66
Move index and bulk_update actions to good ol' HTTP requests
...
We've found that we just can't rely in StimulusReflex (and the underlying WebSockets stack) to guarantee a response to a request.
Because of this, there was intermittent issues when the server was overloaded with large requests, and the response never arrived, leaving an infinite loader, and a poor user wondering if anything was still happening.
2024-04-10 15:17:56 +01:00
Maikel Linke
3382a62eb5
Simplify BulkInvoiceJob by removing checks
...
The check for invoiceability is already done by the reflex triggering
the job. Let's DRY the code, save time and be more flexible in the
future.
Also checking the order of actually generated PDF pages.
2024-04-10 16:52:56 +10:00
Maikel Linke
48b447500f
Move selection of invoicable orders to database
...
It's more efficient and should allow for further optimisations.
2024-04-10 16:52:56 +10:00
Maikel Linke
16c877f7cb
Fix: preserve order of invoices in bulk print
2024-04-10 14:51:55 +10:00
Maikel Linke
1d8b942acd
Fix spec for invoice ordering
2024-04-10 14:03:25 +10:00
David Cook
ade4e855dc
Merge pull request #12341 from mkllnk/connected-app-url
...
Make URL to connect app translatable
2024-04-10 10:36:49 +10:00
David Cook
d4da684f4a
Merge pull request #12349 from openfoodfoundation/dependabot/bundler/rubocop-1.63.0
...
chore(deps-dev): bump rubocop from 1.62.1 to 1.63.0
2024-04-10 10:32:32 +10:00
cyrillefr
404fcf1f72
Fix FixRailsWhereEquals
...
- fixes offenses caused by RuboCop::Cop::Rails::WhereEquals cop
2024-04-09 10:44:02 +02:00
