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
Rohan Mitchell
0e354f8fc1
Remove unused currency config vars: decimal_mark, thousands_separator
2016-11-04 09:39:17 +11:00
Rohan Mitchell
a6a0bdb063
Sanitize values before they're used
2016-11-04 09:39:17 +11:00
Rohan Mitchell
6753320336
Do not stomp address on create
2016-11-04 09:39:17 +11:00
Rohan Mitchell
a3b91dabe5
TEMP: Remove override for no-longer-present method
2016-11-04 09:39:17 +11:00
Rohan Mitchell
257441c9be
Re-add object-level auth to Spree::Admin::ResourceController
2016-11-04 09:39:17 +11:00
Rohan Mitchell
1497d2c3bb
Remove missing call
2016-11-04 09:39:17 +11:00
Rohan Mitchell
8f0bc367d0
Include missing helpers
2016-11-04 09:39:17 +11:00
Rohan Mitchell
764219b9ed
Fix OrderMailer#find_order
2016-11-04 09:39:17 +11:00
Rohan Mitchell
7f7ee25e27
Money accessors changed to dollars/cents
2016-11-04 09:39:17 +11:00
Rohan Mitchell
1765ba0422
Fix spec dependent on product on_demand
2016-11-04 09:39:17 +11:00
Rohan Mitchell
32d2adc8a2
Fix mailers - provide from address
2016-11-04 09:39:17 +11:00
Rohan Mitchell
d890770104
Order state transition condition removed in Spree
2016-11-04 09:39:17 +11:00
Rohan Mitchell
376c4c3e0e
Fix factories - base_product and base_variant removed
2016-11-04 09:39:17 +11:00
Rohan Mitchell
a0b740f52d
Generalise fix for missing EnterpriseFee::Calculator to any use of calculated_adjustments
2016-11-04 09:39:17 +11:00
Rohan Mitchell
0d4c4f20df
Fix missing EnterpriseFee::Calculator error
...
Conflicts:
app/models/enterprise_fee.rb
2016-11-04 09:39:17 +11:00
Rohan Mitchell
ab707cf312
Bundle incremental Spree upgrade
2016-11-04 09:39:17 +11:00
Rohan Mitchell
9989b76b7d
Integrate from Spree fork: Calculators work against LineItems
2016-11-04 09:39:17 +11:00
Rohan Mitchell
04a714426f
Integrate from Spree fork: Fix spree issues #3531 and #2210 (patch provided by leiyangyou)
2016-11-04 09:39:17 +11:00
Maikel Linke
b66cf14bcb
Merge remote-tracking branch 'origin/master' into transifex
...
Conflicts:
config/locales/en_GB.yml
2016-10-28 15:21:03 +11:00
Transifex-Openfoodnetwork
b78739f777
Updating translations for config/locales/it.yml [skip ci]
2016-10-21 22:51:27 +11:00
Bing Xie
fb08759bec
Add more tests
2016-10-21 14:45:04 +11:00
Bing Xie
a4755865ca
Fix customer name
2016-10-21 11:58:50 +11:00
