raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-06 02:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,679 Commits 16 Branches 455 Tags
c7c19e47de2a53c2cae6befb56f7980cc78bb80c
Commit Graph

410 Commits

Author SHA1 Message Date
Gaetan Craig-Riou
0c43d0f16a Put vouchers admin screen behind 'vouchers' feature toggle 2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou
fb1ad4c65f Remove non needed collumn from voucher list 2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou
04748b6e0e Move voucher value to the model 
Use Spree::Money to display amount with currency
 2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou
e4f40d14b8 Fix enterprise voucher tab 
Add harcoded voucher amount
Add missing translation
 2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou
f9f6793d10 Add template and basic controller for backoffice voucher pages 2023-03-28 13:39:29 +11:00
Filipe
1673a18eb6 Merge pull request #9729 from binarygit/remove-angular-from-users 
Admin, Enterprise Settings, Users tabs: remove tooltips directives + use reflex to invite user to be managers
 2023-03-23 11:52:18 +00:00
binarygit
ecd5033efa Replace angular for when adding a new unregistered manager to an enterprise 
Co-Authored-By: David Cook <david@redcliffs.net>
 2023-03-23 11:21:05 +01:00
binarygit
a397ba1ca9 Replace what's this tooltips 
There are tooltips here that don't have a what's this?
There are many angular directives/methods being used that I haven't
looked into
Every select box is using select2
 2023-03-20 08:37:47 +01:00
Jean-Baptiste Bellet
40a0d8e08c Improve design: make delete not a button but a link + close to file name 2023-03-08 10:38:28 +01:00
binarygit
8f6fdf3e31 [Admin, Enterprise Settings] Remove Angular from Business Details tab 2023-03-08 10:26:05 +01:00
Jean-Baptiste Bellet
e18454c55a Add pagination on enterprises page for super admin 
Enterprises are stored in `@enterprise_set` variables, and we iterate over to show the list of enterprises to super admin.

Previously, we used to use `Sets::EnterpriseSet.new(collection)` instead of creating set based on `@collection`: this leads to call the `collection` method twice, which was probably very time consuming. This commit fix also that.

+ use paginated enterprises loading on bulk update but without testing if the current user is an admin
 2023-02-03 09:15:07 +01:00
Gaetan Craig-Riou
8194ae1eae Add required asterisk in business details panel 2023-01-24 15:24:14 +01:00
Konrad
e288c7a551 Merge pull request #9956 from jibees/9626-resize-and-crop-logo-instead-of-just-resizing-should-fit-into-a-square 
Enterprise logo: Resize and crop logo instead of just resizing --> logo should fit into a square
 2022-11-27 20:28:55 +01:00
vviekk
22559a755f Removing 'required' tag for 'Latitude / Longitude' for Enterprises 
Empty/Null values are valid in db and for existing use-cases
 2022-11-21 15:19:28 +05:30
Konrad
8510379178 Merge pull request #9985 from binarygit/add-spinner-when-enterprise-sells-changes 
[Admin][Enterprise Settings] Show spinner when enterprise sells option changes
 2022-11-17 16:59:55 +01:00
binarygit
8fc721c651 [Admin, Enterprise Settings] Show spinner when enterprise sells changes 2022-11-13 16:24:35 +05:45
Jean-Baptiste Bellet
262b546836 Add some visual spacing 2022-11-08 14:59:23 +01:00
Jean-Baptiste Bellet
4bfd39caec The info tip indicates image should be 100*100, so display it at 100*100 size 2022-11-08 14:54:47 +01:00
David Cook
20c0449128 Remove unnecessary case 
Seems cleaner to me.

Best viewed with whitespace ignored.
 2022-11-04 14:26:41 +11:00
Jean-Baptiste Bellet
d797ef2b3a As we are in the Business Address panel, use the business_address attr 
Not the address one, which is different

Business address country could be null, so use an empty array
 2022-10-26 11:21:44 +02:00
Jean-Baptiste Bellet
d46105ea90 Correct some input styling 2022-10-26 11:21:44 +02:00
Jean-Baptiste Bellet
151e71b4d9 Actually controller is named dependEnt-select 2022-10-26 11:21:44 +02:00
Jean-Baptiste Bellet
b6bc4c66a2 Specify the current value of country 2022-10-26 11:21:44 +02:00
binarygit
01c477f2cb Remove angular from Payment Methods 2022-10-08 14:20:54 +02:00
David Cook
4c3e20d25a Scope Enterprise form legend translations 2022-10-04 19:39:29 +02:00
David Cook
2e2ff25ef7 DRY up code 
Slightly. If we upgrade to Ruby 3.1 with hash value omission, this would be neater.
If we could set a scope in the controller (https://stackoverflow.com/questions/6137960/rails-i18n-default-scope) it would be even neater.
 2022-10-04 19:39:29 +02:00
Maikel
5173ddb7a0 Merge pull request #9675 from filipefurtad0/split_build_consumer_tests 
Makes build run all specs; fixes failing specs
 2022-09-20 11:20:52 +10:00
Jean-Baptiste Bellet
4a8dc37b40 Since #9087, we don't use a boolean but an enum, 'public' or 'hidden' 2022-09-16 10:02:27 +02:00
binarygit
90f4b1328b Remove angular from shipping methods tab in enterprise/edit 2022-09-13 15:20:33 +05:45
Maikel
44bf63137a Merge pull request #9606 from binarygit/remove-angular-from-address 
Remove Angular from Address Tab
 2022-09-12 13:49:54 +10:00
binarygit
abbb61b943 Remove country controller from enterprises/new and Business Details tab 2022-09-05 09:52:27 +05:45
binarygit
36b5cb3b49 Replace country controller with dependent select in address tab 2022-09-05 09:52:27 +05:45
binarygit
02e3184945 Replace angular tooltips in Primary Details tab 2022-08-31 11:51:51 +05:45
binarygit
8861b6d077 Replace permalinks angular ctrl with stimulus 2022-08-31 10:06:51 +05:45
binarygit
52b1f40acb Replace select2 with tom-select in primary details tab 2022-08-31 10:06:51 +05:45
Filipe
8ace56956b Merge pull request #9560 from binarygit/replace-tooltip 
Replace tooltip on Enterprise Settings /contact page
 2022-08-30 16:23:09 +01:00
binarygit
b76d9045ce Replace power-tip in enterprises/edit/<name>/contact with floatingUI 2022-08-24 13:31:45 +05:45
Filipe
d3f1d4a5f9 Merge pull request #9529 from Philwi/make-the-shop-url-clickable 
Make the shop url clickable
 2022-08-17 20:47:07 +01:00
Philipp Winkler
141a2a507d Make shop url clickable 2022-08-11 22:14:51 +02:00
binarygit
6b56a8df0a Display/hide side-menu items when values in primary details change 2022-08-10 15:11:53 +05:45
binarygit
e18a242b90 Render admin/enterprises/<name>/edit page using stimulus 2022-08-10 15:08:59 +05:45
Arthur Vieira
62ee3c2de1 Add admin view field for whatsapp number 
Creates a field and tooltip in
/admin/enterprises/<enterprise>/edit#!/contact for updating the
enterprise's WhatsApp phone number, with corresponding i18n keys for the
name of the field, placeholder and tooltip text.
 2022-06-30 19:19:10 -03:00
GeorgeThoppil
898c470c00 Change enterprise visibility scope 2022-04-21 20:27:28 -04:00
Filipe
4ea1dd68af Merge pull request #9023 from apricot12/8908-Access-Enterprise-perms-from-setting-page 
Enterprise can access permissions from enterprise edit page
 2022-04-21 13:21:27 +01:00
Cillian O'Ruanaidh
4162830bee Switch help modals from angular templates to use ViewComponent and StimulusJs 2022-04-20 09:36:30 +10:00
Nihal Mohammed
15e7a5a4df Rename product_stock_display to product_low_stock_display 
Rename product_stock_display to product_low_stock_display in enterprise_serializer and shop_variant_controller
 2022-04-15 10:59:42 +10:00
Jean-Baptiste Bellet
143c977a19 i18n for shop preferences 2022-04-15 10:53:28 +10:00
Nihal M. Kelanthodika
356d759dbe Add Display stock option to enterprises form 2022-04-15 10:53:28 +10:00
Nihal M. Kelanthodika
f7a767988c Add preferred_product_stock_display to Enterprise model, serializer and permitted attributes. (Fixed alignment of guest orders radio button as well) 2022-04-15 10:53:28 +10:00
Nihal Mohammed
d23846bfa2 Add Enterprise Settings to admin enterprises edit side menu, adds redirect_function to side menu services. 2022-04-13 17:03:04 +05:30