Rob Harrington
e67e22ee73
Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security
...
Conflicts:
lib/open_food_network/xero_invoices_report.rb
2015-12-17 14:22:16 +11:00
Rob Harrington
7a23f671a2
Restricting access to orders within Sales Tax Report
...
Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for
2015-12-17 14:21:30 +11:00
Rob Harrington
d115eb816e
Restricting access to orders within Xero Invoices Report
...
Managers of suppliers should not be able to generate xero invoices for orders they supply products for
2015-12-17 14:21:30 +11:00
Rob Harrington
4b5e33d5b0
Implementing new permissions for producers in reports_controller_spec
2015-12-17 14:21:30 +11:00
Rob Harrington
c579d302d5
Fixing customer info security for orders and distributors report
2015-12-17 14:21:30 +11:00
Rob Harrington
ecd11702c3
Fixing up enterprise user account page
2015-12-16 19:18:59 +11:00
Rob Harrington
ca3c464fda
Reorganising busines model config settings, moving account invoice tax rate in busines model config settings
2015-12-16 19:18:57 +11:00
Rob Harrington
044e423543
Adding update logic to business model config controller
2015-12-16 19:18:57 +11:00
Rob Harrington
e20b06bb97
Adding basic route and controller for business model configuration
2015-12-16 19:18:56 +11:00
Rob Harrington
c91f1301f0
Adding preferences to enterprises for sorting of order cycles in shopfront list
2015-12-16 11:55:23 +11:00
Continuous Integration
b7edf5e046
Auto-merge from CI [skip ci]
2015-12-16 10:58:03 +11:00
Em-AK
fcc328f00a
Display default xero invoice dates
...
fixes #682
* pre-fill the invoice_date and due_date in the xero report generation form
* increase the default period between invoice_date and due_date to 1 month in
XeroInvoiceReport
2015-12-13 16:42:32 +01:00
Rohan Mitchell
3f8d470d23
When admin associates user with an order, look up last used address
2015-12-11 13:06:59 +11:00
Rohan Mitchell
5579fa5e0b
Extract last used address finding into service object
2015-12-11 13:06:59 +11:00
Rohan Mitchell
76d4fbccf9
Use select2 for order cycle selection
2015-12-11 13:06:58 +11:00
Rohan Mitchell
60e971ad63
Take variant overrides into account for price when admin adds line item to order
2015-12-11 13:06:57 +11:00
Rohan Mitchell
222b390b31
Fix error display
2015-12-11 13:06:57 +11:00
Rohan Mitchell
80ebaece2d
Sort distribution choices by name
2015-12-11 13:06:57 +11:00
Rohan Mitchell
cbaf2a0cb3
Angularise edit order form
2015-12-11 13:06:57 +11:00
Rohan Mitchell
eb07680f1f
Inject shops and order cycles
2015-12-11 13:06:57 +11:00
Continuous Integration
ae945ace9d
Auto-merge from CI [skip ci]
2015-12-11 11:09:54 +11:00
Maikel Linke
cd7721a127
Using date and time of current timezone
...
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Rohan Mitchell
a2c0088c91
Do not show flash message if we're performing an async update without reload
2015-12-10 09:17:24 +11:00
Rohan Mitchell
29bfac5f54
Order cycle interface may update or update and close
2015-12-10 09:17:24 +11:00
Rob Harrington
7ecf5df26a
Updating line items through admin controller causes enterprise fees to be recalculated
2015-11-27 15:06:49 +11:00
Rob Harrington
6268b7cc7e
Printing/sending an invoice uses the same template for generating a pdf
2015-11-18 10:02:51 +11:00
Rob Harrington
a96cdd5ee7
Merge branch 'master' into line_item_naming
...
Conflicts:
app/views/admin/order_cycles/edit.html.haml
2015-11-13 09:54:26 +11:00
Rob Harrington
3d36ebe2e6
Some Ransack trickery to get OrderCycles#index to load only recent OR undated OCs when no orders_close_at predicate is passed in
2015-11-12 18:29:19 +11:00
Rob Harrington
be8038e9d0
Merge branch 'master' into line_item_naming
...
Conflicts:
lib/open_food_network/order_cycle_management_report.rb
lib/open_food_network/packing_report.rb
2015-11-12 14:40:11 +11:00
Rob Harrington
1556d38b1e
Admin Enterprise#update.json renders updated enterprises using index serializer
2015-11-12 14:30:43 +11:00
Rob Harrington
4e4de65cba
Fetch undated order cycles by default for index actions
2015-11-12 12:08:39 +11:00
Rob Harrington
095466cb43
Fixing syntax error for new method for OCs controller
2015-11-12 10:34:09 +11:00
Rob Harrington
722471a111
Allow use of completed_at for orders index ransacking
...
Needed to override original Spree method to allow intuitive use of
completed_at_gt and completed_at_lt
2015-11-12 10:01:35 +11:00
Rohan Mitchell
e20d8d3e95
Merge branch 'master' into folklabs-producer-emails
2015-11-11 14:20:25 +11:00
Rohan Mitchell
5a29311137
Choose a more sensible default tax rate: one that calculates to the same amount as the current adjustment tax
2015-11-11 11:53:04 +11:00
Rohan Mitchell
81a6e07d5c
Admin can remove tax on an adjustment
2015-11-11 11:53:04 +11:00
Rohan Mitchell
727ecae62b
Admin can modify a taxed adjustment on an order
2015-11-11 11:53:04 +11:00
Rohan Mitchell
83c0093665
Admin can include tax when creating an adjustment
2015-11-11 11:53:04 +11:00
Rob Harrington
eb7b2e7a3b
Use ams_prefix not ams_suffix!
2015-11-05 17:17:45 +11:00
Rob Harrington
73c80cb5e5
Ordering index orders within query
2015-11-05 17:11:13 +11:00
Rob Harrington
6769c2c729
Can pass params for order or line items into LineItemsController#index
2015-11-05 17:07:47 +11:00
Rob Harrington
51762753f4
WIP: BOM Refactor, adding json route for OrderCyclesController#index, loading OCs based on show_more or specific order_close_at_gt
2015-11-05 14:04:29 +11:00
Rob Harrington
b43049af47
WIP: BOM Refactor, building line_item fetch and update logic with ngResource
2015-11-04 18:16:17 +11:00
Rob Harrington
f563f04f1c
WIP: BOM Refactor, building order fetch and update logic with ngResource, updating rails routes
2015-11-04 16:35:56 +11:00
Rob Harrington
ae7e744644
WIP: BOM Refactor, adding for_line_items action to enterprises controller
2015-11-04 15:02:29 +11:00
Rob Harrington
625e0888ea
Adding logic to Admin::BaseController to standardise rendering of data with AMS
2015-11-04 12:10:50 +11:00
Rohan Mitchell
a3d638df67
Merge branch 'master' into folklabs-producer-emails
2015-11-04 11:15:01 +11:00
Lynne Davis
7350dbb75e
Adding tweaks that have been missed from merges
2015-10-30 11:54:06 +11:00
Rohan Mitchell
f63a80300b
Merge branch 'master' into folklabs-producer-emails
2015-10-29 11:49:24 +11:00
Rob Harrington
18a7317185
Merge branch 'account-invoices' into line_item_naming
...
Conflicts:
app/models/spree/line_item_decorator.rb
2015-10-28 13:42:27 +11:00
