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

205 Commits

Author SHA1 Message Date
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
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
Mohamed ABDELLANI
e10d441153 load GeneralSettingsHelper#all_units from WeightsAndMeasures::UNITS 2023-11-13 09:29:31 +01:00
Neal Chambers
c3b4781a28 Safely autocorrect Style/RedundantConstantBase 
Inspecting 1509 files
.........................................................................................................C.........................................C......................................................................................................................................................................................................................................................................................................................................................................................................................................................................C.......................................................................................................................................................................................................................................................................................................................................................................................................................C.........................................................................................................................................................................CCC........................................C......................................................................................C......................................................................................................................................................................................................

Offenses:

app/controllers/split_checkout_controller.rb:5:33: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
class SplitCheckoutController < ::BaseController
                                ^^
app/controllers/webhook_endpoints_controller.rb:3:36: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
class WebhookEndpointsController < ::BaseController
                                   ^^
config.ru:5:9: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
require ::File.expand_path('config/environment', __dir__)
        ^^
spec/helpers/checkout_helper_spec.rb:168:68: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
      let!(:tax_rate) { create(:tax_rate, amount: 0.1, calculator: ::Calculator::DefaultTax.new) }
                                                                   ^^
spec/models/spree/order_spec.rb:619:25: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
    let(:fee_handler) { ::OrderFeesHandler.new(subject) }
                        ^^
spec/models/spree/payment_method_spec.rb:150:51: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
                                      calculator: ::Calculator::FlatRate.new(preferred_amount: 10))
                                                  ^^
spec/models/spree/payment_method_spec.rb:154:54: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
                                         calculator: ::Calculator::FlatPercentItemTotal
                                                     ^^
spec/models/spree/payment_spec.rb:429:49: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
            create(:payment_method, calculator: ::Calculator::FlatRate.new(preferred_amount: 10))
                                                ^^
spec/models/spree/payment_spec.rb:1002:11: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
          ::Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10)
          ^^
spec/models/spree/payment_spec.rb:1039:28: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
        let(:calculator) { ::Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10) }
                           ^^
spec/queries/complete_visible_orders_spec.rb:12:31: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
    let(:order_permissions) { ::Permissions::Order.new(user, filter_canceled) }
                              ^^
spec/services/paypal_items_builder_spec.rb:34:37: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
                        calculator: ::Calculator::DefaultTax.new)
                                    ^^
spec/services/paypal_items_builder_spec.rb:38:37: C: [Corrected] Style/RedundantConstantBase: Remove redundant ::.
                        calculator: ::Calculator::DefaultTax.new)
                                    ^^

1509 files inspected, 13 offenses detected, 13 offenses corrected
 2023-11-10 09:13:57 +09:00
David Cook
671dc570ec Refactor: with form builder 2023-10-24 15:21:14 +11:00
Maikel Linke
477ca39e58 Update spec 2023-10-12 15:40:06 +11:00
Gaetan Craig-Riou
7f2c1feaf8 Fix rubocop warning 2023-10-02 15:58:13 +11:00
Gaetan Craig-Riou
8d639c14cb Add a fake adjustment voucher tax on admin order page 
When tax are included in price, voucher tax is stored in the voucher
adjustment and not as its own adjustment. So we add a "fake adjustment"
for display purposes.
 2023-10-02 15:58:12 +11:00
Gaetan Craig-Riou
8254bd9625 Take into account voucher tax part when displaying tax included in price 2023-10-02 15:58:12 +11:00
Neal Chambers
29df80945d Fix Style/HashSyntax 2023-09-20 23:46:26 +09:00
Konrad
3b9ebf4e07 Merge pull request #11396 from abdellani/fix-if-tos-is-not-set 
fix If ToS file is not set, customer needs to accept Terms on each checkout
 2023-09-06 16:56:21 +02:00
Maikel Linke
e12cf2aa4c Simplify feature check for multiple actors at once 
I think that it's a valid case to check a feature toggle against the
user and an enterprise. You may want to check with only one user first,
then activate it for a whole enterprise and lastly activate the feature
globally.
 2023-08-25 10:19:17 +10:00
Mohamed ABDELLANI
f9e6f8bfa5 fix existing tests 2023-08-23 11:50:33 +01:00
Filipe
d27a632a38 Merge pull request #11079 from abdellani/fix-distributors-listing-on-checkout-options 
filter distributors before listing on checkout options
 2023-06-29 17:02:34 +01:00
Neal Chambers
5b6f45931c Fix Layout/LineLength 2023-06-26 13:06:56 +09:00
Maikel Linke
61c4fb936a Test OrderCycleHelper with real data, not mocks 
It's more realistic and doesn't break with the next change.
 2023-06-26 12:55:57 +10:00
Maikel Linke
7f94fbc085 Add common whitespace to spec 2023-06-26 12:48:54 +10:00
Mohamed ABDELLANI
b072da142e filter distributors before listing on checkout options 2023-06-22 09:00:39 +01:00
Mohamed ABDELLANI
bd0e7cdfc8 remove legacy checkout tests 2023-06-13 14:58:16 +01:00
Jean-Baptiste Bellet
fc21fdb485 Customize default tab: could be either shop or home 2023-05-25 09:19:51 +02:00
Matt-Yorkley
4b707b9310 Extract locale file digest logic to a separate class and add tests 2023-05-08 14:09:00 +01:00
Ana Nunes da Silva
bb71b281d6 Remove print ticket links 2023-02-14 08:08:20 +00:00
Mohamed ABDELLANI
9bff2718c7 implement display_line_items_taxes to render included & added tax 2023-01-21 08:16:05 +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
Maikel Linke
b297299838 Simplify test of adjustments 2022-10-08 10:00:57 +02:00
Maikel Linke
52843de1da Test against unique fee name 
The adjustment factory calls everything "Shipping" by default. This was
confusing here because we were explicitely looking at a non-shipping
fee.
 2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
77e644e3d4 Get adjustment which is not the shipping one 2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
72df2867d4 Remove admin_and_handling merging 
+ update specs as well
 2022-10-08 10:00:57 +02:00
Cillian O'Ruanaidh
bff7650b35 Change :available_shipping_methods helper to use new OrderAvailableShippingMethods service. 2022-09-30 13:13:39 +01:00
Maikel Linke
326b0af35f Sort tax total by percentage on invoice 2022-09-01 11:19:02 +10:00
Maikel Linke
91eaa522cf Simplify tax totals helper 2022-08-31 16:47:04 +10:00
Maikel Linke
2a57dc9766 Index tax totals correctly for invoice display 2022-08-31 16:47:04 +10:00
Maikel Linke
f37b681fac Allow more tax data in the summary 
I converted the value to a hash so that we can put all information in
there and we won't need the current hash key as percentage any more.
 2022-08-31 16:47:04 +10:00
Maikel Linke
f4466b1aad Spec problem with tax rate summary display 2022-08-31 16:47:04 +10:00
Filipe
6ff2d4a9d5 Merge pull request #9109 from apricot12/8917-Link-to-enterprise-site 
Adding a link to enterprise's own site from Order confirmation page.
 2022-06-02 17:59:03 +01:00
Sebastian Castro
452a3fa933 Reports Refactor 2: Merge Spree::reports into Admin::Reports 2022-05-12 16:54:13 +02:00
Nihal Mohammed
af58ba523c Renamed groups_helper to link_helper and removed strip_url method, as well as updated specs and ApplicationHelper. Added "Back To Website" button and i18n. 2022-04-26 01:38:25 +05:30
Cillian O'Ruanaidh
21affa6250 Include language metatags in html template when more than one language available 
Fixes #8902

This is to help Google find pages in all languages, see https://developers.google.com/search/docs/advanced/crawling/localized-versions
 2022-02-25 12:49:49 +00:00
Jean-Baptiste Bellet
8455d79f9b Use the last payment method instead of the first for the Payment Method Report 2022-01-18 20:35:08 +01:00
Maikel Linke
178d296c9f Adapt specs to use stripe_sca_payment_method 
There are still some specs directly related to StripeConnect and I left
them for now.
 2021-12-20 15:00:14 +11:00
Luis Azcuaga
e8fd89a6d2 Run rubocop over existing todo 2021-10-25 21:28:28 -05:00
Maikel
a3c31f7d86 Revert "Kill stripe connect" 2021-09-20 08:39:34 +10:00
Luis Ramos
0c240cee9a A few more removals of stripe connect related code 2021-09-10 14:43:34 +05:30
Luis Ramos
f90e34bb47 Adapt specs to use stripe_sca_payment_method factory and delete stripe_connect_payment_method 2021-09-10 14:43:34 +05:30
Matt-Yorkley
ec84564f28 Add test coverage for TaxHelper 2021-07-27 22:09:14 +01:00
Andy Brett
7d399b4c6d Remove duplicative line item for taxes 2021-07-12 09:16:28 -07:00
Andy Brett
e9a00eb0d4 Merge pull request #7310 from cillian/resumed-order-actions-menu 
Make sure the Resend Confirmation and Send/Print Invoice links display for resumed orders
 2021-06-30 10:43:07 -07:00
Luis Ramos
e52937c113 Use rubocop auto correct to add frozen string literal to all files 
This is an unsafe auto corection, we will need to trust our build here
 2021-06-17 23:07:26 +01:00
Luis Ramos
23627c5453 Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied 
9290 issues fixed
 2021-06-17 22:19:26 +01:00