raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,120 Commits 18 Branches 452 Tags
82e38d7b91ee437cbd0cbee290fcf2d1d1bbee45
Commit Graph

25120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
82e38d7b91 Merge pull request #9526 from jibees/6730-use-a-date-range-picker 
Admin, List of Orders & Orders Bulk Management pages: use a date range picker
 2022-10-10 13:59:37 +11:00
Maikel
5894246474 Merge pull request #9682 from binarygit/picked_up_email 
Send picked up emails when orders are picked up
 2022-10-10 13:15:24 +11:00
Maikel
058a45f4e5 Merge pull request #9442 from jibees/8904-display-fees-name-instead-of-type-on-invoices 
Display fees name instead of type on invoices
 2022-10-10 13:15:01 +11:00
Maikel
e5ccee42cc Merge pull request #9725 from vsmay98/9468-hide-all-references-hub-from-producers-profile 
[Shopfront] Hide hub with "hide all references" setup in producers profiles
 2022-10-10 13:11:49 +11:00
Maikel
38f145549a Merge pull request #9741 from mkllnk/empty-variant-param 
Avoid error when sending empty variant attributes in bulk product edit
 2022-10-10 11:43:10 +11:00
Maikel
f551bea00b Merge pull request #9731 from mkllnk/features 
Add used feature toggles to appear in the admin UI
 2022-10-10 11:41:05 +11:00
Jean-Baptiste Bellet
f5ebc797c4 Send change event on flatpickr widget close 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
263b36d1d9 Confirm input changed by pressing enter key 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
ea76615763 Forward focus event on calendar open 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
e076e23064 Do not use ng-change on endDate but instead watch both start and end date 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
a272479483 When selecting date range picker, orders should load 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
6ec3e7ee0c Only send event change on valid range (ie. both start and end date) 
+ do not refresh data on start date change but only on end date change
 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
ec4d091c2e Remove the or label as it was unecessary 
and actually, untranslated
 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
eec117e769 Implements daterangepicker for /admin/orders/bulk_management 
+ update specs as well
 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
eb621cae35 Update spec to be more defensive 
Actually, this one fail on master too (when changing month?)
 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
73f55ae776 Implements daterangepicker for /admin/orders 
+ update specs as well
 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
19584ce6e0 flatpickr controller is now ready to be used in range mode 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
8942d3d17b Clear date on custom event flatpickr_clear 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
ddfbcacd83 Include plugins 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
c3a7acf9ad import locale 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
fb0d922d73 Remove datetimepicker directive + default values 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
5c83a3277e Replace datetimepicker by flatpickr stimulus controller 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
c6332ab306 Remove datepicker instance 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
6b7030a6a8 Don't use directive, but the flatpickr stimulusjs controller 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
b1fd6d9541 Create the flatpickr date|datetime controller 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
d73d6dcdb6 Do not import flatpickr via this require 
as now flatpickr is managed by yarn and should be imported when module need it, via import
 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
792d6d9569 Add stimulus flatpickr 
Update yarn.lock
 2022-10-08 16:36:26 +02:00
Maikel Linke
1137e6890b Supply feature mock with default value 
Otherwise Rspec complains about receiving another argument which is not
the one we defined here before.
 2022-10-08 16:23:17 +02:00
Maikel Linke
52e934ec2b Consistently use our FeatureToggle module 
Direct calls to Flipper have the downside that we can't add any new
functionality like storing the feature in the database when used.
 2022-10-08 16:23:17 +02:00
Maikel Linke
bc26a3aa07 Add used feature toggles to appear in the admin UI 
The admin UI shows only features which were added to the database. We
always had to look up a feature's name add it manually before we could
enable it. Now it will appear in the UI after some code asked if it was
enabled.

This only adds a database query once when the feature doesn't exist yet.
The `feature.exist?` call only performs an in-memory lookup in the
memoizer.
 2022-10-08 16:23:17 +02:00
binarygit
8335594351 Add different subject for picked up email 2022-10-08 12:31:26 +02:00
binarygit
44db511e66 Send a picked up email (rather than shipped email) when orders are picked up by customers 2022-10-08 12:31:26 +02:00
Jean-Baptiste Bellet
8b89c901ef Do not display "Admin and Handling" ie. fees total 2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
7b57f2358c Create a new key instead of modifying the old one 
it could lead to issues when key is not updated and we should avoid that kind of issue.
 2022-10-08 10:00:57 +02:00
Maikel Linke
b297299838 Simplify test of adjustments 2022-10-08 10:00:57 +02:00
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.

* f940397781 Pau's spec
* 6f228781d4 Fixing error detection
 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 v4.2.16 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