Konrad
ecfa47cd78
Merge pull request #12574 from rioug/refactor-products-renderer
...
[Product Refactor] Refactor products renderer
2024-07-10 17:59:38 +02:00
Konrad
10898fdcfc
Merge pull request #12639 from wandji20/wb-OFN-11597
...
Redirect successful user signup request to main home page [OFN-11597]
2024-07-10 17:24:40 +02:00
Gaetan Craig-Riou
686fe8c028
Per review, remove flag argument from products_relation
...
products_relation is now split in two, products_relation and
products_relation_incl_supplier_properties.
It avoids using a flag argument which is not a a good practice see:
https://martinfowler.com/bliki/FlagArgument.html
2024-07-10 13:19:08 +10:00
Gaetan Craig-Riou
5c3acbbcaf
Per review, remove instance variable @query
2024-07-10 11:45:39 +10:00
Konrad
f0fd3bb73c
Merge pull request #12635 from wandji20/wb-OFN-10685
...
(Fix) Product description not correctly truncated
2024-07-09 19:51:46 +02:00
Konrad
d60d29b685
Merge pull request #12634 from chahmedejaz/bugfix/12632-voucher-field-focus-issue
...
Fix Voucher Code Field Focus Issue
2024-07-08 12:19:19 +02:00
wandji20
ac347b9c8e
Redirect successful user signup request to main home page [OFN-11597]
2024-07-08 10:12:33 +01:00
wandji20
8a8a178683
Fix Product description not correctly truncated [OFN-10685]
2024-07-08 10:04:16 +01:00
Gaetan Craig-Riou
5c136f8baa
Fix OrderCycleController to use products_relation
2024-07-08 10:35:57 +10:00
Gaetan Craig-Riou
c372bf746a
Refactor ProductRenderer
...
The sorting logic has been moved to
OrderCycles::DistributedProductsService#product_relations
Plus hopefully fix the spec flackiness
2024-07-08 10:35:57 +10:00
Gaetan Craig-Riou
79a22aefc3
Refactor #products_relation
...
Due to primary_taxon and supplier having moved to the variant, filtering
by_producer and by_category with a custom order involves some
complicated sql queries. So we moved the sorting logic from
ProductsRenderer to OrderCycles::DistributedProductsService so we can
keep the complicated SQL logic contained in one place
2024-07-08 10:35:57 +10:00
Gaetan Craig-Riou
17fe492bf4
Fix typo
2024-07-08 10:35:57 +10:00
Gaetan Craig-Riou
47faedc295
Merge pull request #12646 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.1.2
...
Bump trix from 2.1.1 to 2.1.2
2024-07-08 09:48:54 +10:00
dependabot[bot]
ac2f59bdb2
Bump trix from 2.1.1 to 2.1.2
...
Bumps [trix](https://github.com/basecamp/trix ) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/basecamp/trix/releases )
- [Commits](https://github.com/basecamp/trix/compare/v2.1.1...v2.1.2 )
---
updated-dependencies:
- dependency-name: trix
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-07-05 09:44:38 +00:00
Maikel Linke
8d327355f9
Update all locales with the latest Transifex translations
2024-07-05 13:29:17 +10:00
Maikel
c8cb15df33
Merge pull request #12644 from mkllnk/spec-fixes
...
Fix orders and distributors report after product refactor
2024-07-05 13:25:37 +10:00
Maikel Linke
d602482d91
Fix report spec referencing distributor
2024-07-05 12:08:33 +10:00
Maikel Linke
51f89b995a
Update database include statement for report
...
Fixes:
* spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb
* spec/system/admin/reports_spec.rb
2024-07-05 12:04:14 +10:00
Maikel
2b10862779
Merge pull request #12641 from cyrillefr/FixRailsSelectMap
...
Fixes Rails/SelectMap offense
2024-07-05 11:27:23 +10:00
Maikel
6594b30bf4
Merge pull request #12640 from dacook/bulk-invoice-polling-12215
...
Poll to check when invoice file finished
2024-07-05 10:05:56 +10:00
Maikel Linke
b131c352a9
Spec backup polling of rendered invoice file
2024-07-05 09:36:50 +10:00
David Cook
e62b640372
Poll to check when invoice file finished
...
The BulkInvoiceJob already sends a notification via WebSockets once complete, but sometimes that fails. So this is added on top, just in case.
2024-07-05 08:58:10 +10:00
cyrillefr
838974973d
Fixes Rails/SelectMap offense
...
Cf. cop @ https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsselectmap
2024-07-03 13:17:02 +02:00
Rachel Arnould
2c41d065df
Merge pull request #12594 from dacook/12559-fix-orders-and-distributors-report
...
Hide customer data on orders_and_distributors report
2024-07-03 13:12:42 +02:00
Rachel Arnould
045da3c0e5
Merge pull request #12562 from rioug/product-supplier-id
...
[Product Refactor] Move supplier to Variant
2024-07-03 13:03:58 +02:00
Gaetan Craig-Riou
cfc51f399f
More rebase fix
2024-07-03 13:07:17 +10:00
Gaetan Craig-Riou
fb2575aaeb
Fix more rebase issue
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
be5a228509
Fix rebase issue
...
and add missing translation
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
dfe56c1eed
Fix flacky spec
...
In practise we shouldn't have product with mutiple variant with
different supplier, so I think it's fine to not test it.
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
1ead9208ee
Fix rebase issue
...
Fix test by creating a variant instead of relying on some random data
from the database.
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
1d86315108
Per review, update comment to match code
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
f60a79437e
Reworked the test to use variant factory
...
Creating a variant actually create an extra one via the associated
product, as it will create a "standard variant".
As far as I can see there is no way around it, but it should be fixed
once the Product refactor is finished, and product becomes product
group.
Added a comment on the variant factory to explain the problem.
It's not ideal as it will slow down the test suite a little, but I think
it's better to write the code the way you would expect it, and it will
eventually get fixed.
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
f79691e4bf
Ignore supplier_id for Spree::Product
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
9549f4e506
Update product description
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
448308710a
Per review, distributor are now updated via variant
...
When a product is deleted, it will delete associated variant and
in turn will touch the affected distributors
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
f73745a803
David's first review changes
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
3788b33eb0
First round of code review change
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
c328ee8087
Remove stockable_by from Product and Variant
...
It's not used anymore
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
efbec02fb9
Fix rebase issue
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
117f6d3300
First round of code review change
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
56b58219da
Update rubocop TODO
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
260211cf15
Fix Ruboxop issue
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
7219f72ac7
Fix rebase issue
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
891f79666d
Spree::Product remove in_supplier_or_distributor scope
...
It is not used anywhere
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
312c240968
Fix mutilingual spec
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
b6faa43879
Fix touching distributor callback spec
...
The original spec check if the supplier and distributor where
updated after deleting product. In reality, the supplier and the
distributor are the same, so no need to test with the supplier
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
84197aca19
Fix the filtering by properties/supplier properties
...
- Apply OR when filtering by both product properties and supplier
properties
- Apply AND when filtering by supplier properties and taxon
Filtering by product properties and taxon is handled by ransack, so
no change there
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
9632f42a40
Fix producer property filtering
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
a52401107a
Order cycle API, separate properties and producer_properties
...
Due to moving the supplier to the variant, we had to add manual search
for producer properties instead of using ransack. So we need a way
for the frontend to diferenciate between product properties and producer
properties. This is the first step towards that
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
3704b18952
Fix property filtering in shopping system spec
2024-07-03 11:21:28 +10:00
