raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,539 Commits 21 Branches 450 Tags
cb2adea59f4db437edbe40cc5167682f45cbd405
Commit Graph

5539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
cb2adea59f Remove executable bit from a migration file 2015-06-03 10:16:29 +10:00
Rohan Mitchell
952353da8c Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit 
Conflicts:
	spec/features/admin/bulk_product_update_spec.rb
 2015-05-29 15:08:30 +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
Rohan Mitchell
835b56b222 Attempt to fix intermittent failures in spec/features/consumer/authentication_spec.rb 2015-05-29 09:44:57 +10: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
Maikel Linke
bf9addfa42 Merge branch 'group-custom-url' into group-pages 2015-05-28 13:27:48 +10:00
Maikel Linke
ff2eed7760 Using permalink in URLs pointing to groups 2015-05-28 11:27:40 +10:00
Maikel Linke
e4f93863fd Finding unique permalink before validation. 2015-05-28 11:27:40 +10:00
Maikel Linke
aef128f2c9 permalink editable 2015-05-28 11:27:40 +10:00
Maikel Linke
19448a182e Add permalink field to enterprise groups 2015-05-28 11:27:39 +10:00
Continuous Integration
a01a53caea Auto-merge from CI [skip ci] 2015-05-28 11:05:07 +10:00
Rohan Mitchell
7f43dbf9bb Fix further intermittent failures in permissions spec 2015-05-28 10:58:12 +10:00
Rohan Mitchell
97e49c2bdb Replace 'array.sort.should == expected.sort' pattern with match_array 2015-05-28 10:46:08 +10:00
Rohan Mitchell
ccf1e2951c Fix intermittent failure in permissions spec 2015-05-28 10:45:47 +10:00
Continuous Integration
5377af9cf9 Auto-merge from CI [skip ci] 2015-05-24 09:52:53 +10:00
Rick Giner
a5482c269f #541 Fixed issue of showing negative 'more' numbers, and only working for current Hub 2015-05-24 09:52:34 +10:00
Maikel Linke
5a43ed2046 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit 2015-05-22 18:17:20 +10:00
Maikel Linke
28dae3c6c6 Enterprises cannot add themselves to Groups 2015-05-22 15:23:59 +10:00
Rob Harrington
5d47dc2fdb Sort array so that order doesn't cause spec fail 2015-05-22 15:03:21 +10:00
Rob Harrington
5b65f67737 Amending spec expect after_create when we want after_save 2015-05-22 15:02:49 +10:00
Rob Harrington
e931f4b31f Merge branch 'master' into require_standard_variant 2015-05-22 12:22:54 +10:00
Rob Harrington
63f3ede766 Prepare master variants for duplication as standard variant by ensuring they have a unit value and that the product has a variant unit 2015-05-22 12:22:05 +10:00
Rob Harrington
d43df86201 Moving conditional logic into ensure_standard_variant 2015-05-22 12:20:31 +10:00
Maikel Linke
9c137ccf0f provide tax_categories in spec 2015-05-22 11:03:21 +10:00
Maikel Linke
7e4751cb3a updating bulk product js spec 2015-05-21 22:30:23 +10:00
Maikel Linke
e6b6303f5e Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit 2015-05-21 18:03:11 +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
cd44d43b3e Adding price to line_item serializer (oops, forgot to include when merging in master) 2015-05-21 17:48:35 +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
79a59e2e81 Add order_with_distributor factory 2015-05-21 13:34:32 +10:00
Maikel Linke
73884d4f01 BPE: Display notice about variant overrides 2015-05-21 13:01:28 +10:00
Maikel Linke
2ed519ef50 on_demand checkbox for variants 2015-05-21 12:37:10 +10:00
Maikel Linke
1936767084 BPE: new col for tax category 2015-05-21 11:06:08 +10:00
Rob Harrington
0b28771364 Removing unrequired specs for variant/product 'units_show' 2015-05-20 21:06:20 +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
3431c687b8 Making sure every created by factories has a distributor 2015-05-20 20:54:27 +10:00
Rob Harrington
65a6329132 Products and inventory reports scopes products to visible in permissions 2015-05-20 16:19:08 +10:00
Rob Harrington
8132f07d88 Adding visible products method to permissions 2015-05-20 15:53:10 +10:00
Maikel Linke
1e26466d11 bulk product edit: "on demand" for new product 2015-05-20 15:29:35 +10:00
Maikel Linke
6953f61939 bulk product edit: new col "on demand" 2015-05-20 15:07:22 +10:00
Rob Harrington
01d4cf6ecf Renaming managed_products permissions method to editable_products 2015-05-20 15:02:36 +10:00
Rob Harrington
05131de1ad Use full_name on BOM instead of options_text 2015-05-20 14:11:31 +10:00
Maikel Linke
0a0bb67277 No SKU for cloned products. Community topic 175 2015-05-20 14:05:14 +10:00
Rob Harrington
8d73b2f532 involving... order cycle scopes return distinct OCs 2015-05-20 13:47:01 +10:00
Rob Harrington
c56efabfbe Removing obsolete rabl templates 2015-05-20 11:52:49 +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