Rob Harrington
|
77e74c5642
|
OC Coordinators can opt to restrict products in an order cycle to those in their inventory only
|
2016-03-02 12:10:22 +11:00 |
|
Continuous Integration
|
ae945ace9d
|
Auto-merge from CI [skip ci]
|
2015-12-11 11:09:54 +11:00 |
|
Maikel Linke
|
cd7721a127
|
Using date and time of current timezone
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
|
2015-12-10 11:38:41 +11:00 |
|
Rohan Mitchell
|
243ef4ee16
|
When an outgoing exchange includes a variant that is not in an incoming exchange, remove it from the outgoing exchange
|
2015-12-10 09:17:25 +11:00 |
|
Rohan Mitchell
|
a2c0088c91
|
Do not show flash message if we're performing an async update without reload
|
2015-12-10 09:17:24 +11:00 |
|
Rob Harrington
|
a96cdd5ee7
|
Merge branch 'master' into line_item_naming
Conflicts:
app/views/admin/order_cycles/edit.html.haml
|
2015-11-13 09:54:26 +11:00 |
|
Rob Harrington
|
51762753f4
|
WIP: BOM Refactor, adding json route for OrderCyclesController#index, loading OCs based on show_more or specific order_close_at_gt
|
2015-11-05 14:04:29 +11:00 |
|
Rohan Mitchell
|
ecc3bad8c8
|
Merge branch 'master' into folklabs-producer-emails
|
2015-10-16 12:38:54 +11:00 |
|
Rohan Mitchell
|
d0b7a0795d
|
Fix 500 when bulk updating order cycles with no data
|
2015-07-10 09:42:09 +10:00 |
|
Rohan Mitchell
|
36584f0177
|
Remove puts from specs, fix failing controller spec
|
2015-04-29 14:46:20 +10:00 |
|
Rohan Mitchell
|
6b1c125b03
|
Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails
Conflicts:
Gemfile.lock
app/controllers/admin/order_cycles_controller.rb
app/views/admin/order_cycles/edit.html.haml
app/views/admin/order_cycles/show.rep
db/schema.rb
spec/controllers/admin/order_cycles_controller_spec.rb
|
2015-04-29 14:42:17 +10:00 |
|
Paul Mackay
|
0f1ec17698
|
#275: Use better path variable in test.
|
2015-04-28 16:08:26 +01:00 |
|
Paul Mackay
|
9103e83ce2
|
#275: spec test for controller method. Other small fixes.
|
2015-04-11 18:28:31 +01:00 |
|
Rob Harrington
|
60a3d8e0d1
|
Restrict bulk updating order cycles at controller level
|
2015-04-09 12:27:43 +10:00 |
|
Rohan Mitchell
|
a6f0d8f69a
|
Show a nice error message instead of 500 error when deleting a referenced order cycle
|
2015-03-16 12:42:35 +11:00 |
|
Rob Harrington
|
8de6f983a2
|
User must set the coordinator first when creating an order cycle
|
2015-02-27 17:24:36 +11:00 |
|