Rohan Mitchell
|
b8d0e3f49a
|
OrderPopulator decorator checks cart contents against order cycle as well as distributor
|
2013-06-20 15:13:59 +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
|
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
|
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
|
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
|
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 |
|
David Cook
|
203232de27
|
Disable as this has now been incorporated into move_save_checkout_button
|
2013-06-13 12:30:35 +10:00 |
|
David Cook
|
aa468140ac
|
Move save/process button to side on checkout pages
|
2013-06-13 12:29:34 +10:00 |
|
Rohan Mitchell
|
5e120b35aa
|
Ensure orders controller decorator is loaded, fixes home controller test failures
|
2013-06-13 07:57:03 +10:00 |
|
David Cook
|
30253ffd07
|
align actions column left for better usability
|
2013-06-12 15:51:07 +10:00 |
|
David Cook
|
017275f40e
|
fix error when order has no payments (ie not yet complete)
|
2013-06-12 15:40:36 +10:00 |
|
David Cook
|
ea3922a023
|
filter out cancelled orders from the reports
|
2013-06-12 15:19:14 +10:00 |
|
David Cook
|
cf4582c08e
|
Create respond_override to return user back to the referring page. (But it breaks payments#create respond_with..)
|
2013-06-12 11:24:49 +10:00 |
|
David Cook
|
2b15f92ab8
|
fix capture button to link to latest payment
|
2013-06-12 09:58:44 +10:00 |
|
David Cook
|
ada95183a2
|
Start respond_override
|
2013-06-11 17:09:41 +10:00 |
|
David Cook
|
df769a2f4c
|
ensure latest 'payment' object is used for the capture button
|
2013-06-11 16:57:14 +10:00 |
|
David Cook
|
4967093b72
|
Add capture button and resize columns
|
2013-06-11 15:07:41 +10:00 |
|
Rohan Mitchell
|
1e94f88c5e
|
Ensure order decorator is required, fix test fragility
|
2013-06-07 15:40:03 +10:00 |
|
Rohan Mitchell
|
4bcae29553
|
Add specs for OrderPopulator#check_distribution_provided_for and distribution_provided_for
|
2013-06-05 15:50:20 +10:00 |
|
Rohan Mitchell
|
f4df69765d
|
Add spec for OrderPopulator#distributor_can_supply_products_in_cart
|
2013-06-05 15:09:11 +10:00 |
|
Rohan Mitchell
|
fb4f533976
|
Refactor OrderPopulator, add outside level spec
|
2013-06-05 14:44:57 +10:00 |
|
Rohan Mitchell
|
98f3197c08
|
WIP Move orders#populate logic to OrderPopulator class
|
2013-06-05 11:47:47 +10:00 |
|
Rohan Mitchell
|
f91e1144e0
|
Name blank order cycle option
|
2013-06-04 11:11:13 +10:00 |
|
Rohan Mitchell
|
661ce4e597
|
Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products
|
2013-06-04 10:26:13 +10:00 |
|
Rohan Mitchell
|
cb703c2a66
|
Do not give order cycle choice when there is only one option
|
2013-05-28 16:35:39 +10:00 |
|
Rohan Mitchell
|
54fe63e7f3
|
User can add subsequent order cycles product to cart, show order cycle selection in page header along with distributor
|
2013-05-28 16:20:58 +10:00 |
|
Rohan Mitchell
|
1f9f5efb79
|
Add first product to cart with order cycle choice
|
2013-05-28 14:06:52 +10:00 |
|
Rohan Mitchell
|
9ef7da1339
|
Add OrderCycle#distributed_variants
|
2013-05-28 14:01:04 +10:00 |
|
Rohan Mitchell
|
3bedfc3d1d
|
Add OrderCycle distributing_product scope
|
2013-05-28 13:27:52 +10:00 |
|
Rohan Mitchell
|
1b25364160
|
Cherry-pick c3b2f52: Cache DistributorChangeValidator#all_available_distributors, move Enterprise#available_variants into SQLland - massive render speed improvement
Conflicts:
app/models/enterprise.rb
lib/open_food_web/distribution_change_validator.rb
|
2013-05-28 13:01:07 +10:00 |
|
Rohan Mitchell
|
0e08829a29
|
Rename DistributorChangeValidator to DistributionChangeValidator in preparation for expansion to include order cycles
|
2013-05-28 12:32:52 +10:00 |
|
Rohan Mitchell
|
02561ee252
|
With order cycle distribution, show error message when adding a product to cart with no distribution chosen
|
2013-05-28 11:54:46 +10:00 |
|
Rohan Mitchell
|
a2abcaf7bd
|
Push product_compatible_with_current_order and available_distributors_for down to DistributorChangeValidator, add tests
|
2013-05-27 13:50:33 +10:00 |
|
Rohan Mitchell
|
612e6aed2c
|
Include order cycle distributions in distributor choice when adding product to cart
|
2013-05-27 13:12:29 +10:00 |
|
Rohan Mitchell
|
e3a419993c
|
Work around order cycles not having fees / shipping methods yet - notify bugsnag and provide an undefined shipping method
|
2013-05-27 13:00:12 +10:00 |
|
Rohan Mitchell
|
796be2ee6d
|
Refactor add to cart form into partials and helpers
|
2013-05-27 11:25:09 +10:00 |
|
David Cook
|
0f8cd4705a
|
Regenerate favicon.ico from higher quality image
|
2013-05-24 10:14:40 +10:00 |
|
David Cook
|
731cf33f86
|
Add new favicon.ico file with size 16, 32 and 64
|
2013-05-22 16:21:13 +10:00 |
|
David Cook
|
423bd52fd6
|
rename _count vars to _total
|
2013-05-22 14:03:51 +10:00 |
|
vagrant
|
4e7f966429
|
add suppliers scope, limit by 5, test
|
2013-05-22 13:07:30 +10:00 |
|
Rohan Mitchell
|
c3b2f52b7a
|
Cache DistributorChangeValidator#all_available_distributors, move Enterprise#available_variants into SQLland - massive render speed improvement
|
2013-05-20 21:16:43 +10:00 |
|