Konrad
ca12eab4bb
Merge pull request #11985 from chahmedejaz/task/11768-add-voucher-in-enterprise-fees-with-tax-by-order-report
...
Include vouchers in report: Enterprise Fees With Tax Report By Order
2024-01-24 22:57:48 +01:00
Konrad
5377304190
Merge pull request #12050 from cyrillefr/Replace-toggle_button_disabled_controller-with-generic-toggle_control_controller
...
Replace toggle_button_disable controller with generic toggle_control controller
2024-01-24 16:39:26 +01:00
Konrad
ec4bbe6241
Merge pull request #12038 from mkllnk/dfc-tax-category
...
Spec requiring tax category when creating products
2024-01-24 16:26:57 +01:00
Ahmed Ejaz
cb9c2963af
11768: add roundoff
...
- Fix lint issues
2024-01-19 01:52:24 +05:00
Ahmed Ejaz
38b7616b1a
11768: apply voucher
2024-01-19 01:52:18 +05: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
cyrillefr
ca4aa645f7
Delete now ununsed stimulus controller toggle_button_disabled
...
- also delete one comment about replacing this controller with another
2024-01-18 10:10:49 +01:00
Maikel
08ca85250a
Merge pull request #12018 from openfoodfoundation/dependabot/bundler/stripe-10.5.0
...
Bump stripe from 10.3.0 to 10.5.0
2024-01-18 12:41:17 +11:00
David Cook
f14f325441
Record exception details
...
Why mask the actual exception with a made-up one? The name did convey a bit more context, but Bugsnag tracks the context anyway. It would be more helpful to record the details of the error.
Just in case, I checked if there were any recorded instances of StripeDeauthorizeFailure. I couldn't find any in Bugsnag (last 3 months) for AU, Germany, Katuma, NZ, Norway, UK, USA. Also no mention in GitHub issues.
2024-01-17 15:16:51 +11:00
cyrillefr
8eb5ac990e
Replace toggle_button_disable ctrller with generic toggle_control ctrller
...
- add enableIfPresent method in toggle_control_controller.js to handle enabling on toggle
- add testing in the corresponding spec
- replace in view previous ctrler with intended generic toggle-control
2024-01-16 20:35:21 +01:00
David Cook
627863bdf7
Fix up button colour variables
2024-01-16 13:45:02 +11:00
David Cook
c67f0c52a2
Show edit button only when hover image
...
This required some branching in the haml, which would be nice to avoid. But we have more work to do here so we'll refactor at the end.
2024-01-16 13:45:02 +11:00
David Cook
fa9deeb948
Remove unused method
2024-01-16 13:45:02 +11:00
David Cook
471dadeaec
Accept only image files
...
Leaving the more specific validation in the Rails model (rather than try to duplicate it).
2024-01-16 13:45:02 +11:00
David Cook
88c840b3ee
Update styling for close button
...
I think we need a more general solution similar to ConfirmModalComponent's .modal-actions so that we can style all modals more consistently. But it's too late in the afternoon.
2024-01-16 13:45:00 +11:00
David Cook
6ed96bae85
Submit image when selected
...
This could have been done with a tiny amount of inline JS, but I went this way in case I needed any special logic for UJS. It turns out we don't.. but it still looks a bit cleaner this way.
2024-01-16 13:44:34 +11:00
David Cook
6479990f6d
Show image update form in modal
...
It submits to the existing controller. I wanted to submit it with StimulusReflex, but it [doesn't support file uploads](https://docs.stimulusreflex.com/guide/working-with-forms.html#a-note-about-file-uploads ). Perhaps we'll enhance this with javascript later.
2024-01-16 13:44:28 +11:00
David Cook
38661a67bc
Add option to open modal instantly
...
Using pre-existing feature in ModalController
2024-01-16 12:53:07 +11: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
David Cook
91abb856a6
DRY
...
Refactor to use the (previously unused) shared method.
2024-01-16 12:53:07 +11:00
David Cook
c584d639cc
Show default image if none set
2024-01-16 12:53:07 +11:00
David Cook
ca73a9ab62
Reduce space used by image
2024-01-16 12:53:07 +11:00
David Cook
a6a3a02d79
Use padding to set button size
...
It's more flexible.
Also reduced the overall size to suit the desired table row sizes.
2024-01-16 12:53:06 +11:00
David Cook
1f61b03796
Add image with edit button
...
With a new 'mini' button style.
For now, it's just a shortcut to the image edit page.
2024-01-16 12:50:31 +11:00
Gaetan Craig-Riou
64043b820a
Merge pull request #12030 from mkllnk/connected-apps-visibility
...
Show Connected Apps only to enterprise managers
2024-01-15 15:24:29 +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
746b521856
Associate each label with its checkbox
2024-01-14 15:06:02 +05:45
binarygit
bc570743a5
Bugfix: Link individual send shipment button to its corresponding form
2024-01-14 15:06:02 +05:45
binarygit
5b99c2666a
Use cable_ready.replace instead of morphing after order is captured
2024-01-14 15:06:02 +05:45
binarygit
6e00a34494
Use transaltion with HTML in it by adding html suffix
2024-01-14 15:06:02 +05:45
binarygit
75ca1dddf1
Fix tests and rubocop warnings
2024-01-14 15:06:02 +05:45
binarygit
36c5d7c5ee
Change displayed message
2024-01-14 15:06:02 +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
99f4c4705f
Remove redundant function
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
Filipe
4c96eb40df
Merge pull request #11932 from dacook/buu-dropdown-tweaks-11518
...
[BUU] Dropdown UI tweaks (tom-select)
2024-01-12 11:41:07 +00:00
Filipe
2cd3545d1d
Merge pull request #12015 from rioug/fix-select-customer-search
...
Backoffice, fix customer search when searching by first name
2024-01-12 11:22:13 +00:00
Rachel Arnould
877a145874
Merge branch 'master' into buu-dropdown-tweaks-11518
2024-01-12 10:40:19 +01:00
Maikel Linke
95c6a56e2e
Simplify loading of default tax category
...
The logic doesn't change but I simplified it and added more detailed
specs.
2024-01-12 17:06:24 +11:00
Filipe
2493ee5e2a
Merge pull request #11982 from drummer83/logo_size
...
Make hint for logo size translatable and adjust to 300 px
2024-01-11 19:27:11 +00:00
Rachel Arnould
6ff2be17c6
Merge pull request #12023 from dacook/buu/sticky_table_header_and_saving_banner-2
...
[BUU] Sticky table header and saving banner - alternate solution
2024-01-11 15:23:06 +01:00
Maikel Linke
78e42ec664
Show Connected Apps only to enterprise managers
...
Super-admins also saw that tab but connecting an app doesn't work unless
you are a manager of that enterprise.
2024-01-11 12:20:40 +11:00
Maikel
d197251262
Merge pull request #12026 from dacook/rubocop-autocorrect
...
Autocorrect Rubocop issues
2024-01-11 09:04:49 +11:00
Konrad
1c01af5874
Merge pull request #11983 from bmd08a1/opt/fix-enterprise-roles
...
Improve `admin/enterprise_roles` page performance
2024-01-10 20:30:41 +01:00
Konrad
19dd5b110c
Merge pull request #12009 from chahmedejaz/bugfix/11971-tos-position-issue
...
Fix ToS Position Issue
2024-01-10 19:36:57 +01:00
David Cook
0bb0e1674e
Remove unused rule
...
I forgot to remove this before.
2024-01-10 16:41:47 +11:00
