254 Commits

Author	SHA1	Message	Date
Rohan Mitchell	71273dfc7f	Refactor Product to use exchanges.incoming instead of sender/receiver roles	2014-03-26 16:36:09 +11:00
Rohan Mitchell	4aace221ea	Enterprise user can reorder product properties and update product images	2014-03-20 11:41:08 +11:00
Will Marshall	c6f1d43dbd	Reworking the shipping confirmation	2014-03-19 16:09:45 +11:00
Will Marshall	abf1b17fe9	Taking payment methods with no distributor out of circulation	2014-03-19 12:03:39 +11:00
Will Marshall	1ba720481f	Finally fixing the same as billing address checkbox?	2014-03-13 11:41:46 +11:00
Rohan Mitchell	356099a49a	When product unit changed, remove option types from master as well as other variants	2014-03-12 12:35:52 +11:00
Rohan Mitchell	68eaa61732	Enterprise user can delete product images	2014-03-12 12:35:51 +11:00
Will Marshall	57eb65f721	Adding an accessor for requires shipping address	2014-03-12 12:07:41 +11:00
Will Marshall	84955d3647	Merging master	2014-03-06 16:53:03 +11:00
Will Marshall	12f39ce511	Patching up some more address bugs	2014-03-06 16:46:56 +11:00
Will Marshall	cc3fb27490	Restoring the old checkout, but NOW our new checkout is broken	2014-03-06 16:16:00 +11:00
Will Marshall	56646ca5e3	Getting some form state into the Order	2014-03-06 10:26:51 +11:00
Rohan Mitchell	07caf99488	Enterprise user can delete product properties	2014-03-05 16:52:06 +11:00
Rohan Mitchell	637ccc113b	Do not show products that have no stock available to the current distribution	2014-03-05 13:54:02 +11:00
Rohan Mitchell	17debd9fad	On product list view, do not show variants that are out of stock	2014-03-05 13:54:02 +11:00
Rohan Mitchell	8234812157	Do not include master when outputting variants for oc/d	2014-03-05 13:54:02 +11:00
Rohan Mitchell	ec6f70c145	On product list view, only show variants that are a member of the current order cycle	2014-03-05 13:54:02 +11:00
Will Marshall	b5019f12b4	Fixing up a couple of bugs introduced to the old step workflow	2014-03-04 15:07:00 +11:00
Will Marshall	1d5addb06e	Patching up our checkout flow so we don't try to create shipments before we have valid shipping addresses	2014-02-28 13:41:02 +11:00
Will Marshall	86a8b926f3	Adding conditions to the autopopulator for shipping address	2014-02-28 11:53:45 +11:00
Will Marshall	85606b2a0d	Merge branch 'master' into checkout	2014-02-27 10:41:39 +11:00
Will Marshall	a0abd9c95a	Merge branch 'master' into checkout	2014-02-26 15:52:37 +11:00
Rohan Mitchell	11fb6c96a1	Charge per-order fees on orders exactly once	2014-02-26 14:34:30 +11:00
Rohan Mitchell	75c8da1774	Rename create_adjustments_for to create_line_item_adjustments_for, only show per-item fees	2014-02-26 12:07:38 +11:00
Will Marshall	04ac6f466c	Forcing the class of Country	2014-02-21 15:15:06 +11:00
Rohan Mitchell	7b80518621	On admin variant edit page, do not show option values for unit-related option types	2014-02-19 11:29:26 +11:00
Rohan Mitchell	701896be95	BPE: Add variant and save it to server. Edit the saved variant.	2014-02-13 11:52:44 +11:00
Rohan Mitchell	4aa43cfbe0	Set the master unit value for a product without variants	2014-02-12 13:57:49 +11:00
Rohan Mitchell	f187041606	Do not display a space separating units and scaled values. eg. 1kg, 4 boxes	2014-02-06 14:05:26 +11:00
Rohan Mitchell	eccea9d9ff	When removing a product's option type, remove its variants' associated option values	2014-02-06 10:47:13 +11:00
Rohan Mitchell	d0fd48456e	Variant calculates fees and its price inclusive of fees	2014-02-05 14:01:10 +11:00
Will Marshall	2bb004ebaa	Adding notes field to products	2014-02-04 14:11:32 +11:00
Rohan Mitchell	5adc4f27f4	Do not display option type when showing variant options_text. This makes variant names cleaner.	2014-01-22 09:24:09 +11:00
Rohan Mitchell	5e0515e6c5	Variant value expression returns a value of 1 when unit value equals the scale	2014-01-17 16:12:07 +11:00
Will Marshall	b6590000a4	Improving Product's has_stock, filtering Shop#products to in_stock products	2014-01-17 14:41:15 +11:00
Rohan Mitchell	29235cd2cb	Merge branch 'master' into product-amount-units ... Conflicts: app/assets/javascripts/admin/bulk_product_update.js.coffee spec/spec_helper.rb	2014-01-14 15:34:05 +11:00
Rohan Mitchell	9c28b5baae	Fix product lists not matching when saving changes to product unit+values fields	2014-01-10 15:43:45 +11:00
Rohan Mitchell	a60c9a9cea	When variant already has a value set, remove old option value and assign a new one	2014-01-09 14:11:54 +11:00
Rohan Mitchell	cbe46bffed	Merge branch 'bpe_paginate' ... Conflicts: config/ng-test.conf.js	2014-01-09 12:07:42 +11:00
Will Marshall	7838d759ee	Removing redundant functionality from the Order Populator	2014-01-08 14:45:40 +11:00
Rohan Mitchell	ea3e697b73	Rename method for clarity, remove outdated specs for OrderPopulator	2014-01-08 14:14:45 +11:00
Rohan Mitchell	dd16934496	Remove redundant serializer spec, reinstate creation of order distribution charges	2014-01-08 13:22:34 +11:00
Rohan Mitchell	eda4f241e2	Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests	2014-01-08 11:39:05 +11:00
Will Marshall	5e041a6f4f	Uncommenting the old OP code	2014-01-08 10:35:27 +11:00
Rohan Mitchell	2fec16af5d	Merge branch 'master' into product-amount-units	2014-01-07 16:00:06 +11:00
Rohan Mitchell	042e8386ab	Refactor: Extract methods to simplify	2014-01-07 15:16:36 +11:00
Rohan Mitchell	ebae76375f	Fix specs to work with unit_value stored in base units, scale units correctly for output	2014-01-07 14:57:30 +11:00
Rohan Mitchell	5a1249e249	When value is blank, display description only	2014-01-07 12:19:48 +11:00
Rohan Mitchell	35d0bf6219	Generate option value values and units for weight, volume and items	2014-01-07 12:07:54 +11:00
Rohan Mitchell	ef6c08408b	Generate option value name - value and description	2014-01-07 10:57:58 +11:00