luisramos0
c652cfe4d5
Merge branch 'master' into 2-0-stable-Feb12
2019-02-12 16:03:33 +00:00
luisramos0
ad0e5bb093
Re implement orders ctrl update method so we can change redirection logic and add specs for it
2019-02-10 15:31:01 +00:00
Kristina Lim
c81be75530
Move engine libraries except Engine and Version to services
2019-02-08 21:26:38 +00:00
Kristina Lim
3f84d0008a
Move some in OpenFoodNetwork to engine services
...
This removes the OpenFoodNetwork namespace from these too.
2019-02-08 21:26:38 +00:00
Kristina Lim
95e3a2f45d
Move authorization to the ::Parameters class
2019-02-08 21:26:38 +00:00
Kristina Lim
9e035efd50
Render enterprise fee report directly in renderer
2019-02-08 21:26:38 +00:00
Kristina Lim
c8b154b12a
Separate enterprise fee summary action
...
Split the previous "index" action into "new" and "create" actions.
2019-02-08 21:26:38 +00:00
Kristina Lim
c0e6b70131
Rename EnterpriseFeeSummaryReportController
...
Remove "Report" because this is redundant, and pluralize the resource
name.
2019-02-08 21:26:38 +00:00
Kristina Lim
552bf1b9f7
Move report list to own class
2019-02-08 21:26:38 +00:00
Kristina Lim
edf0b0df76
Add navigation item for enterprise fee summary
2019-02-08 21:26:37 +00:00
Kristina Lim
d3e9a53120
Filter enterprise fee summary for user permissions
2019-02-08 21:26:37 +00:00
Kristina Lim
f81f4b7e4a
Authorize filters before generating enterprise fee report
2019-02-08 21:26:37 +00:00
Kristina Lim
cd3e258b59
Rename report authorizers to reflect permissions
2019-02-08 21:26:37 +00:00
Kristina Lim
7d74ddc85b
Add HTML view for enterprise fee summary report
2019-02-08 21:26:37 +00:00
Kristina Lim
34dc16f8c9
Base filter options from initial authorizer object
2019-02-08 21:26:37 +00:00
Kristina Lim
bd2b4c0134
Add enterprise fee summary form without options
...
The objects will be filled in another commit. This simply sets up the
filters UI for now.
2019-02-08 21:26:37 +00:00
Kristina Lim
ec81e4221f
Add basic action for enterprise fee summary
2019-02-08 21:26:37 +00:00
Matt-Yorkley
2c3eeec2b9
Update cancan permissions for second iteration of bulk invoices
2019-02-06 18:19:53 +00:00
luisramos0
729feb16f1
Merge branch 'master' into 2-0-stable-jan-29th
2019-01-29 12:38:34 +00:00
Matt-Yorkley
66ac61f591
Rename background processing method
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4f9f8adcd6
Add Service and remove Job
2019-01-10 09:57:06 +00:00
Matt-Yorkley
638dc6eada
Add polling and show action
2019-01-10 09:57:06 +00:00
Matt-Yorkley
b0f75162ac
Add delayed job for create bulk invoice
2019-01-10 09:57:06 +00:00
Matt-Yorkley
7d82020657
Move bulk invoice to new RESTful route
2019-01-10 09:57:06 +00:00
Matt-Yorkley
5279210254
Improve invoice order querying
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4ec0f0ff73
Add bulk invoices printing
2019-01-10 09:57:06 +00:00
Matt-Yorkley
96d530b473
Tidy up invoice template selection
2019-01-10 09:57:06 +00:00
Maikel
f0d3992511
Merge pull request #3203 from luisramos0/2-0-fix-prod-images-delete
...
[Spree Upgrade] Fix product properties and images deletion
2018-12-14 11:54:05 +11:00
luisramos0
47be452ca0
Make ProductsController#create and #update work by not mass-assigning the provided on_hand and on_demand values and set them in product variant after the product is created
2018-12-12 12:10:29 +00:00
luisramos0
b5379a204b
Fix deletion of product images
2018-12-11 15:10:26 +00:00
luisramos0
fcdb5cd7af
Merge branch 'master' into 2-0-stable-nov-8th
2018-11-08 11:18:54 +00:00
Matt-Yorkley
443515dae4
Improve comment in index action
2018-10-29 10:34:05 +00:00
Matt-Yorkley
334eebeab1
Move json to API and strip index action
2018-10-26 21:38:57 +01:00
Matt-Yorkley
77251848ee
Refactor Spree::Admin::OrdersController
2018-10-26 21:38:57 +01:00
luisramos0
90d7b7f4a0
Merge branch 'master' into 2-0-stable-oct-25
2018-10-25 14:28:58 +01:00
Matt-Yorkley
42c1584e6f
Fix pagination conflict with LineItemsCtrl requests
2018-10-22 18:13:56 +01:00
luisramos0
653c67971f
Remove order admin page filter 'show only unfulfilled orders' as done on spree 2
2018-10-20 15:11:47 +01:00
luisramos0
87cd73ddba
Merge branch 'master' into 2-0-stable-oct
2018-10-15 17:09:26 +01:00
Matt-Yorkley
dafcd0ddc2
Add per_page controls to admin orders index
2018-10-10 18:32:12 +01:00
Pau Pérez Fabregat
58a99a7f89
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
...
Angularise orders page
2018-10-04 21:10:48 +02:00
Pau Pérez Fabregat
20077c99b5
Merge pull request #2618 from coopdevs/enable-style-send-cop
...
Favor #public_send over #send using Rubocop's cop
2018-09-20 19:03:40 +02:00
luisramos0
57bb1fec9a
Adapt ShippingMethodsController to keep disallowing delete of shipping_methods associated with orders. Added controller tests to verify behaviour
2018-09-19 16:21:12 +01:00
Matt-Yorkley
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00
Matt-Yorkley
e577bcb46f
Prepare angular controller and serialized data
2018-09-17 14:18:23 +01:00
luisramos0
238d2f4feb
Removed unnecessary code copied and replaced with call to identical super class
2018-09-14 22:20:21 +01:00
Maikel
beedd933e9
Merge pull request #2512 from kristinalim/feature-remove_enterprise_images
...
Support removal of enterprise logo and promo image
2018-09-14 15:07:24 +10:00
Maikel Linke
a447fe4f40
Require lib file where needed
...
We can't always rely on other parts of the code been loaded first. We
need to declare dependencies so that they are always present.
I just ran into this problem in my dev environment.
2018-09-13 12:01:16 +10:00
Pau Perez
b23cb55525
Fix current violations of Style/Send cop
2018-09-05 12:05:05 +02:00
Kristina Lim
01d4b8fb10
Allow custom resource permission for admin controllers
2018-09-04 01:18:48 +08:00
