2082 Commits

Author	SHA1	Message	Date
Rob Harrington	eba13a0dd7	Line items inherit units from variants upon creation	2015-10-28 13:07:31 +11:00
Rob Harrington	40972cc6ec	Updating reports to use naming information from line_items directly, rather than from the original variant	2015-10-28 13:07:31 +11:00
Rob Harrington	795830d94d	Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module	2015-10-28 13:07:31 +11:00
Rob Harrington	039fcb80eb	Extracting variant and option_value naming out into a lib class that is now shared between line items and variants, line_items have option_values	2015-10-28 13:06:10 +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
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
Rohan Mitchell	4fbeb0c3b1	Check if an order is an account invoice	2015-10-15 10:05:27 +11:00
Rohan Mitchell	de80e6d5bf	Find adjustments for billable periods	2015-10-15 09:58:22 +11:00
Rohan Mitchell	92f7b72056	Check whether an individual adjustment has tax included	2015-10-15 09:58:06 +11:00
Rohan Mitchell	7552776349	Add product_and_variant_name display for Variant	2015-09-21 16:49:31 +10:00
Rohan Mitchell	8f40702369	Line items report whether they have tax included	2015-09-21 15:57:04 +10: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	13adb61b3a	Refactoring invoice update process to use new AccountInvoice model	2015-09-17 22:38:29 +10:00
Rob Harrington	77c10dafd6	Linking billable_periods to the relevant account_invoice upon creation	2015-09-17 22:38:29 +10:00
Rob Harrington	b1285cd07f	WIP: Adding AccountInvoice model to more robustly record information about enterprise user invoices	2015-09-17 22:38:28 +10:00
Rob Harrington	79497d28d2	Associating billable periods with the relevant adjustment, and moving labelling logic to model	2015-09-17 22:38:13 +10:00
Rob Harrington	5eb20fd8cd	Adding tax settings for billing enterprise users	2015-09-17 22:38:13 +10:00
Rob Harrington	6cc403cd92	Preventing double creation of invoices by recognising completed invoices within the specifed period	2015-09-17 22:38:13 +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	8bbda5715d	Adding basic template for account page	2015-09-17 22:38:10 +10:00
Rob Harrington	92eb5ed367	Adding routes for a new admin account page for users to manage their billing preferences and access invoices	2015-09-17 22:38:10 +10:00
Rob Harrington	160c0d75fe	Confirmation emails do not get send for orders distributed by accounts_distributor	2015-09-17 22:38:09 +10:00
Rob Harrington	f2389ee672	User Invoice Updater finalizes user invoices using global preferences for payment method and shipping method	2015-09-17 22:38:08 +10:00
Rob Harrington	e3e59d76a9	Adding global config for setting default payment and shipping methods for accounts distributor	2015-09-17 22:38:08 +10:00
Rob Harrington	9c4ed5f092	Enterprises have billable_periods	2015-09-17 22:38:08 +10:00
Rob Harrington	f0fa696d2f	Default scope for BPs ignores deleted records	2015-09-17 22:38:08 +10:00
Rob Harrington	311ffc3dc9	wip: user invoice updater finalizes orders on the first of the month	2015-09-17 22:37:56 +10:00
Rob Harrington	ee8a86d495	User model can generate a current invoice for enterprise users	2015-09-17 22:37:56 +10:00
Rob Harrington	fa8c3d65dc	Adding settings for global accounts and billing setup	2015-09-17 22:37:56 +10:00
Rob Harrington	b4e58a1a79	WIP: Basic structure for daily job to update user invoices	2015-09-17 22:37:55 +10:00
Rob Harrington	550434dfe8	Renaming bill_items to billable_periods	2015-09-17 22:37:55 +10:00
Rob Harrington	77e361dd52	Adding shop_trial_expiry method to enterpise model	2015-09-17 22:37:44 +10:00
Rob Harrington	083d7327bc	Adding BillItem to database	2015-09-17 22:37:44 +10:00
Rob Harrington	2fa217df56	Adding paper_trail to enterprise model, to track changes to owner_id and sells	2015-09-17 22:37:33 +10:00
Maikel Linke	637e5c4fee	PermalinkGenerator for products	2015-09-16 15:45:10 +10:00
Maikel Linke	326c972f63	Handling nil in final_weight_volume calculation	2015-09-16 10:12:59 +10:00
Continuous Integration	d595e1558a	Auto-merge from CI [skip ci]	2015-08-26 10:03:13 +10:00
Rohan Mitchell	170799f65f	Add permission for hub enterprise users to use xero report #628	2015-08-07 13:37:37 +10:00
Rohan Mitchell	719ddea789	Merge branch 'variable-weights-improvements' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-variable-weights-improvements	2015-08-07 11:10:07 +10:00
Continuous Integration	14900655df	Auto-merge from CI [skip ci]	2015-08-05 12:18:31 +10:00
Rohan Mitchell	be66769999	SELECT DISTINCT results in inconsistent #count value. Work around this with to_a.	2015-08-05 11:05:29 +10:00
Lynne Davis	8639109372	Variable weights improvements additions	2015-08-04 20:13:28 +01:00
Rohan Mitchell	012b0517a5	Fetch order cycle variants in SQL	2015-07-31 16:57:47 +10:00
Rohan Mitchell	ec908fce92	Make TOS URL configurable	2015-07-31 14:51:17 +10:00
Rohan Mitchell	5fd3dc1d28	Customise footer logo	2015-07-17 16:24:07 +10:00
Rohan Mitchell	bb3a4170f5	Add dimensions to image upload	2015-07-17 16:06:50 +10:00
Rohan Mitchell	74f90dada3	Allow overriding mobile logo (raster and SVG) and home hero image	2015-07-17 16:06:50 +10:00