Pau Perez
5b1947429e
Fix odd-even background by relying on Spree
...
This removes unnecessary duplication of #destroy. We can make it work by
adding a simple fix in Spree.
2017-09-08 23:55:50 +10:00
Pau Perez
8db1fa4e77
Move JSON line items responses to a new controller
...
Extracts the JSON response from the admin's line item controller which
are only used by the bulk management feature into its own controller.
This decouples spree from an OFN-only feature and allows to remove
unnecessary code. Furthermore, Admin::LineItemsController is gone in
Spree 2.4.0.beta. See: https://github.com/spree/spree/pull/5280
2017-09-08 23:55:50 +10:00
Enrico Stano
d09e0cd44a
Deal with both JS and JSON format
2017-09-08 23:55:50 +10:00
Enrico Stano
d581fc4863
Fix specs to contemplate XHR requests and more coverage
2017-09-08 23:55:50 +10:00
enricostano
cf4bd8d755
WIP Preparing to get rid of MailMethod model
...
Please give a look at the following links:
- http://guides.spreecommerce.org/release_notes/spree_2_0_0.html#mailmethod-model-no-longer-exists
- https://github.com/spree/spree/pull/2643
2017-09-08 23:55:49 +10:00
Rohan Mitchell
0a8e8dfbbb
Add specs and fix line items HTML response
2017-09-08 23:55:49 +10:00
Rob Harrington
7c0feab08f
Fix #1526 : add descriptions for reports *before* they are filtered
2017-07-28 17:15:57 +10:00
Julius Pabrinkis
55b2c19b64
Extract translations from lib folder
2017-07-21 12:17:12 +10:00
Bing Xie
21ed37189a
Only search customers in user managed enterprises
2016-10-21 10:51:36 +11:00
Bing Xie
bc798504e0
Add new enterprise customers search API
2016-10-21 10:51:36 +11:00
Rob Harrington
4b5e33d5b0
Implementing new permissions for producers in reports_controller_spec
2015-12-17 14:21:30 +11:00
Continuous Integration
b7edf5e046
Auto-merge from CI [skip ci]
2015-12-16 10:58:03 +11:00
Rohan Mitchell
60e971ad63
Take variant overrides into account for price when admin adds line item to order
2015-12-11 13:06:57 +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
Rob Harrington
7e6b43266f
Making sure that price and final_weight_volume can be updated (by distributor or coordinator)
2015-11-25 14:23:55 +11:00
Rob Harrington
6268b7cc7e
Printing/sending an invoice uses the same template for generating a pdf
2015-11-18 10:02:51 +11:00
Rob Harrington
be8038e9d0
Merge branch 'master' into line_item_naming
...
Conflicts:
lib/open_food_network/order_cycle_management_report.rb
lib/open_food_network/packing_report.rb
2015-11-12 14:40:11 +11:00
Rohan Mitchell
81a6e07d5c
Admin can remove tax on an adjustment
2015-11-11 11:53:04 +11:00
Rohan Mitchell
83c0093665
Admin can include tax when creating an adjustment
2015-11-11 11:53:04 +11:00
Rob Harrington
6769c2c729
Can pass params for order or line items into LineItemsController#index
2015-11-05 17:07:47 +11:00
Rob Harrington
b43049af47
WIP: BOM Refactor, building line_item fetch and update logic with ngResource
2015-11-04 18:16:17 +11:00
Rob Harrington
f563f04f1c
WIP: BOM Refactor, building order fetch and update logic with ngResource, updating rails routes
2015-11-04 16:35:56 +11:00
Rob Harrington
ae7e744644
WIP: BOM Refactor, adding for_line_items action to enterprises controller
2015-11-04 15:02:29 +11:00
Rob Harrington
625e0888ea
Adding logic to Admin::BaseController to standardise rendering of data with AMS
2015-11-04 12:10:50 +11:00
Rob Harrington
ef08977dbe
Prevent invoices from being sent unless the distributor of an order has set their ABN
2015-10-21 16:23:48 +11:00
Rob Harrington
47fb2270bd
Making spec do the right thing
2015-10-16 17:25:40 +11:00
Rob Harrington
40d627cb34
Adding new route for printing an order to pdf
2015-10-16 17:25:40 +11:00
Rob Harrington
6e7fc6a0f7
Adding invoice action to orders controller, to allow sending of invoice email
2015-10-16 17:25:40 +11:00
Rohan Mitchell
9ffc97f8b6
Fix controller spec for extraction of report controller logic
2015-07-24 14:10:04 +10:00
Rob Harrington
1b52564d58
Rerouting welcome page to be an enterprise action, updates to copy for package selection
2015-06-12 01:49:38 +08:00
Rohan Mitchell
7486daa2a3
Merge branch 'master' into require_standard_variant
...
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
spec/lib/open_food_network/permissions_spec.rb
spec/lib/open_food_network/products_and_inventory_report_spec.rb
spec/models/enterprise_spec.rb
2015-05-28 15:08:13 +10:00
Rohan Mitchell
97e49c2bdb
Replace 'array.sort.should == expected.sort' pattern with match_array
2015-05-28 10:46:08 +10:00
Rob Harrington
e931f4b31f
Merge branch 'master' into require_standard_variant
2015-05-22 12:22:54 +10:00
Rob Harrington
fc55a000b8
Adding managed controller action which uses new order serializer to render json
2015-05-20 11:48:13 +10:00
Rohan Mitchell
1531c476e3
Merge branch 'master' into require_standard_variant
...
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
2015-05-08 13:45:31 +10:00
Rob Harrington
0d5ce5ff57
Fixing issues with reports controller spec
2015-05-07 12:50:57 +10:00
Maikel Linke
5efc0a5110
quick fix: update fees after updating order
2015-04-30 16:29:51 +10:00
Maikel Linke
a937fd3c61
Using variant overrides in variant seach on order edit page
2015-04-23 11:37:10 +10:00
Rob Harrington
b9f19d5777
Fixing broken specs
2015-04-17 13:00:20 +10:00
Rob Harrington
8ed6653dc4
Ignoring any new product properties submitted by a non-admin user
2015-04-02 08:55:20 +11:00
Rob Harrington
dcb24cf06c
Controller method to allow enterprise users to search for other users which share management of their enterprises
2015-02-12 11:34:58 +11:00
Rohan Mitchell
94d50f220f
Display an error message to admin when there are hubs in order cycles that are not ready for checkout
2014-10-31 12:22:02 +11:00
Rob Harrington
7113875a45
Adding welcome page to overview controller
2014-10-22 16:49:32 +11:00
Rob Harrington
3d938b3450
Shifting dashboard rendering from partials to templates
2014-10-22 12:30:07 +11:00
Rob Harrington
8bf472e970
Split dashboard into single and multiple enterprise views
2014-10-22 12:21:25 +11:00
Rafael Schouten
b821107c27
bugfix migration ad specs
2014-09-27 18:14:10 +10:00
Rohan Mitchell
b7708d750b
Check authorisation for bulk update products
2014-09-05 15:10:15 +10:00
Rob H
d80166e80d
Restrict access to show_provider_preferences action on payment methods controller
2014-08-08 17:47:50 +10:00
Rob H
f19af52556
WIP: angularised provider settings for payment method works on create (for admin only at this stage)
2014-08-08 17:47:50 +10:00
Rob H
f430267304
Specs for show_provider_preferences
2014-08-08 17:47:50 +10:00
