François Turbelin
f8336edb07
Revert "Don't allow spaces in external billing id"
...
This reverts commit 39825a9ecb
2025-01-25 21:05:37 +01:00
François Turbelin
39822e1761
Launch new Docker procfile from Docker Compose
2025-01-19 22:17:31 +01:00
François Turbelin
49e66c3d23
Add a Procfile for Docker
2025-01-19 21:01:05 +01:00
François Turbelin
2acde5423d
Remove extra containers
2025-01-19 21:00:28 +01:00
François Turbelin
39825a9ecb
Don't allow spaces in external billing id
2025-01-19 20:57:31 +01:00
filipefurtad0
d0a3d4996e
Update all locales with the latest Transifex translations
2025-01-17 16:53:56 -06:00
Filipe
a472f3e4f5
Merge pull request #13068 from vishaldeepak/variant-with-tax
...
New variants should inherit tax category in UI
2025-01-17 10:57:22 -06:00
Filipe
ace3bfa2a5
Merge pull request #13061 from kernal053/add-voucher-label-to-edit-cart-page
...
Add 'Voucher:' before voucher code on edit cart page
2025-01-16 22:51:57 -06:00
Filipe
3c1dd10219
Merge pull request #13047 from mkllnk/spree-roles
...
Clarify that our only user role is "admin" and simplify code
2025-01-16 18:06:49 -06:00
Filipe
5726eeffaa
Merge pull request #13038 from chahmedejaz/task/13032-plural-variant-unit-names
...
Add plural form for flower farming variant unit names
2025-01-16 17:51:07 -06:00
Maikel
eace31f1fc
Merge pull request #13074 from rioug/sync-prod-databse-schema
...
Sync prod database schema
2025-01-15 08:23:40 +11:00
Gaetan Craig-Riou
600195a726
Allow null for customers.created_manually
...
Some production database don't allow null for customers.created_maually,
we want to allow it to bring the database inline with schema.rb
2025-01-14 12:10:22 +11:00
Gaetan Craig-Riou
e2e12ccb52
Remove spree_variants default value and constraint
...
Some of the production database have default value for `weight` and
`unit_value` has well as check constraint. We want to remove them to
bring the database schema inline with schema.rb
2025-01-14 12:09:40 +11:00
Rachel Arnould
92c45084dc
Merge pull request #12980 from pacodelaluna/add-external-billing-id-on-enterprises
...
Add external billing id on enterprises
2025-01-13 17:03:40 +01:00
David Cook
244e0524c7
Re-instate check for external_billing_id
2025-01-13 16:54:17 +01:00
François Turbelin
96c7c828c1
Fix specs
2025-01-13 16:54:17 +01:00
François Turbelin
9c153c6083
Improve specs
2025-01-13 16:54:17 +01:00
François Turbelin
e946b50515
Isolate into an Admin Only section
2025-01-13 16:54:17 +01:00
François Turbelin
3ef5b41282
Remove Admin Only tab logic
2025-01-13 16:54:17 +01:00
François Turbelin
a007fdaab8
Revert "Put back permalink fields on primary details panel"
...
This reverts commit d90ca538fb5b02e942842f1f9c1f44232f44027d.
2025-01-13 16:54:17 +01:00
François Turbelin
983e3e717b
Revert "Fix spec"
...
This reverts commit b40e8a1ff9072721c468a7c012e1e4a9d47e3957.
2025-01-13 16:54:17 +01:00
François Turbelin
1e3f86625f
Revert "Add spinner"
...
This reverts commit 16506c44fa8aee0a588c01a253b78b023a8f3a39.
2025-01-13 16:54:17 +01:00
François Turbelin
9cd3bbf46f
Revert "Use params value only if present"
...
This reverts commit 5cd50b1c1ff66398f470d51fdafacf26663a2730.
2025-01-13 16:54:17 +01:00
François Turbelin
f9f5d0eb51
Revert "Do explicit save in specs when switching tabs"
...
This reverts commit 3230159dceeb1485b0c6ec2422ea282b39431e0c.
2025-01-13 16:54:17 +01:00
François Turbelin
0b0b6a04e1
Do explicit save in specs when switching tabs
2025-01-13 16:54:17 +01:00
François Turbelin
0f77d1bad5
Use params value only if present
2025-01-13 16:54:17 +01:00
François Turbelin
cd38e02cac
Add spinner
2025-01-13 16:54:17 +01:00
François Turbelin
d6faa23fc2
Fix spec
2025-01-13 16:54:17 +01:00
François Turbelin
9dc364979a
Put back permalink fields on primary details panel
2025-01-13 16:54:17 +01:00
François Turbelin
3c7c02da2f
Repair specs
2025-01-13 16:54:17 +01:00
François Turbelin
657df9eb8f
Repair field placeholder translation
2025-01-13 16:54:17 +01:00
François Turbelin
6ae3c8b102
Add external_billing_id field on revenues_by_hub report
2025-01-13 16:54:17 +01:00
François Turbelin
e37881837b
Add unit tests for admin entreprises changes
2025-01-13 16:54:17 +01:00
François Turbelin
57c237c72d
Move admin_only tab upper
2025-01-13 16:54:17 +01:00
François Turbelin
6030d7e05b
Handle the async action for entreprises sells field changes
2025-01-13 16:54:17 +01:00
François Turbelin
30dfae7e18
Deal with translations
2025-01-13 16:54:17 +01:00
François Turbelin
14334b02bf
Add new field on enterprise admin form
2025-01-13 16:54:17 +01:00
François Turbelin
772f1f8fde
Add external_billing_id field on enterprises table
2025-01-13 16:54:17 +01:00
Vishal Deepak
1586c8ef28
New varaints should inherit tax category in UI
2025-01-10 13:30:18 +05:30
Maikel
e2bc86faa9
Merge pull request #12491 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.25.0
...
chore(deps-dev): bump rubocop-rails from 2.24.1 to 2.28.0
2025-01-10 13:03:25 +11:00
David Cook
7f2266ef40
Merge pull request #13066 from mkllnk/fix-flaky-order-spec
...
Fix flaky admin order spec
2025-01-10 12:26:46 +11:00
Maikel Linke
b8c5b24c17
Fix flaky admin order spec
...
We were trying to assert values in the database withou waiting for he
update to finish. First expecting the changed values on the screen
ensures that Capybara waits for the action to finish. Then we can check
the database.
2025-01-10 09:54:50 +11:00
Maikel Linke
f8788d358e
UNSAFE style Rails/RootPathnameMethods
2025-01-10 09:14:34 +11:00
Maikel Linke
c1198c8e1f
UNSAFE Style Rails/CompactBlank
2025-01-10 09:14:34 +11:00
Maikel Linke
6cf1a0500d
Bump rubocop-rails from 2.25.0 to 2.28.0
2025-01-10 09:14:04 +11:00
David Cook
314126a937
Update all locales with the latest Transifex translations
2025-01-10 09:08:52 +11:00
Maikel Linke
f9d436b1c9
Simplify subscription query
...
The artificial limit of 100 years was just set because the old SQL query
wouldn't deal with `null` well. Comparing with null always is always
false and returns nothing.
But Rails is now clever enough to interpret `begins_at..nil` as open
end query. This shouldn't have any practical impact as there's unlikely
to be an order cycle closing in more than 100 years. And if there was,
it would be confusing that it's not treated like other order cycles
ending in 80 years.
2025-01-10 08:57:20 +11:00
Maikel Linke
49ec9a3136
Style Rails/WhereRange
2025-01-10 08:43:58 +11:00
dependabot[bot]
2937595a33
chore(deps-dev): bump rubocop-rails from 2.24.1 to 2.25.0
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.24.1 to 2.25.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.24.1...v2.25.0 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-01-10 08:34:00 +11:00
Maikel
edf236778e
Merge pull request #13063 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.6.13
...
Bump @floating-ui/dom from 1.6.12 to 1.6.13
2025-01-09 08:54:47 +11:00
