Differentiate individual and enterprise on customers by pacodelaluna · Pull Request #14294 · openfoodfoundation/openfoodnetwork

pacodelaluna · 2026-05-17T22:05:20Z

⚠️ Use # 88 B2B customer on clockify to work on this

What? Why?

Closes #14256.

What should we test?

Log in as enterprise
Notice you can add enterprise type to customers, but the columns are hidden by default
Check the mandatory fields
Check invoices
Check the API V1 customer endpoint has been updated as well

Release notes

Add the ability to differentiate between enterprise and individuals in admin/customers

Changelog Category (reviewers may add a label for the release notes):

User facing changes
API changes (V0, V1, DFC or Webhook)
Technical changes only
Feature toggled

The title of the pull request will be included in the release notes.

pacodelaluna

I finished a first iteration on this topic, I put some comments, there must be some adjustments. I will add screenshots below.

pacodelaluna · 2026-06-10T20:47:33Z

+  enum :customer_type, {
+    individual: "individual",
+    enterprise: "enterprise"
+  }, default: "individual"


Using an enum for our purpose, it seems a good fit.

pacodelaluna · 2026-06-10T20:53:33Z


  attr_accessor :gateway_recurring_payment_client_secret, :gateway_shop_id

+  attribute :enterprise_charges_sales_tax, :boolean, default: false


The enterprise_charges_sales_tax field is handled with a checkbox input on the form, so the presence validation is an issue, as the checkbox can be empty. I choose the approach of giving it a default value. Tell me if you prefer an other approach.

pacodelaluna · 2026-06-10T20:54:53Z

          = @order.customer.email
+        - if @order&.customer&.enterprise_acn.present?
+          %br
+          = @order.customer.enterprise_acn


I didn't have mockups, so I put the enterprise_acn at the end of the customer details, tell me if it has to be in an other position.

pacodelaluna · 2026-06-10T20:56:46Z

    code { SecureRandom.base64(150) }
    user
    bill_address { create(:address) }
+    customer_type { "individual" }


We have a default value now, but I kept this here, as a kind of documentation. I can remove it if it does not make sense.

pacodelaluna · 2026-06-10T20:57:58Z

+      expect(presenter.enterprise_name).to be_nil
+    end
+  end
+end


This class was not tested, so I added them, but I am wondering if they are really useful.

pacodelaluna · 2026-06-10T21:00:10Z

+      expect(json['data']['attributes']['email']).to eq(customer.email)
+    end
+  end
+end


Same here, not sure these tests are much important, I added them a bit by reflex.

Thanks, I guess that most of this is already covered by spec/requests/api/v1/customers_spec.rb.

pacodelaluna · 2026-06-10T21:05:43Z

The failing check seems to be a flaky test, not related to my changes.

pacodelaluna · 2026-06-10T21:22:45Z

On the customers list:

On the invoice:

pacodelaluna · 2026-06-10T21:25:09Z

It makes me think that we may need to adjust enterprise data in our Anonymization task, it looks like we are missing some parts on this side. I will take a look after this.

rioug

Looks good, thanks for adding the extra tests !

dacook

Great job, this looks mostly good.
I have a small suggested change to simplify the code, and I suggest using DB enums but would be happy if you don't have time to try it.

In reviewing this, I also needed to consider the bigger picture and added some comments on the issue. I'm not a fan of the field name enterprise_acn.
But I'm not exactly sure of the best option, so am interested to hear other ideas. If "acn" is agreed, I will approve it :)

dacook · 2026-06-15T05:04:43Z

+class AddEnterpriseRelatedFieldsToCustomers < ActiveRecord::Migration[7.1]
+  def change
+    change_table :customers, bulk: true do |t|
+      t.string :customer_type, default: "individual", null: false


This will store a string for every record. We could instead make use of database-level enums which would be more efficient:
https://guides.rubyonrails.org/active_record_postgresql.html#enumerated-types

Would you be willing to try this?

Sure, I will implement it.

dacook · 2026-06-15T05:10:55Z

                    }
+  validates :customer_type,
+            presence: true,
+            inclusion: { in: customer_types.keys }


± It looks like you don't need to create this validation, you can just enable it on the enum definition above with validate: true
(https://stackoverflow.com/a/77025739/421243)

I tried this method initially, but I faced an issue, I don't remember exactly which one... I will try again and spot it if it pops again.

dacook · 2026-06-15T05:36:23Z

+      expect(json['data']['attributes']['email']).to eq(customer.email)
+    end
+  end
+end


Thanks, I guess that most of this is already covered by spec/requests/api/v1/customers_spec.rb.

pacodelaluna · 2026-06-15T07:51:41Z

@dacook Thanks for your review!

About spec/requests/api/v1/customers_spec.rb spec, I understand, I will remove these specs then.

About the enterprise_acn naming, I just reuse the naming from Enterprise data model, maybe we could just put enterprise_vat_number instead? I am open to any clearer suggestion.

dacook · 2026-06-15T23:23:22Z

Thanks Paco. I'm still not sure of the best name for the field, but I don't want to hold things up further so I'm happy to approve it as-is (once you have tried the other changes).

github-project-automation Bot added this to OFN Delivery board May 17, 2026

github-project-automation Bot moved this to All the things 💤 in OFN Delivery board May 17, 2026

pacodelaluna marked this pull request as draft May 17, 2026 22:05

github-actions Bot assigned pacodelaluna May 17, 2026

sigmundpetersen moved this from All the things 💤 to In Progress ⚙ in OFN Delivery board May 18, 2026

pacodelaluna force-pushed the differentiate-individual-and-enterprise-on-customers branch 2 times, most recently from 9171071 to 5fffb5a Compare June 10, 2026 16:01

Add customer_type field on customers table

29e4c13

pacodelaluna force-pushed the differentiate-individual-and-enterprise-on-customers branch 4 times, most recently from 9ec7e68 to 74980c4 Compare June 10, 2026 17:46

pacodelaluna added 7 commits June 10, 2026 22:49

Set validations on new customer attributes

a9d5966

Handle new fields and columns on Admin Customers list

70ef07c

Add a default value for enterprise_charges_sales_tax on customers

2225efd

Add new customer attributes on API V1

cdc6570

Add translations for EN locale

dfec622

Add enterprise_acn field on invoices

6435941

Add attributes and specs for customer presenter

f11746e

pacodelaluna force-pushed the differentiate-individual-and-enterprise-on-customers branch from 74980c4 to f11746e Compare June 10, 2026 20:49

pacodelaluna commented Jun 10, 2026

View reviewed changes

pacodelaluna marked this pull request as ready for review June 10, 2026 21:02

sigmundpetersen moved this from In Progress ⚙ to Code review 🔎 in OFN Delivery board Jun 11, 2026

rioug approved these changes Jun 12, 2026

View reviewed changes

rioug added api changes These pull requests change the API and can break integrations user facing changes Thes pull requests affect the user experience labels Jun 12, 2026

dacook self-requested a review June 15, 2026 04:40

dacook requested changes Jun 15, 2026

View reviewed changes

github-project-automation Bot moved this from Code review 🔎 to In Progress ⚙ in OFN Delivery board Jun 15, 2026


		attr_accessor :gateway_recurring_payment_client_secret, :gateway_shop_id

		attribute :enterprise_charges_sales_tax, :boolean, default: false

Uh oh!

Conversation

pacodelaluna commented May 17, 2026 • edited by dacook Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What? Why?

What should we test?

Release notes

Uh oh!

pacodelaluna left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pacodelaluna commented Jun 10, 2026

Uh oh!

pacodelaluna commented Jun 10, 2026

Uh oh!

pacodelaluna commented Jun 10, 2026

Uh oh!

rioug left a comment

Choose a reason for hiding this comment

Uh oh!

dacook left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pacodelaluna commented Jun 15, 2026

Uh oh!

dacook commented Jun 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

pacodelaluna commented May 17, 2026 •

edited by dacook

Loading

dacook left a comment •

edited

Loading