Maikel Linke
aef128f2c9
permalink editable
2015-05-28 11:27:40 +10:00
Continuous Integration
5377af9cf9
Auto-merge from CI [skip ci]
2015-05-24 09:52:53 +10:00
Rick Giner
a5482c269f
#541 Fixed issue of showing negative 'more' numbers, and only working for current Hub
2015-05-24 09:52:34 +10:00
Rob Harrington
903ed7e507
Merge branch 'master' into variable_weights
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
app/views/spree/api/line_items/bulk_show.v1.rabl
spec/features/admin/bulk_order_management_spec.rb
2015-05-21 17:31:33 +10:00
Rob Harrington
05131de1ad
Use full_name on BOM instead of options_text
2015-05-20 14:11:31 +10:00
Rob Harrington
c56efabfbe
Removing obsolete rabl templates
2015-05-20 11:52:49 +10:00
Rohan Mitchell
924492ec5b
Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2
2015-05-15 10:37:34 +10:00
Continuous Integration
e3723da65a
Auto-merge from CI [skip ci]
2015-05-14 14:32:07 +10:00
Rohan Mitchell
b86872095a
Add google analytics
2015-05-13 14:52:17 +10:00
Rick Giner
62ae38372e
#541 add "show more" link to producers lists in hub on home page
2015-05-11 20:31:24 +10:00
Lynne Davis
3179887842
Do not allow line_item.unit_value to be updated if the variant.unit_value is zero
2015-05-09 19:12:24 +01:00
Lynne Davis
2a991ad130
Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.
2015-05-09 19:10:55 +01:00
Rob Harrington
b5c7607d67
Order cycle filter resets date filters on BOM
2015-05-07 12:50:55 +10:00
Rick Giner
8fb11defdb
bind-once in groups home page
2015-05-03 14:41:34 +10:00
Rick Giner
3fc616cdff
bind-once on hubs
2015-05-03 14:11:09 +10:00
Rick Giner
16e9f0545b
bind-once in products
2015-05-03 14:02:33 +10:00
Rick Giner
a3664d4448
Added bindonce and ng-if improvements to Producers templates
2015-05-03 12:51:59 +10:00
Rohan Mitchell
03ae740cd6
Revert "Display header for Xero invoices report"
...
This reverts commit a6cecdcc25
2015-05-01 14:55:26 +10:00
Rohan Mitchell
153604dd64
Merge branch 'single-order-patches'
2015-05-01 14:39:17 +10:00
Rohan Mitchell
a6cecdcc25
Display header for Xero invoices report
2015-05-01 11:59:52 +10:00
Maikel Linke
f6d87eee87
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-29 13:20:44 +10:00
Lynne Davis
9e61a7d083
Adding report type drop down to order_cycle_management_report
2015-04-26 11:03:32 +01:00
Rob Harrington
6a4de7c7e2
Hiding filters on list views because styling is broken
2015-04-24 19:35:18 +10:00
Maikel Linke
3412bc25bf
Edit Orders: more variant info in variant search
...
Displaying variant's full name and the producer's name.
2015-04-23 10:17:01 +10:00
Rob Harrington
0251d8962d
Adding sku to BPE
2015-04-22 21:02:07 +10:00
Rob Harrington
f610a709e1
Adding inherits_properties to BPE
2015-04-22 21:02:06 +10:00
Rohan Mitchell
0d9ba4257d
Merge branch 'properties'
2015-04-17 15:25:51 +10:00
Rob Harrington
c43eb9ef72
Merge branch 'email_user' into properties
2015-04-17 15:17:37 +10:00
Rohan Mitchell
9bbc151cae
Admin can set enterprises to charge or not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
08fef890ec
Do not show tax lines if there is no tax on the order
2015-04-17 13:41:14 +10:00
Rohan Mitchell
a93633a626
Show tax on order confirmation emails
2015-04-17 13:41:14 +10:00
Rohan Mitchell
4bd1ff2011
Extract the bulk of the confirmation emails into partials, eliminating a lot of duplication
2015-04-17 13:40:08 +10:00
Rohan Mitchell
3ce2c5b84f
Show tax on order confirmation page
2015-04-17 13:40:08 +10:00
Rohan Mitchell
77d7255243
Use short syntax for rendering partials
2015-04-17 13:39:10 +10:00
Rohan Mitchell
6bb926f811
Do not show tax in checkout
2015-04-17 13:39:09 +10:00
Rohan Mitchell
beec910445
Display tax in cart
2015-04-17 13:39:09 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rohan Mitchell
aef3fdf4b4
Merge branch 'group-pages'
2015-04-16 16:53:49 +10:00
Rohan Mitchell
768cfab591
Change field text at checkout
2015-04-16 10:59:15 +10:00
Rohan Mitchell
48bf87ec73
Perpetually updating copyright year
2015-04-16 10:59:15 +10:00
Maikel Linke
548e3576b9
textAngular editor for group description
2015-04-15 17:13:10 +10:00
Maikel Linke
201bcb133a
show profiles checkbox on groups hubs page
2015-04-15 16:15:21 +10:00
Rob Harrington
0c155e6e3a
Display message when email has not been confirmed for new enterprise
2015-04-15 15:32:17 +10:00
Rob Harrington
e3138c3cd2
Renaming order_cycle_enterprises_for as visible_enterprises
2015-04-11 22:25:23 +10:00
Rob Harrington
26d55baa35
Moving order cycle permissions to their own permissions class
2015-04-11 21:11:10 +10:00
Rob Harrington
02f8f293da
Only allow managers or coordinator to add/remove fees from exchanges
2015-04-11 18:32:04 +10:00
Maikel Linke
2fd25f6cc4
Injecting all enterprises into group page
...
The enterprises have related producers and hubs that need to be
dereferenced. Therefore, we need a bigger set of enterprises to be
loaded. Injecting all enterprises is simple and doesn't require changes
if the set of needed enterprise data is growing in future.
2015-04-10 17:42:54 +10:00
Maikel Linke
1e168afd71
giving the enterprise serializer the active_distributors
2015-04-10 12:55:20 +10:00
Rob Harrington
226e2f0e2c
Fixing error caused by order show template doing a lookup based on current distributor rather than order distributor
2015-04-10 09:26:20 +10:00
Rob Harrington
2280a71b23
Replace for_order_cycle rabl template with a serializer
2015-04-10 09:25:40 +10:00
