raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,078 Commits 18 Branches 452 Tags
a41019fbffcf02484fc522f38eb761d4e60fa41d
Commit Graph

2462 Commits

Author SHA1 Message Date
Konrad
27a4202fa4 Merge pull request #12357 from mkllnk/fix-invoice-order 
Fix: preserve order of invoices in bulk print
 2024-04-11 12:47:14 +02:00
Maikel
082b1f9411 Merge pull request #12300 from mkllnk/checkout-steps 
Remove unnecessary method checkout_steps
 2024-04-11 15:57:45 +10:00
Maikel Linke
48b447500f Move selection of invoicable orders to database 
It's more efficient and should allow for further optimisations.
 2024-04-10 16:52:56 +10:00
cyrillefr
404fcf1f72 Fix FixRailsWhereEquals 
- fixes offenses caused by RuboCop::Cop::Rails::WhereEquals cop
 2024-04-09 10:44:02 +02:00
Gaetan Craig-Riou
52bc88bbd8 Merge pull request #11369 from Matt-Yorkley/product-taxon 
[Product Refactor] Primary Taxon
 2024-04-03 10:31:49 +11:00
Ana Nunes da Silva
eedbaaff6e Fix duplicate branch in Spree::Preferences::Preferable private method 
:string, :text and :password cases have the same value
 2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
5fde1cc7cd Fix duplicate branch in Spree::Preference#value method 
:string, :text and :password cases have the same value
 2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
3e796da8ff Fix duplicate branch Spree::Calculator 2024-04-02 10:20:17 +01:00
Matt-Yorkley
3f2a5786bd Apply taxon from sibling variant if none is provided on variant creation 2024-04-02 09:27:37 +11:00
Matt-Yorkley
6b3e33f607 Update Taxon associations and joins 2024-04-02 09:27:36 +11:00
Matt-Yorkley
3b715875ad Update taxon association 2024-04-02 09:27:36 +11:00
Matt-Yorkley
2707c3137a Apply taxon to new variant when creating a new product 2024-04-02 09:27:36 +11:00
Matt-Yorkley
2ef266390d Move primary taxon to variant 2024-04-02 09:27:36 +11:00
Matt-Yorkley
c01bab5f27 Wrap commonly-repeated calls to Spree::Config to reduce unnecessary cache reads 
These config values are relatively static but in some cases they can be called many times in the same request (like rendering a report or a large list of line_items in BOM). These values will now only get fetched from Redis/Postgres once at most per request/job.
 2024-03-26 13:39:16 +00:00
Maikel
4c1268b3ce Merge pull request #12274 from mkllnk/dfc-product-import 
Import products from DFC catalog
 2024-03-22 09:25:02 +11:00
Maikel Linke
54738fc552 Remove unnecessary method checkout_steps 
It allowed introspection of a dynamic state machine. But the only two
usages of this method only referred to the first state which is always
the same. Our complicated checkout logic needs more clarity and
introducing some hardcoded state names here can only help.
 2024-03-21 13:43:54 +11:00
Feruz Oripov
9d919938f3 Group Order && OrderCycle related services and specs 2024-03-16 19:07:08 +05:00
Maikel Linke
d47d3eba8f Add SemanticLink model for variants 
We want to link variants/products to external DFC SuppliedProducts to
trigger supplier orders when local stock is exhausted. This is the first
step to enable the link.
 2024-03-15 16:46:41 +11:00
Maikel Linke
96ccea3691 Add controller to handle import of DFC products 
It's not doing anything yet, but this is the basic setup.
 2024-03-15 11:40:10 +11:00
Filipe
9abaf90907 Merge pull request #12233 from dacook/buu/unit-scale-basic-12005 
[BUU] Unit Scale - basic implementation
 2024-03-07 17:20:45 +00:00
Rachel Arnould
cd9bef4f7b Merge pull request #12172 from abdellani/12067-fix-invoice-render-multiple-tax-rates 
fix invoice render multiple tax rates
 2024-03-07 10:53:52 +01:00
David Cook
4b2406c9c2 Add unit scale dropdown 2024-03-06 13:41:17 +11:00
Filipe
cd7a9c606e Merge pull request #12208 from abdellani/11673-add-a-coder-for-every-serialized-attribute 
add for every serialized attribute a coder
 2024-03-05 15:41:45 +00:00
Mohamed ABDELLANI
ca13b0154c add for every serialized attribute a coder 2024-02-27 18:59:50 +01:00
David Cook
cb1f877117 Layout/LineLength 
Manual fix, for some reason rubocop couldn't fix these automatically
 2024-02-27 09:51:58 +11:00
Maikel Linke
4d8bb25f86 Allow enterprise users to disconnect their OIDC account 2024-02-22 10:21:58 +11:00
Maikel Linke
a89b22e397 Allow user to disconnect OIDC account 
This makes testing much easier. But probably also good for users to
revoke any access via OIDC apps. It also enables users to then connect
to a different account, or just renew the current connection.
 2024-02-22 10:15:07 +11:00
Maikel Linke
07a8617143 Store OIDC account data in new model 2024-02-22 10:15:07 +11:00
Mohamed ABDELLANI
f4395a9d18 test display_line_item_tax_rate 2024-02-21 20:55:49 +01:00
Gaetan Craig-Riou
edc40c9ea9 Refactor Spree::Gateway::StripeSCA 
- fix confusing comment
- rename parameter to better reflect usage
 2024-02-19 10:58:31 +11:00
Gaetan Craig-Riou
549610bc35 Finally remove StripePaymentIntentsGateway decorator 
Add spec for Spree::Gateway::StripeSCA#void
It also partially fix 11670, refund of Stripe payment should now work
for complete order
 2024-02-19 10:58:31 +11:00
David Cook
7164cbd0bd Don't validate numericality if blank 
This avoids unnecessary second message when left blank:
> can't be blank
> is not a number

Ok this is a little confusing. Why is there a  separate presence check above, and why is it only for measurable units, when we still require a number for _all_ units? Because, for 'items', we allow a blank value then auto-set it to 1.
I don't know if it's really necessary, but that's how it currently works...
 2024-02-16 08:51:53 +11:00
Konrad
9e6b8e0624 Merge pull request #12047 from rioug/12021-enterprise-fee-tax-on-invoice 
Include Tax on enterprise fees on the invoice
 2024-01-31 15:32:54 +01:00
Konrad
ca12eab4bb Merge pull request #11985 from chahmedejaz/task/11768-add-voucher-in-enterprise-fees-with-tax-by-order-report 
Include vouchers in report: Enterprise Fees With Tax Report By Order
 2024-01-24 22:57:48 +01:00
Konrad
ec4bbe6241 Merge pull request #12038 from mkllnk/dfc-tax-category 
Spec requiring tax category when creating products
 2024-01-24 16:26:57 +01:00
Ahmed Ejaz
cb9c2963af 11768: add roundoff 
- Fix lint issues
 2024-01-19 01:52:24 +05:00
Ahmed Ejaz
38b7616b1a 11768: apply voucher 2024-01-19 01:52:18 +05:00
Konrad
bed405794f Merge pull request #11762 from binarygit/send-shipment-email-optionally 
send-shipment-email-optionally
 2024-01-18 12:02:00 +01:00
Gaetan Craig-Riou
aa6392029c Add #enterprise_fee_adjustments 
It returns adjustments associated to enterprise fee
 2024-01-16 15:40:22 +11:00
binarygit
75ca1dddf1 Fix tests and rubocop warnings 2024-01-14 15:06:02 +05:45
binarygit
aa7a4fb5a2 Send shipment email by default 2024-01-14 15:06:02 +05:45
binarygit
95a51159d7 send-shipment-email-optionally 2024-01-14 15:05:59 +05:45
Maikel Linke
95c6a56e2e Simplify loading of default tax category 
The logic doesn't change but I simplified it and added more detailed
specs.
 2024-01-12 17:06:24 +11:00
Maikel Linke
78e42ec664 Show Connected Apps only to enterprise managers 
Super-admins also saw that tab but connecting an app doesn't work unless
you are a manager of that enterprise.
 2024-01-11 12:20:40 +11:00
David Cook
2a3d498c13 Style/RedundantReturn 2024-01-10 09:38:35 +11:00
David Cook
7e00dbfd67 Style/RedundantParentheses 2024-01-10 09:38:21 +11:00
David Cook
fbbaf51522 Safely autocorrect Lint/SymbolConversion 
Inspecting 1530 files
.....................................................................................................................................................................................................................................................................................................................................................W.................................................................................................................................................................................................................................................W..........................................................................................................................................................................................................................................................W.......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................

Offenses:

app/models/spree/preferences/preferable_class_methods.rb:73:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}" instead.
        "preferred_#{name}".to_sym
        ^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:77:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}=" instead.
        "preferred_#{name}=".to_sym
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:81:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"prefers_#{name}?" instead.
        "prefers_#{name}?".to_sym
        ^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:85:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"prefers_#{name}=" instead.
        "prefers_#{name}=".to_sym
        ^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:89:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}_default" instead.
        "preferred_#{name}_default".to_sym
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:93:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}_type" instead.
        "preferred_#{name}_type".to_sym
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:97:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}_description" instead.
        "preferred_#{name}_description".to_sym
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/services/sets/product_set.rb:121:28: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"variant_#{error.attribute}" instead.
        product.errors.add("variant_#{error.attribute}".to_sym, error.message)
                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/spree/core/environment_extension.rb:11:24: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"#{name}=" instead.
        create_method( "#{name}=".to_sym ) { |val|
                       ^^^^^^^^^^^^^^^^^

1530 files inspected, 9 offenses detected, 9 offenses corrected
 2024-01-10 09:21:43 +11:00
Gaetan Craig-Riou
b0541b0a34 Merge pull request #12004 from mkllnk/default-country 
Cache default country simply in memory
 2024-01-05 14:10:35 +11:00
Maikel Linke
cb3cd3e7ea Cache default country simply in memory 
This simplifies the code, avoids a method naming collision with Rails
and should be faster as well.
 2024-01-04 13:45:36 +11:00
Mohamed ABDELLANI
d239beb226 remove unnecessary require instructions 2024-01-03 11:34:57 +01:00