4858 Commits

Author	SHA1	Message	Date
Continuous Integration	23b9dd5c71	Auto-merge from CI [skip ci]	2015-12-17 13:02:37 +11:00
Maikel Linke	bc6110c178	Re-defining in_distributor scope as method to allow chaining	2015-12-17 12:42:28 +11:00
Rob Harrington	e0da49e4df	Formatting dates for account invoices in rails time zone	2015-12-17 11:34:06 +11:00
Rob Harrington	b004060679	Printing invoices doesn't fail when order has no order cycle	2015-12-17 11:33:18 +11:00
Rob Harrington	26a2f1a280	Adjustments on account invoices are created based on presence of a bill ... Rather than of turnover	2015-12-16 23:10:47 +11:00
Rob Harrington	83e3fb98f7	Only display billable period adjustments where the amount in > 0 ... Rather than where the bill (which is calculated according to current settings) is > 0	2015-12-16 19:18:59 +11:00
Rob Harrington	bac4fcbd8f	Make sure that adjustments for billable periods have a valid order to attach to when creating/updating	2015-12-16 19:18:59 +11:00
Rob Harrington	ecd11702c3	Fixing up enterprise user account page	2015-12-16 19:18:59 +11:00
Rob Harrington	fe0652e243	When updating a line_item quantity from 0, final_weight_volume is recalculated from the variants unit value	2015-12-16 19:18:59 +11:00
Rob Harrington	0370723edd	Attempt to add a sensible name and contact number to Account Invoice addresses	2015-12-16 19:18:58 +11:00
Rob Harrington	d46712de84	Obsolete BillablePeriods only deleted if their associated order is not already complete	2015-12-16 19:18:58 +11:00
Rob Harrington	0ed8cf973d	Adding an example bill calculator to business model config edit page ... To allow super admin to see the effects of any changes they make to BMC settings	2015-12-16 19:18:58 +11:00
Rob Harrington	76d4f74f6b	Ammending BillablePeriod spec to be ensure tax is charged correctly	2015-12-16 19:18:58 +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	85f61364f8	BillablePeriods use global config to calculate bills	2015-12-16 19:18:57 +11:00
Rob Harrington	c1d04af5cc	Implementing monthly billing description logic in required pages	2015-12-16 19:18:57 +11:00
Rob Harrington	5b72f53738	Adding helper for describing monthly billing charges	2015-12-16 19:18:57 +11:00
Rob Harrington	da325780b1	Adding BMC link to configurations menu	2015-12-16 19:18:57 +11:00
Rob Harrington	a40a03905f	Reorganising BMC edit view	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	cb9b61f393	WIP: Adding an edit view for BMC variables	2015-12-16 19:18:56 +11:00
Rob Harrington	58031408f1	Adding basic business model configuration variables to app config	2015-12-16 19:18:56 +11:00
Rob Harrington	e20b06bb97	Adding basic route and controller for business model configuration	2015-12-16 19:18:56 +11:00
Rob Harrington	befc558224	Pulling product_and_variant_name down into VariantAndLineItemNaming, renaming to product_and_full_name ... Also allowing this method to be used in reports (Xero), to reflect appropriate name for weight/volume adjusted line items	2015-12-16 11:55:24 +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
Rob Harrington	e6a51bb49d	Adding actions dropdown to admin order view/pages	2015-12-16 11:55:23 +11:00
Rob Harrington	ae0ad73b4a	Printable Invoices Improvements for Food Connect ... Adding cusotmer instructions, hiding tax column when not present, order cycle name appears at top of invoice and items are sorted by product name	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
Maikel Linke	1d46c2febd	LettuceShare report: display only if count_on_hand > 0 ... Use the inventory of a distributor if selected.	2015-12-11 15:12:27 +11: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	e33ede0ec2	Include order cycle status in new order form	2015-12-11 13:06:58 +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	932ac45ea5	Do not show form until distribution has been chosen	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	3419198635	Disable distributors that do not have an order cycle	2015-12-11 13:06:57 +11:00
Rohan Mitchell	1026b81d0c	Do not show order cycle choice until distributor is chosen	2015-12-11 13:06:57 +11:00
Rohan Mitchell	c74463404d	Only show order cycle options that include the chosen distributor	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	6e7b6b5dfc	Tidy render partial calls and hash syntax	2015-12-11 13:06:57 +11:00
Rohan Mitchell	815694de31	Move orders/edit template from Spree	2015-12-11 13:06:57 +11:00
Rohan Mitchell	2daceb1111	Angularise new 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	47c23c986a	Move distribution fields from override to partial	2015-12-11 13:06:56 +11:00
Rohan Mitchell	742e2279ae	Tidy render partial calls	2015-12-11 13:06:56 +11:00
Rohan Mitchell	eaae16a486	Copy orders/new template from Spree	2015-12-11 13:06:56 +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