raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,630 Commits 21 Branches 450 Tags
e6e4e014dc95da76a6d96cea21fa2fa45380cf21
Commit Graph

29630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
e6e4e014dc Merge pull request #11731 from chahmedejaz/bugfix/11667-clone-tags-issue-for-OC 
Fix Cloning Tags Issue for OrderCycle
 2023-11-17 10:50:33 +00:00
Filipe
c9084db933 Merge pull request #11761 from binarygit/open-external-links-in-new-page 
Open external links in product description in a new page
 2023-11-17 10:30:03 +00:00
David Cook
84ea05ad5a Merge pull request #11822 from rioug/revert-prettier-to-2.8.8 
Revert prettier to v 2.8.8
 2023-11-17 16:01:20 +11:00
Maikel
a1dbb3353f Merge pull request #11820 from macanudo527/fix_autocorrect_rubocop2 
Fix Style Rubocop Errors
 2023-11-17 14:25:12 +11:00
Maikel
df44446291 Merge pull request #11819 from dacook/update-browserslist-db 
Update browserslist caniuse db
 2023-11-17 14:05:11 +11:00
Gaetan Craig-Riou
5117cd31e9 Pretty-quick breaks with Prettier v3 
As explained here : https://github.com/azz/pretty-quick/issues/164
We most likely need to move away from pretty-quick
 2023-11-17 13:04:32 +11:00
Maikel
f087aa07d0 Merge pull request #11705 from abdellani/fix-existing-tests 
Fix invoice printing tests
 2023-11-17 12:57:24 +11:00
Neal Chambers
c3c4486d0c Safely autocorrect Style/RedundantStringEscape 
Inspecting 1513 files
..........................................................................................................................................................................................................................................................................................................................C...........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C......................................................................................................................................................................................................................................................................................................................................................................................................................................................................C...........................................................................................................

Offenses:

app/models/spree/calculator.rb:31:48: C: [Corrected] Style/RedundantStringEscape: Redundant escape of / inside string literal.
      self.class.name.titleize.gsub("Calculator\/", "")
                                               ^^
spec/controllers/spree/admin/shipping_methods_controller_spec.rb:40:78: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
        params[:shipping_method][:calculator_attributes][shipping_amount] = "\'20.0'"
                                                                             ^^
spec/system/admin/enterprise_fees_spec.rb:82:78: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
    fill_in("#{prefix}_calculator_attributes_preferred_flat_percent", with: "\'20.0'")
                                                                             ^^
spec/system/admin/enterprise_fees_spec.rb:140:42: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
        'preferred_flat_percent', with: "\'20.0'"
                                         ^^

1513 files inspected, 4 offenses detected, 4 offenses corrected
 2023-11-17 09:03:32 +09:00
Neal Chambers
edbf4c15a9 Safely autocorrect Style/RedundantReturn 
Inspecting 1513 files
.........................................................................................................................................................................................................................................................................................................C......................................................C............................................................................................................................................................................................................................................................................................................................................................................................................................................C.........................................................C.......C.........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................

Offenses:

app/models/product_import/entry_validator.rb:200:7: C: [Corrected] Style/RedundantReturn: Redundant return detected.
      return true unless Float(value, exception: false).nil?
      ^^^^^^
app/models/spree/stock/availability_validator.rb:30:9: C: [Corrected] Layout/EmptyLineAfterGuardClause: Add empty line after guard clause.
        return line_item.target_shipment if line_item.target_shipment
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/stock/availability_validator.rb:31:9: C: [Corrected] Style/RedundantReturn: Redundant return detected.
        return line_item.order.shipments.first if line_item.order&.shipments&.any?
        ^^^^^^
lib/reporting/reports/enterprise_fee_summary/summarizer.rb:41:11: C: [Corrected] Layout/EmptyLineAfterGuardClause: Add empty line after guard clause.
          return DataRepresentations::IncomingExchangeLineItemFee if for_incoming_exchange?
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/reporting/reports/enterprise_fee_summary/summarizer.rb:42:11: C: [Corrected] Style/RedundantReturn: Redundant return detected.
          return DataRepresentations::OutgoingExchangeLineItemFee if for_outgoing_exchange?
          ^^^^^^
lib/stripe/authorize_response_patcher.rb:31:7: C: [Corrected] Style/RedundantReturn: Redundant return detected.
      return url if url.match(%r{https?://\S+}) && url.include?("stripe.com")
      ^^^^^^
lib/tasks/data.rake:99:7: C: [Corrected] Style/RedundantReturn: Redundant return detected.
      return true if Integer(value)
      ^^^^^^

1513 files inspected, 7 offenses detected, 7 offenses corrected
 2023-11-17 09:00:50 +09:00
Neal Chambers
85fef7ac4b Safely autocorrect Style/RedundantRegexpArgument 
Inspecting 1513 files
...........................................................................................................................................................................................................................................................................................................................................................C....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................

Offenses:

app/models/spree/shipping_method.rb:69:25: C: [Corrected] Style/RedundantRegexpArgument: Use string ":tracking" as argument instead of regexp /:tracking/.
      tracking_url.gsub(/:tracking/, tracking) unless tracking.blank? || tracking_url.blank?
                        ^^^^^^^^^^^
lib/spree/i18n.rb:36:17: C: [Corrected] Style/RedundantRegexpArgument: Use string "spree" as argument instead of regexp /spree/.
      path.gsub(/spree/, '')
                ^^^^^^^

1513 files inspected, 2 offenses detected, 2 offenses corrected
 2023-11-17 08:59:27 +09:00
Gaetan Craig-Riou
8347557bea Merge pull request #11814 from openfoodfoundation/dependabot/bundler/active_storage_validations-1.1.2 
chore(deps): bump active_storage_validations from 1.1.1 to 1.1.2
 2023-11-17 10:12:29 +11:00
Gaetan Craig-Riou
ecb5ae47ff Merge pull request #11812 from openfoodfoundation/dependabot/bundler/angular_rails_csrf-6.0.0 
chore(deps): bump angular_rails_csrf from 5.0.0 to 6.0.0
 2023-11-17 10:08:15 +11:00
Maikel
54f6b32231 Merge pull request #11810 from filipefurtad0/extend_payment_intents_tests 
[VCR, automation] Adds payment intent tests with invalid cards
 2023-11-17 09:50:25 +11:00
David Cook
de9fbea2b8 npx update-browserslist-db@latest 
Compilation was sometimes failing with the following error. So I did what it said.

> Browserslist: caniuse-lite is outdated. Please run:
>   npx update-browserslist-db@latest
>   Why you should do it regularly: https://github.com/browserslist/update-db#readme
 2023-11-17 09:45:11 +11:00
David Cook
2960f7570e Merge pull request #11741 from abdellani/fix-product-with-ml-unit-display-dl 
Fix product with ml unit display dl
 2023-11-17 09:41:44 +11:00
Konrad
0fae09f5a2 Merge pull request #11659 from chahmedejaz/bugfix/11606-localized-date-times 
Fixes un-localized Order date and time format on edit order page
 2023-11-16 21:27:13 +01:00
Ahmed Ejaz
fc59c9397d 11606, fix lint issues 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
4040dc0a52 #11606, add and fix specs for pretty_time method 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
edc827bdc8 #11606, adds long time formatting for en.yml 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
dddb777cea #11606, adds date locales for Português do Brasil 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
4639a002f2 #11606, adds date locales for Nederlands (Belgium) 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
6a889d8084 #11606, adds date locales for Italiano (Switzerland) 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
a35dcde0e3 #11606, adds date locales for Français (Cameroon) 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
ec7c77af68 #11606, adds date locales for Français (Switzerland) 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
6a0588e6a2 #11606, adds date locales for Français (Canada) 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
c3bc2d1087 #11606, adds date locales for Français (Belgium) 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
e0ed5ef9f0 #11606, adds date locales for Filipino (Philippines) 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
295ad230c2 #11606, adds date locales for Espanol (United States) 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
afa172bfa2 #11606, adds date locales for Espanol (Costa Rica) 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
315dfe7d38 #11606, adds date locales for Espanol (Colombia) 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
adcca684bf #11606, adds date locales for German (Germany) 2023-11-16 20:57:40 +01:00
Ahmed Ejaz
850a9c3738 #11606, adds langage locales for the German for Germany 2023-11-16 20:57:40 +01:00
Filipe
ed8fd41bec Merge pull request #11290 from cyrillefr/Orders_in_confirmation_state_cannot_be_completed_by_hub_or_shop 
Fix Orders in confirmation state cannot be completed by hub or shop
 2023-11-16 19:50:14 +00:00
Filipe
37436aab80 Merge pull request #11799 from murjax/enterprise-panel-navigation-6754 
Fix navigation behavior on enterprise settings panel tabs
 2023-11-16 17:56:49 +00:00
Filipe
8a3fbf92b9 Merge pull request #11776 from rioug/11775-fix-hidden-input 
Fix hidden input showing on Producer registration
 2023-11-16 17:26:28 +00:00
Konrad
dff8257255 Merge pull request #11661 from mkllnk/report-file-storage 
Store report files on the local disk
 2023-11-16 16:20:46 +01:00
filipefurtad0
beb47f03c0 Removes Stripe module 
...and calls it within the describe block
 2023-11-16 14:46:25 +00:00
Maikel
c8023b7c37 Merge pull request #11813 from openfoodfoundation/dependabot/bundler/spring-4.1.2 
chore(deps-dev): bump spring from 4.1.1 to 4.1.2
 2023-11-16 17:00:51 +11:00
Maikel
63721938c3 Merge pull request #11780 from filipefurtad0/fix_pending_examples_on_invoices_spec 
Fixes pending tests cases on invoices spec
 2023-11-16 17:00:02 +11:00
Maikel
5f3e176b49 Merge pull request #11816 from mkllnk/dfc-enterprise-fields 
Add logo and contact info to DFC Enterprise API
 2023-11-16 10:15:01 +11:00
Maikel Linke
b055474918 DRY long method 2023-11-16 09:30:04 +11:00
Maikel Linke
e5f5f3922c Add contact name to DFC Enterprise API 2023-11-16 09:10:43 +11:00
filipefurtad0
9d00b7dc43 Re-records relevant cassettes 2023-11-15 13:05:15 +00:00
filipefurtad0
4c3f87f047 Adds payment intent tests with invalid cards 2023-11-15 13:05:15 +00:00
Maikel Linke
3e6db7fda4 Update spec of changed report link 
The link now contains the local test server instead of some fake domain.
 2023-11-15 10:29:05 +01:00
Maikel Linke
9f00817852 Use source of truth of url_options for report URLs 
The ActionController options were not set in testing nor Sidekiq jobs.
The now used config is always set in config/application.rb.
 2023-11-15 10:29:05 +01:00
Maikel Linke
a110ee0982 Simplify Active Storage config for test env 2023-11-15 10:29:05 +01:00
Maikel Linke
eaff1ed921 Store report files on the local disk 2023-11-15 10:29:05 +01:00
Maikel Linke
20af19c912 Simplify report file storage 2023-11-15 10:29:05 +01:00
Maikel Linke
ff6bcb113f Create report file where the content is generated 
In the past, we needed the report blob to know when the report has been
finished and uploaded. But not we use cable_ready to notify when the
report is done and we don't need the blob in the controller.
 2023-11-15 10:29:05 +01:00