Julius Pabrinkis
8b2b51d511
Fix code style for Rubocop
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
ba0b17e168
Extract translations from controllers
2017-07-21 12:17:12 +10:00
Pau Perez
cee24dcca7
Use indented style for multiline method calls
...
This enables the Rubocop's Style/MultilineMethodCallIndentation cop with
indentend enforced style. Which makes you split multiline method calls like:
orders = Spree::Order
.an_scope
.another_scope
.where(id: list_of_ids)
It also autofixes the current violations and updates the
rubocop_todo.yml
2017-07-12 10:40:53 +02:00
Rob Harrington
fc5b339e2a
Rubocop: Correct Lint/DuplicateMethods offences
2017-06-23 16:49:08 +10:00
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
Rob Harrington
d01da727f0
Removing :bulk_update action from actions allowed on nil object, using collection_actions methods on controller instead
2016-01-15 09:07:49 +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
Rohan Mitchell
29bfac5f54
Order cycle interface may update or update and close
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
3d36ebe2e6
Some Ransack trickery to get OrderCycles#index to load only recent OR undated OCs when no orders_close_at predicate is passed in
2015-11-12 18:29:19 +11:00
Rob Harrington
4e4de65cba
Fetch undated order cycles by default for index actions
2015-11-12 12:08:39 +11:00
Rob Harrington
095466cb43
Fixing syntax error for new method for OCs controller
2015-11-12 10:34:09 +11:00
Rob Harrington
eb7b2e7a3b
Use ams_prefix not ams_suffix!
2015-11-05 17:17:45 +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
4279742de5
Avoid serialising entire order cycle when enqueuing OrderCycleNotificationJob
2015-04-29 15:21:05 +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
9103e83ce2
#275 : spec test for controller method. Other small fixes.
2015-04-11 18:28:31 +01:00
Rob Harrington
b24cad7aeb
Providing access to order_cycle_permissions in order cycles controller
2015-04-11 23:25:30 +10:00
Paul Mackay
99709b53ed
Change controller action to 'notify_producers'.
...
Add flash message on completion.
Simplify job variables.
Improve mailer query.
Spec for job.
2015-04-11 13:19:48 +01:00
Rob Harrington
60a3d8e0d1
Restrict bulk updating order cycles at controller level
2015-04-09 12:27:43 +10:00
Rob Harrington
32cc17745a
Non-coordinating user cannot alter important attributes of order cycle
2015-04-08 14:12:49 +10:00
Rob Harrington
f5bacf71b7
Permissions for OrderCycleFormApplicator are determined internally
2015-03-27 16:16:13 +11:00
Rob Harrington
43d2eb4d22
Adding 'new' method to admin order cycle service, for loading data from serializer for new OCs
2015-03-27 16:16:12 +11:00
Rob Harrington
193a061c44
Order cycle form applicator only updates visible variants, should add an 'editable variants' scope to permissions
2015-03-27 16:16:11 +11:00
Rob Harrington
d115ef5f7e
Scoping old generalised order cycle helper methods to a specific order cycle
2015-03-27 16:16:10 +11:00
Rob Harrington
c9f343f680
Swapping over scoping method for displayed enterprises in OC index page from order_cycle_enterprises to enterprises_for(order_cycle)
2015-03-27 16:15:28 +11:00
Rob Harrington
e9f2e743ce
Replacing old representative template for OCs with active model serializers
2015-03-27 16:07:38 +11:00
Rob Harrington
a9c7e4b716
Order cycles index shows all OrderCycles I am involved in
2015-03-27 15:56:06 +11: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
Victor Nava
208fa02ec0
Create a 'Show More' button at the top of the page, next to New Order on on admin order cycles index page
2015-03-11 13:14:45 +11:00
Victor Nava
2c89573441
Shave off a few seconds when showing order_cycles#index by loading order_cycle_enterprises only once.
2015-03-11 11:59:25 +11:00
Victor Nava
1b709a3e03
Do not load Order Cycles that closed more than a month a go
2015-03-05 16:04:36 +11:00
Rob Harrington
c91699a11e
Using @order_cycle.coordinator instead of @coordinator
2015-02-27 17:24:37 +11:00
Rob Harrington
5563d23beb
Rename set_coordinator method to require_coordinator
2015-02-27 17:24:36 +11:00
Rob Harrington
8de6f983a2
User must set the coordinator first when creating an order cycle
2015-02-27 17:24:36 +11:00
Paul Mackay
67b17de695
#275 : Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback.
2014-12-30 11:33:13 +00:00
Paul Mackay
8d5a0aea9f
Setup daemon and delayed job table.
2014-11-24 21:25:58 +00:00
Paul Mackay
05437e2a56
#275 : start on producer email.
2014-11-09 11:17:46 +00:00
Rohan Mitchell
913c167fdf
Revert 5ede8d1, reinstating a4be0ff..7b89e6a
2014-09-05 15:10:12 +10:00
Rob H
5ede8d169f
Revert a4be0ff..7b89e6a for deployment
2014-08-28 14:32:57 +10:00
Rohan Mitchell
a5debc19dc
Permit edits to exchanges involving enterprises permitted via E2E relationships
2014-08-28 10:09:50 +10:00
Rohan Mitchell
8548a1a67e
Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class
2014-08-28 10:09:50 +10:00
Rohan Mitchell
9b15c213d1
When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges
2014-05-23 11:28:00 +10:00
Rohan Mitchell
124b6df75d
Show undated order cycles on index page
2013-12-13 14:51:43 +11:00
Rohan Mitchell
94c33e5f45
Colour order cycle rows based on their status
2013-11-22 11:31:04 +11:00
Rohan Mitchell
89f93cae77
Rename namespaced includes from open_food_web to open_food_network
2013-10-18 17:43:18 +11:00
Rohan Mitchell
57f7d489ff
Rename OpenFoodWeb namespace to OpenFoodNetwork
2013-10-18 17:29:55 +11:00
Rohan Mitchell
8a092697ee
Enterprise manager can clone an order cycle
2013-08-22 17:11:53 +10:00
