raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,934 Commits 18 Branches 451 Tags
17eb8d5cd851663bf8ecb016f737a58fe103b283
Commit Graph

129 Commits

Author SHA1 Message Date
Ahmed Ejaz
c52c2ebfe1 12570 - fix specs 2024-07-12 18:20:19 +05:00
Ahmed Ejaz
0986971473 12570 - fix variant's display_as field being empty issue 
- New variant unit_value is empty, so +VariantUnits::OptionValueNamer.new(variant).name+ returns ""
- Now we are making sure that new variant unit_value won't be empty
 2024-07-12 17:00:42 +05:00
cyrillefr
8616847793 Update button should change status on modified white label 
- swap position between users & white label so that user's inner form
- does not interfere with white_label own position in outer form
- modified spec so that lowermost user is clickable
 2024-06-17 17:11:19 +02:00
Abdul Aziz Ali
369ea7cd16 Define tax_on_fees i8n key #11680 2024-06-03 13:04:36 +08:00
Abdul Aziz Ali
82f75e344f Display additional tax total in order #11680 
Add new text key admin.order.edit.additional_tax_included_in_price
Add spec file for additional tax display. Add new trait for enterprise fee and calculator factory
 2024-06-03 12:50:37 +08:00
Filipe
706da37f15 Merge pull request #12507 from mkllnk/connected-apps-super-admin 
Allow only enterprise managers to connect apps
 2024-06-01 18:16:28 +02:00
Maikel Linke
4e8896d655 Clearer naming of helper method 2024-05-24 08:17:08 +10:00
Maikel Linke
7b9577b547 Allow only enterprise managers to connect apps 
Otherwise it doesn't work because non-managers, like super admins, are
not authorised to access enterprise data via the DFC API.
 2024-05-23 13:44:47 +10:00
David Cook
536b5608ab Show edit form for new images 2024-05-22 17:08:58 +10:00
Matt-Yorkley
c01bab5f27 Wrap commonly-repeated calls to Spree::Config to reduce unnecessary cache reads 
These config values are relatively static but in some cases they can be called many times in the same request (like rendering a report or a large list of line_items in BOM). These values will now only get fetched from Redis/Postgres once at most per request/job.
 2024-03-26 13:39:16 +00: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
Dung Bui
ab6a7e307b remove unused helpers 2024-01-04 00:19:15 +07:00
Gaetan Craig-Riou
9609ba4268 Don't show the banner if no ToS file uploaded 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
aaa8f3f572 Per review, move logic to display ToS banner to a helper 
It easier to understand when we can see the logic to display the banner
in the view.
 2023-12-22 13:20:14 +01:00
Maikel Linke
d4ce3965b1 Connected apps can be enabled per user or enterprise 2023-12-15 11:22:15 +11:00
Maikel Linke
af2b65256f Add new enterprise settings tab Connected Apps 2023-12-15 11:22:15 +11:00
Maikel Linke
f6903518c3 Remove orphaned JSON data in admin pages 
This was left over data from commit:

- 79ba223e12
 2023-11-03 15:16:22 +11:00
Maikel Linke
f83e78a5b8 Clarify adjustment data only for display 
We are not creating a new adjustment here.
 2023-10-12 15:16:38 +11:00
Maikel Linke
74c8f06e80 Simplify helper with extracted method 2023-10-12 14:17:41 +11:00
Gaetan Craig-Riou
8d639c14cb Add a fake adjustment voucher tax on admin order page 
When tax are included in price, voucher tax is stored in the voucher
adjustment and not as its own adjustment. So we add a "fake adjustment"
for display purposes.
 2023-10-02 15:58:12 +11:00
Neal Chambers
416d6e538a Fix Style/HashSyntax 2023-09-09 09:00:38 +09:00
Neal Chambers
4feb8f922e Fix Rails/HelperInstanceVariable in injection_helper.rb 2023-09-01 11:03:26 +09:00
Jean-Baptiste Bellet
0065ece6a6 Show vouchers panel only if enterprise sells products (own or any) 2023-07-19 16:02:16 +02:00
Jean-Baptiste Bellet
aaa9bac4dd Remove white_label feature toggle 
White label is now activated for everyone.

+ add mock for `spec/controllers/spree/orders_controller_spec.rb`
 2023-05-15 17:10:50 +02:00
Maikel Linke
42585bb074 Remove redundant cop disable directive 2023-04-14 16:04:57 +10:00
Jean-Baptiste Bellet
4fa44e6c64 Put the white label behind a feature toggle white_label 
+ update specs as well

+ for admin section also
 2023-03-30 09:19:17 +11:00
Jean-Baptiste Bellet
3452864503 Add "white label" panel in enterprise settings page 2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet
d2f29b7d73 Some refactoring to avoid rubocop class too long warning 2023-03-30 09:13:35 +11:00
Gaetan Craig-Riou
7dc5bc87d1 Fix rubocop warnings 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
David Cook
13d95ecf1d Scope Enterprise Group side menu translations 
With it's own lazy scope, we no longer need to define labels separately.
 2022-10-04 19:39:29 +02:00
binarygit
27552c99b8 Render enterprise groups #edit and #new page using stimulus 2022-08-10 15:14:09 +05:45
binarygit
e18a242b90 Render admin/enterprises/<name>/edit page using stimulus 2022-08-10 15:08:59 +05:45
Sinan Chaush
01ee2070eb producer id is used to select the producer 2021-10-05 21:35:18 +02:00
Sinan Chaush
70000db52c when creating a product, preselect the supplier if there is only one 2021-10-03 11:51:41 +02:00
Luis Ramos
e52937c113 Use rubocop auto correct to add frozen string literal to all files 
This is an unsafe auto corection, we will need to trust our build here
 2021-06-17 23:07:26 +01:00
Matt-Yorkley
d29c0cdcb7 Don't show line item adjustments in Admin::OrdersHelper#order_adjustments_for_display 
Line item adjustments are displayed separately, if we don't filter them here they get displayed twice.
 2021-04-15 14:23:37 +01:00
Matt-Yorkley
5d1d72b36b Update Admin::OrdersHelper#order_adjustments_for_display 2021-03-23 18:19:37 +00:00
Matt-Yorkley
c482173394 Delete dead code 
This AMS injection method is no longer referenced anywhere in the codebase
 2021-01-06 13:20:31 +00:00
Andy Brett
866452383d rubocop fix 2020-10-29 09:17:49 -07:00
Andy Brett
fa62ec0bff only show available units for products 2020-10-29 09:17:49 -07:00
Luis Ramos
0f06195baa Remove Image settings page, these settings will come from ofn-install now 2020-10-20 11:20:37 +01:00
cyrillefr
e6d9ec7bd7 Small fixes for default single Hub/Shop options issue 
- removed mode variable
 - reverted html template accordingly
 - added a more specific helper
 - fixed some short variable names
 2019-12-19 21:08:34 +01:00
luisramos0
73ee14cc7c Fix long line in injection helper 2019-11-10 19:21:08 +00:00
luisramos0
9404aacfb2 run rubocop --auto-correct 2019-11-10 18:42:43 +00:00
luisramos0
86b0d71c7e Result of rubocop auto-correct and rebuilding rubocop_manual_todo 2019-05-28 12:57:29 +01:00
Maikel Linke
d31b5efac6 Simplify orders helper 2019-04-03 11:15:54 +11:00
Maikel Linke
7035d57267 Better helper naming and spec cover 2019-04-03 11:13:56 +11:00
Maikel Linke
2a6236823f Move adjustment filtering from view to helper 2019-04-02 17:25:33 +11:00
Maikel Linke
11c12787f6 Move adjustment selection to helper 2019-04-02 17:02:05 +11:00