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
David Cook
ad809facc6
[fixup] Fix translation key
...
The dot indicates lazy lookup
Also the name was missing a letter. It was hard to notice because the key name was so long, so I suggest reducing the key to something like 'order_has_changed'
2023-12-15 09:55:14 +11:00
Mohamed ABDELLANI
2b1d7923da
remove ':' after the shipping category on the invoice template
2023-12-14 16:42:24 +01:00
Mohamed ABDELLANI
82d50f58f3
remove raw from shipping method name
2023-12-14 16:36:36 +01:00
Mohamed ABDELLANI
db653fc945
render the shipping category in the invoice.
2023-12-14 16:36:36 +01:00
Rachel Arnould
9d87449730
Merge pull request #11704 from abdellani/add-reference-to-previous-invoices
...
a new invoice should refer the latest invoice.
2023-12-14 16:05:08 +01:00
Mohamed ABDELLANI
1038536c39
show warning when a new invoice can be generated
2023-12-14 15:34:19 +01:00
drummer83
43effb8197
Fix missing translation of tooltip
2023-12-12 02:00:59 +01:00
drummer83
1afdbd92ea
Show Dashboard header in the header area for multi-enterprise users
...
Use correct translation string
2023-12-12 00:11:15 +01:00
Mohamed ABDELLANI
915afd8557
update the invoice v3 template
2023-12-11 08:26:32 +01:00
Mohamed ABDELLANI
fea910f8b6
update the invoice number rendering
2023-12-08 13:33:36 +01:00
Mohamed ABDELLANI
23a56d35a0
add tax_adjustment total to the invoice
2023-10-30 22:09:22 +01:00
Mohamed ABDELLANI
c8f69c8778
always render shipment on the invoice
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
15aeb2f8e5
remove legacy template (used when invoice feature enable)
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
da89860f35
fix price per unit
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
c1ed8ed67c
update the adjustments rows
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
716cf3e522
reorder the totals section
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
b7f601d140
show tax rate column regardless of the tax amount on the order
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
a08a2fd5f6
[skip ci] add terms of service link to the invoice.
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
a5fd0608c3
align the columns of the totals rows
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
a8f9b29a6d
[skip ci]add the total price columns to the invoice
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
30537f7743
add "Weight/VOL." column to the invoice
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
b64058a71d
swap tax rate with total price (incl tax)
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
1182544c47
update the view used when the invoice feature is enabled
2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
affecf53c6
add order cycle name to the invoice number section
2023-10-30 19:43:57 +01:00
Konrad
2ba5ab7dc1
Merge pull request #11577 from jibees/10956-use-cable_ready-instead-of-morph
...
Admin, Orders list: when capturing an order, fix an issue that makes the tooltip invisible (+ errors in the console)
2023-10-20 11:56:53 +02:00
Rachel Arnould
aecb55beb3
Merge pull request #11660 from dacook/products_v3_path
...
Hide old products screen when admin_style_v3 enabled
2023-10-17 10:45:01 +02:00
Gaetan Craig-Riou
7ce3fea7d5
Refactor tooltip on the backoffice orders page
2023-10-17 13:35:01 +11:00
David Cook
6e6854f564
Fix payment state indicator
...
Now the correct class is added, we can see the little coloured circles again.
2023-10-13 19:25:12 +02:00
lauriejefferson
2020a9fa76
changed table row alignment to align-left and removed padding from table header
2023-10-13 19:25:12 +02:00
David Cook
655c16cca0
New bulk products screen shares path with old
...
The feature toggle will determine which bulk products screen shows. An additional products_old path is also temporarily added for easy reference.
Later, when the old screen is full removed, we'll probably rename the _v3 classes to tidy up.
2023-10-13 10:39:45 +11:00
Konrad
cc8898e074
Merge pull request #11219 from abdellani/fix-tax-rates-rendering-when-invoice-enabled
...
fix Viewing an invoice with the instance's invoice setting set to alternative model leads to an error 500
2023-10-12 17:47:27 +02:00
Mohamed ABDELLANI
aa4798d35c
add adjustables to the list of objects to serialize when creating an invoice
2023-10-11 09:27:16 +01:00
Mohamed ABDELLANI
68a6fb132a
implement display_adjustment_tax_rates helper on the adjustment presenter
...
For every adjustment a list of tax rates will be created using TaxRateFinder.tax_rates_of.
This will prevent running the queries to find the tax rates during the invoice generation.
2023-10-11 09:26:50 +01:00
Mohamed ABDELLANI
33826631a3
reimplement the display_line_item_tax_rates helper on the line item presenter
...
1. reimplment the helper on the LintItem presenter
2. add the tax rate associated to the line items to the list of objects to serialize during the order serialization.
3. implement a presenter for the introducer tax rates.
2023-10-11 09:26:49 +01:00
David Cook
99205e435c
Show only the new products page in the menu
...
When the feature toggle is enabled, we don't want to see the old products page. It's a bit broken and causes confusion. But we still want to be able to access it by the URL for now.
2023-10-10 22:09:26 +11:00
Mohamed ABDELLANI
dce096a56e
check if invoices feature is enabled for the current user before showing invoices tab
2023-10-08 21:47:17 +02:00
Filipe
ccabf5936d
Merge pull request #11505 from drummer83/master
...
[Super admin] Highlight 'Configuration' tab on 'Terms of Service' page
2023-09-07 18:00:18 +01:00
drummer83
13d5b954e6
Add 'Terms of Service' to the tabs
2023-09-06 23:18:00 +02:00
Pedro Carmona
51050036d4
Use instance default locale as the default locale for a new user
2023-09-05 01:00:35 +01:00
Pedro Carmona
c4830e3baa
Send localized email when creating users via admin interface
...
Based on the current user locale
2023-09-05 01:00:35 +01:00
