raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,508 Commits 16 Branches 456 Tags
ccfb83d2cd0a78f4bbd2cb2e9423948246eaa950
Commit Graph

25508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
9dbc9f7272 Bump debug from 1.6.2 to 1.6.3 
Bumps [debug](https://github.com/ruby/debug) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/ruby/debug/releases)
- [Commits](https://github.com/ruby/debug/compare/v1.6.2...v1.6.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-24 09:02:49 +00:00
Mohamed ABDELLANI
da9a4803ff add it "lists products sorted by name" test 2022-10-24 09:01:42 +01:00
Mohamed ABDELLANI
732ebd8457 fix the expected table size in "generates the report" test 2022-10-24 09:01:42 +01:00
Mohamed ABDELLANI
39e567d386 set line_items_count to 3 2022-10-24 09:01:42 +01:00
Mohamed ABDELLANI
4740c2b0db add sort by product name to order_cycle_supplier_totals_by_distributor report rules 2022-10-24 09:01:42 +01:00
jibees
ee70ab8adb Merge pull request #9847 from mkllnk/stable-orders_and_fulfillment_spec 
Expect report rows for same product in random order
 2022-10-24 09:57:06 +02:00
Maikel
936a96bd6c Merge pull request #9839 from openfoodfoundation/dependabot/bundler/rswag-ui-2.7.0 
Bump rswag-ui from 2.6.0 to 2.7.0
 2022-10-24 16:01:04 +11:00
Maikel
b3492981d3 Merge pull request #9832 from openfoodfoundation/dependabot/bundler/nokogiri-1.13.9 
Bump nokogiri from 1.13.8 to 1.13.9
 2022-10-24 15:58:57 +11:00
Maikel Linke
167ce0e53c Expect report rows in random order 
It's not deterministic which variant is shown first and therefore this
spec would fail from time to time.
 2022-10-24 15:40:35 +11:00
Maikel
8f47d2b2be Merge pull request #9820 from jibees/update-all-github-action-to-avoid-deprecated 
Upgrade deprecated github/actions in our CI
 2022-10-24 15:26:54 +11:00
Maikel
e873771f18 Merge pull request #9822 from filipefurtad0/redis_CannotConnectError 
Extracts routing outside it block
 2022-10-24 13:33:01 +11:00
Maikel
627b8af37b Merge pull request #9828 from mkllnk/authorize-api-key 
Prevent users from changing API keys for others
 2022-10-24 11:22:35 +11:00
Cillian O'Ruanaidh
eb72ec8e13 An order cycle isn't ready for checkout if a tag rule means no payment/shipping methods are available to the customer 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
7458dccea6 Call @order_cycles.count instead of #size because TagRuleApplicator doesn't return Relation anymore 
In March 2020 this was changed to use :size instead of :count because TagRuleApplicator returned an ActiveRecord::Relation, see:

d2eee1dafd

However in October 2020 TagRuleApplicator was changed to always return an Array so this is no longer needed, see:

7e606471e4
 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
3e24b7ba6b Assign variable across two lines so Rubocop override comment isn't needed in OrderCycleClone 
Co-authored-by: Maikel <maikel@email.org.au>
 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
62cd507fb9 Stub Spree::Config.stripe_connect_enabled instead of changing it before and back after tests 
It's less code and sometimes there can be issues when config cache values are changed.

Co-authored-by: Maikel <maikel@email.org.au>
 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
beba3c7684 Disable Metrics/ClassLength check for OrderCycleForm 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
f5bd23b4d8 Remove unused Spree::Order#available_payment_methods method 
This was introduced in 47d2f698ef but we are using OrderAvailablePaymentMethods now.
 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
2c14aecf4f Extract a OrderCycleClone service 
Before it was giving a Rubocop error, probably not a bad idea anyway.
 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
4e6d64c0a1 Let people choose which payment methods are available to customers on order cycles 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
5718f9f00c Create :order_cycles_distributor_payment_methods HABTM join table 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
5423c1c02e Resolve conflict in db/schema.rb 2022-10-21 17:21:24 +01:00
saunmanoj888
ee8454bd2c Use js-big-decimal package for calculation 2022-10-21 21:30:00 +05:30
dependabot[bot]
45c23a76ff Bump rswag-ui from 2.6.0 to 2.7.0 
Bumps [rswag-ui](https://github.com/rswag/rswag) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.6.0...2.7.0)

---
updated-dependencies:
- dependency-name: rswag-ui
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-21 13:24:52 +00:00
Jean-Baptiste Bellet
5a1d9013c6 Update all locales with the latest Transifex translations v4.2.18 2022-10-20 23:12:32 +02:00
jibees
3a68e237de Merge pull request #9772 from mkllnk/revenue-report-for-au 
Add more fields to revenue report as used by Aus
 2022-10-20 23:10:17 +02:00
Jean-Baptiste Bellet
87ed23211e Use the last version of github/codeql-action/upload-sarif 2022-10-20 17:42:22 +02:00
jibees
48e18b016a Merge pull request #9756 from vsmay98/8249-fix-snail-for-all-shipping-method-fee 
Fix snail issue for all shipping method fees
 2022-10-20 17:31:24 +02:00
jibees
da851079f4 Merge pull request #9776 from abdellani/product-creation-minor-improvements 
Product creation minor improvements
 2022-10-20 17:30:47 +02:00
jibees
1d265d19ce Merge pull request #8872 from Matt-Yorkley/bugsnag-data 
Update Bugsnag error data
 2022-10-20 17:30:14 +02:00
jibees
9e4bd23332 Merge pull request #9738 from AthiraKadampatta/9726-remove-unused-paperclip-columns 
Delete unused paperclip columns.
 2022-10-20 17:29:44 +02:00
jibees
fdc362cb44 Merge pull request #9806 from mkllnk/feature-constraint 
Generalise feature toggle constraint
 2022-10-20 17:27:46 +02:00
Vishal Jain
8d3845508c remove check_permissions method 2022-10-20 19:54:23 +05:30
Vishal Jain
952b6039f9 Remove spree user registrations controller file 2022-10-20 19:54:23 +05:30
Jean-Baptiste Bellet
053af8416b Previous setup-ruby action was deprecated. Use ruby/setup-ruby@v1 2022-10-20 16:14:14 +02:00
dependabot[bot]
955b84ae6f Bump nokogiri from 1.13.8 to 1.13.9 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.13.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.8...v1.13.9)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-20 13:45:27 +00:00
jibees
2455ecabde Merge pull request #9758 from openfoodfoundation/dependabot/bundler/activerecord-import-1.4.1 
Bump activerecord-import from 1.4.0 to 1.4.1
 2022-10-20 15:44:42 +02:00
Konrad
71037022ec Merge pull request #9816 from viniciusueharaweb/9703-product-description-should-have-a-pointer-cursor 
Add pointer cursor when hovering a clickable product description
 2022-10-20 10:38:46 +02:00
Jean-Baptiste Bellet
7ffd4669be Change node version to use the latest LTS 
We probably need to modify our `ofn-install` build to also use the latest LTS
 2022-10-20 10:20:09 +02:00
jibees
2b7b83ba37 Merge pull request #9826 from filipefurtad0/fix_flaky_spec_bom_9824 
Clarifies contexts, cleans-up spec DRY
 2022-10-20 09:55:33 +02:00
Maikel Linke
fc79612f26 Prevent users from changing API keys for others 
It was checking for the permission to create a user which everyone can
do. Now it's checking for updating that particular user and doesn't
allow generating new keys for other users any more.

This would have been an inconvenience but not a big security issue
because you can't view the key of another user.
 2022-10-20 17:56:46 +11:00
Vishal Jain
de28027623 add system spec 2022-10-20 12:15:22 +05:30
Vishal Jain
755107ec9f Fix snail issue for all enterprise fees 2022-10-20 12:15:21 +05:30
saunmanoj888
b40cd579bc Fix spec failure 2022-10-19 23:18:22 +05:30
saunmanoj888
8e45b758ba Fix unit value UI issue 2022-10-19 22:59:28 +05:30
filipefurtad0
c4de247dd9 Clarifies contexts, cleans-up spec DRY 2022-10-19 16:56:04 +01:00
filipefurtad0
a244b34627 Extracts routing to context (DRY); creates context for separate it block 2022-10-19 11:15:15 +01:00
filipefurtad0
dabe37ebcb Extracts routing outside it block 2022-10-19 11:01:56 +01:00
Jean-Baptiste Bellet
2fcbe437f2 Upgrade "actions/setup-node" to non-deprecated version 2022-10-19 11:31:47 +02:00
Jean-Baptiste Bellet
642938afe0 Upgrade "actions/checkout" to non-deprecated version 2022-10-19 11:28:31 +02:00