Rohan Mitchell
|
4d24fec6fb
|
BPE: Add a variant. Do not show edit on unsaved variants. Delete unsaved variants.
|
2014-02-13 09:26:07 +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
|
b2ad6c7d57
|
Filter products for submit includes master variant
|
2014-02-11 19:23:27 +11:00 |
|
Rohan Mitchell
|
e845c0dc06
|
Remove derived attributes from master variant
|
2014-02-11 19:20:46 +11:00 |
|
Rohan Mitchell
|
0b255ed1e9
|
Pack the master variant before sending to the server
|
2014-02-11 19:19:12 +11:00 |
|
Rohan Mitchell
|
c7c70252d0
|
ofnTrackProduct and ofnTrackVariant accept nested properties as arguments
|
2014-02-11 19:13:11 +11:00 |
|
Rohan Mitchell
|
33691085bd
|
Only perform scaling when a scale is present. Fixes items values not saving then loading as infinity.
|
2014-02-06 13:51:08 +11:00 |
|
Rob H
|
9373dcea3d
|
Merge branch 'master' into bom
|
2014-01-31 12:32:23 +08:00 |
|
Rob H
|
d679c7ac30
|
BOM dataSubmitter service changes class of relevant element based on response
|
2014-01-31 11:38:38 +08:00 |
|
Rob H
|
4fb06b76c7
|
BOM: Add switchClass service to help visualise update status
|
2014-01-30 18:34:48 +08:00 |
|
Rob H
|
b8448853ac
|
BOM: Add dataSubmitter service to handle updates
|
2014-01-30 17:09:55 +08:00 |
|
Rob H
|
224d91083d
|
BOM: Add factory to monitor changes made to line_items
|
2014-01-30 14:12:28 +08:00 |
|
Rob H
|
1723ff22eb
|
Ignore confirm boxes when deleting line items in js tests
|
2014-01-22 18:41:03 +08:00 |
|
Rob H
|
b9a3031663
|
Line item delete button works
|
2014-01-19 21:46:11 +08:00 |
|
Rob H
|
701b5aceb4
|
Add 'All' option to supplier and distributor filters
|
2014-01-18 14:26:07 +08:00 |
|
Rob H
|
79631ebb8e
|
Add distributor filter to BOM
|
2014-01-18 12:48:52 +08:00 |
|
Rob H
|
d6b4f8129c
|
Match supplier of each line item with the list fetched from server
|
2014-01-17 17:14:05 +08:00 |
|
Rob H
|
94c375ad31
|
WIP: changing BOM listing from orders to line items
|
2014-01-17 16:57:08 +08:00 |
|
Rob H
|
5aa032b54c
|
BOM: fetchOrders sends request to API and resetOrders stores returned data
|
2014-01-17 14:00:02 +08:00 |
|
Rob H
|
c6d9bfafbc
|
Create shared services module for backend angularjs, rename modules
|
2014-01-17 13:48:28 +08:00 |
|
Rob H
|
970942ff42
|
Add JS spec and basic initialisation code for BOM
|
2014-01-17 13:16:35 +08:00 |
|
Rohan Mitchell
|
87cf596a30
|
For a product with one or more on_demand variants, don't show 'On demand' at the product level
|
2014-01-17 16:12:07 +11:00 |
|
Rohan Mitchell
|
ed78cc053b
|
Do not update product on_hand when product has on_demand variants
|
2014-01-17 16:12:07 +11:00 |
|
Rob H
|
ce5b24a777
|
Prevent duplicate filters being added
|
2014-01-15 15:50:41 +08:00 |
|
Rob H
|
8146301b2f
|
Add validation to BPE advanced filter box
|
2014-01-15 14:35:46 +08: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
|
d0d0fc1a06
|
Fix intermittently failing spec - comparison of slightly differing dates
|
2014-01-14 11:47:56 +11:00 |
|
Rohan Mitchell
|
a30e46d747
|
Do not delete variant options_text when saving/refreshing products
|
2014-01-14 11:40:58 +11:00 |
|
Rohan Mitchell
|
9442b7b5dc
|
On save, scale from chosen unit to base unit (eg. mL to L)
|
2014-01-14 11:13:19 +11:00 |
|
Rohan Mitchell
|
c43b56f3f8
|
On load, scale from base unit to chosen unit (eg. g to kg)
|
2014-01-14 10:16:21 +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
|
cbe46bffed
|
Merge branch 'bpe_paginate'
Conflicts:
config/ng-test.conf.js
|
2014-01-09 12:07:42 +11:00 |
|
Rob H
|
2e56d7a551
|
Can remove filters from BPE
|
2014-01-05 17:53:32 +08:00 |
|
Rob H
|
fb9fd5089a
|
WIP: Adding a hard filter to BPE works
|
2014-01-05 17:04:27 +08:00 |
|
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 |
|
Will Marshall
|
b5dd921a81
|
Our feature spec is breaking but we'll work that out
|
2013-12-19 10:44:47 +11:00 |
|
Will Marshall
|
b3a4d826b8
|
Dumping OrderCycle data via :javascript tags instead of ng-init, Angularising the selector stuff
|
2013-12-18 17:05:47 +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 |
|
Will Marshall
|
36694822db
|
Starting to prettify
|
2013-12-12 10:28:43 +11:00 |
|
Rohan Mitchell
|
42d3947861
|
Set unit value and description on variants
|
2013-12-12 10:14:05 +11:00 |
|
Will Marshall
|
8f41078c0c
|
Reworking our bindings so everything stacks on objects and automagically updates
|
2013-12-11 15:39:50 +11:00 |
|
Will Marshall
|
bc4f472523
|
Fixing up the tests with some refactoring
|
2013-12-11 15:33:57 +11:00 |
|
Will Marshall
|
44fe304efb
|
Building out and testing our Product and OrderCycle Angular stuff
|
2013-12-11 12:42:33 +11:00 |
|
Will Marshall
|
4db8f755bf
|
Getting an order cycle update function in place like a boss
|
2013-12-11 12:42:02 +11:00 |
|
Rohan Mitchell
|
33f06f5eff
|
Display unit value and description for variants in BPE
|
2013-12-06 15:57:37 +11:00 |
|
Will Marshall
|
63dfa0b696
|
Getting the test framework set up for Angular, setting up a products fetch stub
|
2013-12-06 15:24:42 +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
|
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 |
|