Rohan Mitchell
6795237a2d
Put timecop into safe mode and fix leaky Timecop.freeze
2016-11-25 14:14:42 +11:00
Rohan Mitchell
57363e2da5
When a product is deleted, touch the supplier and distributors
2016-11-25 14:14:42 +11:00
Rohan Mitchell
da9a3ce9f3
Refresh products cache when product is deleted (cf. destroyed)
2016-11-25 14:14:42 +11:00
Rohan Mitchell
c4318030d3
Fix spec: Second visit doesn't actually reload the page
2016-11-25 14:14:42 +11:00
Rohan Mitchell
44a301edb1
When touching distributing enterprises, do not touch self -> infinite recursion
2016-11-25 14:14:42 +11:00
Rohan Mitchell
dabac50128
Replace Enterprise.distributing_product and Enterprise.distributing_any_product_of with Enterprise.distributing_products
2016-11-25 14:14:42 +11:00
Rohan Mitchell
6030e9a294
Cache enterprise supplied and distributed properties and producer properties
2016-11-25 14:14:42 +11:00
Rohan Mitchell
9b656eaf4f
Property / ProducerProperty changes update distributor enterprise cache
2016-11-25 14:14:42 +11:00
Rohan Mitchell
22080a9a08
Property / ProducerProperty changes update supplier enterprise cache
2016-11-25 14:14:42 +11:00
Rohan Mitchell
d93fe3cf2c
Cache enterprise supplied and distributed taxons
2016-11-25 14:14:42 +11:00
Rohan Mitchell
1ea4f4274c
Add enterprise cache invalidation for order cycle changes
2016-11-25 14:14:42 +11:00
Rohan Mitchell
bd11c6ce14
New hash style
2016-11-25 14:14:42 +11:00
Rohan Mitchell
e8848451a5
Spacing
2016-11-25 14:14:42 +11:00
Rohan Mitchell
f4f38b4183
Re-apply shop property filters - including performance regression
...
This reverts commit 7d149ed198
2016-11-25 14:14:42 +11:00
Rob Harrington
27283c50b8
Customers service clears array fo each #index request
2016-11-25 12:43:48 +11:00
Rob Harrington
5e214a32b3
Moving ShippingMethods service to admin.resource module
2016-11-25 11:59:00 +11:00
Rob Harrington
7498b7f098
Moving PaymentMethods service to admin.resource module
2016-11-25 11:57:59 +11:00
Rob Harrington
268c8dbcdd
Moving Customers and CustomerResource services to admin.resource module
2016-11-25 11:46:51 +11:00
Rob Harrington
dbbd52cace
Fixing broken taxons filter on bulk product edit
...
Was referencing Taxons.taxons instead of Taxons.all
2016-11-25 10:37:01 +11:00
Rob Harrington
1770a67cd9
Adding #load function to services for resources, for generic loading of data into byID and pristineByID
2016-11-25 10:37:01 +11:00
Rob Harrington
3678d4d018
Creating new 'resources' module for holding interdependent ngResource services
2016-11-25 10:37:01 +11:00
Rob Harrington
3de69987e6
Changing convention for angular resource services to generic 'byID' object and 'all' array
2016-11-25 10:37:01 +11:00
Rob Harrington
cbbb047fc1
Expunge all mentions of includeBlank and blankOption from angular services
2016-11-25 10:37:01 +11:00
Maikel Linke
338d3cbc38
Delete old commented code
2016-11-25 10:27:13 +11:00
Maikel Linke
4c438ff101
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into shop-navigation-directive
2016-11-25 10:24:42 +11:00
Rohan Mitchell
631b19084a
Fix intermittent failure via FK when deleted taxon is primary taxon on p2
2016-11-25 09:37:05 +11:00
Rohan Mitchell
b7e9ffc9da
Fix enterprise user being denied access to admin when spree dash configured (as on production)
2016-11-24 13:35:49 +11:00
Rohan Mitchell
d8ce0e7d58
A user without enterprises does not have access to the dashboard, so it's not meaningful to spec
2016-11-24 13:35:04 +11:00
Continuous Integration
a115f2a268
Merge remote-tracking branch 'origin/master' into HEAD
2016-11-23 15:00:02 +11:00
Maikel Linke
c0c8b07add
Let shopping tabs listen to URL changes
...
When clicking on a shopping tab like "contact", it changed the URL. But
changing the URL did not change the tab. Listening to URL changes
enables manual manipulation of the URL and simple links to "#/contact"
to open the contact tab.
2016-11-11 17:11:39 +11:00
Rohan Mitchell
5913004e14
Fix datepicker error parsing date
2016-11-09 11:47:57 +11:00
Rohan Mitchell
f4034b1065
Fix spec
2016-11-04 09:39:17 +11:00
Rob Harrington
db93b74490
Refactoring ofnSelect2, works with multiple, and with promised data
2016-11-04 09:39:17 +11:00
Rohan Mitchell
d574b8943b
WIP: Cherry-pick b2d82b6 - Using ofnSelect2 instead of plain select on BOM
2016-11-04 09:39:17 +11:00
Rohan Mitchell
46fcf7b62e
Fix enterprise group save error - initialise address correctly
2016-11-04 09:39:17 +11:00
Rohan Mitchell
3e565ad7cb
Mark admin enterprises form dirty when property removed
2016-11-04 09:39:17 +11:00
Rohan Mitchell
0e01350107
Use jquery-migrate instead of downgrading jQuery to access $.browser
2016-11-04 09:39:17 +11:00
Rohan Mitchell
7d79fffa33
Reinstate Spree::PaymentMethod::DISPLAY (removed in Spree but used by us)
2016-11-04 09:39:17 +11:00
Rohan Mitchell
4117b32ebd
Fix specs: We had no permission to update the specified supplier (how did this ever work?)
2016-11-04 09:39:17 +11:00
Rohan Mitchell
7a68cc7da1
Remove spec for product distributions
2016-11-04 09:39:17 +11:00
Rohan Mitchell
20e6b703d9
Rewrite alias_method to alias_method_chain
2016-11-04 09:39:17 +11:00
Rohan Mitchell
a1535d6c04
Catch flash messages after fadeout
2016-11-04 09:39:17 +11:00
Rohan Mitchell
f33df883a0
Fix link_to_remove_fields - does not immediately delete the field
2016-11-04 09:39:17 +11:00
Rohan Mitchell
48acf80c85
Fix tabbing
2016-11-04 09:39:17 +11:00
Rohan Mitchell
d8f8c0df16
Fix API auth: Need Spree::Api::UsersController for authorise_api action to work
2016-11-04 09:39:17 +11:00
Rohan Mitchell
8ce917a422
Work around click obscuration
2016-11-04 09:39:17 +11:00
Rohan Mitchell
6546d2763b
Add Spree::Money#to_html (from Spree 2.0)
2016-11-04 09:39:17 +11:00
Rohan Mitchell
d3a3b2da9a
Pin jquery-rails to 2.1.4 (older version) to prevent missing $.browser errors
2016-11-04 09:39:17 +11:00
Rohan Mitchell
fdd6400cb8
Fix perms for API soft delete
2016-11-04 09:39:17 +11:00
Rohan Mitchell
225e436293
Update included tax param before loading resource
2016-11-04 09:39:17 +11:00
