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
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
Rob Harrington
f60b6994eb
Wrapping line_item update with order.update_distribution_charge inside lock
2015-10-28 13:08:50 +11:00
Rob Harrington
50b3635e7e
Locking line_items on API update
2015-10-28 13:08:50 +11:00
Rob Harrington
ef08977dbe
Prevent invoices from being sent unless the distributor of an order has set their ABN
2015-10-21 16:23:48 +11:00
Rob Harrington
9b2653aa2d
Updating order invoice template to be more legally compliant
2015-10-21 15:52:14 +11:00
Maikel Linke
adf0a84669
Use ! version of find_by_permalink to recover on missing resource
2015-10-21 15:42:28 +11:00
Rob Harrington
40d627cb34
Adding new route for printing an order to pdf
2015-10-16 17:25:40 +11:00
Rob Harrington
6e7fc6a0f7
Adding invoice action to orders controller, to allow sending of invoice email
2015-10-16 17:25:40 +11:00
Rohan Mitchell
ecc3bad8c8
Merge branch 'master' into folklabs-producer-emails
2015-10-16 12:38:54 +11:00
Rob Harrington
2dcbe2b4f2
Updating the admin account view to show use the new account_invoice model to display data
2015-09-17 22:38:29 +10:00
Rob Harrington
ae30007fed
Redesignating all references to user_invoices as account_invoices
2015-09-17 22:38:28 +10:00
Rob Harrington
6665f9b4a0
Adding global settings for controlling automatic scheduling of accounts tasks
2015-09-17 22:38:12 +10:00
Rob Harrington
aa8e486a45
Look for job names without 'Struct', now that we aren't using structs
2015-09-17 22:38:12 +10:00
Rob Harrington
619c4959ff
Removing button for updating billable periods from accounts and billing settings page
2015-09-17 22:38:12 +10:00
