Rob Harrington
|
439d122e93
|
Merge branch 'master' into customers
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/assets/javascripts/admin/bulk_product_update.js.coffee
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
db/schema.rb
spec/javascripts/unit/bulk_order_management_spec.js.coffee
|
2015-06-03 15:19:40 +08:00 |
|
Maikel Linke
|
1936767084
|
BPE: new col for tax category
|
2015-05-21 11:06:08 +10:00 |
|
Rob Harrington
|
7a4f0e214c
|
Adding customers index view
|
2015-05-13 12:44:33 +10:00 |
|
Rob Harrington
|
5d6f265c0a
|
Moving spree namespaced serializers into admin
|
2015-04-22 21:02:06 +10:00 |
|
Rob Harrington
|
c91699a11e
|
Using @order_cycle.coordinator instead of @coordinator
|
2015-02-27 17:24:37 +11:00 |
|
Rob Harrington
|
8de6f983a2
|
User must set the coordinator first when creating an order cycle
|
2015-02-27 17:24:36 +11:00 |
|
Rohan Mitchell
|
dcc04ea538
|
On enterprise edit page, do not show side menu links we don't have permission to
|
2015-01-15 13:43:39 +11:00 |
|
Rob Harrington
|
f145a7ed65
|
Moving taxons into its own module, adding preferred shopfront taxon order to enterprise
|
2014-12-19 14:04:02 +11:00 |
|
Rob Harrington
|
b18163bfaf
|
Remove separate long description injection, use full enterprise serializer instead
|
2014-12-19 14:04:01 +11:00 |
|
Rob Harrington
|
d5df73c6a2
|
Duplicate create basic version of enterprise serializer for lists, make shopfront_message input use textangular
|
2014-12-19 14:04:01 +11:00 |
|
Rohan Mitchell
|
efae9265c1
|
Inject variant overrides
|
2014-12-12 13:33:12 +11:00 |
|
Rohan Mitchell
|
5b82fcaca7
|
Inject hub permissions - which producers each hub can add to order cycle
|
2014-12-12 13:33:12 +11:00 |
|
Rohan Mitchell
|
58fdc48b9f
|
Display products in table
|
2014-11-21 13:49:09 +11:00 |
|
Rohan Mitchell
|
912c60f720
|
Do not show producers in hubs list
|
2014-11-21 13:49:09 +11:00 |
|
Rohan Mitchell
|
f117c0cd24
|
Make spree_current_user available to serializers as 'scope'
|
2014-11-21 08:41:41 +11:00 |
|
Rohan Mitchell
|
0e03b5f209
|
Admin can change the format that Spree::Images are stored/served in
|
2014-10-16 12:41:11 +11:00 |
|
Rafael Schouten
|
884c111240
|
fix failing tests
|
2014-10-04 11:56:35 +10:00 |
|
Rafael Schouten
|
bb24e1ce88
|
sanitize long_description html before injection
|
2014-10-03 16:06:04 +10:00 |
|
Rafael Schouten
|
3a14a26bc6
|
refactor wysiwyg
|
2014-10-01 16:07:10 +10:00 |
|
Rob H
|
7dc42c9e39
|
Creating an enterprise works in registration process
|
2014-09-11 17:07:05 +10:00 |
|
Rob H
|
3d4e00a03c
|
Swtich API key injection over to helper
|
2014-09-11 17:07:05 +10:00 |
|
Rohan Mitchell
|
cb615ba994
|
Render enterprise relationships JSON with AMS instead of rabl
|
2014-08-25 13:07:31 +10:00 |
|
Rohan Mitchell
|
6e17f0aaa2
|
Admin can create enterprise roles
|
2014-08-15 16:09:05 +10:00 |
|
Rohan Mitchell
|
8bc9def6ae
|
Switch to AMS for enterprise role serialisation
|
2014-08-15 16:09:05 +10:00 |
|
Rob H
|
2f5b5e7ee5
|
Inject taxons into BPE
|
2014-08-08 14:05:52 +10:00 |
|
Rob H
|
aaddccfae4
|
Injecting producer information into BPE
|
2014-08-08 14:05:51 +10:00 |
|
Rob H
|
9889b09c65
|
Add shipping method injection helper using id name serializer
|
2014-07-24 10:16:55 +10:00 |
|
Rob H
|
e8c7fe9db1
|
Rename payment method serializer as id name serializer
|
2014-07-24 10:16:55 +10:00 |
|
Rob H
|
6dbe2a3098
|
WIP: Angularise payment methods on enterprise edit page
|
2014-07-24 10:16:54 +10:00 |
|
Rob H
|
2200392031
|
Angularising Admin enterprises form
|
2014-07-24 10:16:54 +10:00 |
|