raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-01 06:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,355 Commits 15 Branches 460 Tags
778b3c3f59fc0f92cbf968ca0ad3b85cefb086fa
Commit Graph

878 Commits

Author SHA1 Message Date
drummer83
ac7090817c Improve email footer of all emails 
Use wrap style full width background like header

Move 'Powered by...' message to footer and rephrase to suit all recipients (not shoppers only)

Always show link to openfoodnetwork.org instead of email (if present) because email will be available via icon in the row below now

Add social media buttons of instance to email footer

Make footer text and icons dark gray (as instance name in email header)
 2024-09-21 12:46:29 +02:00
Ahmed Ejaz
5be53a40a9 11200: rename products scope 2024-09-11 11:54:38 +05:00
Ahmed Ejaz
76fdf3725a 11200: add explanations 2024-09-11 11:41:01 +05:00
Ahmed Ejaz
f8d3467d46 11200: add specs 2024-09-11 01:59:43 +05:00
Ahmed Ejaz
1580d539df 11200: coniditonally hide producer column 2024-09-11 00:56:52 +05:00
Joseph Johansen
66b519bd1c Undo minor unneeded changes 2024-08-22 17:41:00 +02:00
Joseph Johansen
1b8e256e8a Add unit tests 2024-08-22 17:41:00 +02:00
Joseph Johansen
b73e529bfc Scope injected enterprise properties to specific enterprises 2024-08-22 17:41:00 +02:00
Konrad
25b1620707 Merge pull request #12743 from wandji20/wb-OFN-12214 
(Fix) chore(deps): bump wicked_pdf from 2.6.3 to 2.8.0 [OFN-12214]
 2024-08-22 17:34:20 +02:00
Konrad
059dceb304 Merge pull request #12735 from chahmedejaz/bugfix/12698-fix-products-stateful-navigataion 
Fix 'Back to products list' stateful navigation
 2024-08-15 10:43:13 +02:00
wandji20
fa004d0897 Remove wicked pdf stylsheet include tag in order report pdf [OFN-12214] 2024-08-13 17:11:29 +01:00
Ahmed Ejaz
b14cd08990 12698 - keep old UI URL as it is 2024-08-13 14:23:39 +05:00
wandji20
a85cfab506 Remove awesome nested set gem and dependencies [OFN-11636] 2024-08-12 18:47:16 +01:00
Ahmed Ejaz
787205dcca Merge branch 'master' into bugfix/12739-fix-number-rounding-with-hu-locale 2024-08-09 01:59:50 +05:00
Filipe
76d874d5f9 Merge pull request #12710 from chahmedejaz/bugfix/12705-fix-products-index-page 
[BUU] Fixes Products Page ActionView::Template::Error
 2024-08-08 16:20:26 +01:00
Ahmed Ejaz
6757c8df74 12739 - fix number_with_precision method 2024-08-07 18:54:35 +05:00
David Cook
254e11aa36 Use whitelist 
It wasn't really necessary, but I'm going to need this list in a moment, so we might as well use it.
Also it allows us to ensure the options are listed in a certain order.

Also maybe it will help protect against corrupt preferences.
 2024-08-06 11:26:03 +02:00
David Cook
fcea437d7e Only show connected apps in enterprise settings, if system setting is enabled 2024-08-06 11:26:03 +02:00
Ahmed Ejaz
c101c4e42f 12698 - fix 'go back to products' stateful navigation 2024-08-05 13:51:59 +05:00
Ahmed Ejaz
1014a50aff 12705 - incorporate old UI behavior 
- if unit_value is not present and unit_description then display unit_description only.
- if both are not present then display empty fields
 2024-08-04 17:47:02 +05:00
wandji20
ef87cdb167 Revert changes and use selectable locales for helper local_options [OFN-11513] 2024-07-28 12:52:01 +02:00
Ahmed Ejaz
e808c7fb2b 12705 - set 1 as default for variant's unit_value 2024-07-25 23:42:03 +05:00
wandji20
0b46c41ffd Update reply email for order confirmation mail [OFN-12509] 2024-07-23 08:54:06 +01:00
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
zanetagebka
a2a670c848 Fix cops StringConcatenation 2024-06-11 15:17:32 +10:00
Gaetan Craig-Riou
8b31fa1ee5 Merge pull request #12541 from openfoodfoundation/dependabot/bundler/rubocop-1.64.1 
chore(deps-dev): bump rubocop from 1.63.5 to 1.64.1
 2024-06-11 10:30:28 +10:00
Maikel Linke
e6ac2f0d88 Style/SuperArguments 
Call super without arguments and parentheses when the signature is identical.
 2024-06-05 09:29:42 +10: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
Filipe
925d257dc5 Merge pull request #12495 from cillian/osm-registration-map 
Get registration location map working with OSM
 2024-05-31 14:32:05 +02:00
Maikel Linke
4e8896d655 Clearer naming of helper method 2024-05-24 08:17:08 +10:00
Filipe
88baf5e1de Merge pull request #12496 from isidzukuri/12355-remove-unused-discourse 
[12355] Remove discourse
 2024-05-23 19:28:02 +01: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
isidzukuri
621a95e913 Remove discourse 2024-05-21 09:02:45 +03:00
Cillian O'Ruanaidh
826d9eb36d Get registration location map working with OSM 2024-05-17 19:56:52 +01: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
Konrad
b3dd51d6ac Merge pull request #12324 from chahmedejaz/task/12314-fix-rubocop-rails-helper-instance-variable 
Fix Rubocop Rails/HelperInstanceVariable
 2024-04-10 20:17:06 +02:00
Ana Nunes da Silva
eaf32226a4 Fix duplicate branches in Spree::Admin::BaseHelper 
:string case already handled by the else case
 2024-04-02 10:20:17 +01:00
Ahmed Ejaz
7b4b7c5f45 12314 - Fix specs for orders helper 2024-04-01 21:51:46 +05:00
Ahmed Ejaz
05f373f541 12314 - add order parameter in OrdersHelper methods 2024-04-01 06:41:41 +05:00
Ahmed Ejaz
4ba6afa665 12314 - fix Rails/HelperInstanceVariable error 
- InjectionHelper
- OrdersHelper
 2024-04-01 02:19:14 +05:00
Ahmed Ejaz
ac1595e718 12314 - remove shared distributor partial 
- this was only used in the enterprise show view
- the above view was deleted here 4f2389e257
- by removing this, we can remove distributor_link_class method
- it will also fix the rubocop error
 2024-03-31 18:08:22 +05:00
Ahmed Ejaz
3bb44cfe6d 12314 - fix order helper rubocop errors 
- remove the direct access of @order instance variable
- add an attr_reader for order and use it instead
 2024-03-31 17:07:00 +05: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
Feruz Oripov
9d919938f3 Group Order && OrderCycle related services and specs 2024-03-16 19:07:08 +05:00
David Cook
864b95612a Show error message on variant_unit_name 
Now passing options through to the error tag
 2024-03-06 13:41:22 +11:00