raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,694 Commits 20 Branches 451 Tags
bfeb63c8d7f84799ba64dd2dfb60cd0f67907c96
Commit Graph

783 Commits

Author SHA1 Message Date
Rohan Mitchell
604360034b Make filter method private 2015-06-10 17:04:09 +10:00
Maikel Linke
7461009c3b Merge branch 'handle-invalid-referer-urls' into combined/xero-report_analytics-bugfixes 2015-06-05 14:23:58 +10:00
Maikel Linke
ffa960b02e Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor 2015-06-05 13:48:24 +10:00
Maikel Linke
e35b39c7cf Handle invalid referer URLs 
Rescues URI::InvalidURIError of URL(request.referer).
 2015-06-05 12:43:49 +10:00
Rob Harrington
e93736b123 Ordering managed orders by id to fix spec 2015-06-03 18:16:07 +08:00
Rob Harrington
439d122e93 Merge branch 'master' into customers 
Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	db/schema.rb
	spec/javascripts/unit/bulk_order_management_spec.js.coffee
 2015-06-03 15:19:40 +08:00
Rohan Mitchell
22230294ab Merge branch 'master' into optimise-shopfront 2015-06-03 10:07:42 +10:00
Rohan Mitchell
e5b3736e86 Merge branch 'single-order-patches' into combined/single-order-patches-and-bulk-product-edit 2015-05-29 14:36:51 +10:00
Continuous Integration
c14de4e97f Auto-merge from CI [skip ci] 2015-05-29 14:29:23 +10:00
Continuous Integration
dccc9fb479 Auto-merge from CI [skip ci] 2015-05-29 12:44:44 +10:00
Rohan Mitchell
4ce9ea05f0 Merge branch 'master' into require_standard_variant 2015-05-29 10:12:14 +10:00
Maikel Linke
ff2eed7760 Using permalink in URLs pointing to groups 2015-05-28 11:27:40 +10:00
Rohan Mitchell
704955a185 Load active distributors where they're needed rather than in most controllers 2015-05-27 15:44:01 +10:00
Rohan Mitchell
c5f00d87bd When loading products for shopfront, load all master variants in one go 2015-05-27 15:44:01 +10:00
Rohan Mitchell
99cb09c6f7 When loading products for shopfront, load all variants in one go 2015-05-27 15:44:01 +10:00
Maikel Linke
28dae3c6c6 Enterprises cannot add themselves to Groups 2015-05-22 15:23:59 +10:00
Rob Harrington
e931f4b31f Merge branch 'master' into require_standard_variant 2015-05-22 12:22:54 +10:00
Maikel Linke
9c884b31a3 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches 2015-05-21 18:01:16 +10:00
Maikel Linke
f017197221 orders list: filter by distributor and order cycle 2015-05-21 18:00:14 +10:00
Rob Harrington
903ed7e507 Merge branch 'master' into variable_weights 
Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	app/views/spree/api/line_items/bulk_show.v1.rabl
	spec/features/admin/bulk_order_management_spec.rb
 2015-05-21 17:31:33 +10:00
Rob Harrington
1aca4657d9 Oops, switch managed_products to editable_products for Api::ProductsController 2015-05-20 20:59:06 +10:00
Rob Harrington
0ad2978926 Removing old managed route from api orders controller and switching BOM over to use new controller action 2015-05-20 11:48:48 +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
Rob Harrington
312a6299a8 Making where clause unambiguous 2015-05-15 21:19:16 +10:00
Rohan Mitchell
a467d3c379 Add filtering to xero invoices report - order date range, hub and order cycle 2015-05-15 16:20:56 +10:00
Rohan Mitchell
3d4a0f8407 Xero invoices report: Preserve form fields on submit, do not show rows with no cost 2015-05-15 15:27:46 +10:00
Rohan Mitchell
c5b618b1f4 Admin can customise some fields on Xero invoices report 
Add require for xero invoices report spec
 2015-05-15 12:35:14 +10:00
Rohan Mitchell
0a2f2e0fba Output summary data without customisation 
Add route for xero invoices report

Add require for reports controller decorator
 2015-05-15 12:35:05 +10:00
Rob Harrington
734ad21e82 Customers controller responds with json 2015-05-13 12:44:35 +10:00
Rob Harrington
220f42fcf2 Customers controller serializes data for json requests, just renders view without data for html 2015-05-13 12:44:32 +10:00
Rob Harrington
37ff61d663 Adding basic routing to display customer index page 2015-05-13 12:44:32 +10:00
Lynne Davis
662c7fe368 Removing notes to myself from this file 2015-05-09 19:10:55 +01:00
Lynne Davis
f7ade48e86 Update DB schema to store updatable weight on items sold 2015-05-09 19:10:55 +01:00
Continuous Integration
3d0880857a Auto-merge from CI [skip ci] 2015-05-08 16:24:39 +10:00
Continuous Integration
df14c10608 Auto-merge from CI [skip ci] 2015-05-08 13:45:56 +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
f88fdac710 Adding module - doh! 2015-05-07 12:50:56 +10:00
Rob Harrington
a7019e7e78 Adding permissions method for order report enterprises 2015-05-07 12:50:56 +10:00
Rob Harrington
bd66091d75 Push logic for checking of user super admin status down into private method 2015-05-07 12:50:56 +10:00
Rob Harrington
7ffe0f042e Moving accessible_by scope on Enterprise to permissions 2015-05-07 12:50:55 +10:00
Rob Harrington
f79fba52be Hiding personal details of customers, where the user does not manage the distributor of the order or the coordinator of the order cycle 2015-05-07 12:50:55 +10:00
Rob Harrington
4259b466f5 Using new order and line item permissions to fetch items to display in Orders and Fullfillment reports 2015-05-07 12:50:55 +10:00
Rob Harrington
28bf7037db Updating methods for retrieving allowed producers, distributors and order cycles for order and fulfillment reports 2015-05-07 12:50:55 +10:00
Rob Harrington
9ab16d8cec Allowing calls to Api::OrderCyclesController#accessible to specify :as => 'distributor' or 'producer' 2015-05-07 12:50:54 +10:00
Rohan Mitchell
d9404d3332 Merge branch 'master' into single-order-patches 2015-05-06 17:29:23 +10:00
Rob Harrington
8788322492 Alllowing payments in payment reports to access soft-deleted payment methods 2015-05-06 11:10:50 +10:00
Rohan Mitchell
03ae740cd6 Revert "Display header for Xero invoices report" 
This reverts commit a6cecdcc25.
 2015-05-01 14:55:26 +10:00
Maikel Linke
7c55285708 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches 2015-05-01 14:50:51 +10:00
Maikel Linke
e6e063670c Allow managers to remove line items from order 
Managers of an order cycle and the distributor of an order are allowed to
remove a line item from the order.
 2015-05-01 14:49:34 +10:00
Rohan Mitchell
153604dd64 Merge branch 'single-order-patches' 2015-05-01 14:39:17 +10:00