raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-21 00:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,717 Commits 18 Branches 454 Tags
b4c4381473175fef38fe2b7ccda51280b130fead
Commit Graph

27717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
b4c4381473 Merge pull request #10987 from jibees/10979-white-label-trix-link-unlink-buttons-are-white-text-on-white-background 
[White Label] Fix colors of custom content editor to have beautiful toolbar
 2023-06-22 16:12:25 +01:00
jibees
22a3b31172 Merge pull request #11100 from mkllnk/remove-json-patch 
Revert "Fix json v1.8.6 common.rb warning"
 2023-06-22 11:11:21 +02:00
jibees
8eee90118e Merge pull request #11093 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.4.2 
chore(deps): bump @floating-ui/dom from 1.3.0 to 1.4.2
 2023-06-22 10:25:13 +02:00
jibees
5ba9c815cf Merge pull request #11082 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.20.2 
chore(deps-dev): bump rubocop-rails from 2.19.1 to 2.20.2
 2023-06-22 10:18:26 +02:00
jibees
300c4ceed2 Merge pull request #11083 from openfoodfoundation/dependabot/bundler/knapsack_pro-5.1.2 
chore(deps-dev): bump knapsack_pro from 5.1.0 to 5.1.2
 2023-06-22 10:17:44 +02:00
Maikel Linke
e7fe04f526 Revert "Fix json v1.8.6 common.rb warning" 
This reverts commit 21b80db0ee.

This fix was needed for an old version of the JSON module with a newer
version of Ruby. But we updated the json gem since and don't need this
any more.
 2023-06-22 12:47:28 +10:00
Jean-Baptiste Bellet
d2534d6645 Be more specific via !important than the default button rule 
This one should override the default one
 2023-06-21 15:01:14 +02:00
Jean-Baptiste Bellet
7d9018c590 Instead of overriding css rules, prefer to not select rules for trix buttons 2023-06-21 15:01:14 +02:00
dependabot[bot]
c532e822e5 chore(deps): bump @floating-ui/dom from 1.3.0 to 1.4.2 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.3.0 to 1.4.2.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.4.2/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-21 09:57:46 +00:00
David Cook
5ec872c6fd Merge pull request #11008 from mkllnk/dfc-connector-import 
Prototype: Import products via DFC Connector
 2023-06-21 12:23:58 +10:00
dependabot[bot]
e8e3aa5f5d chore(deps-dev): bump knapsack_pro from 5.1.0 to 5.1.2 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 5.1.0 to 5.1.2.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v5.1.0...v5.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-20 09:31:26 +00:00
dependabot[bot]
584a25052f chore(deps-dev): bump rubocop-rails from 2.19.1 to 2.20.2 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.19.1 to 2.20.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.19.1...v2.20.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-20 09:14:06 +00:00
Maikel Linke
a9f8c7c4ab Update DFC API docs, describe all endpoints 2023-06-19 16:20:35 +10:00
Maikel Linke
ec8c710e3a Import simple DFC SuppliedProduct 
OFN products and variants need more data like a price but the DFC
stores that in a different object. We may get a larger graph containing
that information but we don't have any test data yet.
 2023-06-19 16:19:48 +10:00
Maikel Linke
df9e1ac2b4 Encapsulate SuppliedProductBuilder 
And improve EnterpriseBuilder. It was builder products twice.
 2023-06-19 16:19:48 +10:00
Maikel Linke
1adfb5463a Import DFC measures 2023-06-19 16:19:40 +10:00
Maikel Linke
949019a277 Map has* predicates to Connector attributes 2023-06-19 16:19:40 +10:00
Maikel Linke
bfd084d9b6 Import graphs including anonymous objects 2023-06-19 16:18:58 +10:00
Maikel Linke
3c6f90dbb3 Import from IO objects for convenience, efficiency 
The Connector exports to a String but Rails' `request.body` is an IO
object. Since the used JSON-LD parser needs an IO object anyway and it
can lower the memory usage we take IO objects as well and handle
in-memory Strings only when given.
 2023-06-19 16:18:58 +10:00
Maikel Linke
f5f8c349e1 Resolve DFC Connector objects when importing graph 2023-06-19 16:18:51 +10:00
Maikel Linke
12d56d725b Import properties which contains lists 
Not just single values.
 2023-06-19 16:18:51 +10:00
Maikel Linke
2abad60511 Import DFC graphs with multiple objects 2023-06-19 16:18:42 +10:00
Maikel Linke
15dd38d6c6 Import simple data from DFC 2023-06-19 16:16:18 +10:00
Maikel Linke
f6db69104f Update Gemfile.lock with new Ruby version 2023-06-19 15:03:44 +10:00
Maikel
7e20415490 Merge pull request #10888 from mkllnk/ruby3.1 
Bump Ruby from 3.0.3 to 3.1.4
 2023-06-19 10:08:20 +10:00
Maikel
101e72726c Merge pull request #11032 from dacook/show-current-version2 
Show current version2
 2023-06-19 10:07:49 +10:00
Konrad
dab5436444 Merge pull request #10532 from abdellani/invoices 
Invoices
 2023-06-18 21:44:29 +02:00
Mohamed ABDELLANI
d059680f4b remove white label from feature toggle 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
27c1fd0d30 test invoice model 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
639567e903 replace attr with attr_reader 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
fff0b1e577 Update lib/open_food_network/feature_toggle.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
7a0686786d Update db/migrate/20230308075421_create_invoices.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
73cdcca022 fix linter issues 2023-06-18 21:03:13 +02:00
Matt-Yorkley
4eb05a1d73 Reduce public interface of OrderInvoiceComparator 2023-06-18 21:03:13 +02:00
Matt-Yorkley
3946e7a6f5 Memoize presenters in OrderInvoiceComparator 
This is now twice as fast and triggers half the number of database queries if both comparison methods get called
 2023-06-18 21:03:13 +02:00
Matt-Yorkley
c6ec13443e Drop next_invoice_number method from Spree::Order 2023-06-18 21:03:13 +02:00
Matt-Yorkley
d3a31bd0bd Rename @invoice_presenter instance variable to @order in invoice templates 2023-06-18 21:03:13 +02:00
Matt-Yorkley
352ad20681 Fix display_checkout_taxes_hash in invoice_table4 template 2023-06-18 21:03:13 +02:00
Matt-Yorkley
68ab539ed3 Include completed_at attribute 2023-06-18 21:03:13 +02:00
Matt-Yorkley
113e1344f2 Include tax adjustments in serializer and presenter 2023-06-18 21:03:13 +02:00
Matt-Yorkley
5bbc63f716 Fix options_text displaying when there is no options_text 2023-06-18 21:03:13 +02:00
Matt-Yorkley
72e537b598 Update *_amount_with_adjustments methods on LineItem presenter 
These methods are slightly different and they're both needed in the template for invoice4
 2023-06-18 21:03:13 +02:00
Matt-Yorkley
208840b99d Use @invoice_presenter.checkout_adjustments 2023-06-18 21:03:13 +02:00
Matt-Yorkley
a44f24ad43 Remove prefixes from invoice data representation so it conforms to the same interface as order 2023-06-18 21:03:13 +02:00
Matt-Yorkley
8dba1618b1 Don't call information from @order in new invoice templates 
Previously this template was calling various bits of data from the @order object and not the @invoice_presenter object
 2023-06-18 21:03:13 +02:00
Matt-Yorkley
c3d6b2280f Update reference to removed method 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
0ed7599267 extract methods related to invoices from the order model to the OrderInvoiceComparator 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
61d58df56f fix linter issues 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
d86173c509 add feature toggle 
seperate the invoice templates that rely on presenters from the old ones.
 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
fa14dc370b implement the invoice data generator 2023-06-18 21:03:13 +02:00