2470 Commits

Author	SHA1	Message	Date
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	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	34030276d7	Cleaning up line items index (BOM)	2015-11-12 10:06:21 +11:00
Rob Harrington	330977186e	Using confirm-change and select2-min-search directive for line items index	2015-11-12 10:05:14 +11:00
Rob Harrington	fc57255b40	Adding save-bar to line items index	2015-11-12 10:04:18 +11:00
Rob Harrington	266820742d	Using request monitor on line items index (BOM)	2015-11-12 10:03:28 +11:00
Rob Harrington	193325f81b	Improve formatting around saving on line items index (BOM)	2015-11-12 09:52:10 +11:00
Rob Harrington	5a7cac652c	Adding confirm-link directive	2015-11-12 09:49:36 +11:00
Rohan Mitchell	e20d8d3e95	Merge branch 'master' into folklabs-producer-emails	2015-11-11 14:20:25 +11:00
Rohan Mitchell	fb3e292e20	Formatting	2015-11-11 11:53:04 +11:00
Rohan Mitchell	a32321df68	Clarify label	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	85e45fa558	Use select2	2015-11-11 11:53:04 +11:00
Rohan Mitchell	d794981ecf	Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.	2015-11-11 11:53:04 +11:00
Rob Harrington	330882c689	Pulling out styling for red buttons in admin into more generic .red class	2015-11-06 09:52:48 +11:00
Rob Harrington	66d1e4297e	WIP: Renaming admin.order_cycles to admin.orderCycles for consistency	2015-11-05 14:40:42 +11:00
Rob Harrington	d731d4e803	Making sure flash is a hash so that is can be used to initialize OpenStuct	2015-11-05 11:09:21 +11:00
Rohan Mitchell	65589d25c6	Display more verbose product and variant name	2015-11-05 09:50:00 +11:00
Rohan Mitchell	5ffad4d343	Fix quantity calculation	2015-11-05 09:43:44 +11:00
Rob Harrington	ae7e744644	WIP: BOM Refactor, adding for_line_items action to enterprises controller	2015-11-04 15:02:29 +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
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	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	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	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	9b2653aa2d	Updating order invoice template to be more legally compliant	2015-10-21 15:52:14 +11:00
Rob Harrington	5b3e052f78	Using a compiled stylesheet for pdf styling	2015-10-16 21:36:18 +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	b5bc4701fa	Detailed xero report	2015-09-22 09:15:55 +10:00
Rob Harrington	1c6f3f4877	Translating words on admin accounts page	2015-09-17 22:38:29 +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	ae30007fed	Redesignating all references to user_invoices as account_invoices	2015-09-17 22:38:28 +10:00
Rob Harrington	5eb20fd8cd	Adding tax settings for billing enterprise users	2015-09-17 22:38:13 +10:00
Rob Harrington	01c9560a19	Account page reads from created at date of invoice	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	448bd12e9f	Adding billing tasks to whenever schedule	2015-09-17 22:38:12 +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	619c4959ff	Removing button for updating billable periods from accounts and billing settings page	2015-09-17 22:38:12 +10:00
Rob Harrington	128b6853f4	Styling tweaks to the admin account page	2015-09-17 22:38:11 +10:00
Rob Harrington	7c5816af82	Switching accounts interface over to showing invoices	2015-09-17 22:38:10 +10:00