raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-17 04:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,934 Commits 15 Branches 457 Tags
17eb8d5cd851663bf8ecb016f737a58fe103b283
Commit Graph

16404 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
1b9a7aa81e Adjust height, border and background colors for inputs 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
98f9303c99 Tweak colors, size, ... for select2 to looks like tom-select 
One day, we'll remplace select2 by tom-select
 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
e5086ce057 Adjust colors for select2 and remove useless ones 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
3a67f5c9d7 Integrate select2 to admin_v3 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
b8406be4b9 Add trix editor to admin_v3 css 
That was an omission when installing trix
 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
03d5f8acc4 No need to specify padding when having a line height 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
48f1c65a91 Include dashboard_item into admin_v3 2023-09-15 10:47:43 +02:00
David Cook
e075d40525 Prevent accidentally leaving the page 2023-09-15 16:00:41 +10:00
David Cook
99ac48a258 Discarding changes reloads from DB 
But it also clears any search filters. To confirm exactly what behaviour is desired before fixing...
 2023-09-15 15:46:02 +10:00
David Cook
8ff67aca41 Disable filters and sorting when form is modified 
Stimulus controllers aren't supposed to reach outside their own element (so we can't do this with targets). Perhaps the controller should be bigger to encompass more, but I wanted to see if I could avoid making a mega component that does everything. For now it seems appropriate just to pass a selector in.
Another option is to publish events on other controllers using Outlets, but I don't know if we need to go there just yet.
 2023-09-15 15:45:48 +10:00
David Cook
e047f49998 Make form actions float over sort controls. 2023-09-15 15:45:48 +10:00
David Cook
15f7a8299b Show form actions only when modified 2023-09-15 15:45:48 +10:00
David Cook
daefada5a9 Show summary of modified records 
I found myself trying to write Ruby in Javascript, and it's not nearly as pretty..
Javascript now has more advanced data structures like Map, but it's rather useless because it doesn't have the usual iterator methods (such as filter, map, reduce etc).

Also for the spec I wasn't sure of the best approach, so will gladly recieve feedback.
 2023-09-15 15:45:48 +10:00
David Cook
18e40bebd0 Mark modified fields 2023-09-15 15:45:45 +10:00
Gaetan Craig-Riou
e7a52e4733 Update app/controllers/admin/enterprises_controller.rb 
Simplify code

Co-authored-by: Maikel <maikel@email.org.au>
 2023-09-14 17:57:31 +10:00
Neal Chambers
bf9db13bb3 Fix Style/HashSyntax 2023-09-14 16:25:49 +09:00
David Cook
0966864589 Merge pull request #11511 from dacook/fix-update-button-11349 
Fix Update button sizing
 2023-09-14 13:37:19 +10:00
David Cook
2e6e083667 [fixup] Fix Update button sizing 
By disabling line wrap we can consistently predict how it will appear. The longest translation we currently have is 14 characters so this should be fine.
 2023-09-14 09:37:10 +10:00
Maikel
758c6e033f Merge pull request #11533 from macanudo527/fix_stylehash_2 
Fix Style/HashSyntax 3/13
 2023-09-14 09:04:03 +10:00
Konrad
c36c5be2c9 Merge pull request #11497 from Matt-Yorkley/import-tax-category 
Fix error when importing entries with a tax category
 2023-09-13 23:28:16 +02:00
Mohamed ABDELLANI
ee7668e713 implement enterprise fee report filters 
squash Reformat/Refactor spec
 2023-09-13 19:09:55 +02:00
Filipe
0f47ec0094 Merge pull request #11525 from jibees/11524-enlarged-unit-price-tooltip-image-on-variant-edit-page 
BUU: Fix question mark icon for tooltip
 2023-09-13 16:52:15 +01:00
Filipe
dae05e31ab Merge pull request #11501 from jibees/9146-improve-user-feedback-in-oc-edit-page-for-hidden-inventory 
Improve user feedback in oc edit page for hidden inventory
 2023-09-13 16:26:39 +01:00
Neal Chambers
ed06edda3f Fix Style/HashSyntax 2023-09-13 16:45:00 +09:00
Neal Chambers
4ffd3759cc Fix Style/HashSyntax 2023-09-12 23:19:05 +09:00
Gaetan Craig-Riou
9925399292 Sales Tax Totals by order, fix tax amount when voucher applied 
Apply the tax discount to the tax collumn when a voucher is added
to the order, and update total excluding tax accordingly.
 2023-09-12 14:36:28 +02:00
Jean-Baptiste Bellet
ff8b9465c7 Display info on outgoing products panel when some variants hidden 2023-09-12 10:20:26 +02:00
Jean-Baptiste Bellet
ff7629ba2c Display information on outgoing product when variant aren't available 
Update en.yml
 2023-09-12 10:20:26 +02:00
Jean-Baptiste Bellet
edc6ac801d Use the right colors for the question mark icon tooltip in admin style v3 2023-09-11 15:44:08 +02:00
Jean-Baptiste Bellet
75751f07b8 Move question-mark-icon into admin_style_v3 context 2023-09-11 15:31:30 +02:00
Jean-Baptiste Bellet
99ea4a63e0 No need to have a button: not conflicting with button styles 2023-09-11 15:29:09 +02:00
Gaetan Craig-Riou
e44a0092ea Fix edge case when trying to deactivate the only availabe voucher 
Plus spec
 2023-09-11 12:00:48 +02:00
Gaetan Craig-Riou
48956b9bd1 As per review comment, simplify voucher view a little 2023-09-11 11:59:34 +02:00
Neal Chambers
416d6e538a Fix Style/HashSyntax 2023-09-09 09:00:38 +09:00
Matt-Yorkley
839e580878 Fix error when importing entries with a tax category 2023-09-08 19:24:50 +01:00
Gaetan Craig-Riou
8face3d182 Merge pull request #11488 from macanudo527/fix_helperinstancevariable_2 
Fix Rails/HelperInstanceVariable 2
 2023-09-08 19:51:39 +10:00
David Cook
99da60921f Fix Update button sizing 
This was broken when upgrading [Foundation](https://github.com/openfoodfoundation/openfoodnetwork/pull/11349). For some reason the button.expand class now sets larger font size and padding, which overrides the button.small class. It's probably a bug but we'll have to work around it.
 2023-09-08 10:20:26 +10:00
Maikel
1991970185 Merge pull request #11377 from mkllnk/dfc-update-request 
[DFC API] Import known units when creating new products
 2023-09-08 09:05:26 +10: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
Konrad
ea622cd2d7 Merge pull request #11487 from pedrocarmona/feature/invitation-email-locale 
Send translated email when creating users via super admin interface
 2023-09-07 16:41:59 +02:00
Gaetan Craig-Riou
f225cd78df Handle unique voucher code exception 
Rails validation doesn't handle unique validation for soft deleted
object. So we rescue the exception raise by the database and display
a nice error message. We don't want an enterprise to be able to reuse
a code in case the voucher get reactivated.
 2023-09-07 15:13:47 +02:00
Gaetan Craig-Riou
b955e0b25d Use depedend: nil on adjustment association 
We want to keep the voucher adjustment associated with the Voucher
event when the voucher as been soft deleted, as we use this
functionality as activate/deactivate feature
 2023-09-07 13:58:07 +02:00
drummer83
a7ddf99ee4 Fix typo 2023-09-06 23:20:12 +02:00
drummer83
13d5b954e6 Add 'Terms of Service' to the tabs 2023-09-06 23:18:00 +02:00
Konrad
3b9ebf4e07 Merge pull request #11396 from abdellani/fix-if-tos-is-not-set 
fix If ToS file is not set, customer needs to accept Terms on each checkout
 2023-09-06 16:56:21 +02:00
Neal Chambers
2da9ffd3cb Delete Unused Helper Functions 2023-09-06 22:36:51 +09:00
Neal Chambers
b1e40ed605 Fix Rails/HelperInstanceVariable 2023-09-06 22:36:46 +09:00
Gaetan Craig-Riou
d1b5dcab88 Add ability to activate deactivate a voucher 
Plus controller specs
 2023-09-05 15:48:59 +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