raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,315 Commits 18 Branches 452 Tags
bbf400a83bf0dcf6a73c0aa78727e5cf290b9ea8
Commit Graph

5480 Commits

Author SHA1 Message Date
Rachel Arnould
2652bc086a Merge pull request #9755 from cillian/order-cycle-payment-methods 
Let people choose which payment methods are available to customers on order cycles
 2022-10-26 20:10:34 +02:00
Konrad
4a7ac45dba Merge pull request #9830 from jibees/9821-remove-report_inverse_columns_logic-feature-toggle 
Remove `report_inverse_columns_logic` feature toggle
 2022-10-25 00:23:31 +02:00
Rachel Arnould
3c9b7a10f4 Merge pull request #9058 from Matt-Yorkley/oidc-redux 
Add OIDC authentication for Les Communs
 2022-10-24 13:18:36 +02:00
Jean-Baptiste Bellet
e2441cdcf6 Use the report type or subtype as the title 2022-10-24 11:12:22 +02:00
Jean-Baptiste Bellet
6dec80aaaf Links only on right side 2022-10-24 11:12:22 +02:00
Jean-Baptiste Bellet
1c349049d1 Remove report description when they are useless 2022-10-24 11:12:22 +02:00
Jean-Baptiste Bellet
02787e668f Remove report_inverse_columns_logic feature toggle 
Co-Authored-By: Maikel <maikel@email.org.au>
 2022-10-24 11:12:22 +02:00
Cillian O'Ruanaidh
4e6d64c0a1 Let people choose which payment methods are available to customers on order cycles 2022-10-21 17:21:31 +01:00
jibees
da851079f4 Merge pull request #9776 from abdellani/product-creation-minor-improvements 
Product creation minor improvements
 2022-10-20 17:30:47 +02:00
Matt-Yorkley
66c3ba3bba Remove default omniauth link 2022-10-18 11:32:14 +11:00
Matt-Yorkley
b322df8515 Generate devise links view 2022-10-18 11:32:14 +11:00
Matt-Yorkley
617164684c Configure OIDC 2022-10-18 11:32:14 +11:00
Filipe
d5c3edc8fa Merge pull request #9749 from drummer83/master 
Fix layout of 'Create a new product' button in dashboard overview
 2022-10-17 13:45:37 +01:00
Mohamed ABDELLANI
6a8c7b15dc fix product category errors message in the form 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
955492bfdd show the error message when the variant unit is not selected 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
0000faab91 render the error message when the unit value is not set 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
e3f157ebdd remove empty option from unit size 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
f8af84d9d4 remove red start from tax category form 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
bddbb36813 remove red star from supplier 2022-10-14 03:26:40 +01:00
Maikel
d33cdd1327 Merge pull request #9706 from jibees/9625-create-a-component-to-display-hide-columns-for-report 
Create a component to display/hide columns for report
 2022-10-13 10:05:27 +11:00
Rachel Arnould
617a417dc2 Merge pull request #9506 from binarygit/remove-angular-from-payment-methods 
Remove angular from payment methods
 2022-10-11 13:13:26 +02:00
Jean-Baptiste Bellet
0f9ebfe34a Use the MultipleCheckedSelectComponent 2022-10-11 10:05:06 +02:00
AthiraKadampatta
b2c778794d 9726 Remove safe navigation operator and simplify call to attachment file name 2022-10-10 16:52:02 +02:00
AthiraKadampatta
f40b569a4a 9726 Use active storage filename instead of attachment_file_name of paperclip 2022-10-10 16:52:02 +02:00
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
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
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
eec117e769 Implements daterangepicker for /admin/orders/bulk_management 
+ update specs as well
 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
8942d3d17b Clear date on custom event flatpickr_clear 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
6b7030a6a8 Don't use directive, but the flatpickr stimulusjs controller 2022-10-08 16:36:26 +02:00
binarygit
01c477f2cb Remove angular from Payment Methods 2022-10-08 14:20:54 +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
72df2867d4 Remove admin_and_handling merging 
+ update specs as well
 2022-10-08 10:00:57 +02:00
Konrad
52c6f5a222 Fix layout of 'Create a new product' button in dashboard overview 2022-10-07 12:37:45 +02:00
Maikel
a43d31a9d5 Merge pull request #9711 from dacook/translation-cleanup 
Translation cleanup
 2022-10-06 09:51:28 +11: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
binarygit
25ae10dbe8 Create bulk orders cancellation feature 2022-10-04 16:57:31 +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
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
7e40ad39cb Bring back select all checkboxes on order cycle checkout options form. 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
a53a3259a8 Connect DistributorShippingMethods to OrderCycles instead of Spree::ShippingMethods 
Before if a shipping method was shared between multiple distributors it could only be disabled/enabled on that order cycle for all the distributors which have that shipping method e.g. you couldn't select that shipping method for one distributor but disable it for another.
 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
65ee9e1486 Implement new design with shipping and payment methods on different rows instead of same one, the select all checkboxes still need to be added back later 
This is the new design from https://github.com/openfoodfoundation/openfoodnetwork/pull/9262#issuecomment-1206673689
 2022-09-30 13:13:39 +01:00