8189 Commits

Author	SHA1	Message	Date
Rohan Mitchell	f63a80300b	Merge branch 'master' into folklabs-producer-emails	2015-10-29 11:49:24 +11:00
Rohan Mitchell	87cf3eda41	Amend 'Detailed orders breakdown' heading with missing content	2015-10-29 11:48:12 +11:00
Rob Harrington	cb1f79f59a	Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants	2015-10-28 15:42:14 +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	c5810fc003	Improving BOM form validation	2015-10-28 13:08:50 +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	ab7bfd10c5	Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module" ... This reverts commit e86e08b72e939fee61eddd41d56081395666a877. Conflicts: lib/open_food_network/order_and_distributor_report.rb spec/features/admin/variants_spec.rb spec/lib/open_food_network/order_and_distributor_report_spec.rb	2015-10-28 13:08:50 +11:00
Rob Harrington	cdb0c2db33	Admin Orders show page uses line_item.full_name to describe line_items	2015-10-28 13:07:32 +11:00
Rob Harrington	21e5895a8a	Group Buy panel on BOM takes changes to final_weight_volumes into account	2015-10-28 13:07:32 +11:00
Rob Harrington	33e1322a44	Adding form validation to BOM	2015-10-28 13:07:32 +11:00
Rob Harrington	b08556ec7f	WIP: Making final_weight_volume adjustment a bit nicer	2015-10-28 13:07:31 +11:00
Rob Harrington	2d468f5022	Fixing attr_accessible for line_items (broken in previous commit)	2015-10-28 13:07:31 +11:00
Rob Harrington	eba13a0dd7	Line items inherit units from variants upon creation	2015-10-28 13:07:31 +11:00
Rob Harrington	e52f7165c3	Overriding any last references to options_text in the spree codebase	2015-10-28 13:07:31 +11:00
Rob Harrington	6dfae1b014	Whitespace crusader	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	6a70c162bb	Account invoice jobs run according to rails config time zone rather than system time zone	2015-10-23 12:33:05 +11:00
Maikel Linke	bbeeb8a493	Merge remote-tracking branch 'origin/master' into i18n	2015-10-22 11:03:42 +11:00
Maikel Linke	6c1619ba60	i18n more content	2015-10-22 11:03:35 +11:00
Maikel Linke	df34f6ef8e	using default_locale for precompiled assets	2015-10-22 10:50:29 +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
Maikel Linke	2053fbecda	Merge branch 'i18n-replace-strings-in-js' into i18n ... Conflicts: .travis.yml app/views/spree/order_mailer/confirm_email_for_customer.html.haml config/locales/en.yml	2015-10-21 14:09:43 +11:00
Maikel Linke	f152e4054c	Remove obsolete deface	2015-10-21 10:04:29 +11:00
Maikel Linke	62d31f79ed	Remove obsolete deface	2015-10-21 10:04:28 +11:00
Rohan Mitchell	421774e46c	Do not send producer notifications when the producer has no orders for this order cycle	2015-10-17 11:02:47 +11:00
Rob Harrington	5b3e052f78	Using a compiled stylesheet for pdf styling	2015-10-16 21:36:18 +11:00
Rob Harrington	f12fd7b4a3	Adding button for print action to admin orders show page	2015-10-16 17:25:40 +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
Rob Harrington	104b100fe6	Pulling distributor signoff out into separate partial	2015-10-16 17:25:39 +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
Rob Harrington	b22d591775	BillablePeriods don't get updated when account_invoice has been finalized	2015-10-14 14:36:38 +11:00
Rob Harrington	1ad0f95536	Updating Billable Periods job ignores versions of enterprises created in the future	2015-10-14 14:36:38 +11:00
Rob Harrington	a71410042f	Ensuring that account invoice orders have an address	2015-10-14 14:36:37 +11:00
Rob Harrington	815df3d667	Only clean up account invoice orders that aren't already complete, don't attempt to destroy persisted account_invoice orders	2015-10-14 14:36:37 +11:00
Maikel Linke	5f80043857	using translate filter instead of root scope function with parameters	2015-10-09 10:21:26 +11:00
Maikel Linke	e9d1cf6eb5	using translate filter instead of root scope function	2015-10-08 18:09:11 +11:00
Maikel Linke	d62775a785	update specs and fix labels yes and no	2015-10-07 18:05:59 +11:00
Maikel Linke	8b40d094ee	new translate filter and updated specs for js translations	2015-10-07 15:47:51 +11:00
Maikel Linke	bd737ef727	I18n object file for karma	2015-10-01 16:38:47 +10:00
Maikel Linke	31e7ca9fa2	locale data as js asset	2015-10-01 15:54:46 +10:00
Maikel Linke	0eed8b4578	better testing of existence of I18n	2015-10-01 14:16:59 +10:00