filipefurtad0
3e4d689903
Update all locales with the latest Transifex translations
2025-01-23 19:51:48 -06:00
Filipe
adf1c63c11
Merge pull request #13072 from rioug/update-action-cable-config
...
Update ActionCable config
2025-01-23 19:24:44 -06:00
Filipe
5d360730c7
Merge pull request #13023 from rioug/12907-fix-checkout-shipping-fee
...
[Checkout] Shipping fees update, remove order callback
2025-01-23 18:50:31 -06:00
Maikel Linke
7b8b7b6bbc
Satisfy Rubocop on new migrations
2025-01-23 08:39:40 +11:00
Maikel
2d77b54685
Merge pull request #13092 from openfoodfoundation/dependabot/npm_and_yarn/leaflet-geosearch-4.1.0
...
chore(deps): bump leaflet-geosearch from 4.0.0 to 4.1.0
2025-01-23 08:38:09 +11:00
Konrad
0b8807146e
Merge pull request #13058 from mkllnk/currency-config
...
Remove unused app config options
2025-01-22 11:27:12 +01:00
dependabot[bot]
486af8f58b
chore(deps): bump leaflet-geosearch from 4.0.0 to 4.1.0
...
Bumps [leaflet-geosearch](https://github.com/smeijer/leaflet-geosearch ) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/smeijer/leaflet-geosearch/releases )
- [Commits](https://github.com/smeijer/leaflet-geosearch/compare/v4.0.0...v4.1.0 )
---
updated-dependencies:
- dependency-name: leaflet-geosearch
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-01-22 09:57:36 +00:00
Maikel
c258bee44d
Merge pull request #13065 from mkllnk/dfc-amend-nothing
...
Admin updates can trigger new backorders until the order cycle is closed
2025-01-22 16:32:23 +11:00
Gaetan Craig-Riou
31c717349f
Merge pull request #13085 from mkllnk/ci-runs
...
Reduce parallel CI runs from 45 to 27
2025-01-22 09:38:49 +11:00
Maikel Linke
cf35e48d14
Remove unused app config options
...
This has been defined in ENV for a while
2025-01-21 20:11:05 +01:00
Maikel Linke
917e0ff01a
Remove unnecessary storage of currency
2025-01-21 20:11:05 +01:00
Maikel Linke
ed926e9e26
Remove unnecessary storage of checkout zone
2025-01-21 20:11:05 +01:00
David Cook
51300eecd9
Merge pull request #13079 from mkllnk/dfc-price
...
Publish price as in new DFC standard
2025-01-21 16:42:19 +11:00
Maikel Linke
ca12e35537
Reduce parallel CI runs from 45 to 27
...
This should shave off 18 minutes of overhead time for 18 fewer worker
runs in total. It also means that forks with only 20 parallel worker
should complete quicker.
2025-01-21 16:20:21 +11:00
Maikel
a1df61c612
Merge pull request #13076 from mkllnk/police-migrations
...
Police migrations
2025-01-21 11:36:34 +11:00
Maikel Linke
fcc31fffcd
Fix user seeding
2025-01-21 11:21:08 +11:00
Maikel Linke
971d5bea44
Police new migrations
2025-01-21 11:19:58 +11:00
Maikel Linke
8c68179069
Style default user creation
2025-01-21 11:19:57 +11:00
Maikel Linke
042cc238c8
Modernise db default scripts
2025-01-21 11:17:31 +11:00
Maikel Linke
25a90a44f9
Modernise seeds file
2025-01-21 11:17:29 +11:00
Maikel Linke
8383441f79
List ignored files more explicitely
2025-01-21 11:12:59 +11:00
Maikel
229ee7028c
Merge pull request #13064 from mkllnk/negative-stock
...
Don't show stock for on-demand inventory items
2025-01-21 11:05:50 +11:00
Gaetan Craig-Riou
fcd366cc06
Fix spec
...
Payment needs to be linked to the order, in order for the payment
callback to update `order.payment_total`
2025-01-21 10:52:32 +11:00
Gaetan Craig-Riou
0ca164a354
Fix spec
...
Use a completed payment, instead of trying to complete a payment
2025-01-21 10:51:08 +11:00
Gaetan Craig-Riou
d7ae91c23e
Per review, specify the actual expected value
2025-01-20 16:21:19 +11:00
Gaetan Craig-Riou
17e7f7d26d
Small linting fix
2025-01-20 16:16:00 +11:00
Gaetan Craig-Riou
c71ae35685
Fix payment_total calculation
...
For payment that complete during the checkout (Paypal, Stripe) the
amount was recorded twice against `order.payment_total`. This is because
the `payment_total` gets updated in an afer_save Payment callback when a
payment is completed, and then once more when we process payment in
`Spree::Order#process_each_payment`.
This is an existing issue on master, but it was hidden by the
`update_shipping_fees!` callback, it trigerred an update of the order's
total, which then updated `order.payment_total` with the correct value.
Now that we removed the callback, the bug showed up.
Note, I updated the stripe specs for consistency even though they are
currently disabled.
2025-01-20 16:07:32 +11:00
Gaetan Craig-Riou
1cf5dac979
Merge pull request #13077 from mkllnk/simplecov
...
Fix artifact download for Simplecov collation
2025-01-20 09:41:38 +11: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
Maikel Linke
06d9d96f54
Fix error on removed product from catalog
2025-01-17 12:21:28 +11: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 Linke
84648690a6
Publish price as in new DFC standard
2025-01-16 09:45:26 +11:00
Gaetan Craig-Riou
1afa7fe5c0
Per review, small improvment
2025-01-15 15:44:24 -06:00
Gaetan Craig-Riou
a8d1d0c591
Update spec to properly update line items on an order
...
User Order::Contents#update_item to update line item on an order, it
ensures the order is properly updated
2025-01-15 15:44:24 -06:00
Gaetan Craig-Riou
9e7e40a5a8
Update spec to properly test shipping fee update
2025-01-15 15:44:24 -06:00
Gaetan Craig-Riou
f9bd720341
Add spec for #update_shipping_fees!
...
And update related specs
2025-01-15 15:44:24 -06:00
Gaetan Craig-Riou
20df5c23e8
Remove before save callback to update shipping fees
...
It should be handled in the controller, it's currently handled in
`Spree::OrderContents#remove`. As long as we don't manually remove line
item from an order we should be good.
Currently it gets trigerred each time the order is saved, which seems to
happen mutiple time when we finalize an order. It's a bit useless to
recalculated the fees over and over
Context, it was added here : 217eda8362
2025-01-15 15:44:24 -06:00
Maikel Linke
c9eed4f5b8
Trigger new backorder only when user checks out
...
When an admin creates an order, then AmendBackorderJob is called which
can also trigger a new backorder if needed.
This means that we are not creating backorders via subscriptions any
more. It has never been requested and we can bring that back if needed.
2025-01-15 15:52:57 +11:00
Maikel Linke
6b76fbc817
Fix artifact download for Simplecov collation
...
v4 of the artifact actions works differently to v3.
2025-01-15 12:44:34 +11:00
Gaetan Craig-Riou
a3e939e0ac
Add OFN_REDIS_CABLE_URL env variable
...
It lets us specify a redis url to be used with ActionCable
2025-01-15 10:59:29 +11: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
