Will Marshall
|
7838d759ee
|
Removing redundant functionality from the Order Populator
|
2014-01-08 14:45:40 +11:00 |
|
Rohan Mitchell
|
5f4d787d26
|
Fix sorting error in spec
|
2014-01-08 14:43:46 +11:00 |
|
Rohan Mitchell
|
ea3e697b73
|
Rename method for clarity, remove outdated specs for OrderPopulator
|
2014-01-08 14:14:45 +11:00 |
|
Rohan Mitchell
|
70e16433d3
|
Spec for reusing existing option values
|
2014-01-08 10:16:38 +11:00 |
|
Rohan Mitchell
|
2fec16af5d
|
Merge branch 'master' into product-amount-units
|
2014-01-07 16:00:06 +11:00 |
|
Rohan Mitchell
|
9e6fa4d22d
|
Add spec for small values
|
2014-01-07 15:02:55 +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 |
|
Rohan Mitchell
|
9e956ebec6
|
Add specs for option value creation, create option values for simple case. Delete option value associations, not objects.
|
2014-01-07 10:36:19 +11:00 |
|
Rohan Mitchell
|
6a4c112cf2
|
Rename option_type_for_variant_unit to variant_unit_option_type
|
2014-01-07 10:31:53 +11:00 |
|
Will Marshall
|
1264af584c
|
Removing a pointless test
|
2014-01-06 15:56:28 +11:00 |
|
Will Marshall
|
e20120b9ca
|
Fixing a syntax error
|
2013-12-19 16:05:35 +11:00 |
|
Rohan Mitchell
|
3c95993975
|
Remove order sensitivity in specs
|
2013-12-17 15:25:17 +11:00 |
|
Will Marshall
|
c4c5f3a8c7
|
Merging from master
|
2013-12-17 14:18:21 +11:00 |
|
Will Marshall
|
f6af9e78ac
|
Adding destroy ability to enterprise users
|
2013-12-13 15:40:23 +11:00 |
|
Will Marshall
|
12743850b4
|
Removing a chili, refactoring order mailer
|
2013-12-13 15:40:22 +11:00 |
|
Rohan Mitchell
|
124b6df75d
|
Show undated order cycles on index page
|
2013-12-13 14:51:43 +11:00 |
|
Rohan Mitchell
|
1084862139
|
When product variant unit is changed, remove related option values from variants
|
2013-12-13 12:08:51 +11:00 |
|
Rohan Mitchell
|
f2269654ff
|
Set option type on product when variant unit changed
|
2013-12-13 11:07:57 +11:00 |
|
Rohan Mitchell
|
1b63546a9e
|
Master variants are valid without unit value or description
|
2013-12-05 15:16:51 +11:00 |
|
Rohan Mitchell
|
0bae3e58b8
|
Add product units and amount fields to product and variant models, add validations
|
2013-12-05 15:16:51 +11:00 |
|
Will Marshall
|
ec72e9137a
|
We can now hit the index page
|
2013-12-05 15:07:46 +11:00 |
|
Will Marshall
|
e574185c95
|
Fixing an ordering issue in the order cycle spec
|
2013-11-29 14:48:06 +11:00 |
|
Will Marshall
|
7784a6ef44
|
Adding a default value of NOW to available_on on Products
|
2013-11-28 16:41:46 +11:00 |
|
Rohan Mitchell
|
459b2c1050
|
Add #upcoming? and #open? to OrderCycle
|
2013-11-22 11:15:12 +11:00 |
|
Rohan Mitchell
|
3a2394675f
|
Rename OrderCycle#expired? to #closed?
|
2013-11-22 11:08:42 +11:00 |
|
Rohan Mitchell
|
5ad63d08f3
|
Add some more open/close time scopes to order cycles
|
2013-11-22 10:57:33 +11:00 |
|
Rohan Mitchell
|
dfcf567f26
|
Sort payment methods by name
|
2013-11-21 14:42:28 +11:00 |
|
Rohan Mitchell
|
7a8bd16083
|
On enterprise page, do not display products outside of the outgoing exchange
|
2013-11-15 15:08:45 +11:00 |
|
Rohan Mitchell
|
59935619e3
|
Rename OrderCycle#distributed_variants_by to variants_distributed_by
|
2013-11-15 14:34:05 +11:00 |
|
Rohan Mitchell
|
52b6c33aaa
|
When converting an exchange to a hash for comparison, ensure id lists are sorted - ordering issues should not indicate inequality
|
2013-11-15 12:09:26 +11:00 |
|
Will Marshall
|
2ce687fc79
|
Adding variant update permissions to Enterprise users
|
2013-11-14 11:53:14 +11:00 |
|
Rohan Mitchell
|
27b8c4508f
|
Split product distribution editing into its own admin page
|
2013-11-13 15:22:17 +11:00 |
|
Rohan Mitchell
|
48f18a93de
|
Order shipping methods by name, not distributor
|
2013-11-07 16:25:43 +11:00 |
|
Will Marshall
|
f0d335a454
|
Fixing up the failing spec for distributor changes, reworking a method to SharedHelper
|
2013-11-07 11:47:05 +11:00 |
|
Rohan Mitchell
|
04387aa6b7
|
Scope time since last oc expired to distributor
|
2013-11-06 16:17:36 +11:00 |
|
Will Marshall
|
9f150c8d87
|
Adding a small display on the distributor page indicating when the next order cycle is, if any - BugHerd#127
|
2013-11-01 16:12:31 +11:00 |
|
Will Marshall
|
b8fcfbd72b
|
Test and implementation: dropping inclusion of product_distributions from active Distributors on front page - BugHerd#125
|
2013-11-01 14:48:23 +11:00 |
|
Rohan Mitchell
|
758676c1ea
|
When visiting supplier page without selecting a distributor, provide choice of distributors that distribute their products
|
2013-10-31 14:49:26 +11:00 |
|
Rohan Mitchell
|
647e1d196c
|
Position enterprise groups
|
2013-10-30 14:46:49 +11:00 |
|
Rohan Mitchell
|
7f6f725e02
|
Find enterprise groups on the front page
|
2013-10-30 13:54:11 +11:00 |
|
Rohan Mitchell
|
e78815c2d3
|
Create models for EnterpriseGroups
|
2013-10-30 10:42:32 +11:00 |
|
Rohan Mitchell
|
fb22b5e2b7
|
When there are no order cycles open, display an 'orders closed' message
|
2013-10-24 10:32:30 +11:00 |
|
Rohan Mitchell
|
57f7d489ff
|
Rename OpenFoodWeb namespace to OpenFoodNetwork
|
2013-10-18 17:29:55 +11:00 |
|
Rohan Mitchell
|
bd112c64b0
|
Fix edit enterprise link to point to edit page, fix spec breakages
|
2013-10-18 15:39:58 +11:00 |
|
Rohan Mitchell
|
91f14dcd4c
|
Enterprise manager can create/edit enterprise fees
|
2013-10-18 13:56:22 +11:00 |
|
Rohan Mitchell
|
3b5e6f5742
|
When viewing shipping methods, only show those for the distributor I select
|
2013-10-18 10:01:11 +11:00 |
|
Rohan Mitchell
|
c07c52085a
|
Enterprise user can view and create shipping methods
|
2013-10-18 09:35:53 +11:00 |
|