Gaetan Craig-Riou
df0795acf1
Merge pull request #12689 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-8.0.5
...
Bump @hotwired/turbo from 8.0.4 to 8.0.5
2024-08-05 14:36:05 +10:00
Gaetan Craig-Riou
7e1af9e04b
Merge pull request #12723 from johansenja/optimise-shops-page
...
Preload enterprise logos and promo images for /shops page
2024-08-05 13:54:20 +10:00
Gaetan Craig-Riou
4805adec42
Merge pull request #12730 from openfoodfoundation/revert-12665-wb-OFN-12532
...
Revert "Pluralize admin products search result [OFN-12532]"
2024-08-05 10:29:52 +10:00
Filipe
7939bf8038
Revert "Pluralize admin products search result [OFN-12532]"
2024-08-05 10:03:58 +10:00
filipefurtad0
0afbdf157e
Update all locales with the latest Transifex translations
2024-08-02 11:42:59 +01:00
Filipe
5012c52438
Merge pull request #12711 from cillian/wider-item-column-on-invoice-pdf
...
Make Item column wider and tax and quantity columns narrower in invoice PDF
2024-08-02 10:20:24 +01:00
Maikel
615a81c55d
Merge pull request #12728 from mkllnk/flaky-order-cycle-spec
...
Fix flaky spec with fixed order of products
2024-08-02 14:39:42 +10:00
Maikel Linke
99b31d05cb
Fix flaky spec with fixed order of products
2024-08-02 14:26:54 +10:00
Konrad
1a72b5b227
Merge pull request #12563 from abdulazizali77/bugfix/11326-incoming-exchange-per-item-calculator
...
Display only per_item fees for oc incoming exchange #11326
2024-08-02 03:11:27 +02:00
Joseph Johansen
ffe4603f2f
Preload enterprise logos and promo images for shops page
2024-08-01 14:10:53 +01:00
David Cook
1288592d58
Merge pull request #12715 from rioug/add-request-id-log
...
Add request_id to logs for production and staging
2024-08-01 10:01:25 +10:00
David Cook
0836d844a6
Merge pull request #12677 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.1.3
...
Bump trix from 2.1.2 to 2.1.3
2024-08-01 09:49:07 +10:00
David Cook
96355a1ed4
Merge pull request #12719 from dacook/ActivateAdminStyleV3For50PcUsers
...
[BUU] Activate admin_style_v3 for ~50% of users
2024-08-01 09:24:33 +10:00
Filipe
ce44f19b4a
Merge pull request #12704 from cyrillefr/FilteringProductBySupplierPropertyBreaksWhenEnterpriseHasCustomSortingByCategorySet
...
Fixes 422 error due to bad sql building
2024-07-31 19:45:09 +01:00
Filipe
6c214543ad
Merge pull request #12690 from wandji20/wb-OFN-12666
...
Require variant category and supplier when creating new product variants [OFN-12666]
2024-07-31 19:28:31 +01:00
Filipe
8b1713d169
Merge pull request #12665 from wandji20/wb-OFN-12532
...
Pluralize admin products search result [OFN-12532]
2024-07-31 18:55:53 +01:00
David Cook
587ce5ad9d
Activate admin_style_v3 for 50% of users
2024-07-31 16:55:12 +10:00
Rachel Arnould
f51705cb57
Merge pull request #12676 from dacook/add-affiliate_sales_data-connected_app-12550
...
Add "Affiliate Sales Data" connected app option
2024-07-30 16:14:27 +02:00
wandji20
55df9416cc
Add test to check when new variant category and producer is empty [OFN-12666]
2024-07-30 12:09:59 +01:00
wandji20
0376c04ad5
Fix failing specs [OFN-12666]
2024-07-30 12:07:50 +01:00
wandji20
2709479bf2
Require varian t category when creating new product variant [OFN-12666]
2024-07-30 12:07:50 +01:00
David Cook
c5fc621aa4
Use scope to determine which enterprises are ready to be affiliated
2024-07-30 15:21:29 +10:00
Gaetan Craig-Riou
bfd0e7f784
Add request_id to logs for production and staging
...
It will prepend a request unique id to each log lines, it makes it
easier to debug individual request.
2024-07-30 11:38:46 +10:00
David Cook
fece8beef5
Style/Send
2024-07-29 14:13:22 +10:00
David Cook
53e3621e04
Merge pull request #12703 from johansenja/fix-rubocop-style-send
...
Fix rubocop Style/Send group
2024-07-29 14:02:01 +10:00
David Cook
1949839056
Update interpolation variable name
...
This avoids error 'missing interpolation argument'.
2024-07-29 10:41:11 +10:00
Konrad
00a0006ff2
Merge pull request #12691 from ccozkan/use-vertical-transitions-for-cloning-and-deleting
...
Use vertical transitions for cloning and deleting products
2024-07-28 18:25:07 +02:00
Konrad
325f9aa6f3
Merge pull request #12664 from wandji20/wb-OFN-12551
...
Remove SR from clear search button [OFN-12551]
2024-07-28 14:31:08 +02:00
Konrad
95ec5c3c58
Merge pull request #12655 from wandji20/wb-OFN-11513
...
(Fix) [User->New] Language is displayed twice [OFN-11513]
2024-07-28 13:46:51 +02:00
wandji20
ef87cdb167
Revert changes and use selectable locales for helper local_options [OFN-11513]
2024-07-28 12:52:01 +02:00
wandji20
65d4596f3b
Fix failling spec [OFN-11513]
2024-07-28 12:52:01 +02:00
wandji20
a9e295bc11
(Fix) [User->New] Language is displayed twice [OFN-11513]
2024-07-28 12:52:01 +02:00
Abdul Aziz Ali
ac8caf7710
Revert to use .order_cycle_id #11326
2024-07-28 17:57:56 +08:00
Abdul Aziz Ali
8a1e61fd60
Fix incoming_controller_spec. Remove .order_cycle_id usage #11326
2024-07-27 17:54:39 +08:00
Abdul Aziz Ali
baf38b6b30
Only set per_item flag in order_cycle incoming controller #11326
2024-07-27 16:12:26 +08:00
Cillian O'Ruanaidh
3507405dae
Make Item column wider and tax and quantity columns narrower in invoice PDF
2024-07-26 15:36:42 +01:00
Filipe
c25fe6ae57
Merge pull request #12654 from wandji20/wb-OFN-112509
...
Use public contact email at the bottom of order confirmation email [OFN-12509]
2024-07-25 20:14:47 +01:00
Filipe
7bcf3206d8
Merge pull request #12678 from chahmedejaz/bugfix/11640-products-page-broken-URL
...
Fix URL State management on the Products page
2024-07-25 20:00:49 +01:00
David Cook
df81e8ed35
Add task to connect all enterprises
...
Example usage:
rake ofn:enterprises:activate_connected_app_type[affiliate_sales_data]
2024-07-25 21:14:04 +10:00
David Cook
e9d7a0b099
Add User#affiliate_enterprises
2024-07-25 21:14:01 +10:00
David Cook
da7bbcf82f
Enable/disable affiliate sales data
2024-07-25 17:06:13 +10:00
David Cook
1742d2807f
Add affiliate sales data to form
2024-07-25 17:06:13 +10:00
David Cook
d3c5e2365a
Add AffiliateSalesData model
...
Using namespace subfolder to help organise it and show the inheritance.
Hmm, instead of scopes, we could have different has_many relationships on the Enterprise. Maybe it should be in a concern. We can refactor later I guess.
2024-07-25 17:06:13 +10:00
David Cook
27e53f9dcc
Scope spec to section
...
Because there's going to be a new section with the same button label
2024-07-25 17:06:13 +10:00
David Cook
5d0f55b8c3
Re-organise spec
...
Best viewed with whitespac ignored.
2024-07-25 17:06:13 +10:00
David Cook
9d89b4726b
Move connect logic to model
...
Then subtypes can override as needed.
2024-07-25 17:06:13 +10:00
David Cook
9b37eacb8d
add scope for discover_regen
2024-07-25 17:06:13 +10:00
David Cook
bbe22bbfeb
AddTypeToConnectedApps
2024-07-25 17:06:13 +10:00
David Cook
85d5e2ee70
Expect single connected_app record for discover regen
2024-07-25 17:05:42 +10:00
David Cook
9a4051f37b
Move discover regen to named partial
...
To make way for a new type of connected app.
If only we could use [relative partial paths](https://github.com/rails/rails/issues/1143 )
2024-07-25 17:05:42 +10:00
