Gaetan Craig-Riou
034feabcff
Javascript code linting
2025-04-22 13:42:09 +10:00
Gaetan Craig-Riou
aba6240736
Per review, use css :has() pseudo class
...
It saves writing some custom javascript, less code to maintain!
2025-04-22 13:42:09 +10:00
Gaetan Craig-Riou
6417c87047
Add visual feedback when adding tag errors
...
Highlight the tag name in red, if trying to add a tag that already
exists.
2025-04-22 13:42:08 +10:00
Gaetan Craig-Riou
157de25f36
Prettyfy code
2025-04-22 13:41:02 +10:00
Gaetan Craig-Riou
9e1a80c327
Mock hotkeys.js
2025-04-22 13:41:02 +10:00
Gaetan Craig-Riou
94cc774f27
Fix html used in test
...
It get rids of errors, even if they didn't affect the test result it's
noise we don't need
2025-04-22 13:41:02 +10:00
Gaetan Craig-Riou
559249b621
Improve tagListInputController to integrate with bulkFormController
...
tagListInputController is not a standard form controller so we had to
make a few changes to integrate with the change tracking used int
bulkFormController. Mainly we make sure to manually trigger event when
deleting a tags, and we handle the change highlight.
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
c15e16900d
Add stimulus tag list input controller
...
It handles the UI to display the list of tags, and lets you add and
remove tags from the list.
2025-04-22 13:41:01 +10:00
Filipe
d2fa2e612c
Merge pull request #13113 from chahmedejaz/task/13031-allow-producers-to-edit-orders
...
Allow producer to edit their products on hubs' orders
2025-04-21 11:28:36 +01:00
Filipe
cb9db54cd3
Merge pull request #13240 from rioug/13100-do-not-remove-fee-product-removed-from-OC
...
[Enterprise Fees] Keep fees on product when a product is removed from the order cycle
2025-04-20 21:57:56 +01:00
Filipe
3236cbb0b8
Merge pull request #13191 from mkllnk/dfc-reset
...
Reset stock for absent products in DFC catalog
2025-04-20 21:34:49 +01:00
Ahmed Ejaz
87c957541d
refactor: fix rubocop lint issues
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
213209b460
hide customer info on bulk orders page
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
4e2198cd4f
hide shipping icons from suppliers
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
eee5d5c8ad
fix buggy spec:
...
- this before block was causing multiple nevigation to the index
- one from the spec itself, one from here.
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
3474734418
implement spree_current_user let! so that user creation doesn't get captured in the scoper queries
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
0500294480
rename is_producer to is_producer_only
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
9867d0bc3a
fix flaky spec error:
...
Ferrum::BrowserError:
Argument should belong to the same JavaScript world as target object
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
ccfd0edbf1
fix lint issues
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
bf6934db94
add specs
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
b803e18f42
fix lint issues
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
20146a8e11
update respective specs
2025-04-13 21:35:55 +05:00
Filipe
9f988f7a02
Merge pull request #13216 from drummer83/email_header
...
Email header: Improve logo, resizing and styles
2025-04-09 12:00:09 +01:00
Filipe
c17821687d
Merge pull request #13243 from cyrillefr/GoButtonResumeEnabledAfterFailedReport
...
Fixes button staying disabled after report fail
2025-04-09 10:19:06 +01:00
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
cyrillefr
0ef3b06cdf
Requested changes
2025-04-07 13:12:51 +02:00
cyrillefr
019c703b1c
Fix Rubocop InverseOf offense in Order
...
- also fix failing spec due to adding inverse
2025-04-03 12:39:06 +02:00
cyrillefr
6666896fa3
Requested changes
2025-04-02 14:46:22 +02:00
David Cook
5c5a115daa
Fix typo
2025-04-02 10:40:46 +11:00
Konrad
9ee37ee0b6
Update specs
2025-04-01 18:11:13 +02:00
cyrillefr
f0a5c76b45
Fixes button staying disabled after report fail
...
- added a test
2025-04-01 17:25:53 +02: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
Gaetan Craig-Riou
1279ab21a6
Fix delete fee logic
...
A fee can be associated to both the incoming and outgoing exchange, the
previous logic did not account for that, resulting in the fee not being
correctly removed.
Now the delete logic also check for the metadata enterprise role to see
if any additional fee need to be removed.
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
3744ba9198
create_*_adjustment now return the adjustment
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
223faa5569
Move #recreate_all_fees! spec to HandleFeesService
...
Spree::Order just delegate Orders::HandleFeesService so there is no
point testing fees in the order spec
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
b5bc6b84d7
Update Orders::HandleFeesService#recreate_all_fees!
...
We now update or create line item fees instead of deleting them and
recreating them. This is to cover the case when a product has been
removed from an Order Cycle but we want to keep the fee already applied
on existing order. This was an issue only if the existing order got
updated after the product was removed.
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
d83f8ded0d
Remove Module from spec and some stylying
...
Also remove unnecessary use of `__send__`
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
2a0caca570
Refactor EnterpriseFee.clear_all_adjustments
...
Renamed to clear_order_adjustments, it doesn't clear line item
adjustment
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
02a9aaf1ec
Refactor spec
2025-04-01 13:46:34 +11:00
Trésor Bireke
5e7f0f8a1a
Merge branch 'master' into tb-rescue-not-found-error-for-enterprise
2025-04-01 01:10:17 +02:00
Gaetan Craig-Riou
0537a56b47
Merge pull request #13239 from cyrillefr/FixRailsRubocopIssueInverseOfInPayments
...
Fixes rubocop offense inverse_of on payment model
2025-04-01 09:59:01 +11:00
David Cook
d8eab7875f
Merge pull request #13235 from mkllnk/stock-aggregation
...
[API change] Remove unused ProductStock concern
2025-04-01 09:45:24 +11:00
David Cook
176e33d6bf
Rubocop fixes
2025-04-01 09:29:27 +11:00
Tresor11
507705a4eb
Update method name to require
...
This commit updates the method name to be called required_enterprise
since we only expect it to raise an error when the enterprise is not found.
2025-03-31 22:28:38 +03:00
cyrillefr
09a6da0c57
Fixes rubocop offense inverse_of on payment model
...
- some clean up unused method too
2025-03-31 17:10:43 +02:00
David Cook
e02ef08b06
Consolidate translations for hidden field
...
The string '< Hidden >' was agreed on as a good default, so we will use the hidden_field key.
I also moved the definition in en.yml up to the more general area at the start of admin.reports section (before it was hidden between report-specific keys.
2025-03-31 16:24:07 +11:00
David Cook
19b6cbcc9b
Packing reports: Display phone numbers to suppliers
2025-03-31 16:16:27 +11:00
David Cook
f40a00dde3
Expand spec to cover existing behaviour
...
And use let to avoid extra db query
2025-03-31 16:16:27 +11:00
David Cook
47b6888fe6
Display customer emails & phone numbers to suppliers
...
when permitted.
The MaskDataService is used by the report framework, so this should affect all reports. It would be nice to test all reports, but I figured it wasn't worth it (already we only test one report for masking names).
2025-03-31 16:16:27 +11:00
David Cook
b05a42f3bb
Refactor spec
2025-03-31 16:16:27 +11:00
