Rohan Mitchell
eac22df200
Merge branch 'master' into redesign
...
Conflicts:
app/assets/javascripts/templates/product_modal.html.haml
2015-05-13 09:53:20 +10:00
Rohan Mitchell
d9404d3332
Merge branch 'master' into single-order-patches
2015-05-06 17:29:23 +10:00
Rohan Mitchell
f024f62970
Content-manage footer fields
2015-05-06 16:36:10 +10:00
Rohan Mitchell
bf435a8f3d
Make home page what's happening text and about URL configurable
2015-05-06 15:17:28 +10:00
Rohan Mitchell
b5a6f9c1bc
Add infrastructure so admin can configure content. Make homepage tagline CTA configurable.
2015-05-06 14:54:16 +10:00
Rohan Mitchell
1ffba674b3
Show real stats on home page
2015-05-06 14:54:16 +10:00
Rob Harrington
8788322492
Alllowing payments in payment reports to access soft-deleted payment methods
2015-05-06 11:10:50 +10:00
Rohan Mitchell
03ae740cd6
Revert "Display header for Xero invoices report"
...
This reverts commit a6cecdcc25
2015-05-01 14:55:26 +10:00
Maikel Linke
7c55285708
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches
2015-05-01 14:50:51 +10:00
Maikel Linke
e6e063670c
Allow managers to remove line items from order
...
Managers of an order cycle and the distributor of an order are allowed to
remove a line item from the order.
2015-05-01 14:49:34 +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
summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
Maikel Linke
5efc0a5110
quick fix: update fees after updating order
2015-04-30 16:29:51 +10:00
Maikel Linke
f6d87eee87
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-29 13:20:44 +10:00
Maikel Linke
f94a5a975a
Edit Order: resend button uses new pretty template.
2015-04-24 15:31:45 +10:00
Maikel Linke
a937fd3c61
Using variant overrides in variant seach on order edit page
2015-04-23 11:37:10 +10:00
Rob Harrington
5d6f265c0a
Moving spree namespaced serializers into admin
2015-04-22 21:02:06 +10:00
Rob Harrington
c43eb9ef72
Merge branch 'email_user' into properties
2015-04-17 15:17:37 +10:00
Rob Harrington
456a6f94f5
On enterprise confirmation: create a new user based on enterprise contact email if one does not already exist, and add it as a manager
2015-04-17 10:24:37 +10:00
Rob Harrington
afe77925ba
Allow request to specify a return value when calling user_passwords#edit
2015-04-17 10:21:25 +10:00
Rob Harrington
5940ff2b2c
Don't override devise's after_sign_in_path_for, use specific before filters for user sessions and registrations controllers instead
2015-04-16 16:56:27 +10:00
Rohan Mitchell
7f973604e5
Add columns to customer totals report: order cycle, payment method, customer code, tags, billing address
2015-04-16 10:59:15 +10:00
Rohan Mitchell
2e021941d1
Fix bug where new enterprises should be created as hubs, but aren't
2015-04-16 10:59:15 +10:00
Rob Harrington
b24cad7aeb
Providing access to order_cycle_permissions in order cycles controller
2015-04-11 23:25:30 +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
24e3c9a9e1
Adding bugsnag notify block for catching naughty phantom fees
2015-04-10 16:41:10 +10:00
Rob Harrington
72403fd021
Fixing broken enterprise controller spec
2015-04-10 13:16:21 +10:00
Rob Harrington
2280a71b23
Replace for_order_cycle rabl template with a serializer
2015-04-10 09:25:40 +10:00
Rob Harrington
60a3d8e0d1
Restrict bulk updating order cycles at controller level
2015-04-09 12:27:43 +10:00
Rob Harrington
adc1b639bc
Merge remote-tracking branch 'origin/master' into complex_oc
2015-04-08 14:38:27 +10:00
Rob Harrington
32cc17745a
Non-coordinating user cannot alter important attributes of order cycle
2015-04-08 14:12:49 +10:00
Rob Harrington
104a8ddecf
Refactor order_cycle_enterpises_for permission method, now requires an order cycle
2015-04-08 13:00:17 +10:00
Rob Harrington
d516795774
Fetching Enterprise Fees for order cycle, using new enterprisefee serializer
2015-04-06 13:06:21 +10:00
Rob Harrington
5020eb4e32
And again: override redirect to index page when editing properties from edit page
2015-04-02 14:14:16 +11:00
Rob Harrington
cb376602f2
Override redirect to index page when editing properties from edit page
2015-04-02 14:03:51 +11:00
Rob Harrington
3aa5f6e023
Adding properties tab to admin enterprise edit form
2015-04-02 11:30:32 +11:00
Rob Harrington
8ed6653dc4
Ignoring any new product properties submitted by a non-admin user
2015-04-02 08:55:20 +11:00
Rob Harrington
ca1a5b5f8d
Ignoring any new producer properties submitted by the user
2015-04-02 08:54:35 +11:00
Rob Harrington
588e036c1d
Adding SKU to customer totals report
2015-04-01 14:45:23 +11:00
Rob Harrington
aa7ddbcba4
Renaming Dist. column to Admin & Handling
2015-04-01 14:38:15 +11:00
Rob Harrington
f5bacf71b7
Permissions for OrderCycleFormApplicator are determined internally
2015-03-27 16:16:13 +11:00
Rob Harrington
43d2eb4d22
Adding 'new' method to admin order cycle service, for loading data from serializer for new OCs
2015-03-27 16:16:12 +11:00
Rob Harrington
193a061c44
Order cycle form applicator only updates visible variants, should add an 'editable variants' scope to permissions
2015-03-27 16:16:11 +11:00
Rob Harrington
d115ef5f7e
Scoping old generalised order cycle helper methods to a specific order cycle
2015-03-27 16:16:10 +11:00
Rob Harrington
35b27fcfd2
Delegating responsibility for returning an empty scope when no options are passed to order_cycle_enterprises_for
2015-03-27 16:16:10 +11:00
Rob Harrington
45f6042d3d
Enterprises etched by for_order_cycle action now use permissions scoped using an order cycle or coordinator
2015-03-27 16:16:10 +11:00
Rob Harrington
c9f343f680
Swapping over scoping method for displayed enterprises in OC index page from order_cycle_enterprises to enterprises_for(order_cycle)
2015-03-27 16:15:28 +11:00
Rob Harrington
d8c4e292c8
Adding method for determining variant override hubs
2015-03-27 16:09:45 +11:00
