Commit Graph

17582 Commits

Author SHA1 Message Date
Ashish Gaur
b98552003c 13220 Add Product name in Order LineItem and update it during order creation
13220 Fixes affiliate sales spec

13220 Use before_create to update product name

13220 Fixes rubocop warnings

13220 Update product_name in line_item in specs

13220 Fix before_create lint

13220 Add spec for checking product_name is not set in reports

13220 Fixes rubocop issue

13220 Add migrations for updating the existing line items

13220 Fixing lint issues

13220 Set product_name in line_item before doing validation

13220 Fix linter issues

13220 Fixes spec

13220 Fixes linter issues

13220 Review comments

13220 Review comments

13220 Add default product name

13220 Use product_name instead of variant product name when using line item

13220 Fix specs

13220 Revert change in affiliate_sales_data_spec

CL-13220 Store variant name in line_item

13220 Default variant name to original variant's full name for line_items

13220 Add missing frozen string literal

13220 Add spec for full_variant_name

13220 Remove UpdateProductNameInLineItems and AddNotNullToProductNameInLineItems migrations

13220 Remove presence validation for product_name

13220 Use full_product_name which defaults to variant product name if empty
2026-02-06 12:17:03 +11:00
Sigmund Petersen
f8c88ea8c7 Merge pull request #13859 from rioug/10298-upgrade-to-shakapaker_v8
Upgrade to shakapaker v8
2026-02-04 12:51:42 +01:00
Maikel
4ba55c4067 Merge pull request #13898 from dacook/js-error-handler
Fix function call
2026-02-04 12:44:41 +11:00
Maikel
813249bad7 Merge pull request #13897 from arunguleria/13893-products-table-layout-changes
13893-hiding too many columns in Admin product list, the table layout breaks
2026-02-04 12:42:17 +11:00
Maikel
79af9efd29 Merge pull request #13857 from rioug/10298-remove-rails-sass
Remove rails-sass dependency
2026-02-04 09:55:29 +11:00
Rachel Arnould
b731f9b9e4 Merge pull request #12997 from wandji20/wb-OFN-12794-user
Remove Cable Ready responses from User related controllers
2026-02-03 15:51:11 +01:00
David Cook
876d37d19a Fix function call
This function got renamed in 01d5830480, but this call got missed.

I would like to add a spec to cover this, but am not sure exactly how to set it up right now.
I also notice that usage occurs after the preventDefault, and one before. I'm not sure if that matters. I have myself to blame for that inconsistency 🤦
2026-02-02 17:08:24 +11:00
Arun Guleria
36d617bceb 13893-hiding too many columns in Admin product list, the table layout breaks 2026-02-02 10:47:02 +05:30
Maikel Linke
c115ab7a0d Translate Taler payment status to error message 2026-01-29 15:07:28 +11:00
Maikel Linke
d748972fca Resolve flaky spec with defined order 2026-01-29 15:07:28 +11:00
Maikel Linke
b9c7925008 Complete Taler payment success scenario 2026-01-29 15:07:28 +11:00
Maikel Linke
c11b93a4dc Demo Taler flow without validating payment yet 2026-01-29 15:07:28 +11:00
Maikel Linke
61e0688392 Demonstrate retrieving the payment Taler URL 2026-01-29 15:07:27 +11:00
Maikel Linke
b3a1d1269a Add Taler as payment method
It doesn't take payments yet but can be selected during checkout.
2026-01-29 15:07:27 +11:00
Rachel Arnould
2a3b076170 Merge pull request #13826 from chahmedejaz/task/13744-add-none-option-in-tags-filter
Allow to select "none" in variant tags dropdown
2026-01-26 22:29:59 +01:00
Gaetan Craig-Riou
e6d556c809 Update locale cache key to invalidate cache 2026-01-26 14:56:10 +11:00
Gaetan Craig-Riou
cc9cb966b5 Fix images/font path
Now `additional_paths` are stripped like `source_path`
2026-01-26 14:54:48 +11:00
Gaetan Craig-Riou
9a90e46b78 Move mail css back to be managed by wepack
It wil allow us to remove dependency on `rails-sass`, and `sass` which
are not maintained anymore.
More or less revert this PR: https://github.com/openfoodfoundation/openfoodnetwork/pull/12743
2026-01-26 14:50:31 +11:00
Maikel
7bfe51d067 Merge pull request #13849 from rioug/10298-upgrade-to-shakapaker_v7
Upgrade to shakapaker v7
2026-01-26 11:14:31 +11:00
Rachel Arnould
2a7e8816c0 Merge pull request #13834 from mkllnk/pay-methods
Simplify code listing available payment method types
2026-01-23 22:52:29 +01:00
Gaetan Craig-Riou
988f903164 Update locale cache key to invalidate cache 2026-01-23 16:23:14 +01:00
Gaetan Craig-Riou
a0c23825b8 Top level dir is not stripped anymore for static assets 2026-01-23 16:23:14 +01:00
David Cook
1e2b8bad3f Fix linter error 2026-01-22 12:32:12 +11:00
David Cook
88a0737916 Return correct http code for bad login params
This tells our generic ajax (Turbo) error handling to ignore the error and let the application display the response as usual.
2026-01-22 12:26:24 +11:00
wandji20
f5823bd618 Refactor to render turbo responses inline 2026-01-22 12:06:56 +11:00
wandji20
d9453979b1 Small improvements 2026-01-22 12:06:56 +11:00
wandji20
2cde74b91a Handle user confirmation with turbo stream 2026-01-22 12:06:56 +11:00
wandji20
3fd007fa3d Handle user password with turbo stream 2026-01-22 12:06:56 +11:00
wandji20
e3431c7954 Handle user sessions with turbo stream 2026-01-22 12:06:56 +11:00
wandji20
9fa715c709 Handle user registration with turbo stream 2026-01-22 12:06:56 +11:00
Gaetan Craig-Riou
dd5db396b4 Merge pull request #13828 from rioug/10298-upgrade-to-shakapaker
Upgrade to shakapaker
2026-01-21 16:17:50 +11:00
Gaetan Craig-Riou
315d52961a Add "v1" to locale cache key
This is to invalidate existing locale cache key, so it will pick up
image path changes in cached fragment with locale
2026-01-21 14:29:46 +11:00
David Cook
c0bcf177e7 Merge pull request #13861 from mkllnk/bump-ruby
Bump Ruby from 3.3.10 to 3.4.8
2026-01-20 16:34:31 +11:00
Maikel Linke
bac123f223 Remove unused switch to allow checkout on failures
The inherited payment logic is complicated enough. Removing this dead
code makes it slightly simpler.
2026-01-19 14:35:54 +11:00
Maikel Linke
fdc775ae6d Style arguments forwarding 2026-01-19 10:55:24 +11:00
David Cook
feed223ab4 Merge pull request #13528 from dacook/vine-expiry-message-13495
[VINE] Show helpful message if voucher expired
2026-01-19 09:20:18 +11:00
Gaetan Craig-Riou
82f6484031 Add comment explaning why defer loading is disabled 2026-01-16 12:30:57 +11:00
Gaetan Craig-Riou
82f40d2e93 Merge pull request #13821 from piyyu/fix-import-multiple-products
Fix “Import multiple products” button route on empty products page
2026-01-16 09:55:33 +11:00
Ahmed Ejaz
e8e48f7c64 use double quotes for the string value 2026-01-13 12:59:28 +05:00
David Cook
26702e6f0d Remove unused file
Low-hanging fruit 🍇
2026-01-13 14:59:26 +11:00
Gaetan Craig-Riou
a934b60f67 Make sure shipping modal gets closed
Also check the modal is not showing instead of checking it's hidden
2026-01-13 14:34:50 +11:00
Ahmed Ejaz
fd3c1c1343 Add "None" option to tags filter in product search 2026-01-13 02:13:51 +05:00
David Cook
368da19993 Display more specific invalid_voucher message to customer
It was implemented with error code  409 in https://github.com/openfoodfoundation/vine/pull/112
2026-01-12 17:14:57 +11:00
David Cook
419f4490d6 Recognise certain voucher errors
I considered using the vine error message as the translation key (ie I18n.t(vine_voucher_validator_service.errors.#{message.parameterize.underscore}), but thought it might be more predictable to have keys explicitly defined and whitelisted like this.

These error message are still squashed by the controller, we'll deal with that next.
2026-01-12 16:25:57 +11:00
Gaetan Craig-Riou
39245d55e2 Turn defer off when loading javascript script
It seems that we have functionality that depends on the order the
scripts are executed. Using defer breaks that.
Using defer is better performance wise so we should try to address this
eventually, might need to wait till we get rid of angular.
2026-01-12 15:56:03 +11:00
Maikel Linke
f3c60148c1 Simplify filtering of Stripe 2026-01-09 16:54:25 +11:00
Maikel Linke
2e08c9c44e Simplify with defined order of payment methods 2026-01-09 16:54:21 +11:00
Maikel Linke
93f2af7e7d Lazy load payment method classes
This avoids any class reloading issues in dev, simplifies most of the
code path and opens up for refactoring.

The only reason we still load the class is to call `clean_name` on it
for the translation key. We can probably do better.
2026-01-09 16:54:02 +11:00
Maikel Linke
cb7a4b67ce Replace custom lookup with default Rails feature
Rails renders an error when you try to supply an invalid value. Our code
is safe without an allow-list and the UX doesn't allow you to select an
invalid value.
2026-01-09 16:53:06 +11:00
Maikel Linke
41a8d06326 Remove duplicate definition of payment providers 2026-01-09 15:16:36 +11:00