raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-22 05:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,219 Commits 17 Branches 458 Tags
7458dccea6b3e265e8de1408f528fee3f168ecc4
Commit Graph

13680 Commits

Author SHA1 Message Date
Cillian O'Ruanaidh
7458dccea6 Call @order_cycles.count instead of #size because TagRuleApplicator doesn't return Relation anymore 
In March 2020 this was changed to use :size instead of :count because TagRuleApplicator returned an ActiveRecord::Relation, see:

d2eee1dafd

However in October 2020 TagRuleApplicator was changed to always return an Array so this is no longer needed, see:

7e606471e4
 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
3e24b7ba6b Assign variable across two lines so Rubocop override comment isn't needed in OrderCycleClone 
Co-authored-by: Maikel <maikel@email.org.au>
 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
f5bd23b4d8 Remove unused Spree::Order#available_payment_methods method 
This was introduced in 47d2f698ef but we are using OrderAvailablePaymentMethods now.
 2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
2c14aecf4f Extract a OrderCycleClone service 
Before it was giving a Rubocop error, probably not a bad idea anyway.
 2022-10-21 17:21:31 +01: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
Cillian O'Ruanaidh
5423c1c02e Resolve conflict in db/schema.rb 2022-10-21 17:21:24 +01:00
jibees
48e18b016a Merge pull request #9756 from vsmay98/8249-fix-snail-for-all-shipping-method-fee 
Fix snail issue for all shipping method fees
 2022-10-20 17:31:24 +02: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
jibees
1d265d19ce Merge pull request #8872 from Matt-Yorkley/bugsnag-data 
Update Bugsnag error data
 2022-10-20 17:30:14 +02:00
jibees
fdc362cb44 Merge pull request #9806 from mkllnk/feature-constraint 
Generalise feature toggle constraint
 2022-10-20 17:27:46 +02:00
Matt-Yorkley
0ca86344d2 Update use of deprecated #add_tab method to #add_metadata 2022-10-19 17:36:53 +11:00
Matt-Yorkley
980f004b83 Update Bugsnag error data 2022-10-19 17:36:52 +11:00
Vinicius Uehara
7772c01e16 Add pointer cursor when hovering a clickable product description 2022-10-18 23:11:56 -03: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
Maikel
c83eb5d5dc Merge pull request #9768 from ashwini-seshadri/admin_permissions_granting_permission_to_a_shop_displays_it_in_producers_list_as_if_it_was_a_supplier 
Fix for: [Admin][Permissions] Granting permission to a shop displays it in "Producers" list as if it was a supplier #9589
 2022-10-17 09:58:03 +11: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
jibees
cd641cc5d6 Merge pull request #9714 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.2.1 
Bump tom-select from 2.1.0 to 2.2.1
 2022-10-13 11:30:13 +02:00
Ashwini Seshadri
1596649034 Merge branch 'master' into admin_permissions_granting_permission_to_a_shop_displays_it_in_producers_list_as_if_it_was_a_supplier 2022-10-13 06:48:40 +02:00
Maikel Linke
81461684f3 Generalise feature toggle constraint 
Now we can re-use it for any feature.
 2022-10-13 10:42:20 +11: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
Jean-Baptiste Bellet
14a258c661 Attempt: externalize ofn-drop-down-v2 selector 
+ add class `redesigned-checkbox` on `input`

Move `input.redesigned-input` definition outside dropdown definition

--> more generic
 2022-10-12 09:28:50 +02:00
Maikel Linke
46fde6bd40 Remove now unused scope 2022-10-12 16:48:32 +11:00
Ashwini Seshadri
590a09f069 Fixed the permissions relationship, so the shop displays only suppliers and does not display distributors in producers list 
and updated relevant tests
 2022-10-12 16:48:31 +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
Vishal Jain
e02de2b17d Fix snail issue for all shipping method fees 2022-10-11 15:30:19 +05:30
Jean-Baptiste Bellet
8a6874326a selected could be nil if no columns are selected 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
68de510c4e Redesign checkboxes 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
230afd5024 Update multiple_checked_select_component.html.haml 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
41e696282c Don't build inputs, but directly use input checkbox for each option 
way simpler this way.
 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
e655d5b188 Remove useless id attribute. Prefer to use data-value directly. 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
7d15baef9d Do not use a variable filter_placeholder but translate it in the view 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
312f2544dd Be sure that option key is a Symbol (it could be a String) 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
157bdd9f3d Add a vertical scrolling 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
b4e041c7e9 Implements the ofn-drop-down-v2 design 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
23e2d28488 Implements the filter options feature 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
0f9ebfe34a Use the MultipleCheckedSelectComponent 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
b7adc5f551 Create the MultipleCheckedComponent 
+ Associate the StimulusController to this component
 2022-10-11 10:05:06 +02:00
Maikel
4705d306b5 Merge pull request #9730 from AthiraKadampatta/9726-unused-paperclip-columns-ignored-list 
Ignore paperclip columns to prepare for deletion
 2022-10-11 11:44:42 +11:00
Jean-Baptiste Bellet
1f329e85bc Also include plugins 2022-10-10 17:15:46 +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
80eef9c302 9726 Add attachment_width and attachment_height to the list of ignored columns for spree images 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
AthiraKadampatta
1f161bee1f Add paperclip columns to ignored columns list for enterprise, enterprise group, terms_of_service_file, spree/image models 2022-10-10 16:52:02 +02:00
Jean-Baptiste Bellet
4140e3d153 Import tom-select file directly 
can't use "tom-select" anymore, due to a mis-configuration with babel I guess
 2022-10-10 16:10:33 +02:00
Manish Sharma
cd71233163 Fixed duplicates enterprises in order cycles 2022-10-10 14:30:58 +05:30