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
|
612e6aed2c
|
Include order cycle distributions in distributor choice when adding product to cart
|
2013-05-27 13:12:29 +10:00 |
|
Rohan Mitchell
|
0874f12797
|
Controllers provide current order cycle for product splitting
|
2013-04-05 14:30:11 +11:00 |
|
Rohan Mitchell
|
b3976bfbd0
|
Rename SplitProductsByDistributor to SplitProductsByDistribution
|
2013-04-05 11:08:19 +11:00 |
|
Rohan Mitchell
|
955f313abc
|
Remove require for queries_product_distribution
|
2013-03-08 16:59:47 +11:00 |
|
Rohan Mitchell
|
c9d1573049
|
Remove placeholder scopes, use new Enterprise.active_distributors scope for loading sidebar distributors
|
2013-03-08 16:56:58 +11:00 |
|
Rohan Mitchell
|
e326e590db
|
Implement and use scopes for finding products by distributor via order cycle or product distribution
|
2013-03-08 15:18:53 +11:00 |
|
Rohan Mitchell
|
265336b70c
|
When looking up distributors for sidebar, include both those in ProductDistributions and in OrderCycles
|
2013-03-08 15:18:53 +11:00 |
|
Rohan Mitchell
|
666f110d47
|
Load distributor list from those in an active order cycle
|
2013-03-08 15:17:23 +11:00 |
|
Rohan Mitchell
|
3aa44c3e9a
|
Setting a remote distributor clears the order cycle, and vice versa
|
2013-03-08 15:17:23 +11:00 |
|
Rohan Mitchell
|
e1b2490259
|
Selecting an order cycle highlights valid distributor choices
|
2013-03-08 15:17:23 +11:00 |
|
Rohan Mitchell
|
74e2b70d3a
|
Without JS, select distributor, highlighting local order cycle choices
|
2013-03-08 15:17:22 +11:00 |
|
Rohan Mitchell
|
34cb8bab26
|
View order cycle and distributor choices
|
2013-03-08 15:15:15 +11:00 |
|
Rob H
|
055c07a466
|
Add before_payment method to checkout controller (fixes issues with spree_paypal_express)
|
2013-02-20 14:04:10 +11:00 |
|
Rob H
|
c956706d78
|
Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test
|
2013-02-14 15:12:50 +11:00 |
|
Rob H
|
a3746c6c59
|
Add analytics helper to Enterprises Controller
|
2013-02-14 12:10:31 +11:00 |
|
Rob H
|
612017f143
|
WIP Upgrade to Spree 1.3
|
2013-02-05 15:01:45 +11:00 |
|
Rohan Mitchell
|
f2f3bbd3ed
|
Merge branch 'order-cycles-exchange-products'
Conflicts:
Gemfile.lock
|
2013-01-22 10:40:56 +11:00 |
|
Rohan Mitchell
|
83e3c6815d
|
Merge branch 'checkout-changes'
Conflicts:
.rvmrc
app/helpers/application_helper.rb
|
2013-01-22 10:30:51 +11:00 |
|
Rohan Mitchell
|
43a1cf7779
|
Merge branch 'product-quantity-fix'
|
2013-01-17 16:07:55 +11:00 |
|
Rohan Mitchell
|
4e78fa19a3
|
Add spec for updating order cycle, minor fixes
|
2013-01-10 15:29:13 +11:00 |
|
Rob H
|
8a37b4e918
|
Push validation logic for changing distributor down into lib class
|
2012-12-14 11:02:01 +11:00 |
|
Rob H
|
fc34c9c804
|
Add controller level check of product count_on_hand for adding products to cart
|
2012-12-13 11:16:46 +11:00 |
|
Rob H
|
46abc2fc42
|
Add ability to change distributor based on whether products in the cart are available
|
2012-12-07 11:56:40 +11:00 |
|
Rohan Mitchell
|
a0c40607ec
|
Bulk update order cycle opening/closing times
|
2012-12-02 15:43:05 +11:00 |
|
Rohan Mitchell
|
8e4b729351
|
Load correct order cycle, prep for saving order cycle
|
2012-12-02 13:53:35 +11:00 |
|
Rohan Mitchell
|
ba3a595af2
|
Output an order cycle in JSON
|
2012-11-30 15:43:46 +11:00 |
|
Rohan Mitchell
|
145fed09a1
|
Fixy
|
2012-11-29 11:54:22 +11:00 |
|
Rohan Mitchell
|
8736254f12
|
Create incoming exchanges on save
|
2012-11-29 11:52:34 +11:00 |
|
Rohan Mitchell
|
aacc36ea44
|
Create order cycle basic fields
|
2012-11-29 10:02:23 +11:00 |
|
Rob H
|
ef22168349
|
Move select_distributor and deselect_distributor actions from enterprises controller to orders controller
|
2012-11-28 10:54:11 +11:00 |
|
Rohan Mitchell
|
5103ce64ba
|
Output new order cycle as JSON
|
2012-11-27 10:51:22 +11:00 |
|
Rohan Mitchell
|
d5310452b6
|
Admin list order cycles
|
2012-11-27 10:13:12 +11:00 |
|
Rohan Mitchell
|
7a6d930706
|
Merge branch 'enterprise-fees'
|
2012-11-26 10:13:48 +11:00 |
|
Rohan Mitchell
|
5ae13d6156
|
Order all the fees
|
2012-11-23 17:21:46 +11:00 |
|
Rohan Mitchell
|
5e0a5654ff
|
Correctly index calculator fields. Adds ng-bind-html-unsafe-compiled.
|
2012-11-23 17:02:58 +11:00 |
|
Rohan Mitchell
|
2a645d04ae
|
Move presentation to presenter, display calculator fields
|
2012-11-22 14:37:38 +11:00 |
|
Rohan Mitchell
|
63ba5d13a3
|
Add representative, output enterprise fees as JSON
|
2012-11-21 14:58:29 +11:00 |
|
Rohan Mitchell
|
a4d10ab4e0
|
Create new enterprise fee, display errors when present
|
2012-11-21 09:47:51 +11:00 |
|
Rohan Mitchell
|
ff0d2bc983
|
Create EnterpriseSet as subclass of ModelSet
|
2012-11-21 09:08:41 +11:00 |
|
Rob H
|
0d99d9d18f
|
Don't display unit size in reports for products that are not group buy items
|
2012-11-16 17:00:57 +11:00 |
|
Rohan Mitchell
|
98143ffe5b
|
Add calculator to EnterpriseFee, test passes for listing enterprise fees
|
2012-11-16 16:07:40 +11:00 |
|
Rob H
|
32acba05a3
|
Fixed total row labels in bulk co-op allocation report.
|
2012-11-16 15:28:06 +11:00 |
|
Rohan Mitchell
|
6247bd2541
|
Display admin table of enterprise fees with enterprise, fee type and name columns
|
2012-11-15 15:03:12 +11:00 |
|
Rohan Mitchell
|
03764881c8
|
Generalise EnterpriseSet to ModelSet
|
2012-11-15 14:29:38 +11:00 |
|
Rob H
|
9cb5ac95ff
|
More brackets make everything even better
|
2012-11-11 15:30:01 +11:00 |
|
Rohan Mitchell
|
076c64f7b0
|
Brackets make everything better
|
2012-11-10 12:53:03 +11:00 |
|
Rohan Mitchell
|
9a9bef5304
|
Report filtering on completion date, not creation date
|
2012-11-09 20:31:08 +11:00 |
|
Rob H
|
a15f96aa68
|
Fix for case where no group_buy_size_has been set. ie. = nil
|
2012-11-07 18:34:54 +11:00 |
|
Rob H
|
5f07df9316
|
Add calculation fields to bulk co-op and order cycle reports
|
2012-11-03 11:36:17 +11:00 |
|