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
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
