GeorgeThoppil
898c470c00
Change enterprise visibility scope
2022-04-21 20:27:28 -04:00
Nihal Mohammed
15e7a5a4df
Rename product_stock_display to product_low_stock_display
...
Rename product_stock_display to product_low_stock_display in enterprise_serializer and shop_variant_controller
2022-04-15 10:59:42 +10:00
Nihal M. Kelanthodika
f7a767988c
Add preferred_product_stock_display to Enterprise model, serializer and permitted attributes. (Fixed alignment of guest orders radio button as well)
2022-04-15 10:53:28 +10:00
Nihal Mohammed
992cb9d920
Add invoice_order_by_supplier attribute to enterprise
2022-03-21 20:29:19 +05:30
Matt-Yorkley
18ac9b5335
Add support for generating valid/unique permalinks for Enterprises with non-roman characters in their name
2022-01-15 13:21:09 +00:00
Filipe
4978c95e75
Merge pull request #8467 from SarvarKh/validate-social-links
...
Fix the issue with 'at' in enterprise twitter and instagram
2022-01-11 12:53:11 +00:00
Matt-Yorkley
aecdfee364
Reorganise :though associations on line_item and allow searching/filtering on product, supplier, order_cycle
2021-12-12 13:23:56 +00:00
SarvarKhalimov
c202c52d8b
Refactor correct_social_url method in enterprise model and its tests
2021-11-22 23:31:56 +05:00
SarvarKhalimov
f8c45b3e31
Update app/models/enterprise.rb - optimise delete @ method
...
Co-authored-by: Maikel <maikel@email.org.au >
2021-11-15 13:21:19 +11:00
SarvarKhalimov
5d2a5e63ec
Fix the issue with 'at' in interprise twitter and insgram
2021-11-15 13:21:04 +11:00
Matt-Yorkley
d46ed59699
Remove preference from Enterprise class
2021-11-04 11:48:30 +00:00
Maikel
1cef0dd2ac
Merge pull request #8428 from Matt-Yorkley/enterprise-dead-code
...
Remove Enterprise #inheritance_column
2021-11-03 17:29:42 +11:00
Matt-Yorkley
462ff15f76
Remove Enterprise #inheritance_column
...
Apparently this was part of an old feature from 2014...
2021-10-28 10:44:23 +01:00
Luis Azcuaga
e8fd89a6d2
Run rubocop over existing todo
2021-10-25 21:28:28 -05:00
Nihal
f72f182363
Redo business_address_empty? method
2021-10-06 15:06:56 +05:30
Nihal
372326debc
Updated validation to include phone and edit address_spec to requires phone
2021-10-06 15:06:56 +05:30
Nihal Mohammed
496319b539
Reject changes to business_address if fields are empty
2021-10-06 15:06:56 +05:30
Nihal Mohammed
3cd5ed58c0
Add checkbox to clear business_address form
2021-10-06 15:06:56 +05:30
Nihal Mohammed
9007418455
Set belongs_to association for business_address and accept nested attributes on enterprise model
2021-10-06 15:06:56 +05:30
Maikel
9affc6a945
Merge pull request #8108 from Matt-Yorkley/andand
...
Remove `andand` gem
2021-09-10 15:06:00 +10:00
Matt-Yorkley
1d5077061e
Remove andand
...
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
2021-09-08 14:28:31 +01:00
Matt-Yorkley
3fc0278776
Whitelist searchable attributes on primary models
2021-09-02 14:06:15 +01:00
Andy Brett
46cd05c54a
Merge pull request #7712 from guidoDutra/1861-enable-shopfront-sorting-by-producer
...
Enable sorting by producer in shopfront
2021-07-06 09:27:42 -07:00
Luis Ramos
23627c5453
Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied
...
9290 issues fixed
2021-06-17 22:19:26 +01:00
Guido Oliveira
baca89c575
allow select producers for ordering
2021-06-16 15:02:27 -03:00
Guido Oliveira
c5471fc25c
enable ordering shopfront by producer id
2021-06-16 15:02:27 -03:00
Andy Brett
d197b81351
Merge pull request #7606 from luisramos0/deprecation
...
[Rails 6.1] Fix deprecation warning in rails 6.0
2021-06-04 07:42:50 -07:00
Luis Ramos
d308e20871
Fix deprecation warning in rails 6.0
...
Warning: Class level methods will no longer inherit scoping from create in Rails 6.1
2021-05-10 21:03:24 +01:00
Matt-Yorkley
2560757ea2
Change Enterprise after_create callback to after_create_commit
...
As a general rule, if you're triggering an email job as part of an after create/save callback, it should use after commit instead.
Why? The transaction can't finish until after the record is persisted (the data is committed) which includes the logic in all callbacks. So for example if the transaction fails after the email job has been placed it will be rolled back, but the email job will already be in the queue, and it'll be referencing a record that doesn't actually exist (due to the rollback).
2021-05-02 13:23:31 +01:00
Cillian O'Ruanaidh
c41476423b
Merge latest master into julesemmac/6584-map-location-confirm and resolve conflict in api/enterprises_controller.rb
2021-04-22 19:43:49 +01:00
Maikel Linke
1364b878fe
Add ApplicationRecord for customisations
...
Rails 5 introduced this new class to confine application-specific monkey
patches to our models only, and not leak into other libraries using
ActiveRecord::Base.
https://bigbinary.com/blog/application-record-in-rails-5
2021-04-15 15:59:03 +10:00
Cillian O'Ruanaidh
f20cea7e4f
Allow people to set enterprise latitude/longitude manually or automatically.
...
This for new changes to the enterprise registration/signup flow where a map will be displayed when people are filling in their address. On this map people can check the geocoder has geocoded their address correctly and if not they can manually adjust their latitude/longitude on the map.
But currently every time someone changes their address in the Admin > Enterprise > Address section the address would automatically be geocoded so this could overwrite the latitude/longitude that was set during sign up. To prevent the latitude/longitude from being overwritten this add's a checkbox which people need to explicity click if they want their address to be automatically geocoded, otherwise it will just use the manually configured latitude/longitude.
Note this new feature which allows people to select their location on a map during registration only works with Google maps so far. So if an instance is using Open Street Map this change also adds support for passing a :use_geocoder parameter to the Api::EnterprisesController during registration so that the address will be geocoded on the backend without the use of a map.
2021-03-19 21:43:29 +00:00
julesemmac
971971803e
Improving user discover on ofn map
...
The context for this update is here: https://community.openfoodnetwork.org/t/improving-user-discovery-on-ofn-map/2013
Also with rebasing help from Maikel Linke <mkllnk@web.de >
2021-03-19 21:43:29 +00:00
Andy Brett
a431c03eb1
only show primary producers on shopfront list of producers
2021-03-04 14:32:55 -08:00
Matt-Yorkley
6a7f795f64
Remove WelcomeEnterpriseJob
2021-01-09 11:33:10 +00:00
Matt-Yorkley
6b3da4ac89
Fix "PG::ProtocolViolation: ERROR: bind message supplies 0 parameters" errors
2020-11-27 14:00:28 +00:00
Matt-Yorkley
58350ed338
Set ActiveJob configs and convert WelcomeEnterpriseJob to new format
...
This needs to be done for all jobs.
Docs: https://guides.rubyonrails.org/v4.2/active_job_basics.html
2020-11-27 14:00:28 +00:00
Arun Kumar Mohan
c4205fce34
Improve enterprise specs' performance
2020-10-09 22:11:34 -05:00
Luis Ramos
212820b3da
Merge pull request #5912 from luisramos0/tcs
...
Terms and Conditions - upload PDF in the Enterprise Business Details and read them on Checkout
2020-09-17 12:01:45 +01:00
Luis Ramos
f1358dfa9a
Merge pull request #5722 from rioug/4206-back-from-Edit-Product-removed-filters-products-page
...
4206 back from edit product removed filters products page
2020-09-17 11:51:58 +01:00
Luis Ramos
6f59158153
Remove useless TODOs
2020-09-10 17:36:25 +01:00
Luis Ramos
9c0c324835
Add some requires now required as spree does not contain controller helpers
2020-09-04 14:30:17 +01:00
Luis Ramos
1a734aacf8
Allow user to upload terms and conditions PDF file to an enterprise
2020-08-31 17:40:34 +01:00
Matt-Yorkley
23bb72faa6
Add Enterprise shop preference to allow customer names in reports
2020-08-14 20:48:32 +01:00
Luis Ramos
f3e651b1f7
present? calls length which is breaking it with error ActiveModel::MissingAttributeError Exception: missing attribute: address_id
...
any? works well as it just verifies the size of the collection
2020-04-28 16:31:11 +01:00
Luis Ramos
eccaaca907
Merge pull request #4930 from luisramos0/3-0-stable-mar6
...
Merge master into 3-0-stable
2020-03-17 14:49:30 +00:00
Luis Ramos
32a4355f09
Merge branch 'master' into 3-0-stable-mar6
2020-03-12 16:54:09 +00:00
Luis Ramos
e584233c9e
Uncomment code that was commented earlier on in the upgrade, we are now ready to handle this
2020-03-03 14:25:17 +00:00
Matt-Yorkley
847a349a6b
Fix geocoding in Rails 4 🎉
...
Responsibility for geocoding has moved from the `gmaps4rails` gem using `acts_as_taggable`, to the `geocoding` gem using `geocoded_by`. We already use this in the Address model.
2020-02-29 13:08:06 +01:00
Luis Ramos
1dc7b5793c
Fix Enterprise validation and factory so that users are added after the validation
2020-02-22 12:06:33 +00:00
