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
Gaetan Craig-Riou
2e129eab8f
Fix API V0 variants controller
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
507fa028c1
Fix api admin serializers
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
e1c3f0a31c
Fix product scope query
...
Plus a small name refactor
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
0c9223809b
Fix with_properties scope to accept any number of arguments
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
53e7b02471
Fix admin api exchange products controller
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
a873fa692b
Fix exchange products renderer and specs
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
3d82309c5f
Fix order permission and specs
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
ef298e3b62
Fix taxon
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
054d967323
Fix line items
...
* fix supplier related code
* Fix associations + plus spec
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
859f7efd02
Fix Spree:Ability
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
d5cc60fd3a
Fix ProductImporter and related Class
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
b86d8e1603
Fix product import entry validation
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
80112709f3
Fix invoice and api serializer
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
50bd274715
Fix Enterprise
2024-07-03 10:17:49 +10:00
