Continuous Integration
c14de4e97f
Auto-merge from CI [skip ci]
2015-05-29 14:29:23 +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
Continuous Integration
5377af9cf9
Auto-merge from CI [skip ci]
2015-05-24 09:52:53 +10:00
Rob Harrington
e931f4b31f
Merge branch 'master' into require_standard_variant
2015-05-22 12:22:54 +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
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
Maikel Linke
fa87c53777
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into group-pages
2015-05-20 10:22:28 +10:00
Rick Giner
62ae38372e
#541 add "show more" link to producers lists in hub on home page
2015-05-11 20:31:24 +10:00
Lynne Davis
3179887842
Do not allow line_item.unit_value to be updated if the variant.unit_value is zero
2015-05-09 19:12:24 +01:00
Lynne Davis
54da7ae241
Adding additional logic for if the line_item unit_value is nil
2015-05-09 19:10:55 +01:00
Lynne Davis
2a991ad130
Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.
2015-05-09 19:10:55 +01: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
ed9bbe2c45
Sorting Hub and Producer filter selectors by name
2015-05-07 12:50:55 +10:00
Rob Harrington
b5c7607d67
Order cycle filter resets date filters on BOM
2015-05-07 12:50:55 +10:00
Rob Harrington
e640376d63
Don't load cancelled orders into bulk order management
2015-05-07 12:50:54 +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
Rob Harrington
89b153dc2c
Update AJAX request to use sells instead of deprecated is_distributor attribute
2015-05-07 12:50:54 +10:00
Rick Giner
368402f115
Changed selectors' ng-repeat. Using existing variable instead of method call
2015-05-03 15:24:16 +10:00
Rick Giner
9e70c80d1d
bind-once in product modal
2015-05-03 14:48:27 +10:00
Rick Giner
9c26b3ebb2
bind-once in partials
2015-05-03 14:34:42 +10:00
Rob Harrington
992fb2347d
Merging master branch into require_standard_variant
2015-04-29 14:30:49 +10:00
Rob Harrington
b1b1bfd8f6
Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page
2015-04-24 16:05:39 +10:00
Rob Harrington
ed7b763ecf
UnitsCtrl can interpret unit_value_with_description without a separating space
2015-04-24 12:15:35 +10:00
Rob Harrington
05c350b5ff
Refactoring unitsCtrl
2015-04-24 11:27:47 +10:00
Rob Harrington
6cde1f7732
Add tooltip with value for selectors
2015-04-23 14:11:50 +10:00
Rob Harrington
7b83438b5e
Pulling property values into the shopfront
2015-04-23 13:51:49 +10:00
Rob Harrington
e6a98747b4
correction in read only logic for filter selectors
2015-04-23 13:32:56 +10:00
Rob Harrington
ed15b95de0
Adding properties and taxons to producer modal
2015-04-23 12:31:20 +10:00
Rob Harrington
3df2720b31
Making filter selectors more flexible, allowing no active-selectors to be passed in, ie. read-only
2015-04-23 12:31:06 +10:00
Rob Harrington
0251d8962d
Adding sku to BPE
2015-04-22 21:02:07 +10:00
Rob Harrington
f610a709e1
Adding inherits_properties to BPE
2015-04-22 21:02:06 +10:00
Rob Harrington
a75a76840d
Merging master into require_standard_variant
2015-04-17 21:18:24 +10:00
Maikel Linke
893b743973
tidy (rm comment)
2015-04-17 17:00:18 +10:00
Maikel Linke
03fd148f41
showing profile modals on groups/hubs
2015-04-17 16:58:49 +10:00
Rohan Mitchell
0d9ba4257d
Merge branch 'properties'
2015-04-17 15:25:51 +10:00
Rob Harrington
c43eb9ef72
Merge branch 'email_user' into properties
2015-04-17 15:17:37 +10:00
Rob Harrington
32f14bca00
Preventing fitting of selectors when there are none
2015-04-17 15:10:41 +10:00
Rob Harrington
6d96a7a60b
Specifiy that allSelectors attribute on filterSelectors directive is optional
2015-04-17 14:43:09 +10:00
Rohan Mitchell
a6a5fdfb3b
Require that the user selects whether their enterprise charges sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
0bdb8f7241
User can set whether an enterprise charges sales tax when registering
2015-04-17 13:41:38 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rob Harrington
0cf8b017b9
Pulling out taxons and properties placeholders from producer and product modals
2015-04-17 13:20:01 +10:00
Rob Harrington
4b182f9248
Can't delete final variant on a product from BPE
2015-04-17 11:25:18 +10:00
Rob Harrington
524f02717b
Don't redirect to root when closing login window on checkout page
2015-04-17 10:25:38 +10:00
Rohan Mitchell
aef3fdf4b4
Merge branch 'group-pages'
2015-04-16 16:53:49 +10:00
Maikel Linke
548e3576b9
textAngular editor for group description
2015-04-15 17:13:10 +10:00
Maikel Linke
2fd25f6cc4
Injecting all enterprises into group page
...
The enterprises have related producers and hubs that need to be
dereferenced. Therefore, we need a bigger set of enterprises to be
loaded. Injecting all enterprises is simple and doesn't require changes
if the set of needed enterprise data is growing in future.
2015-04-10 17:42:54 +10:00
Rob Harrington
81a745420e
Only check editable status of variants when actually selecting
2015-04-09 15:24:45 +10:00
Rob Harrington
69004ac477
Select all box only selects variants I have permission to edit
2015-04-09 13:29:25 +10:00
