raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 452 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jibees
d704157fef Merge pull request #10886 from openfoodfoundation/dependabot/bundler/knapsack_pro-4.1.0 
chore(deps-dev): bump knapsack_pro from 4.0.0 to 4.1.0
 2023-05-24 15:17:16 +02:00
dependabot[bot]
b985ab8d99 chore(deps-dev): bump knapsack_pro from 4.0.0 to 4.1.0 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 4.0.0 to 4.1.0.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: knapsack_pro
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-24 10:10:08 +00:00
dependabot[bot]
d60ba96fe9 chore(deps): bump faraday from 2.7.4 to 2.7.5 
Bumps [faraday](https://github.com/lostisland/faraday) from 2.7.4 to 2.7.5.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v2.7.4...v2.7.5)

---
updated-dependencies:
- dependency-name: faraday
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-24 10:08:17 +00:00
Jean-Baptiste Bellet
3cd53cbd41 Adds some keys to this cached element, due to cookie banner 
Once the user accept the cookie, we should not show the cookie banner element. This is handled via `app/helpers/footer_links_helper.rb#cookies_policy_link` and boolean:

```
!Web::CookiesConsent.new(cookies, request.host).exists? && Spree::Config.cookies_consent_banner_toggle
```
 2023-05-24 10:45:06 +02:00
Maikel Linke
b4deb21872 Bump Ruby from 3.0.3 to 3.1.4 
Major 3.1 highlights:

* https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/
 2023-05-24 16:52:34 +10:00
Maikel
32d425dd58 Merge pull request #10880 from openfoodfoundation/dependabot/bundler/knapsack_pro-4.0.0 
Bump knapsack_pro from 3.11.0 to 4.0.0
 2023-05-24 14:05:09 +10:00
Maikel
ce1317933b Merge pull request #10815 from Pauloparakleto/issue-7483 
refactor(spec/system/admin/subscriptions_spec.rb): issue #7483
 2023-05-24 11:57:44 +10:00
Maikel
340f10b323 Merge pull request #10539 from filipefurtad0/spec_for_enterprise_fee_selection_tax_inherit 
Adds a spec to check enterprise fees creation
 2023-05-24 11:29:27 +10:00
Maikel
8c11bf3033 Merge pull request #10839 from mkllnk/valid-email 
Validate user's email address
 2023-05-24 10:37:00 +10:00
Konrad
0854287b92 Merge pull request #10744 from jibees/10556-remove-ofn-header-banner-in-order-confirmation-emails 
White Label: remove OFN banner from order confirmation emails when `hide_ofn_navigation` is activated for the shop
 2023-05-24 01:14:16 +02:00
dependabot[bot]
6dc1cb6baa Bump knapsack_pro from 3.11.0 to 4.0.0 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 3.11.0 to 4.0.0.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v3.11.0...v4.0.0)

---
updated-dependencies:
- dependency-name: knapsack_pro
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-23 10:01:38 +00:00
Maikel Linke
ef3422bf58 Update syntax and clarify use of outdated gem 2023-05-23 08:23:58 +02:00
Maikel Linke
90cbac7176 Validate email domains 
The gem checks the DNS system for a valid domain entry.
 2023-05-23 08:23:58 +02:00
Maikel Linke
ffc45f77cf Validate user email syntax on change 
We probably have invalid entries in the database and we don't want these
records to suddenly become invalid. People would not be able to log in.
 2023-05-23 08:23:58 +02:00
Maikel Linke
101b9025b4 Spec user email validation 
The pending spec addresses:

 * https://github.com/openfoodfoundation/openfoodnetwork/issues/10808
 2023-05-23 08:23:58 +02:00
Konrad
b56b36f617 Merge pull request #10859 from filipefurtad0/change_voucher_default_message_en 
[Vouchers] Updates warning_forfeit_remaining_amount default message
 2023-05-23 08:20:41 +02:00
filipefurtad0
5e248aa715 Improving shared_example naming 2023-05-22 12:27:04 +01:00
filipefurtad0
554d515875 Introduces prefix to simplify assertions 2023-05-22 12:27:04 +01:00
Matt-Yorkley
459ef5f0d1 Only delete related exchange variants if exchange is outgoing 2023-05-22 11:09:29 +01:00
Jean-Baptiste Bellet
0bec7562a0 When hide_groups_tab is set to false, do not display group in shopfront 
Co-Authored-By: Maikel <maikel@email.org.au>
 2023-05-22 10:29:57 +02:00
Jean-Baptiste Bellet
0d98ec8f4c In admin, add form to set hide_groups_tab attribute 
+ add specs
 2023-05-22 10:29:56 +02:00
Jean-Baptiste Bellet
38cc8a89d1 Add hide_groups_tab to Enterprise model 2023-05-22 10:29:56 +02:00
Matt-Yorkley
7c5067ff42 Update "special instructions" note tooltip and add missing test coverage 2023-05-21 14:06:14 +01:00
Matt-Yorkley
005d95e882 Fix "Resend Confirmation" link and add missing test coverage 2023-05-21 13:33:29 +01:00
Matt-Yorkley
dcdcdb4fc0 Align filter buttons centrally 2023-05-21 00:15:32 +01:00
Matt-Yorkley
abf00353ea Permit explicit params 2023-05-21 00:15:32 +01:00
Matt-Yorkley
be1ed2bbcf Update tomselect multiselect styling 2023-05-21 00:15:32 +01:00
Matt-Yorkley
52450028a1 Fix checkbox alignment 2023-05-21 00:15:32 +01:00
Matt-Yorkley
d50ac4bf45 Reinstate dropdown-with-prepend 2023-05-21 00:15:32 +01:00
Matt-Yorkley
4ddde65a04 Reimplement saving and restoring submitted search filters between page loads 2023-05-21 00:15:32 +01:00
Matt-Yorkley
7d33e0f74d Allow programmatically refreshing flatpickr element via "flatpickr:change" event after changing the select's value externally 2023-05-21 00:15:32 +01:00
Matt-Yorkley
2ba2a826db Clean up event handlers on disconnect in Flatpickr controller 2023-05-21 00:15:32 +01:00
Matt-Yorkley
d64a9afece Replace angular ofn-with-tip directive on capture/ship buttons 2023-05-21 00:15:32 +01:00
Matt-Yorkley
770880c062 Update specs 2023-05-21 00:15:32 +01:00
Matt-Yorkley
310577c49d Close dropdown after selection with multiselect 
This conforms with the previous select2 multiselect behaviour
 2023-05-21 00:15:32 +01:00
Matt-Yorkley
c3cf79f5ef Delete angular ordersCtrl 2023-05-21 00:15:32 +01:00
Matt-Yorkley
71c4f2a5be Update styling on multiselect tabs for tom-select 2023-05-21 00:15:32 +01:00
Matt-Yorkley
95f1643cec Combine related reflex actions 2023-05-21 00:15:32 +01:00
Matt-Yorkley
bee46720f4 Combine bulk action controllers and pass reflex as an argument 2023-05-21 00:15:32 +01:00
Matt-Yorkley
5930d0c1f5 Make bulk actions more generic 2023-05-21 00:15:32 +01:00
Matt-Yorkley
55d9deb5bd Update order cancelling bulk action 2023-05-21 00:15:32 +01:00
Matt-Yorkley
134f1ab151 Replace angular bulkInvoiceCtrl 2023-05-21 00:15:32 +01:00
Matt-Yorkley
27290e5b57 Make modal controller creatable and destroyable 2023-05-21 00:15:32 +01:00
Matt-Yorkley
25aecfa5b9 Add reflex for shipping orders 2023-05-21 00:15:32 +01:00
Matt-Yorkley
e58a37f65b Add reflex for capturing orders 2023-05-21 00:15:32 +01:00
Matt-Yorkley
61849d84e7 Extract order capturing to OrderCaptureService 2023-05-21 00:15:32 +01:00
Matt-Yorkley
73b41154cc Update admin flashes 2023-05-21 00:15:32 +01:00
Matt-Yorkley
048df6230b Remove angular from admin orders index page 2023-05-21 00:15:32 +01:00
Matt-Yorkley
5ad68f25e3 Handle old jquery_ujs buttons 2023-05-21 00:15:30 +01:00
Matt-Yorkley
3df166fb2f Drop jquery_ujs 2023-05-20 19:47:41 +01:00