Rohan Mitchell
bfeb63c8d7
Ensure that changes to Spree::Config.products_require_tax_category do not leak out of the relevant spec
2015-06-11 14:16:18 +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
Rohan Mitchell
97e49c2bdb
Replace 'array.sort.should == expected.sort' pattern with match_array
2015-05-28 10:46:08 +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
992fb2347d
Merging master branch into require_standard_variant
2015-04-29 14:30:49 +10:00
Rob Harrington
c66a7e44b6
Updating product model specs to reflect changes to properties
2015-04-23 15:37:41 +10:00
Rob Harrington
e546388784
Rename properties_h to properties_including_inherited
2015-04-22 21:02:07 +10:00
Rob Harrington
976c24cf4c
properties_h uses inherit_properties flag, and returns property id rather than presentation
2015-04-22 21:02:07 +10:00
Rob Harrington
72d553ef0c
Test actual deletion of variants
2015-04-17 16:51:02 +10:00
Rob Harrington
9ee25c4e42
Making spec better
2015-04-17 11:25:18 +10:00
Rob Harrington
2d7fb3fd67
Updating name of spec
2015-04-17 11:25:18 +10:00
Rob Harrington
a223a2d662
Cannot remove all variants from a product
2015-04-17 11:25:17 +10:00
Rob Harrington
5e2fe56c22
Cleanup
2015-04-17 11:25:17 +10:00
Rob Harrington
971723964e
Update outdated spec
2015-04-17 11:25:17 +10:00
Rob Harrington
28486f9e76
Only adds standard variant on create
2015-04-17 11:25:17 +10:00
Rob Harrington
869551a17c
Adding a standard variant again
2015-04-17 11:25:17 +10:00
Rob Harrington
13a910c372
Replace validates_associated on master with current spree method for error reporting master saves
2015-04-17 11:25:17 +10:00
Rob Harrington
0a7b01ff07
Product requires variant_unit and master requires unit_value and/or unit_desc
2015-04-17 11:25:16 +10:00
Rob Harrington
dfb513cce7
Use after_create callback to duplicate master variant
2015-04-17 11:25:16 +10:00
Rob Harrington
3f01a459ac
Adding a standard variant upon initialisation of a new instance of Spree::Product
2015-04-17 11:25:16 +10:00
Rohan Mitchell
0431e0048c
Merge branch 'master' into variant-overrides-frontend
...
Conflicts:
app/controllers/shop_controller.rb
app/views/shop/products/_form.html.haml
spec/controllers/shop_controller_spec.rb
2015-01-12 16:48:51 +11:00
Rohan Mitchell
ac59665e3c
Test validations without creating models in database
2015-01-08 09:48:33 +11:00
Rohan Mitchell
e4efda2f96
Move model spec into validations block
2015-01-08 09:37:35 +11:00
Rohan Mitchell
087ccb52f9
Merge branch 'tax_cat_dropdown' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-tax_cat_dropdown
2015-01-08 09:09:20 +11:00
Rohan Mitchell
6c300431d2
Move Product#variants_for to Variant.for_distribution scope
2014-12-17 13:42:30 +11:00
Maikel Linke
ccd03bfa84
Using simple_order_cycle
...
Test timings were not accurate. Output:
4 order_cycles: 9.94 seconds
2 order_cycles: 9.87 seconds
0 order_cycles: 9.9 seconds
Felt execution was much higher
2014-11-28 13:20:05 +11:00
Matt-Yorkley
c3829ae64f
Tax category dropdown on create product form
2014-11-23 15:18:16 +00:00
Rohan Mitchell
021cca4fca
Stylistic changes
2014-11-21 08:41:41 +11:00
Rohan Mitchell
3524e658f8
Error when creating product and master is invalid, instead of creating a product without a master
2014-08-25 11:52:15 +10:00
Rohan Mitchell
92e3546a76
Retrieve properties for a product as a hash
2014-06-18 15:22:03 +10:00
Rohan Mitchell
836a08606c
Product and variant deletion removes the product or variant from any order cycles
2014-06-12 14:59:27 +10:00
Rohan Mitchell
083220089f
WIP: Delete ExchangeVariants when product is soft-deleted
2014-06-12 14:59:27 +10:00
Rob H
c09aeeee8f
Recalculate option values on variants when product variant unit is changed
2014-06-12 12:11:20 +10:00
Rob H
bcfa1a8266
Fix spec to check validation of missing primary_taxon correctly
2014-05-30 20:06:40 +10:00
Will Marshall
1c31ac56ea
Adding primary taxon field to product
...
Conflicts:
db/migrate/20140522044009_add_primary_taxon_to_products.rb
2014-05-30 14:31:03 +10:00
Rohan Mitchell
e951f80070
Merge branch 'new-product-form'
...
Conflicts:
app/assets/javascripts/admin/admin.js.coffee
2014-05-24 17:14:32 +10:00
Rohan Mitchell
acbe49b8de
Revert primary taxons
2014-05-24 17:13:01 +10:00
Will Marshall
17f09d1852
Adding primary taxon field to product
2014-05-24 09:29:19 +10:00
Rohan Mitchell
ad1f852bdd
Revert "Adding primary taxon field to product"
...
This reverts commit fd1e7ebaa3
2014-05-24 09:07:57 +10:00
Will Marshall
fd1e7ebaa3
Adding primary taxon field to product
2014-05-23 15:59:06 +10:00
Rob H
ed3c23cd90
Split 'My Enterprises' dashboard item into Hubs and Producers
2014-05-22 15:28:25 +10:00
Will Marshall
9f169e6ef8
Adding a basic stub of the primary taxon
2014-05-16 10:23:31 +10:00
Rohan Mitchell
ec0191806a
Update specs to explicitly specify exchange direction
2014-03-26 12:17:49 +11:00
Rohan Mitchell
356099a49a
When product unit changed, remove option types from master as well as other variants
2014-03-12 12:35:52 +11:00
Rohan Mitchell
637ccc113b
Do not show products that have no stock available to the current distribution
2014-03-05 13:54:02 +11:00
Rohan Mitchell
8234812157
Do not include master when outputting variants for oc/d
2014-03-05 13:54:02 +11:00
Rohan Mitchell
ec6f70c145
On product list view, only show variants that are a member of the current order cycle
2014-03-05 13:54:02 +11:00
Rohan Mitchell
eccea9d9ff
When removing a product's option type, remove its variants' associated option values
2014-02-06 10:47:13 +11:00
Will Marshall
b6590000a4
Improving Product's has_stock, filtering Shop#products to in_stock products
2014-01-17 14:41:15 +11:00
Rohan Mitchell
9e956ebec6
Add specs for option value creation, create option values for simple case. Delete option value associations, not objects.
2014-01-07 10:36:19 +11:00
