Rachel Arnould
fb0f379c43
Merge pull request #13823 from chahmedejaz/bugfix/13625-enterprise-fee-reports-throws-504
...
Some Enterprise Fee reports are unusable when managing big shops
2026-02-18 15:22:21 +01:00
Ashish Gaur
b98552003c
13220 Add Product name in Order LineItem and update it during order creation
...
13220 Fixes affiliate sales spec
13220 Use before_create to update product name
13220 Fixes rubocop warnings
13220 Update product_name in line_item in specs
13220 Fix before_create lint
13220 Add spec for checking product_name is not set in reports
13220 Fixes rubocop issue
13220 Add migrations for updating the existing line items
13220 Fixing lint issues
13220 Set product_name in line_item before doing validation
13220 Fix linter issues
13220 Fixes spec
13220 Fixes linter issues
13220 Review comments
13220 Review comments
13220 Add default product name
13220 Use product_name instead of variant product name when using line item
13220 Fix specs
13220 Revert change in affiliate_sales_data_spec
CL-13220 Store variant name in line_item
13220 Default variant name to original variant's full name for line_items
13220 Add missing frozen string literal
13220 Add spec for full_variant_name
13220 Remove UpdateProductNameInLineItems and AddNotNullToProductNameInLineItems migrations
13220 Remove presence validation for product_name
13220 Use full_product_name which defaults to variant product name if empty
2026-02-06 12:17:03 +11:00
Ahmed Ejaz
d4811648f1
Merge branch 'master' into bugfix/13625-enterprise-fee-reports-throws-504
2026-01-25 11:22:57 +05:00
Maikel Linke
fdc775ae6d
Style arguments forwarding
2026-01-19 10:55:24 +11:00
Ahmed Ejaz
a3c08ceb7c
Add AJAX search functionality for enterprise fees and related entities in reports
2025-12-30 01:25:25 +05:00
Maikel Linke
5dfb7645cb
Avoid enabling rubocop rule listed in todo file
2025-10-31 15:39:58 +11:00
François Turbelin
71dd398131
Apply cosmetics and fix specs
2025-10-31 15:20:44 +11:00
François Turbelin
245f0caedb
Adjust sum for remaining reports
2025-10-31 15:20:44 +11:00
François Turbelin
18bc95c6a3
Update sum calculation in order_cycle_customer_totals spec
2025-10-31 15:20:44 +11:00
David Rodríguez
4c6d894bc0
Bump RuboCop to 1.86.6
...
There were a few changes needed:
* Plugins are now specified through `plugin:` config keyword.
* All plugin gems need to be specified explicitly in Gemfile since they
are no longer dependencies of plugins already specified explicitly.
* All plugin gems need to be updated in other to use the new APIs.
* One cop was renamed.
* New offenses safe to correct were corrected directly with `bundle exec
rubocop -a`.
* New offenses unsafe to correct were added to the TODO configuration
with `bundle exec rubocop --auto-gen-config --auto-gen-only-exclude
--exclude-limit 1400 --no-auto-gen-timestamp`.
2025-10-27 11:30:33 +01:00
Gareth
417011909c
Removed other filter rows. They weren't working and maybe not even relevant. The idea was to include order cycles and distributor ids as well, but it wasn't really requested so I'm taking it out.
2025-10-07 11:01:55 -04:00
Gareth Rogers
0a9eb173ea
Add report name and details to CSV files
2025-10-01 13:59:43 +10:00
Maikel Linke
244a88a1cd
Removed unused user from report classes
...
We needed them for a feature toggle that doesn't exist anymore.
2025-09-05 14:29:01 +10:00
Gaetan Craig-Riou
618d597f6d
ScopeVariantToHub require an Enterprise object
...
The hub parameter is used to check if inventory is enabled, so it breaks
if we just pass an id
2025-07-09 13:43:18 +10:00
Gaetan Craig-Riou
8829f6ad03
Only scope variant when inventory is enabled
2025-07-09 11:35:26 +10:00
Ahmed Ejaz
8d407b1dc9
Fix lint issues
2025-06-21 16:19:31 +05:00
Ahmed Ejaz
ade35f2fa2
Fixes specs and update code respectively
2025-06-21 16:19:31 +05:00
Carlos Chitty
d0c687650e
Autocorrect Style/HashEachMethods offenses
2025-04-29 15:16:34 -04:00
Filipe
6a9493a581
Merge pull request #13256 from ashishp91/missing_translations_for_tax_category
...
Use translation for "none" in reports
2025-04-23 13:10:13 +01:00
Ashish Gaur
2da170912f
Use translation for none in reports
2025-04-12 12:01:06 +05:30
Filipe
c3cb51441f
Merge pull request #13192 from dacook/display-customer-contacts-in-reports-13129
...
[FF] Add option to display customer contact details to suppliers in reports
2025-04-08 20:34:44 +01:00
David Cook
369b93f0dd
Update tip
...
By updating the translation key, all other locales will be notified to update their translations too.
2025-04-07 16:33:39 +10:00
Filipe
a7c77dc894
Merge pull request #13084 from abdulazizali77/bugfix/11529-report-by-enterprise-fee-from-lineitems
...
Fetch variant enterprise fees from order lineitems adjustments #11529
2025-04-01 16:13:51 +01:00
David Cook
729dc9d658
Move mask logic to separate module
...
And cross-reference similar files so we don't miss it next time\!
2025-03-31 16:16:27 +11:00
David Cook
19b6cbcc9b
Packing reports: Display phone numbers to suppliers
2025-03-31 16:16:27 +11:00
David Cook
9c296b691f
Remove unnecessary parameter
...
We've never needed it and still don't need it for the next feature
2025-03-31 16:16:27 +11:00
David Cook
38fca53e91
Refactor
...
Using a more specific name for the mask rule, and making way for a second standardised rule.
2025-03-31 16:16:27 +11:00
Abdul Aziz Ali
8b34505b36
Fix query group and pluck #11529
2025-03-28 19:12:09 +08:00
Abdul Aziz Ali
abe4c5e0da
Filter fees by metadata.enterprise_role 'supplier' #11529
2025-03-28 18:30:44 +08:00
Maikel Linke
4962304a48
Deal with nil values in sum
...
Rails was doing that for us but Rails 7.1 won't.
2025-03-28 17:01:26 +11:00
Abdul Aziz Ali
6a525c18ac
remove incoming exchange filtering #11529
2025-03-19 08:23:30 +08:00
Ahmed Ejaz
434434f451
13127 - add shipment state in the oc customer total report
2025-03-04 04:09:04 +05:00
Filipe
f715c366ea
Merge pull request #13160 from chahmedejaz/task/13097-add-columns-in-packing-reports
...
Add shipping method and shipment state to packing reports
2025-02-20 19:49:03 -06:00
Ahmed Ejaz
1611b2a31f
Add shipping method and shipment state to packing reports
2025-02-18 12:42:34 +05:00
Maikel Linke
1e34237b22
Fix order of line item based report rows
...
The orders_and_fulfillment_spec would sometimes fail when the database
would return line items in a different order than they were created.
Without specific `order` clause the order of rows can be random.
The additional sorting may lead to more server load but also ensures
more consistent results for users.
2025-02-14 16:41:43 +11:00
Ahmed Ejaz
d86965bc14
add total tax on product summary
2025-01-31 17:34:34 +05:00
Ahmed Ejaz
71b2b7f97f
13013: add tax on product column
2025-01-31 17:34:34 +05:00
Ahmed Ejaz
6a613a2203
13013: add producer charges gst column
2025-01-31 17:34:33 +05:00
Abdul Aziz Ali
a15cb58ab5
fetch variant enterprise fees from order lineitems adjustments #11529
2025-01-21 06:53:42 +08:00
François Turbelin
6ae3c8b102
Add external_billing_id field on revenues_by_hub report
2025-01-13 16:54:17 +01:00
Konrad
8e0c0392d9
Merge pull request #12991 from murjax/remove-sku-11973
...
Remove product SKU from product pages and report
2025-01-07 21:14:39 +01:00
Ahmed Ejaz
c331d57cdb
13008: add tax category in all products report
2024-12-04 03:36:42 +05:00
Ryan Murphy
bab7756017
Remove product SKU from product pages and report
2024-11-20 19:12:29 -05:00
Filipe
22f3afc7f7
Merge pull request #12930 from chahmedejaz/task/12878-add-variant-name-in-od-report
...
Report Orders and Distributors should display variant
2024-11-20 12:23:36 -06:00
Ahmed Ejaz
ed7685222e
12776: fix included tax on fees
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
4965e2bb9a
Update lib/reporting/reports/suppliers/helpers/line_items_access_helper.rb
...
Co-authored-by: David Cook <david@redcliffs.net >
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
9bcdac8f30
12776: rename vat to tax
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
bc57447d54
12776: refactor supplier_adjustments method
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
f3e086ad59
12776: remove unnecessary include
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
298c0e8d7f
fix reported issues:
...
- wrong enterprise fees
- always 0 tax on fees
2024-11-15 11:09:56 +01:00
