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
|
37f8ce68fb
|
Adding one additional mailer test
|
2013-12-19 11:58:08 +11:00 |
|
Rohan Mitchell
|
9f47ff64fa
|
Update spec now that bulk product edit is the default product edit view
|
2013-12-17 15:29:25 +11:00 |
|
Rohan Mitchell
|
3c95993975
|
Remove order sensitivity in specs
|
2013-12-17 15:25:17 +11:00 |
|
Will Marshall
|
63349c7c9a
|
Fixing some breaking bugs in the refactored mailer
|
2013-12-13 15:40:23 +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 |
|
Will Marshall
|
6e36142809
|
Making some changes to the data on the products inventory page
|
2013-12-13 11:39:45 +11:00 |
|
Rohan Mitchell
|
f2269654ff
|
Set option type on product when variant unit changed
|
2013-12-13 11:07:57 +11:00 |
|
Will Marshall
|
e98031e581
|
Fixing some minor report bugs
|
2013-12-13 10:12:41 +11:00 |
|
Rohan Mitchell
|
a67c7b808d
|
Do not set unit value or description on variant when unpacked field is undefined
|
2013-12-12 10:50:03 +11:00 |
|
Rohan Mitchell
|
42d3947861
|
Set unit value and description on variants
|
2013-12-12 10:14:05 +11:00 |
|
Rohan Mitchell
|
33f06f5eff
|
Display unit value and description for variants in BPE
|
2013-12-06 15:57:37 +11:00 |
|
Rohan Mitchell
|
385a80a305
|
Revert "Can set variant_unit_name when unit type is not items" - this applies to a different field.
This reverts commit 8f6f37355c.
|
2013-12-06 14:38:46 +11:00 |
|
Rohan Mitchell
|
8f6f37355c
|
Can set variant_unit_name when unit type is not items
|
2013-12-06 14:25:19 +11:00 |
|
Rohan Mitchell
|
5e086af27a
|
Update product variant_unit_name when variant unit is items
|
2013-12-06 13:16:33 +11:00 |
|
Rohan Mitchell
|
b21263e1c0
|
Display text field for variant_unit_name
|
2013-12-06 12:06:16 +11:00 |
|
Rohan Mitchell
|
a4edacc138
|
Change to double quotes for spec names
|
2013-12-06 10:41:28 +11:00 |
|
Rohan Mitchell
|
d9d6d48ede
|
Centralise ctrl calls
|
2013-12-06 10:14:38 +11:00 |
|
Rohan Mitchell
|
84fe6706a2
|
Make 'Items' option appear in variant_unit field on BPE
|
2013-12-05 15:50:08 +11:00 |
|
Rohan Mitchell
|
8af7c57a88
|
Pack variant_unit fields back into products and dirtyProducts. These fields can now round-trip to the server.
|
2013-12-05 15:16:52 +11:00 |
|
Rohan Mitchell
|
e3043cc6ae
|
Rename prepareProductsForSubmit to submitProducts
|
2013-12-05 15:16:52 +11:00 |
|
Rohan Mitchell
|
fefea54375
|
Do not include variant_unit_with_scale in product update check. When saving products, save variant_unit and variant_unit_scale.
|
2013-12-05 15:16:52 +11:00 |
|
Rohan Mitchell
|
0a07f38f15
|
Load and display variant_unit on BPE page
|
2013-12-05 15:16:52 +11:00 |
|
Rohan Mitchell
|
21154a9455
|
Convert bulk product update spec to coffeescript
|
2013-12-05 15:16:52 +11:00 |
|
Rohan Mitchell
|
a8668e24e3
|
Finish converting bulk product update to coffeescript
|
2013-12-05 15:16:51 +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
|
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 |
|
Will Marshall
|
acdbbb153d
|
Fixing up the landing page spec to cover the new login text
|
2013-11-28 15:24:38 +11:00 |
|
Will Marshall
|
7bc754a598
|
Adding filtering to the products page
|
2013-11-28 13:44:21 +11:00 |
|
Will Marshall
|
d39cb74d06
|
Merge branch 'customers'
|
2013-11-22 16:55:11 +11:00 |
|
Will Marshall
|
27f99d1383
|
Working version of Customers reports without filters
|
2013-11-22 16:53:57 +11:00 |
|
Will Marshall
|
fbe0e2cc29
|
Basic plumbing for the Customers in place
|
2013-11-22 16:22:44 +11:00 |
|
Will Marshall
|
51ea6fcd67
|
Starting on the Customers Report
|
2013-11-22 14:57:11 +11:00 |
|
Will Marshall
|
b3bf3a8378
|
Adding the plumbing for Customers reports, and one tiny refactor to products
|
2013-11-22 14:56:57 +11:00 |
|
Rohan Mitchell
|
4898460132
|
Fix failing spec with table reorder, lambda-fy scopes that use time
|
2013-11-22 14:00:04 +11:00 |
|
Rohan Mitchell
|
94c33e5f45
|
Colour order cycle rows based on their status
|
2013-11-22 11:31:04 +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 |
|