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
Matt-Yorkley
98fdbb8621
Update deprecated #scoped calls
...
Model#scoped is now deprecated. Model#where(nil) in Rails 4 returns the same result as Model#scoped in Rails 3
2020-02-22 11:06:51 +00:00
luisramos0
9c369caae2
Temporarily comment part of Enterprise.relate_to_owners_enterprises so that most specs pass for now
2020-02-22 11:05:24 +00:00
luisramos0
18ca9980c9
Temporarily comment Enterprise.ensure_owner_is_manager otherwise all specs erroring out with 'Enterprise roles invalid'
2020-02-22 11:05:24 +00:00
luisramos0
8dbe4accaf
Upgrade to the spree branch 2-1-0-stable and rails 4.0.0
2020-02-22 11:05:24 +00:00
Luis Ramos
1eba17f048
Make select column explicit to avoid too many columns sql error
2020-02-18 18:32:52 +00:00
Matt-Yorkley
285c78a5e4
Remove use of #pluck and ensure subquery does not include all columns
2020-02-04 11:10:13 +01:00
Matt-Yorkley
a02c58e231
Add join_table to enterprise groups relation
...
has_and_belongs_to_many relationships now require a join_table
2020-01-22 12:17:23 +01:00
Matt-Yorkley
59ebfb9bd4
Fix subquery errors triggered by #warn_invalid_order_cycles
2020-01-22 12:17:23 +01:00
luisramos0
9404aacfb2
run rubocop --auto-correct
2019-11-10 18:42:43 +00:00
Maikel
ca09c58f26
Merge pull request #3985 from jonleighton/string-to-text
...
Convert several fields from string to text
2019-08-28 11:53:49 +10:00
Maikel Linke
48df853ff5
Skip cascading callbacks when touching distributors
2019-08-27 10:44:19 +10:00
Jon Leighton
4398ea12b8
Convert several fields from string to text
...
See discussion here:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3751#issuecomment-503416955
Fixes #3192 .
I have also done a pass over the schema to identify other fields which
would benefit from being a text rather than a string. However, I ignored
all `spree_*` tables because I didn’t want to mess up the ‘default’
Spree schema.
2019-07-09 13:11:30 +10:00
Maikel
5b0c8bbaef
Merge pull request #3836 from Matt-Yorkley/fast_and_furious2
...
Improve /shops, /producers, and /groups performance
2019-06-21 15:02:19 +10:00
luisramos0
1da18d3386
Fix enterprise model scopes by making ready_for_checkout return enterprises and not ids again and by making not_ready_for_checkout select the id field from the ready_for_checkout scope
2019-06-18 10:52:56 +01:00
luisramos0
0cdb49818d
Remove distinct from enterprise.ready_for_checkout scope
...
Adapt use of enterprise scope not_ready_for_checkout to rails 4 by adding enterprises table alias to selected field id
2019-06-18 10:40:49 +01:00
luisramos0
0d07bf2a3b
Adapt enterprise.distributing_products scope to rails 4
2019-06-18 10:40:49 +01:00
Matt-Yorkley
698d3672a6
List only current taxons for active enterprises
2019-06-12 09:47:01 +01:00
luisramos0
ced6264846
Fix rubocop issues in enterprise model
2019-05-28 16:30:50 +01:00
luisramos0
ffbd79d3dd
Change all model scopes without a callable object to use a proc
2019-05-28 15:55:13 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
Kristina Lim
7593168341
Update code style for Enterpise.not_ready_for_checkout
...
This was changed into multiple lines for readability.
2019-05-06 18:37:28 +08:00
Kristina Lim
c0a5bcce92
Update some comments in Enterprise and OrderCycle models
2019-05-06 18:35:01 +08:00
Kristina Lim
71bff0dd5b
Reduce the number of queries in Enterprise.not_ready_for_checkout
2019-05-06 13:43:44 +10:00
luisramos0
c1d14686a6
Merge branch 'master' into 2-0-stable-Mar22
2019-03-22 10:55:17 +00:00
luisramos0
60ee17204b
Merge branch 'master' into 2-0-stable-Mar16
2019-03-16 16:17:38 +00:00
luisramos0
a022cebfc8
Remove product distributions from enterprise model and controller
2019-03-13 11:49:13 +00:00
Pau Perez
6e9bb640f6
Add spacing between long scopes
2019-02-26 11:36:36 +01:00
luisramos0
0501db1782
Remove changes related to enterprise trials as they dont make sense without business models and account invoices
2019-02-25 14:37:16 +00:00
luisramos0
36e2786a1e
Delete Accounts and Billing dead feature code
2019-02-25 14:37:16 +00:00
Maikel
d8d20429aa
Revert "Instagram pattern"
2018-11-09 13:33:11 +11:00
fabricio.albarnaz
419493f153
Move instagram regex to an method to fix codeclimate
2018-10-16 16:09:15 -03:00
fabricio.albarnaz
93a051bf5a
Regex ajust
2018-10-16 15:33:10 -03:00
fabricio.albarnaz
02bc134c59
Change befor save check to format validation
2018-10-15 17:51:33 -03:00
fabricio.albarnaz
6ad32fb66d
Add check for instagram.com
2018-10-11 18:05:18 -03:00
fabricio.albarnaz
e46b3566c3
Remove the check for www.instagram.com
2018-10-11 16:51:43 -03:00
fabricio.albarnaz
e87075aed7
Add before save to check the instagram link pattern
2018-10-11 15:27:46 -03:00
Maikel Linke
306bfa1944
Remove unused method enterprise method
...
`Enterprise.has_supplied_products_on_hand?` is not used anywhere.
2018-06-27 11:25:44 +10:00
Maikel Linke
792701297b
Remove unused scope Enterprise.active_distributors
...
Working on the Spree upgrade, we found that this scope is using the soon
obsolete column `spree_products.count_on_hand`. Trying to measure the
impact of changing this scope, I couldn't find any use of it.
There is a variable called `active_distributors` used when serialising
enterprises, but that variable is initialised with
`Enterprise.distributors_with_active_order_cycles.ready_for_checkout`,
not using the `active_distributors` scope.
See also:
https://github.com/openfoodfoundation/openfoodnetwork/issues/2013
2018-06-27 11:12:54 +10:00
Matt-Yorkley
d9623176fb
Include admin users as managers on new enterprises
2018-06-21 13:21:08 +10:00
Pau Perez
5a182e8e88
Remove enterprises producers tab from dashboard
2018-05-22 10:21:35 +02:00
Pau Perez
147a74f005
Fix Rubocop violations reported by Code Climate
2018-04-16 10:27:44 +02:00
Pau Perez
e4c86df7b2
Auto correct Rubocop's Layout/CaseIndentation cop
2018-04-09 17:19:47 +02:00
Matt-Yorkley
cc5d0c35dd
Refactor enterprise contact user assignment
2018-02-07 10:41:53 +11:00
Matt-Yorkley
9248ac05ac
Adjustments for failing specs
2018-02-07 10:41:53 +11:00
