raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,329 Commits 20 Branches 451 Tags
dcc8556470355282b4fa05562e1e2eb6faa63fcd
Commit Graph

16153 Commits

Author SHA1 Message Date
Filipe
a854775afe Merge pull request #12470 from mkllnk/description-html-test 
Sanitise HTML in long description of enterprise [read-only]
 2024-05-15 20:52:30 +01:00
Filipe
b67eba2130 Merge pull request #12454 from arunguleria/12372-Add-MissingTranslations 
12372-[Admin] Missing translations  page titles
 2024-05-15 20:39:22 +01:00
Filipe
cb53419681 Merge pull request #12443 from MrBowmanXD/junior 
Remove "ready for" info from shipping method description area at checkout #12395 (solved)
 2024-05-15 20:10:58 +01:00
Filipe
b3ac6bed87 Merge pull request #12428 from cyrillefr/RedundantPresenceValidationOnBelongs_part_III 
Fix RedundantPresenceValidationOnBelongs on two files
 2024-05-15 18:21:52 +01:00
Filipe
59e04cc549 Merge pull request #12376 from cyrillefr/MakeShipOrderButtonWorksOnPageOrderDetails 
Fix Ship Order menu choice not working
 2024-05-15 17:57:25 +01:00
Maikel Linke
f089c0eff3 Keep HTML line breaks 
They do appear in long_description on au_prod.
 2024-05-14 12:40:58 +10:00
Maikel Linke
23a27c65be Sanitise existing HTML in Enterprise#long_description 
We will add a migration to sanitise all existing descriptions but before
we do that destructive action, it's good to test this in a read-only
fashion first.
 2024-05-14 12:25:58 +10:00
Maikel Linke
7b4a85f7ef Sanitise HTML in long description of enterprise 
This happens only on assignment. We still need to migrate existing data.
 2024-05-14 12:25:47 +10:00
David Cook
00f6d01738 Remove errored variants 
I found another case.
 2024-05-14 11:27:04 +10:00
David Cook
da77994a89 Ignore disconnected form elements 
When elements are removed from the DOM, they remain in the recordElements array. But we can simply ignore them.
We have to wait until after rails-nested-form:remove is completed before toggleFormChanged.

hmm It would be even better to remove them from the array..
 2024-05-14 11:26:40 +10:00
David Cook
b45df8a723 Use built-in feature to delete new record row 
I looked at the source code and found that we were missing one detail: data-new-record.
https://github.com/stimulus-components/stimulus-rails-nested-form/blob/master/src/index.ts#L32-L35

It's documented here, but it's easy to miss: https://www.stimulus-components.com/docs/stimulus-rails-nested-form/
 2024-05-14 11:25:52 +10:00
cyrillefr
808f1c65f2 Requested changes on Delete Button missing 
- Styling(in red) for the remove button/link in view

- A remove method to the bulk_form controller
    - removes elements from the Dom
    - removes changed elements from the binded Array in controller
    - so that menu that indicates changes disappear and blured elements
    - resume to non blurring state

- Added the corresponding specs
    - test with one, two variants
    - test with two different products
 2024-05-14 11:25:22 +10:00
cyrillefr
36f3e4af02 Requested changes on Delete button missing 
- cleaned haml/html
 2024-05-14 11:25:22 +10:00
cyrillefr
9b10b73a65 Delete Button missing before saving variant 
- used the remove option of stimulus-components/rails-nested-form lib
 - add the Remove option in the menu
 - the corresponding spec
 - the locale
 2024-05-14 11:25:22 +10:00
David Cook
1f91c2e4b5 Merge pull request #12417 from filipefurtad0/migrate_legacy_specs 
Removes unused spec related to legacy checkout
 2024-05-14 09:42:23 +10:00
David Cook
62fefd5d49 Implement required method 
Most of the time this doesn't get called because source_required: false.
But sometimes it [does happen](https://app.bugsnag.com/yaycode/openfoodnetwork-uk/errors/66329690f4b6380007e8a4f8)

I have a feeling that source_required? could be moved to the superclass as payment_source_class.present?. But I don't know enough about this area of the system to try it...
 2024-05-13 12:55:55 +01:00
Ahmed Ejaz
b5fe19cb7d 11058: add specs 2024-05-10 02:52:57 +05:00
Arun Guleria
c84be2f396 12372-Add missing translation page titles 2024-05-09 15:12:03 +05:30
Manuel Gonçalves
110eeaf793 Removed the "ready for" information located in checkout/details 
This provides the solution wanted and the best way to do it.
 2024-05-09 10:14:37 +10:00
Ahmed Ejaz
86f88792c2 11058: add sortable products by name 2024-05-08 12:56:41 +05:00
cyrillefr
6575ad738b Fix Ship Order Button: requested changes 
- bypass rubocop class lines limit
 2024-05-07 19:15:00 +02:00
cyrillefr
271d50e5ab Fix Ship Order Button: modal should close itself 
- returns to the same processing for customer, invoices etc.
   that edit
 - need a bit of sleep in spec bc 2 tasks are asynchroneous
 2024-05-07 19:15:00 +02:00
cyrillefr
ba68f4b252 Fix 'Ship Order': requested changes 
- deletes local variables in view
- factor logic in helper
 2024-05-07 19:15:00 +02:00
cyrillefr
901c29c97b Fix Ship Order menu choice not working 
- Front End ShipOrderComponent was missed for the menu to work
 - updated spec to test for a specific case
 2024-05-07 19:15:00 +02:00
David Cook
7f40fd7adb Fix typo 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
269e69852c 11060: add style rule for the small gap 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
c291ff88ff 11060: remove duplicated supplier_id 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
7e555b4fcb Update app/views/admin/products_v3/_product_row.html.haml 
Co-authored-by: David Cook <david@redcliffs.net>
 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
f386202ec2 11060: fix lint issues 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
15ee4f6619 11060: add specs 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
c12d6ab7f0 11060: revert 33b947be00563b67ca36475f277ceceaf8c68378 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
da34e7b780 11060 - fix undefined method tax_category_options error in specs 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
aad48b4670 11060 - use SearchableDropdownComponent for categories or tax categories 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
f6efd47af2 11060 - use SearchableDropdownComponent for producer names 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
c153ff75f3 11060 - add searchable dropdown component 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
b577a81f48 11060 - add tax category field 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
5050c2e02b 11060 - remove producer name from variant 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
4360ddde03 11060 - add variant categories dropdown 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
ec4b920f8b 11060 - implement scenario 1 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
2fdaa8b9ec 11060 - implement the scenario 2 and 3 2024-05-07 14:59:14 +02:00
cyrillefr
5e18038a68 Fix RedundantPresenceValidationOnBelongs on two files 
- presence: true is redundant since Rails 5.0 BUT applies
   with new default config of
   belongs_to_required_by_default to true.
   Lots of files with belongs_to_required_by_default = false
   (backward compatibility).
   So: deleting this setting implies to adding optional: true
 - added 'NOT NULL' constraints so model constraints match
   with contraints on DB tables.
 - corresponding migration files to match AR Models &
   DB tables
 - rake tasks to check corrupt data (ie: NULL/nil in id fields)
 - updated the todo
 2024-05-01 15:43:09 +02:00
Gaetan Craig-Riou
04f77b5791 Merge pull request #12414 from cyrillefr/RedundantPresenceValidationOnBelongs_part_II 
Fix RedundantPresenceValidationOnBelongs on some files (part II)
 2024-05-01 13:00:47 +10:00
cyrillefr
521e24d7a6 Requested changes on Fix RedundantPresenceValidationOnBelongs II 
- product id required
 - DB + AR model
 2024-04-30 09:58:24 +02:00
Filipe
e99b072442 Merge pull request #12313 from anthonyms/11482-fix-rubocop-rails-issue-has_many 
Fix Rubocop Rails: Rails/HasManyOrHasOneDependent
 2024-04-25 16:24:47 +01:00
Filipe
4ff832693c Merge pull request #12412 from dacook/buu/fix-non-admin-saving-12403 
[BUU] Fix non-admin saving
 2024-04-25 12:37:11 +01:00
Rachel Arnould
09354dc80e Merge pull request #12219 from abdellani/prevent-generate-invoices-when-distributor-cannot-invoice 
prevent generating invoices when order's distributor can't generate invoices
 2024-04-25 12:18:49 +02:00
cyrillefr
43005672a9 Fix RedundantPresenceValidationOnBelongs on other files 
- presence: true is redundant since Rails 5.0 BUT applies
   with new default config of
   belongs_to_required_by_default to true.
   Lots of files with belongs_to_required_by_default = false
   (backward compatibility).
   So: deleting this setting implies to adding optional: true
 - added 'NOT NULL' constraints so model constraints match
   with contraints on DB tables.
 - corresponding migration files to match AR Models &
   DB tables
 - rake tasks to check corrupt data (ie: NULL/nil in id fields)
 - updated the todo
 2024-04-24 15:19:17 +02:00
David Cook
b846d0f517 Add ability to bulk update products for product managers 
I forgot to do this in #12328 [BUU] Remove Stimulus Reflex from Products screen
 2024-04-24 10:56:30 +10:00
Anthony Musyoki
0d03cdf815 Fix Rubocop: Delete dependent stock_movements 2024-04-23 13:13:26 +03:00
Anthony Musyoki
434afb73cd Fix Rubocop: Update handling of enterprise associations 2024-04-23 12:40:58 +03:00