David Cook
|
7341d5e11a
|
ignore Sublime project files
|
2013-07-05 16:24:37 +10:00 |
|
David Cook
|
8df0f30b4f
|
Move override into .deface format, and removed unecessary bits
|
2013-07-05 16:08:26 +10:00 |
|
David Cook
|
50b5d13e1f
|
Add javascript to hide new save button if not supported (not yet tested on old browsers)
|
2013-06-28 17:53:39 +10:00 |
|
David Cook
|
5b58351b73
|
minor changes
|
2013-06-28 17:04:58 +10:00 |
|
David Cook
|
3007549aa5
|
use .length instead of .count which produced unexpected results
|
2013-06-28 17:02:26 +10:00 |
|
Rohan Mitchell
|
3de52b10b2
|
Fix JS error: Unknown provider: a from order_cycle
|
2013-06-25 12:31:28 +10:00 |
|
Rohan Mitchell
|
ce2c6c5661
|
Fix uninjected directive for enterprise fees
|
2013-06-25 12:17:15 +10:00 |
|
Rohan Mitchell
|
b7a778b0de
|
Define order cycles JS methods in a minification-friendly manner
|
2013-06-25 10:58:12 +10:00 |
|
Rohan Mitchell
|
f78db2493f
|
Define enterprise fees controller in a minification-safe manner
|
2013-06-25 10:35:45 +10:00 |
|
Rohan Mitchell
|
2373601e9d
|
Switch to Karma for angluar testing
|
2013-06-25 10:35:17 +10:00 |
|
Rohan Mitchell
|
37a4ad3372
|
Don't 500 when setting cart order cycle to nil
|
2013-06-21 17:04:47 +10:00 |
|
David Cook
|
a63b8908bb
|
Moved inline style to stylesheet
|
2013-06-21 16:12:56 +10:00 |
|
David Cook
|
0525abb084
|
Test that scopes don't return deleted products
|
2013-06-21 15:53:12 +10:00 |
|
David Cook
|
250e76c281
|
Fix incorrect count of enterprises (due to bug in rails issue #5554)
|
2013-06-21 15:10:21 +10:00 |
|
Rohan Mitchell
|
ae43fd1333
|
Set distributor and order cycle in one step, avoiding validation errors. Update spec with new error messages.
|
2013-06-21 11:36:24 +10:00 |
|
Rohan Mitchell
|
72f1c52b3e
|
Update Order model distribution validation - make fully inclusive of order cycles
|
2013-06-21 11:35:42 +10:00 |
|
Rohan Mitchell
|
bc40b2c856
|
Test each distinct distributor/order cycle invalid combination case
|
2013-06-21 11:06:21 +10:00 |
|
David Cook
|
7121860416
|
new view to display all distributors
|
2013-06-21 10:53:24 +10:00 |
|
David Cook
|
2e6387ac60
|
test available_on for distributors
|
2013-06-21 10:52:15 +10:00 |
|
David Cook
|
38c0552362
|
test 'more' count
|
2013-06-21 10:47:04 +10:00 |
|
David Cook
|
2d64e257ff
|
break long lines into two; no functional change
|
2013-06-21 10:45:11 +10:00 |
|
David Cook
|
d95903a82d
|
add html output format for all distributors
|
2013-06-21 10:44:16 +10:00 |
|
David Cook
|
b0e4bef75e
|
rename sidebar collection variables to avoid clash, fix count to be distinct
|
2013-06-21 10:42:42 +10:00 |
|
Rohan Mitchell
|
3386da4b4c
|
Validate distribution combination for new products added to cart
|
2013-06-21 10:39:08 +10:00 |
|
Rohan Mitchell
|
cfcc8c3fb2
|
Fix DistributionChangeValidator#variants_available_for_distribution: Do not show products distributed through a different order cycle
|
2013-06-21 10:34:39 +10:00 |
|
Rohan Mitchell
|
69019859da
|
Refactor views
|
2013-06-20 15:14:23 +10:00 |
|
Rohan Mitchell
|
b8d0e3f49a
|
OrderPopulator decorator checks cart contents against order cycle as well as distributor
|
2013-06-20 15:13:59 +10:00 |
|
David Cook
|
98be44b301
|
Disable asset debug logging
|
2013-06-20 11:50:34 +10:00 |
|
David Cook
|
4e2549d347
|
Add host setting, required for authenticating local DBs
|
2013-06-20 11:49:36 +10:00 |
|
David Cook
|
65af89c962
|
ignore new rvm files
|
2013-06-20 11:48:22 +10:00 |
|
Rohan Mitchell
|
12fb43e268
|
DistributionChangeValidator returns an empty array when distributor and order cycle are both nil
|
2013-06-17 16:01:10 +10:00 |
|
Rohan Mitchell
|
1d977de328
|
Order validation performed over both product distribution and order cycle distribution
|
2013-06-17 15:06:41 +10:00 |
|
Rohan Mitchell
|
705af41684
|
DistributionChangeValidator finds variants distributed by product distribution when order cycle is nil
|
2013-06-17 15:06:20 +10:00 |
|
Rohan Mitchell
|
be29974dd8
|
DistributionChangeValidator checks if an order can change to a specified new distributION
|
2013-06-17 15:00:19 +10:00 |
|
Rohan Mitchell
|
27b5dc071a
|
Order cycle reports on the variants distributed by a particular distributor
|
2013-06-17 14:58:13 +10:00 |
|
Rohan Mitchell
|
17103a8b0c
|
Remove DistributionChangeValidator#can_change_distributor? method
|
2013-06-17 14:00:39 +10:00 |
|
Rohan Mitchell
|
da02cb5a93
|
Reorder specs
|
2013-06-17 12:05:46 +10:00 |
|
Rohan Mitchell
|
a355a09a7c
|
Disable distributor change in checkout until it takes order cycles into account
|
2013-06-17 11:45:23 +10:00 |
|
Rohan Mitchell
|
b5479380b6
|
Refactor alternative distributors at checkout form, fixing indentation and removed double negatives
|
2013-06-17 11:41:35 +10:00 |
|
Rohan Mitchell
|
6d22f56c86
|
Distribution selection form is not shown when there are products in the cart.
This form doesn't filter options based on which can supply the products in the cart,
so don't show it in those circumstances.
|
2013-06-17 11:29:36 +10:00 |
|
Rohan Mitchell
|
95de78f24e
|
Tidy-ups
|
2013-06-17 10:03:00 +10:00 |
|
Rohan Mitchell
|
bfe8184b6a
|
Reload order before setting variant attributes, fixes group buy
|
2013-06-17 10:02:49 +10:00 |
|
David Cook
|
1a9fd4a9a8
|
Merge branch 'supplied-active-products-on-hand' of github.com:eaterprises/openfoodweb into supplied-active-products-on-hand
|
2013-06-14 17:40:12 +10:00 |
|
David Cook
|
7933dea611
|
WIP: add more tests
|
2013-06-14 17:38:51 +10:00 |
|
David Cook
|
7ce7107c6c
|
Add meaningfull ids and classnames
|
2013-06-14 17:37:44 +10:00 |
|
David Cook
|
1abc0dac68
|
rename vars again
|
2013-06-14 17:36:38 +10:00 |
|
Rohan Mitchell
|
065ea6a1a1
|
Remove controller specs that are now covered by OrderPopulator
|
2013-06-14 14:57:31 +10:00 |
|
Rohan Mitchell
|
4e5f0b9963
|
Set potential distributor and order cycle before attempting add to cart, revert on failure
|
2013-06-14 14:57:08 +10:00 |
|
Rohan Mitchell
|
772d01abf7
|
Merge branch 'favicon'
|
2013-06-14 12:22:51 +10:00 |
|
Rohan Mitchell
|
063d760047
|
Merge branch 'master' into supplied-active-products-on-hand
|
2013-06-14 11:07:24 +10:00 |
|