Maikel
eb22bff908
Merge pull request #12647 from cyrillefr/FixRailsSkipsModelValidations
...
Fixes Rails/SkipsModelValidations offenses
2024-07-11 09:12:26 +10:00
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
cyrillefr
6d22652dfa
Requested changes on VariantOverrride
...
- change was not exactly equivalent, so reverting +
rubo comment
2024-07-09 16:06:45 +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
cyrillefr
ce8a2b3251
Fixes Rails/SkipsModelValidations offenses
...
- increments! & decrement! skip validations
- replaced increment! method calls
- one call was for a redefined increment! method
- the other for a regular(ActiveRecord::Persistence)
- removes increments/decrements definition now useless
2024-07-05 16:35:40 +02:00
Maikel
2b10862779
Merge pull request #12641 from cyrillefr/FixRailsSelectMap
...
Fixes Rails/SelectMap offense
2024-07-05 11:27:23 +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
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
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
c328ee8087
Remove stockable_by from Product and Variant
...
It's not used anymore
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
260211cf15
Fix Ruboxop 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
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
Gaetan Craig-Riou
feb7e173b1
Fix order cycle controller spec, product properties filtering
...
And fix the underlying product renderer
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
3dc7c2bf56
Fix spree product touch supplier
...
Take into account import product scenario, in this case the variant
doesn't have an assigned supplier yet.
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
dd8f0aafab
Fix ProductImport::EntryProcessor#count_existing_items
...
Plus spec
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
564ea0bd49
Fix enterprise touching when associated record updated
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
1c6d10d4e7
Remove supplier_id from simple product serializer
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
b5cf47d306
Fix producer mailer
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
34aba72dea
Fix order summary mailer view
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
6538c7adca
Fix shopping system spec
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
add6d15fc4
Fix bulk order management system spec
2024-07-03 11:16:53 +10:00
Gaetan Craig-Riou
5884edaa1b
Fix product import system spec
2024-07-03 11:15:10 +10:00
Gaetan Craig-Riou
1ea3160a6a
Fic enterprises controller
2024-07-03 11:15:10 +10:00
Gaetan Craig-Riou
b156f722f1
Fix variant override spec
2024-07-03 11:15:10 +10:00
Gaetan Craig-Riou
ee88e2fdfa
Fix product system spec
2024-07-03 11:11:03 +10:00
Gaetan Craig-Riou
9f612270c7
Fix bulk update product page old style
...
and related product pages
2024-07-03 11:05:01 +10:00
Gaetan Craig-Riou
2ab9ccf73d
Bulk edit product, move supplier dropdown to variant
2024-07-03 11:05:00 +10:00
Gaetan Craig-Riou
78abe36327
Fix BUU product page specs
2024-07-03 11:05:00 +10:00
Gaetan Craig-Riou
b891a03468
Fix search by producer, BUU product page
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
63807f198b
Fix product set, to handle updating supplier on the variant
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
25371ee9d0
Fix admin pages
...
- move supplier to variant row on Bulk Edit product page
- add supplier dropdow on add/update variant page
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
80c4d9d03b
Fix invoice template
2024-07-03 10:17:49 +10:00
