Konrad
b3dd51d6ac
Merge pull request #12324 from chahmedejaz/task/12314-fix-rubocop-rails-helper-instance-variable
...
Fix Rubocop Rails/HelperInstanceVariable
2024-04-10 20:17:06 +02:00
Konrad
e88335a923
Merge pull request #12303 from arunguleria/12295-translation-fixes-on-return-authorizaton
...
12295-Translation fixes for return authorization status
2024-04-10 14:10:08 +02:00
Matt-Yorkley
65731f6c52
Update serializers and views for admin products index
2024-04-02 09:27:36 +11:00
Matt-Yorkley
b30944471d
Update admin forms
2024-04-02 09:27:36 +11:00
Ahmed Ejaz
05f373f541
12314 - add order parameter in OrdersHelper methods
2024-04-01 06:41:41 +05:00
Matt-Yorkley
c01bab5f27
Wrap commonly-repeated calls to Spree::Config to reduce unnecessary cache reads
...
These config values are relatively static but in some cases they can be called many times in the same request (like rendering a report or a large list of line_items in BOM). These values will now only get fetched from Redis/Postgres once at most per request/job.
2024-03-26 13:39:16 +00:00
Arun
0ab3c3d875
Merge branch 'master' into 12295-translation-fixes-on-return-authorizaton
2024-03-22 18:16:57 +05:30
Arun Guleria
03630f27af
12295-Translation fixes for return authorization status
2024-03-22 17:16:35 +05:30
Filipe
9abaf90907
Merge pull request #12233 from dacook/buu/unit-scale-basic-12005
...
[BUU] Unit Scale - basic implementation
2024-03-07 17:20:45 +00:00
Filipe
de9446f5f3
Merge pull request #12167 from mkllnk/haml-up
...
Update Haml syntax and gem to version 6
2024-03-07 15:36:29 +00:00
Rachel Arnould
cd9bef4f7b
Merge pull request #12172 from abdellani/12067-fix-invoice-render-multiple-tax-rates
...
fix invoice render multiple tax rates
2024-03-07 10:53:52 +01:00
David Cook
e8bd8389b5
Remove unused parameters
...
They're being silently discarded. I checked, and those classes weren't needed anyway. (theres' no conditions to even show an error in the second case, but nevermind..)
2024-03-06 13:41:22 +11:00
Filipe
af9f07f496
Merge pull request #12194 from cyrillefr/Replace-dropdown_controller-with-generic-toggle-control_controller
...
Re-implement dropdown controller with html details element
2024-03-05 16:28:29 +00:00
Gaetan Craig-Riou
8fb3f9a8b8
Remove "ujs-navigate": "false" from link
...
It somehow was causing a double loading of the page meaning flash
messages were lost. I suspect it's related to turbo/turbo link, but
I am not sure.
2024-02-28 15:13:40 +11:00
cyrillefr
428b9b273c
Replace old dropdown controller by new one
...
- menu items line are unchanged only beggining of file modified
2024-02-25 16:43:57 +01:00
Maikel Linke
ba51641271
Symbolise hash keys in HAML files
...
This was done by the haml-up script.
2024-02-22 15:01:14 +11:00
Maikel Linke
c097f2b622
Upgrade HAML syntax with script
2024-02-22 15:01:13 +11:00
Mohamed ABDELLANI
56fe7f5e21
fix tax rates listing in invoices
2024-02-19 12:32:11 +01:00
Konrad
a30da1f656
Merge pull request #12093 from cillian/generate-invoice-button-warning
...
Display a warning when clicking the generate invoice button if an ABN is required but not present
2024-01-31 21:52:15 +01:00
Konrad
d24924b8f4
Merge pull request #12075 from cyrillefr/Actions-dropdown-should-not-open-automatically-after-shipping-the-order
...
Actions dropdown should stay closed after shipping order
2024-01-31 20:49:49 +01:00
Cillian O'Ruanaidh
f960dec0eb
Display a warning when clicking the generate invoice button if an ABN is required but not present
2024-01-26 14:28:42 +00:00
cyrillefr
b8743d853f
Actions dropdown should stay closed after shipping order
...
- added hidden css class for it to stay closed.
2024-01-24 08:35:55 +01:00
Gaetan Craig-Riou
96a010033d
Fix admin view to use dfc_id
...
This was missed in a previous refactor
2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
652c7a563c
Add dfc_name field on Spree::Taxons
...
This will let us map OFN product taxons to DFC product types
2024-01-22 10:02:10 +11:00
Gaetan Craig-Riou
83beafc564
Add missing translation on taxon admin form
2024-01-22 10:02:10 +11:00
Konrad
bed405794f
Merge pull request #11762 from binarygit/send-shipment-email-optionally
...
send-shipment-email-optionally
2024-01-18 12:02:00 +01:00
David Cook
137489f492
Refactor: move basic modal styles to generic parent component
...
The style was already being shared with a sibling component.
Now we can instantiate a plain old 'modal'.
2024-01-16 12:53:07 +11:00
binarygit
e865f27158
Provide correct modal-link-target-value and write tests for orders#edit page
2024-01-14 15:33:31 +05:45
binarygit
267e749369
Show same dialog box when shipping order through the actions dropdown
2024-01-14 15:06:02 +05:45
binarygit
e83fd5bd83
Create ShipOrder component
2024-01-14 15:06:02 +05:45
binarygit
aa7a4fb5a2
Send shipment email by default
2024-01-14 15:06:02 +05:45
binarygit
5fe246e739
Add translations
2024-01-14 15:06:02 +05:45
binarygit
5e45d3b877
send shipment email optionally from orders#edit page
2024-01-14 15:06:02 +05:45
binarygit
95a51159d7
send-shipment-email-optionally
2024-01-14 15:05:59 +05:45
Rachel Arnould
f7aca7a9f1
Merge branch 'master' into 11431-show_warning_when_a_new_invoice_can_be_generated
2024-01-08 16:38:39 +01:00
drummer83
da4dc637e4
Add empty line at end of file
2023-12-27 09:33:27 +01:00
drummer83
120b2c363d
Fixing indentation error
2023-12-24 20:29:41 +01:00
drummer83
ddd455a73e
Use methodology from order_cycles for products
2023-12-24 17:58:21 +01:00
drummer83
dddebae56a
Unify coding style
2023-12-24 17:52:21 +01:00
David Cook
3319f38e6c
Rename class to signal intent
...
Because the HTML is changed, I had to also update the old stylesheet too.
2023-12-23 15:46:15 +01:00
David Cook
e379ee761b
Refactor
...
'positive' and 'zero' methods are preferred in this case.
2023-12-23 15:46:15 +01:00
David Cook
6ca98d497a
Remove unnecessary 'blue' class
...
Buttons are already blue.
And we don't want the text to be blue. This resolves #11865
2023-12-23 15:46:15 +01:00
David Cook
e9fe66748a
Replace 'orange' class with 'red'
...
It was the same colour anyway
2023-12-23 15:46:15 +01:00
Konrad
eb70eb4bc8
Merge pull request #11966 from bouaik/fix-menu-and-sub-menu-highlighting
...
Fix menu and sub menu highlighting
2023-12-22 22:35:47 +01:00
Konrad
5f7760c3cc
Merge pull request #11803 from rioug/11801-remove-raw-from-email-template
...
Remove raw from various template
2023-12-22 13:10:33 +01:00
bouaik
6fa3720d05
Merge branch 'master' into fix-menu-and-sub-menu-highlighting
2023-12-21 21:20:04 +01:00
bouaik
fde7c34287
fix highlighting
2023-12-21 21:16:39 +01:00
Rachel Arnould
2b749714bd
Merge pull request #11927 from drummer83/Dashboard
...
Show Dashboard header in the header area for multi-enterprise users
2023-12-18 17:49:49 +01:00
Gaetan Craig-Riou
28f3161bf8
Removing raw from invoice template
2023-12-18 14:40:14 +11:00
David Cook
aebc378aa8
[suggestion] Update translation key
2023-12-15 09:58:30 +11:00
