Gaetan Craig-Riou
c6fab57827
Remove Module from spec and some stylying
...
Also remove unnecessary use of `__send__`
2025-02-19 15:11:24 +11:00
David Cook
859a20b7a7
Ensure both email formats contain url
2025-02-19 14:20:28 +11:00
Maikel Linke
691e988fbb
Fix Roadie dev config to inline CSS in emails
...
Roadie doesn't work with asset host:
* https://github.com/Mange/roadie-rails?tab=readme-ov-file#known-issues
And we don't need it.
2025-02-19 13:29:34 +11:00
Ahmed Ejaz
216348d361
fix base urls for assets in development
2025-02-19 05:09:19 +05:00
David Cook
96b8a4c068
Merge pull request #13134 from dacook/fix-locale-12301
...
Update label and change default dev locale
2025-02-19 09:38:14 +11:00
Ahmed Ejaz
d0650fdab0
Fix ABC size rubocop issue
2025-02-19 02:20:33 +05:00
Konrad
29c3ef3f5e
Merge pull request #13154 from mkllnk/flaky-line-items
...
Fix order of line item based report rows
2025-02-18 15:28:02 +01:00
Ahmed Ejaz
1611b2a31f
Add shipping method and shipment state to packing reports
2025-02-18 12:42:34 +05:00
Maikel Linke
699db02098
Remove enterprise id from DFC product group URL
...
A Spree::Product represented as product group is not directly associated
to an enterprise. In theory, it could have multiple enterprises through
its variants. So we better don't include the id in the URL.
```
-http://test.host/api/dfc/enterprises/10000/product_groups/90000
+http://test.host/api/dfc/product_groups/90000
```
This makes it simpler as well.
2025-02-18 16:19:27 +11:00
David Cook
664119ddcf
Update test for multi-part email
...
Now that it's a multi-part email, we have to select the html part for the test.
Another option is to simply check mail.to_s, but this also includes mail headers so doesn't specifically test the body.
2025-02-18 16:15:04 +11:00
David Cook
c9f5dd2d0b
Refactor: rename subject to be consistent
...
Hmm, in different specs it gets called 'mail', 'email', 'message'. The object is a Mail::Message object. The method to generate the object is called `mail`, so I went with that.
2025-02-18 16:07:22 +11:00
Gaetan Craig-Riou
0ae855047d
Fix User controlled method execution
...
Add white list for the fire endpoint to limit which action can be taken.
Add specs for fire endpoint
2025-02-18 14:42:26 +11:00
Gaetan Craig-Riou
e386640b57
Add missing translation
2025-02-18 14:41:43 +11:00
Maikel Linke
5d495b94b3
Use product group attributes for Spree::Product updates
2025-02-18 13:08:49 +11:00
Maikel Linke
11a1d4e09e
Reduce complexity of controller
2025-02-18 13:08:49 +11:00
Maikel Linke
3d435ae781
Include product group objects in our catalog response
...
And when we import a catalog, we don't try to import those product
groups as Spree::Variant. We just see them as reference to
Spree::Product.
2025-02-18 13:08:49 +11:00
Maikel Linke
fba7c24ebd
Product group can be present or just linked
2025-02-18 13:08:49 +11:00
Maikel Linke
516759062f
Import variants for the same product group
...
When importing another catalog, it's probably referring to external
product groups. Storing the external link allows us to group several
variants and replicate the same structure within OFN.
2025-02-18 13:08:48 +11:00
Maikel Linke
c1e0c6ed34
Import variants for existing products via new DFC attribute
2025-02-18 13:08:48 +11:00
Maikel Linke
fbdc6c9bd0
Split growing supplied product builder
2025-02-18 13:08:46 +11:00
Maikel Linke
2043d1f8df
Remove custom syntactical sugar
...
It just makes Rswag specs look more different to other request specs and
I found that discouraging. It's good to know that the parameter is just
specified with `let` and that it works exactly in the same way as `let`
in other specs.
The downside is maybe that it's not obvious that those `let` statements
have to correspond with the parameters for the request but error
messages will tell you if you got it wrong. And there's also the
`parameter` declaration to make that clear.
2025-02-18 12:58:10 +11:00
Maikel Linke
6707516203
Automatically document responses for DFC API w/o tag
2025-02-18 12:58:10 +11:00
Maikel Linke
42b6ecbf31
Move rswag specifc config to rswag helper
2025-02-18 12:58:09 +11:00
Maikel Linke
d39da6d0da
Provide endpoint to show a product group
...
Our Spree::Product corresponds to a DFC SuppliedProduct with variants.
2025-02-18 12:58:09 +11:00
Maikel Linke
35d7bf7a3b
Add dfc-b:isVariantOf to supplied products
2025-02-18 12:58:09 +11:00
Maikel Linke
61b54e922a
Remove impossible error rescue
...
This block got duplicated in a previous PR.
2025-02-18 12:20:01 +11:00
Maikel Linke
4027ce0c05
Style links within flash errors
...
The default aqua link colour looked aweful on orange/red background. I
tried a few different standard colours but couldn't get it right. So I
reverted to the web standard link style: underline. That's looks pretty
good. I personally think that we should use the more for links.
2025-02-18 12:15:17 +11:00
Maikel Linke
ffe4084b7f
Link to OIDC settings from error message
...
The colour of the link is really bad though.
2025-02-18 12:15:13 +11:00
Maikel Linke
bb503e12a3
Direct people to refresh OIDC connection
...
Not the best UX but the easiest next step to implement. Next we should:
* Include link in error message instead of redirecting straight there.
Otherwise users may feel disoriented.
* Provide a custom error message?
2025-02-18 12:14:12 +11:00
Maikel Linke
00a2894e93
Clear invalid OIDC tokens
2025-02-18 11:48:17 +11:00
Gaetan Craig-Riou
29032a913c
Merge pull request #13162 from mkllnk/script-rails
...
Delete old, unused script/rails
2025-02-18 11:01:43 +11:00
Gaetan Craig-Riou
db0547543e
Use the new OutOfStockModalComponent
...
It will now redirect to the shop page if the out of stock check results
in an empty order
2025-02-18 10:47:10 +11:00
Gaetan Craig-Riou
4a2f22e56d
Add OutOfStockModalComponent
...
It encapsulate the logic for the out of stock modal
2025-02-18 10:47:03 +11:00
David Cook
11ee6a3ef5
Merge pull request #13158 from drummer83/test_email
...
Quick beautification of test email
2025-02-17 17:07:20 +11:00
Gaetan Craig-Riou
9d59f87b30
Dispatch "closing" event when closing modal
...
This allow for any other controller to trigger an action when the modal
is closed
2025-02-17 16:50:49 +11:00
Gaetan Craig-Riou
4a63efd342
Remove redundant ||
2025-02-17 16:50:18 +11:00
Maikel Linke
ef98e4e384
Delete old, unused script
2025-02-17 12:25:59 +11:00
Gaetan Craig-Riou
4b33951fa0
Merge pull request #13155 from openfoodfoundation/dependabot/npm_and_yarn/dompurify-3.2.4
...
chore(deps): bump dompurify from 3.2.3 to 3.2.4
2025-02-17 12:02:37 +11:00
Gaetan Craig-Riou
a8b375f3de
Merge pull request #13152 from openfoodfoundation/dependabot/npm_and_yarn/elliptic-6.6.1
...
chore(deps): bump elliptic from 6.6.0 to 6.6.1
2025-02-17 11:58:24 +11:00
David Cook
3a57623b5d
Merge pull request #13146 from mkllnk/dfc-connector
...
Bump datafoodconsortium-connector to support product variants
2025-02-17 11:13:57 +11:00
drummer83
e98fa485b5
Quick beautification of test email
2025-02-16 19:50:18 +01:00
drummer83
4dc0f0e5be
Create styled email for reset password instructions
2025-02-16 19:12:56 +01:00
drummer83
94f58d2f5e
Adjust margin-top for checkboxes on the report pages
...
Apply it only to the checkboxes on the report pages, not to one on the orders page.
2025-02-16 17:42:43 +01:00
drummer83
5651687a25
Align input fields correctly on orders page
...
The margin-top is not needed here. It will be added where needed in a separate commit.
2025-02-16 17:35:58 +01:00
dependabot[bot]
5fd826a954
chore(deps): bump dompurify from 3.2.3 to 3.2.4
...
Bumps [dompurify](https://github.com/cure53/DOMPurify ) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/cure53/DOMPurify/releases )
- [Commits](https://github.com/cure53/DOMPurify/compare/3.2.3...3.2.4 )
---
updated-dependencies:
- dependency-name: dompurify
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-02-14 21:15:09 +00:00
Maikel Linke
1e34237b22
Fix order of line item based report rows
...
The orders_and_fulfillment_spec would sometimes fail when the database
would return line items in a different order than they were created.
Without specific `order` clause the order of rows can be random.
The additional sorting may lead to more server load but also ensures
more consistent results for users.
2025-02-14 16:41:43 +11:00
filipefurtad0
bf62d16ca5
Update all locales with the latest Transifex translations
2025-02-13 22:43:05 -06:00
Filipe
e7ef5984d5
Merge pull request #13125 from dacook/dfc-product-import-list-12301
...
[DFC Orders] List products to import on screen
2025-02-13 22:34:32 -06:00
Filipe
00dd555715
Merge pull request #13131 from krisztin/12846-Back-office-form-border-update-for-contrast
...
Updating form field borders for better contrast
2025-02-13 22:21:39 -06:00
Filipe
dfe978520d
Merge pull request #13115 from dacook/oidc-record-not-unique
...
Catch error and provide message
2025-02-13 21:53:56 -06:00
