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
Jean-Baptiste Bellet
0cc8349c71
Use fee name for the adjustment label instead of type
...
+ update specs as well
2022-10-08 10:00:57 +02:00
Maikel Linke
47ac118cf7
Simplify ProductSet by using Rails changes feature
...
I added a line to this class before and that made it too long. Now I
removed a line again to keep code quality up.
2022-10-08 09:03:38 +02:00
Maikel Linke
95d68b98a9
Spec both cases of removing variants from order cycles
...
The spec tested only the removal but not he keeping of variants.
I want to change this in the next commit to simplify the class.
2022-10-08 09:03:38 +02:00
Maikel Linke
47a43163d8
Avoid error on empty variant attributes
...
In 2019 Pau observed an error where an empty attributes hash was passed
to the bulk product update method. He added an automated test but wasn't
able to reproduce the error.
A recent change in logic made the spec fail but rspec-retry hid that
fail because it would succeed on a second try (not sure why). I now
changed the logic to ignore empty attributes properly and avoid an error
trying to create a new variant when no attributes are given.
* f9403977816f228781d4
2022-10-08 09:03:38 +02:00
Vishal Jain
b582b61414
add specs to not include hidden hubs
2022-10-07 11:24:32 +02:00
Vishal Jain
6ead127b5c
add not hidden scope to hide hidden hub from producers profile
2022-10-07 11:24:32 +02:00
jibees
22cf05ad94
Merge pull request #9742 from openfoodfoundation/dependabot/bundler/active_storage_validations-1.0.0
...
Bump active_storage_validations from 0.9.8 to 1.0.0
2022-10-07 09:12:47 +02:00
jibees
a2e68026e5
Merge pull request #9743 from openfoodfoundation/dependabot/bundler/sidekiq-scheduler-4.0.3
...
Bump sidekiq-scheduler from 4.0.2 to 4.0.3
2022-10-07 09:09:04 +02:00
dependabot[bot]
c9419d3437
Bump sidekiq-scheduler from 4.0.2 to 4.0.3
...
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler ) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases )
- [Changelog](https://github.com/sidekiq-scheduler/sidekiq-scheduler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v4.0.2...v4.0.3 )
---
updated-dependencies:
- dependency-name: sidekiq-scheduler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-10-06 09:02:55 +00:00
dependabot[bot]
c1f34bc680
Bump active_storage_validations from 0.9.8 to 1.0.0
...
Bumps [active_storage_validations](https://github.com/igorkasyanchuk/active_storage_validations ) from 0.9.8 to 1.0.0.
- [Release notes](https://github.com/igorkasyanchuk/active_storage_validations/releases )
- [Changelog](https://github.com/igorkasyanchuk/active_storage_validations/blob/master/CHANGES.md )
- [Commits](https://github.com/igorkasyanchuk/active_storage_validations/compare/0.9.8...1.0.0 )
---
updated-dependencies:
- dependency-name: active_storage_validations
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-10-06 09:02:40 +00:00
Maikel Linke
a64d146bb1
Update translations
2022-10-06 12:31:39 +11:00
Maikel
a43d31a9d5
Merge pull request #9711 from dacook/translation-cleanup
...
Translation cleanup
2022-10-06 09:51:28 +11:00
Maikel
db2b381c3f
Merge pull request #9718 from mkllnk/style
...
Use standard ApplicationRecord in task class
2022-10-06 09:42:29 +11:00
Konrad
9f0c0208dd
Merge branch 'master' into style
2022-10-05 19:59:10 +02:00
Maikel
8072e97579
Merge pull request #9721 from filipefurtad0/fix_flaky_shopping_spec
...
Addresses flakyness in shopping_spec.rb
2022-10-05 13:19:23 +11:00
filipefurtad0
977916cb11
Adds 2 sec sleep time on other flaky examples
2022-10-04 20:58:30 +01:00
filipefurtad0
f4edfcefa2
Adds 2 sec sleep time
2022-10-04 20:17:14 +01:00
Rachel Arnould
b078d3e0cc
Merge pull request #9719 from mkllnk/secrets-config
...
Simplify config of secret token
2022-10-04 20:36:03 +02:00
Rachel Arnould
611475c48a
Merge pull request #9448 from binarygit/cancel-orders-in-bulk
...
Cancel Orders in Bulk
2022-10-04 19:48:59 +02:00
Rachel Arnould
21ecec894f
Merge pull request #9688 from binarygit/order-cycle-closes-during-checkout
...
Redirect to shopfront when OC closes during checkout
2022-10-04 19:46:38 +02:00
David Cook
0fc8c719fe
Scope Enterprise side menu translations
...
And removed some now-unused global translations, yay! I searched for these in the codebase, eg with regex:
/\bt[\( ]["':]shop_preferences/
2022-10-04 19:39:29 +02:00
David Cook
4c3e20d25a
Scope Enterprise form legend translations
2022-10-04 19:39:29 +02:00
David Cook
13d95ecf1d
Scope Enterprise Group side menu translations
...
With it's own lazy scope, we no longer need to define labels separately.
2022-10-04 19:39:29 +02:00
David Cook
7803e5d4ff
Scope Enterprise Group form legend translations
...
Using lazy-lookup builtin scopes, instead of sharing the global translations, as per our guidelines.
2022-10-04 19:39:29 +02:00
David Cook
2e2ff25ef7
DRY up code
...
Slightly. If we upgrade to Ruby 3.1 with hash value omission, this would be neater.
If we could set a scope in the controller (https://stackoverflow.com/questions/6137960/rails-i18n-default-scope ) it would be even neater.
2022-10-04 19:39:29 +02:00
David Cook
3a61cf05ad
Remove unused locale message
...
I can't find any reference to this in the code. The wiki says maybe it's looked up with a variable, but I don't see how it could be used unless this string is defined in code somewhere (we wouldn't translate data from the database, would we?).
Maybe it's used in a gem? In that case, hopefully CI will pick up the error.
2022-10-04 19:39:29 +02:00
Maikel Linke
ef80c3358d
Explain how to easily configure other environments locally
2022-10-04 19:35:40 +02:00
Maikel Linke
57a70455a8
Simplify setting of secret token
...
We define it in the dotenv files already which has the advantage of
being overridable. I adjusted the dotenv files to have the same value as
was set before, 30 times `x`.
2022-10-04 19:35:40 +02:00
Maikel Linke
885e67a39b
Ignore Rails secrets
...
These files are only used in production but sometimes we want to test
production execution on our dev machines, too.
2022-10-04 19:35:40 +02:00
binarygit
25ae10dbe8
Create bulk orders cancellation feature
2022-10-04 16:57:31 +02:00
filipefurtad0
7b592fd80b
Adds assertion after page visit to promote page loading
2022-10-04 12:27:58 +01:00
jibees
4b6aced962
Merge pull request #9732 from openfoodfoundation/dependabot/bundler/test-unit-3.5.5
...
Bump test-unit from 3.5.3 to 3.5.5
2022-10-04 12:15:55 +02:00
dependabot[bot]
e32ad0b436
Bump test-unit from 3.5.3 to 3.5.5
...
Bumps [test-unit](https://github.com/test-unit/test-unit ) from 3.5.3 to 3.5.5.
- [Release notes](https://github.com/test-unit/test-unit/releases )
- [Commits](https://github.com/test-unit/test-unit/compare/3.5.3...3.5.5 )
---
updated-dependencies:
- dependency-name: test-unit
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-10-04 09:19:10 +00:00
binarygit
930721bea6
Redirect to shop front when OC closes during checkout
2022-10-03 20:51:41 +02:00
filipefurtad0
8e6f828f66
Splits it cases into respective contexts
2022-10-03 19:30:57 +01:00
filipefurtad0
fa05327342
Adds assertions on clearing searches
...
Asserts on page contents
2022-10-03 19:12:27 +01:00
filipefurtad0
cafa17ec13
Splits test into two assertions
2022-10-03 19:12:27 +01:00
jibees
b3449137e0
Merge pull request #9728 from openfoodfoundation/dependabot/npm_and_yarn/js-big-decimal-1.3.10
...
Bump js-big-decimal from 1.3.5 to 1.3.10
2022-10-03 14:56:33 +02:00
dependabot[bot]
da6af22d03
Bump js-big-decimal from 1.3.5 to 1.3.10
...
Bumps [js-big-decimal](https://github.com/royNiladri/js-big-decimal ) from 1.3.5 to 1.3.10.
- [Release notes](https://github.com/royNiladri/js-big-decimal/releases )
- [Commits](https://github.com/royNiladri/js-big-decimal/compare/v1.3.5...v1.3.10 )
---
updated-dependencies:
- dependency-name: js-big-decimal
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-10-03 09:05:41 +00:00
Jean-Baptiste Bellet
0468d46241
Update all locales with the latest Transifex translations
2022-09-30 16:37:59 +02:00
jibees
0c64720a9e
Merge pull request #9710 from mkllnk/9002-customer-association-updates
...
Associate and update customer records when ordering
2022-09-30 16:36:01 +02:00
Filipe
4b279d28dd
Merge pull request #9262 from cillian/order-cycle-shipping-methods
...
Let people customise which shipping methods are available to customers on order cycles
2022-09-30 14:36:37 +01:00
Cillian O'Ruanaidh
acd4706890
Set closing time correctly in order_cycles/complex_creating_specific_time_spec.rb
2022-09-30 14:22:11 +01:00
Filipe
f7d21406a1
Merge pull request #9702 from ashwini-seshadri/master
...
Fix for new subscription dialog
2022-09-30 13:32:42 +01:00
Cillian O'Ruanaidh
f9e29f3a78
Fix Metrics/AbcSize violation in order_cycles/complex_creating_specific_time_spec.rb
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
def87485c0
Don't delete schedules on the order_cycles#update action just because the :schedule_ids was not specified in the parameters
...
Before this schedules were being deleted when the Checkout Options step of editing order cycles was saved because this step wasn't sending the :schedule_ids parameter. It's more awkard for API users if they always need to explicity send the :schedule_ids parameter even if they don't want to add/remove any of the schedules, for example if they just want to update an order cycle name.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
6542b47e72
Adjust order_cycles/complex_creating_specific_time_spec to take into account that DistributorShippingMethods instead of ShippingMethods are connected to OrderCycles now
2022-09-30 13:13:39 +01:00
