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
b7e9ffc9da
Fix enterprise user being denied access to admin when spree dash configured (as on production)
2016-11-24 13:35:49 +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
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
20e6b703d9
Rewrite alias_method to alias_method_chain
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
d8f8c0df16
Fix API auth: Need Spree::Api::UsersController for authorise_api action to work
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
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
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
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
Bing Xie
a4755865ca
Fix customer name
2016-10-21 11:58:50 +11:00
Bing Xie
5318aaedcf
Fix country id and state in type bug
2016-10-21 11:42:13 +11:00
Rob Harrington
3e56571e59
Making checkout accordion work with new local storage library
2016-10-21 10:51:36 +11:00
Rob Harrington
e57a25d05f
Replacing local storage library with actively maintained one: grevory/angular-local-storage
2016-10-21 10:51:36 +11:00
Rob Harrington
b59a1cc232
Using true/false instead of YES/NO for address defaults and billing same as shipping
2016-10-21 10:51:36 +11:00
Bing Xie
720ca17533
Fix the mistake
2016-10-21 10:51:36 +11:00
Bing Xie
77f43e3ca7
Refactor setting default addresses
2016-10-21 10:51:36 +11:00
Bing Xie
23b8fbbbc7
Update customer's default address
2016-10-21 10:51:36 +11:00
Bing Xie
b0402daf32
Fix failed customers filter spec
2016-10-21 10:51:36 +11:00
Bing Xie
079788b4eb
Add customer preferred bill and ship address
2016-10-21 10:51:36 +11:00
Bing Xie
21ed37189a
Only search customers in user managed enterprises
2016-10-21 10:51:36 +11:00
Bing Xie
80d755da0d
Convert state_id and country_id in serializer
2016-10-21 10:51:36 +11:00
Bing Xie
8d534041b2
Refactor js CurrentOrder
2016-10-21 10:51:36 +11:00
Bing Xie
e91c313f1e
Fix state_id and country_id type bug
2016-10-21 10:51:36 +11:00
Bing Xie
2f241485a2
Set default addresses for user or customer
2016-10-21 10:51:36 +11:00
Bing Xie
f14ca87eb5
Set new address for user
2016-10-21 10:51:36 +11:00
Bing Xie
1caf648fe5
Move customer search to directive
2016-10-21 10:51:36 +11:00
Bing Xie
63617f80c5
Add confirm when delete customer
2016-10-21 10:51:36 +11:00
