Commit Graph

1463 Commits

Author SHA1 Message Date
Rob H
a6d7044dfd WIP: Adding basic UI for applying hard filtering to BPE 2014-01-04 19:21:10 +08:00
Rob H
7ef358a476 Add basic hard filter adding js infrastructure for BPE 2014-01-04 16:44:00 +08:00
Rob H
687332d2b0 Add loading splash to BPE 2014-01-04 15:50:26 +08:00
Rob H
c6222f2180 BPE pagination works with filtering 2014-01-02 15:22:10 +08:00
Rob H
6b865aa38c Display BPE update message correctly 2014-01-02 13:10:06 +08:00
Rob H
ef78609049 Prevent page being orphaned when changing page size in BPE 2013-12-26 19:37:21 +08:00
Rob H
2df0545819 Fix some outstanding updating issues in BPE 2013-12-23 23:09:19 +08:00
Rob H
3372f1d605 BPE page nav using page numbers 2013-12-23 17:19:38 +08:00
Rob H
ffbfbffb28 WIP: Add basic page nav controls to BPE 2013-12-23 09:22:31 +08:00
Rob H
06995bd3c6 Add controls to alter the number of products displayed for BPE 2013-12-22 17:31:27 +08:00
Rob H
530d38c7d0 Add basic pagination informaion to BPE 2013-12-22 16:58:48 +08: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
60a3e06c5b Reformat 2013-12-13 11:10:08 +11:00
Rohan Mitchell
f2269654ff Set option type on product when variant unit changed 2013-12-13 11:07:57 +11:00
Rohan Mitchell
03aa5604e5 Reorder columns on BPE 2013-12-12 10:52:17 +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
3013870bd6 Merge branch 'master' into product-amount-units
Conflicts:
	config/ng-test.conf.js
2013-12-06 14:33:59 +11:00
Rohan Mitchell
6956eb3f94 Basic styling for variant unit fields on BPE 2013-12-06 14:30:38 +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
4e1a1825e6 Fix incorrect prefix on track-product 2013-12-06 13:14:55 +11:00
Rohan Mitchell
b21263e1c0 Display text field for variant_unit_name 2013-12-06 12:06:16 +11:00
Rohan Mitchell
e70513b06c Remove off-canvas class for landing page, allowing it to scroll 2013-12-06 11:47:07 +11:00
Rohan Mitchell
3adeed1fa0 Update attr name 2013-12-06 11:11:19 +11:00
Rohan Mitchell
fdc98ba24c Convert Karma config file to v0.10 compatible format
Conflicts:

	config/ng-test.conf.js
2013-12-06 11:07:32 +11:00
Rohan Mitchell
62ca121db2 Rename directives to avoid using the ng namespace, which is reserved for angular core 2013-12-06 10:49:06 +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
f07fb8d533 Make variant unit fields attr_accessible 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
2115e33189 Use == instead of is 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
2a989652cb Use ||= 2013-12-05 15:16:52 +11:00
Rohan Mitchell
d552e84302 Tweak formatting 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
cee54b4785 Convert Karma config file to v0.10 compatible format 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
634dd52a80 WIP: Convert bulk product update to coffeescript. 3 tests failing. 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
4c72170742 Remove unnecessary require 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
578651ddae forcing SSL in staging 2013-12-04 14:26:22 +11:00
Will Marshall
987ba1a81a Adding a monkeypatch to spree to always allow SSL 2013-12-04 14:08:08 +11:00
Will Marshall
ff003d8931 disabling SSL :/ 2013-12-04 13:42:35 +11:00