Commit Graph

23651 Commits

Author SHA1 Message Date
Filipe
e1bd2fc695 Merge pull request #8600 from seballot/shop-filters
Make the shop filter section always visible when scrolling
2021-12-17 09:31:51 +00:00
Filipe
e85101e5ff Merge pull request #8599 from seballot/select
Style all standard select as the text input in the backoffice
2021-12-17 09:25:43 +00:00
Matt-Yorkley
542e3ad1aa Reuse StripeScaPaymentAuthorize in Admin::PaymentsController 2021-12-16 20:42:19 +00:00
Matt-Yorkley
dbe4d61e57 Add explanatory note for "off-session" payment processing 2021-12-16 17:57:53 +00:00
Matt-Yorkley
6b683d600f Break up #call! with some readable comment-methods 2021-12-16 17:22:56 +00:00
Matt-Yorkley
bbdbf387b7 Combine SendAuthorizationEmails and StripeScaPaymentAuthorize 2021-12-16 17:13:16 +00:00
Matt-Yorkley
fb2c0a253b Remove reference to params[:token] in Admin::Orders::CustomerDetailsController
params[:token] and session[:access_token] are only really used in the context of guest users in the customer-facing parts of the app. Here the user should be fully authenticated already to view the page. There aren't any URL that point at this controller which append a token to the params.
2021-12-16 14:02:50 +00:00
Matt-Yorkley
ec3dadfe68 Remove reference to params[:token] in PaymentsController
There seemingly shouldn't be any case where this controller actually receives a token param. There's only one place that creates urls that direct to this controller (Stripe authorization emails), and they do not attach any kind of token to the URL.

If the user is not logged in here (or doesn't have an access_token in their session), they get asked to log in.

Note to future devs: see previous commit for additional context.
2021-12-16 13:41:04 +00:00
Matt-Yorkley
9f49a84e7f Clarify use of access tokens used for viewing order details as a guest user
There are 4 or 5 different places in the app where we reference a :token and params[:token] for completely different purposes (they're not even vaguely the *same* token).

This is an attempt to clarify the places in the app where we use params[:token] in relation to *orders*, for allowing guest users (who are not logged in) to view details of an order they have placed (like after checkout completion), and differentiate it from the various other places where params[:token] can actually be used for something entirely different!
2021-12-16 13:35:55 +00:00
Matt-Yorkley
35e20fc179 Can sort orders via bill_address.lastname
We only need to check the orders sort

Fix ordering in api/v0/orders_controller_spec
2021-12-16 09:33:38 +01:00
Matt-Yorkley
45beefc533 Keep the order of passed argument
Do not retrieve the orders list sorted by completed_at but by the order_ids array itself

Add BulkInvoiceJob spec and cover sorting behaviour
2021-12-16 09:33:38 +01:00
Jean-Baptiste Bellet
7a48ffdd38 Add order.full_name as new column
+ add the linked sortable header via `bill_address_lastname`
2021-12-16 09:26:49 +01:00
Jean-Baptiste Bellet
9c280ee612 add new line 2021-12-16 09:26:49 +01:00
Transifex-Openfoodnetwork
d2b0616a67 Updating translations for config/locales/de_DE.yml 2021-12-16 12:04:37 +11:00
Matt-Yorkley
ef7a02004e Update specs 2021-12-15 21:20:58 +00:00
Matt-Yorkley
b77ff346a3 Replace #raise with #return in Checkout::StripeRedirect
The (potential) unhappy code path here was raising an error which would not be explicitly handled, and would in theory not return a useful message / response.
2021-12-15 21:20:58 +00:00
Matt-Yorkley
0fc4b851f2 Refactor payment gateway redirects handling
The checkout was holding a lot of responsibility for knowing which kinds of payment gateways are available and how to initiate the process of redirecting to the external payment page (if needed). This was being hidden somewhat by the way the logic was tucked away in services.

PaymentMethod objects now know whether or not they require an external payment process, and know how that process should be started and how to build the required URL.

So we can now *ask* any payment method if it requires external payment processing or not, and *tell* it to start the process and return the relevant URL (if needed).
2021-12-15 21:20:58 +00:00
Filipe
fd94f26765 Merge pull request #8557 from Matt-Yorkley/card-brand-formatting
Credit card brand formatting
2021-12-15 20:18:21 +00:00
Filipe
f6385215d3 Merge pull request #8568 from Matt-Yorkley/paypal-controller
Move paypal controller
2021-12-15 18:12:27 +00:00
Transifex-Openfoodnetwork
933492a596 Updating translations for config/locales/en_FR.yml 2021-12-16 03:45:53 +11:00
Transifex-Openfoodnetwork
125e93e38f Updating translations for config/locales/fr.yml 2021-12-16 03:45:18 +11:00
Filipe
c4f4d67fc0 Merge pull request #8503 from jibees/split-checkout-payment-forms
Split checkout payment forms
2021-12-15 12:57:03 +00:00
Jean-Baptiste Bellet
a33ebbdc85 Include and joins after the order seems in order to select fields...
...that are in the order by
2021-12-15 10:11:51 +01:00
Nihal M. Kelanthodika
44c3820a8f Update units when variant unit name is edited 2021-12-15 12:30:10 +05:30
Maikel Linke
0cc4e5728e Reference product attributes for sorting correctly
The previous version failed in some cases as it relied on a table name
generated by Rails.
2021-12-15 15:23:52 +11:00
Matt-Yorkley
6bbcec1186 Merge pull request #8617 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.5
Bump jest from 27.4.4 to 27.4.5
2021-12-14 11:55:46 +00:00
dependabot[bot]
d945c64248 Bump jest from 27.4.4 to 27.4.5
Bumps [jest](https://github.com/facebook/jest) from 27.4.4 to 27.4.5.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.4.4...v27.4.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-14 09:06:31 +00:00
Maikel Linke
bc50a01953 Ensure deterministic query to avoid deadlocks 2021-12-14 11:33:16 +11:00
Maikel Linke
9b6c9bd773 Synchronise processing of proxy orders 2021-12-14 11:33:16 +11:00
Maikel Linke
ce0913758b Bring initial proxy order processing closer
We want to make it one transaction soon.
2021-12-14 11:33:16 +11:00
Maikel Linke
7fdc2fdea2 Spec duplicate subscription order issue #8606 2021-12-14 11:33:16 +11:00
Matt-Yorkley
3800eb0eef Merge pull request #8610 from Matt-Yorkley/user-class
Remove Spree.user_class
2021-12-13 15:52:00 +00:00
Maikel Linke
b7e0d46dad Style Layout/LineLength 2021-12-13 13:56:52 +11:00
Maikel Linke
6aa6506df0 Style/StringConcatenation 2021-12-13 13:52:57 +11:00
Matt-Yorkley
48048e11e7 Improve test coverage around packing report filtering 2021-12-12 13:23:56 +00:00
Matt-Yorkley
aecdfee364 Reorganise :though associations on line_item and allow searching/filtering on product, supplier, order_cycle 2021-12-12 13:23:56 +00:00
Matt-Yorkley
1efaa7e726 Switch search filters from orders to line_items 2021-12-12 13:23:56 +00:00
Matt-Yorkley
e3f9825696 Rename #scoped_orders_relation 2021-12-11 19:04:22 +00:00
filipefurtad0
af548815ae Fixes rubocop warnings 2021-12-11 17:48:09 +00:00
filipefurtad0
67d24373e6 Updates assertion to be Ferrum syntax compliant 2021-12-11 17:40:56 +00:00
filipefurtad0
eb315b42e4 Updates cookie_helper to support Ferrum syntax 2021-12-11 17:39:39 +00:00
filipefurtad0
472cc114c0 Fixes line break assertion in account_spec 2021-12-11 17:03:00 +00:00
Filipe
f7087842b4 Merge pull request #8556 from sinansonmez/8546-include-navigation-only-for-super-admins
Navigation is included only for super admin users
v4.1.11
2021-12-11 16:34:10 +00:00
Matt-Yorkley
1143960ce1 Merge pull request #8607 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.4
Bump jest from 27.4.3 to 27.4.4
2021-12-11 13:04:22 +00:00
Sebastian Castro
e20a8122b1 Make the shop filter section always visible when scrolling 2021-12-10 20:53:47 +01:00
Sebastian Castro
8fe125bd1b Adds thin-scroll-bar class 2021-12-10 20:53:47 +01:00
Matt-Yorkley
6d2521bf5f Remove Spree.user_class
This construct was previously used in Spree to switch out the user class with a dummy class during certain tests. We don't use this any more, so it's just mess.

🔥
2021-12-10 18:18:20 +00:00
filipefurtad0
345b9a181c Updates/moves shops_spec into system 2021-12-10 17:48:01 +00:00
filipefurtad0
0e8cc0f916 Updates/moves producers_spec into system 2021-12-10 17:48:01 +00:00
filipefurtad0
2e313dd5e5 Updates/moves multilingual_spec into system 2021-12-10 17:48:01 +00:00