Filipe
69bb78e39c
Merge pull request #13213 from chahmedejaz/task/13128-add-order-number-to-notify-producer-email
...
Add order number to notify producer emails and make customer code available for everyone
2025-04-29 18:22:06 +01:00
Ahmed Ejaz
6f9b5e2c54
fix specs
...
- add a new class .line-items in the orders-summary to better differentiate the line-items summary vs customer-details. This css class is not defined, just .customer-order for customer details. It's only used to make a differentiation in the specs
- use the updated `parsed_email` memoized helper method for mail body content
2025-04-28 15:11:54 +05:00
Ahmed Ejaz
57c30591bc
13128: add order number in OC report
...
- Make Customer Code independant of Customer Names setting
2025-04-28 15:11:52 +05:00
piyush828-design
0bb6860343
Merge branch 'master' into pagy_upgrade
2025-04-28 11:23:44 +05:30
David Cook
e900c95213
Merge pull request #13276 from filipefurtad0/pagy_pagination_spec
...
Adds coverage to pagination (pagy bump)
2025-04-28 13:18:58 +10:00
David Cook
7ed5ca8e1c
Clarify number of users expected
2025-04-28 12:23:53 +10:00
piyush828-design
5e890bb361
Merge branch 'master' into pagy_upgrade
2025-04-24 17:46:39 +05:30
filipefurtad0
1d0d294a09
Adds coverage related to S1 regression #13002
2025-04-24 10:24:13 +01:00
cyrillefr
6fb1737672
Rename get method in spec web helper
2025-04-24 09:29:40 +02:00
cyrillefr
8d5292c4ed
Rename set method in spec helper and calls
2025-04-24 09:29:40 +02:00
cyrillefr
7812d5f58a
Replace set_methods in order model
2025-04-24 09:29:40 +02:00
Filipe
40d4b0c811
Merge pull request #13269 from drummer83/remove_txt-mails
...
Remove text versions of emails
2025-04-23 22:44:39 +01:00
filipefurtad0
e3fff0869e
Adds test case on pagination for zones index page
2025-04-23 19:45:06 +01:00
filipefurtad0
a84c0ffd73
Adds test case on pagination for users index page
2025-04-23 19:45:06 +01:00
Filipe
07842bf5eb
Merge pull request #13081 from pacodelaluna/do-not-allow-spaces-in-external-billing-id
...
Do not allow spaces in external billing
2025-04-23 12:20:02 +01:00
piyush828-design
8c564d344b
Merge branch 'master' into add_coverage_10597
2025-04-22 11:37:54 +05:30
piyush828-design
ed0b7f88a4
updated specs
2025-04-22 11:26:56 +05:30
Konrad
d97cb9ccb3
Update specs
2025-04-21 20:11:50 +02: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
François Turbelin
318bc1dae0
Add tests
2025-04-17 21:29:23 +02:00
piyush828-design
da5cef26db
upgraded pagy to latest version
2025-04-16 17:46:31 +05:30
piyush828-design
5849ae57de
Added tests for edit and delete
2025-04-16 12:11:52 +05:30
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