Ashish Gaur
5fc3fe03ee
13221 Add spec for checking flash error is shown when editing a shipped order
2025-05-05 20:37:59 +05:30
Ashish Gaur
8d96411741
13221 Fix rubocop issues
2025-05-05 20:03:47 +05:30
Ashish Gaur
c533111509
13221 Don't allow shipped orders to process update request
2025-05-05 20:03:47 +05:30
Ashish Gaur
475cfdc8f0
Show cannot add item to shipped order in the Add products section
2025-05-05 20:03:47 +05:30
Ashish Gaur
42e2d3cdd5
13221 - Don't allow shipped orders to be editable
2025-05-05 20:03:47 +05:30
David Cook
3ec14607a6
Merge pull request #13286 from chitty/apr29-rubocop-style-corrections
...
Rubocop Style corrections
2025-05-05 12:53:57 +10:00
David Cook
29a14848ea
Merge pull request #13285 from cyrillefr/FixRubocopNamingMemoizedInstanceVariableName
...
Fixes Rubocop Naming NamingMemoizedInstanceVariableName cop
2025-05-05 12:48:28 +10:00
Filipe
846cb4dd89
Merge pull request #13252 from rioug/13159-add-tag-variant
...
[Variant tags] Add variant tag on Bulk Edit Product screen
2025-05-03 17:34:51 +01:00
Gaetan Craig-Riou
da8675826e
Per review, remove :variant_tag context
2025-04-30 14:56:31 +10:00
Gaetan Craig-Riou
212b122700
Add translation for default placeholder in TagListInputComponent
2025-04-30 14:56:31 +10:00
Gaetan Craig-Riou
df785e907d
Update app/components/tag_list_input_component/tag_list_input_controller.js
...
Co-authored-by: Maikel <maikel@email.org.au >
2025-04-30 13:53:30 +10:00
Carlos Chitty
d0c687650e
Autocorrect Style/HashEachMethods offenses
2025-04-29 15:16:34 -04:00
Carlos Chitty
63168086e7
Autocorrect Style/HashConversion offenses
2025-04-29 14:27:31 -04:00
Carlos Chitty
17a5b5e620
autocorrect Style/ArrayIntersect offenses
2025-04-29 14:20:50 -04:00
Filipe
d20ed5c757
Merge pull request #13275 from slothmock/fix-#13264
...
Fix #13264 - missing 'ng-bind-html'
2025-04-29 18:45:15 +01:00
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
Filipe
bf2277b6da
Merge pull request #13255 from piyush828-design/pagy_upgrade
...
Upgrade pagy version to latest
2025-04-29 16:12:58 +01:00
cyrillefr
fbb4954ff7
Fixes Rubocop Naming NamingMemoizedInstanceVariableName cop
2025-04-29 13:27:47 +02: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
d9c15cf414
update locale to use lazy loading
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
cyrillefr
2dce79a93d
Fixes Rubocop HeredocDelimiterNaming offense
2025-04-28 09:47:55 +02: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
piyush828-design
5e890bb361
Merge branch 'master' into pagy_upgrade
2025-04-24 17:46:39 +05:30
Jordan Mock
3bb14fbfdb
Merge branch 'master' into fix-#13264
2025-04-24 13:13:37 +01:00
Jordan 'sloth' Mock
b56411145c
Incorrect place for origianl fix. Thanks to Blane W for pointint out the correct line.
2025-04-24 13:05:40 +01:00
cyrillefr
7e8661b936
Rename a set method in Post checkout service
2025-04-24 09:29:40 +02:00
cyrillefr
7812d5f58a
Replace set_methods in order model
2025-04-24 09:29:40 +02:00
cyrillefr
9996fcb54d
Strips set prefix from method in ProducerMailer
2025-04-24 09:29:40 +02:00
piyush828-design
6f2f8e9542
fixed users page breaking
2025-04-24 12:49:47 +05:30
Gaetan Craig-Riou
bb882ddfa3
Per review, simplify disabling of default action
...
Turns out you can just call `event.preventDefault()` on the action and
there is no need actually use hotkeys to do that.
2025-04-24 13:53:23 +10: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
c8a91a9d44
Fixes deprecation on trailing hashes for sort_link
...
Running the spec was pointing to the following deprecation - Passing two trailing hashes to is deprecated, merge the trailing hashes into a single one. (called at /home/ffurtado/openfoodnetwork/app/views/spree/admin/users/index.html.haml:16)
2025-04-23 19:45:06 +01:00
Jordan Mock
c14c760033
Fix #13272 - missing 'ng-bind'
...
This PR fixes issue #13272 where supplier and product names containing HTML character entities (e.g. ã) were rendered as raw text on the /admin/inventory page.
For example, a supplier name intended to appear as:
Pãtes du Contentin
would incorrectly display as:
Pãtes du Contentin
Cause:
AngularJS’s {{ ... }} interpolation inserts raw strings into the DOM without decoding HTML entities.
2025-04-23 14:05:21 +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
Gaetan Craig-Riou
1479be787b
Prevent adding empty tag
2025-04-22 13:42:09 +10:00
Gaetan Craig-Riou
31afdfd8c4
Disable "enter" hotkeys only on tag input element
...
We are still able to use enter to submit the form on anyother input.The
tag input creates a new tag when enter is pressed
2025-04-22 13:42:09 +10:00
Gaetan Craig-Riou
6ff47eab3b
Clean up css, we dont' need a different font for tags
2025-04-22 13:42:09 +10:00
Gaetan Craig-Riou
034feabcff
Javascript code linting
2025-04-22 13:42:09 +10:00
Gaetan Craig-Riou
aba6240736
Per review, use css :has() pseudo class
...
It saves writing some custom javascript, less code to maintain!
2025-04-22 13:42:09 +10:00
Gaetan Craig-Riou
90ca224680
Fix tag display for long name
2025-04-22 13:42:08 +10:00
Gaetan Craig-Riou
6417c87047
Add visual feedback when adding tag errors
...
Highlight the tag name in red, if trying to add a tag that already
exists.
2025-04-22 13:42:08 +10:00
Gaetan Craig-Riou
559249b621
Improve tagListInputController to integrate with bulkFormController
...
tagListInputController is not a standard form controller so we had to
make a few changes to integrate with the change tracking used int
bulkFormController. Mainly we make sure to manually trigger event when
deleting a tags, and we handle the change highlight.
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
c15e16900d
Add stimulus tag list input controller
...
It handles the UI to display the list of tags, and lets you add and
remove tags from the list.
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
6ff4c2c3aa
Disable submitting form with enter key
...
We need to the enter key available to create new tags
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
d6ed536eb7
Add example of component stimulus controller naming convention
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
3585499fba
Move tag list input to a component
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
352203747a
Add tag styling
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
87a80d3efe
Add Tags collumn
...
Currently display the list of tags, no fancy UI.
Updating works
2025-04-22 13:41:01 +10:00
