15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	eca25a2564	Make coordinator fees apply to all variants, not just those with exchange fees	2015-07-31 16:57:47 +10:00
Rohan Mitchell	012b0517a5	Fetch order cycle variants in SQL	2015-07-31 16:57:47 +10:00
Rohan Mitchell	faa1d0d1c5	When cart clear is declined, revert order cycle selection change	2015-07-31 16:56:08 +10:00
Rohan Mitchell	b97bbae00e	Remove old selenium-related test helper, remove unused param on handle_js_confirm	2015-07-31 16:56:08 +10:00
Rohan Mitchell	679531fe2a	Prompt for clear cart when order cycle changes	2015-07-31 16:56:08 +10:00
Rohan Mitchell	eb6dcba396	Clear localstorage in Cart.clear()	2015-07-31 16:56:08 +10:00
Rohan Mitchell	9c9051498b	Rename ofnEmptiesCart to ofnChangeHub	2015-07-31 16:56:08 +10:00
Rohan Mitchell	5688cfd1dd	WIP: Rename ofnEmptiesCart to ofnChangeHub	2015-07-31 16:56:08 +10:00
Rohan Mitchell	fc409c97bf	Decouple ofn-empties-cart directive from hub-choice navigation	2015-07-31 16:56:08 +10:00
Rohan Mitchell	09b4b3e659	When order cycle is changed, clear the cart	2015-07-31 16:56:08 +10:00
Rohan Mitchell	bf2bd403a4	Clear variants when order cycle changed, not when products are initially loaded	2015-07-31 16:56:08 +10:00
Rohan Mitchell	012a210782	Add method to clear cart	2015-07-31 16:56:08 +10:00
Rohan Mitchell	7caebb11e2	Clear variants registry before reloading products - fixes fees not updating when changing order cycle	2015-07-31 16:56:08 +10:00
Rohan Mitchell	ee65452de3	Add method to clear variants registry	2015-07-31 16:56:08 +10:00
Rohan Mitchell	3a9b13b55e	Reorder methods	2015-07-31 16:56:07 +10:00
Rohan Mitchell	734b2fc766	Merge branch 'master' into redesign-cms	2015-07-31 14:59:33 +10:00
Rohan Mitchell	5559231245	Fix date spec error	2015-07-31 14:59:05 +10:00
Rohan Mitchell	3345f54e0a	Merge branch 'master' into redesign-cms	2015-07-31 14:55:01 +10:00
Rohan Mitchell	ec908fce92	Make TOS URL configurable	2015-07-31 14:51:17 +10:00
Rohan Mitchell	d8f4061030	Tidy link	2015-07-30 12:09:20 +10:00
Rohan Mitchell	759c53ec34	Add note about provisioning to README	2015-07-30 11:45:50 +10:00
Continuous Integration	8d041f5e7a	Auto-merge from CI [skip ci]	2015-07-29 12:03:03 +10:00
Continuous Integration	32d3d0f912	Auto-merge from CI [skip ci]	2015-07-28 14:03:29 +10:00
Rohan Mitchell	917c17af59	Clarify quantities used for calculations, show excess available via max_quantity	2015-07-24 18:31:49 +10:00
Rohan Mitchell	21a9681205	Do not show negative remainder when there are no purchases	2015-07-24 17:42:23 +10:00
Rohan Mitchell	54fd298e3a	Reinstate variant full name column - needed to identify variants differing only by description	2015-07-24 17:42:00 +10:00
Rohan Mitchell	9ffc97f8b6	Fix controller spec for extraction of report controller logic	2015-07-24 14:10:04 +10:00
Rohan Mitchell	211171aed4	Rename column for clarity	2015-07-24 12:49:43 +10:00
Rohan Mitchell	f43eacb75d	Revert "Do not show non-group buy products on bulk coop reports" ... This reverts commit f5c2386296.	2015-07-24 12:40:50 +10:00
Rohan Mitchell	fffc35d9ed	Revert "Add a blank row after summary row in all reports" ... This reverts commit b0dd765181.	2015-07-24 12:40:42 +10:00
Rohan Mitchell	17fb4a7247	DRY by extracting calculation to method	2015-07-24 07:17:20 +10:00
Rohan Mitchell	3abce54115	Split variant name into number and unit columns	2015-07-24 07:07:49 +10:00
Rohan Mitchell	28de125b59	Bulk coop allocation report uses unit value rather than variant weight	2015-07-24 07:00:49 +10:00
Rohan Mitchell	4d71a56e38	Update available/unallocated calculations	2015-07-23 16:40:50 +10:00
Rohan Mitchell	ae968cd0eb	Simple refactoring of original total_allocated code	2015-07-23 16:21:37 +10:00
Rohan Mitchell	1a89c3caf4	Translate bulk coop allocation report to reports DSL	2015-07-23 15:07:39 +10:00
Rohan Mitchell	bdd792a3ea	Extract helpers to new superclass	2015-07-23 15:07:15 +10:00
Rohan Mitchell	f5c2386296	Do not show non-group buy products on bulk coop reports	2015-07-23 14:17:00 +10:00
Rohan Mitchell	8665b35f1d	Units required shows amount to fulfil order, not complete units required. Remainder works in opposite direction to suit.	2015-07-23 14:16:40 +10:00
Rohan Mitchell	d68cfbff18	Use scaled value for group_buy_unit_size	2015-07-23 14:06:04 +10:00
Rohan Mitchell	e8f7ab5425	Do bulk coop report calculations using unit values rather than variant weight field	2015-07-23 14:06:04 +10:00
Rohan Mitchell	b0dd765181	Add a blank row after summary row in all reports	2015-07-23 14:05:59 +10:00
Rohan Mitchell	8ee467d2b9	Split variant name into number and unit columns	2015-07-23 12:22:30 +10:00
Rohan Mitchell	5874ecbbef	Small tweaks	2015-07-23 12:02:31 +10:00
Rohan Mitchell	dcae584673	Extract bulk coop supplier report into Report DSL	2015-07-23 12:02:24 +10:00
Rohan Mitchell	a90666467a	Add helper support to Reports DSL	2015-07-23 11:45:19 +10:00
Rohan Mitchell	cc9d0defca	Use class attributes instead of class variables to avoid leakage between subclasses	2015-07-23 11:04:36 +10:00