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
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
2d707e8acb
Fix consumer producer system spec
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
7b6b365c4f
Fix subscription form spec
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
8244fa7685
Fix enterprise shopfront serializer spec
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
3eae329cc4
Fix shop system spec
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
848144d378
Fix DFC engine
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
d614780059
Fix product serializer spec
2024-07-03 11:21:28 +10:00
