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
1,970 Commits 21 Branches 450 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

390 Commits

Author SHA1 Message Date
Rohan Mitchell
5e0515e6c5 Variant value expression returns a value of 1 when unit value equals the scale 2014-01-17 16:12:07 +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
Will Marshall
cbce5958e0 Removing an attr_accessible which breaks EVERYTHING 2014-01-16 15:47:38 +11:00
Will Marshall
0ddef9626e First working image upload for enterprise logos 2014-01-16 15:47:38 +11:00
Rohan Mitchell
29235cd2cb Merge branch 'master' into product-amount-units 
Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb
 2014-01-14 15:34:05 +11:00
Rohan Mitchell
9c28b5baae Fix product lists not matching when saving changes to product unit+values fields 2014-01-10 15:43:45 +11:00
Rohan Mitchell
a60c9a9cea When variant already has a value set, remove old option value and assign a new one 2014-01-09 14:11:54 +11:00
Rohan Mitchell
cbe46bffed Merge branch 'bpe_paginate' 
Conflicts:
	config/ng-test.conf.js
 2014-01-09 12:07:42 +11:00
Will Marshall
7838d759ee Removing redundant functionality from the Order Populator 2014-01-08 14:45:40 +11:00
Rohan Mitchell
ea3e697b73 Rename method for clarity, remove outdated specs for OrderPopulator 2014-01-08 14:14:45 +11:00
Rohan Mitchell
20ad906f7a Fix multicart use of OrderPopulator 2014-01-08 14:13:19 +11:00
Rohan Mitchell
dd16934496 Remove redundant serializer spec, reinstate creation of order distribution charges 2014-01-08 13:22:34 +11:00
Rohan Mitchell
eda4f241e2 Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests 2014-01-08 11:39:05 +11:00
Will Marshall
5e041a6f4f Uncommenting the old OP code 2014-01-08 10:35:27 +11:00
Rohan Mitchell
2fec16af5d Merge branch 'master' into product-amount-units 2014-01-07 16:00:06 +11:00
Rohan Mitchell
042e8386ab Refactor: Extract methods to simplify 2014-01-07 15:16:36 +11:00
Rohan Mitchell
ebae76375f Fix specs to work with unit_value stored in base units, scale units correctly for output 2014-01-07 14:57:30 +11:00
Rohan Mitchell
5a1249e249 When value is blank, display description only 2014-01-07 12:19:48 +11:00
Rohan Mitchell
35d0bf6219 Generate option value values and units for weight, volume and items 2014-01-07 12:07:54 +11:00
Rohan Mitchell
ef6c08408b Generate option value name - value and description 2014-01-07 10:57:58 +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
Rohan Mitchell
6a4c112cf2 Rename option_type_for_variant_unit to variant_unit_option_type 2014-01-07 10:31:53 +11:00
Will Marshall
751e98443f Removing LOADS of code 2013-12-19 16:47:27 +11:00
Will Marshall
f6af9e78ac Adding destroy ability to enterprise users 2013-12-13 15:40:23 +11:00
Will Marshall
12743850b4 Removing a chili, refactoring order mailer 2013-12-13 15:40:22 +11:00
Rohan Mitchell
124b6df75d Show undated order cycles on index page 2013-12-13 14:51:43 +11:00
Rohan Mitchell
1084862139 When product variant unit is changed, remove related option values from variants 2013-12-13 12:08:51 +11:00
Rohan Mitchell
60a3e06c5b Reformat 2013-12-13 11:10:08 +11:00
Rohan Mitchell
f2269654ff Set option type on product when variant unit changed 2013-12-13 11:07:57 +11:00
Rohan Mitchell
42d3947861 Set unit value and description on variants 2013-12-12 10:14:05 +11:00
Rohan Mitchell
f07fb8d533 Make variant unit fields attr_accessible 2013-12-05 15:16:52 +11:00
Rohan Mitchell
1b63546a9e Master variants are valid without unit value or description 2013-12-05 15:16:51 +11:00
Rohan Mitchell
0bae3e58b8 Add product units and amount fields to product and variant models, add validations 2013-12-05 15:16:51 +11:00
Will Marshall
7784a6ef44 Adding a default value of NOW to available_on on Products 2013-11-28 16:41:46 +11:00
Will Marshall
d39cb74d06 Merge branch 'customers' 2013-11-22 16:55:11 +11:00
Will Marshall
fbe0e2cc29 Basic plumbing for the Customers in place 2013-11-22 16:22:44 +11:00
Rohan Mitchell
4898460132 Fix failing spec with table reorder, lambda-fy scopes that use time 2013-11-22 14:00:04 +11:00
Rohan Mitchell
459b2c1050 Add #upcoming? and #open? to OrderCycle 2013-11-22 11:15:12 +11:00
Rohan Mitchell
3a2394675f Rename OrderCycle#expired? to #closed? 2013-11-22 11:08:42 +11:00
Rohan Mitchell
5ad63d08f3 Add some more open/close time scopes to order cycles 2013-11-22 10:57:33 +11:00
Rohan Mitchell
dfcf567f26 Sort payment methods by name 2013-11-21 14:42:28 +11:00
Will Marshall
5772fa9589 Boilerplate for the new Product and Inventory report, sans any functionality 2013-11-20 10:34:18 +11:00
Rohan Mitchell
7a8bd16083 On enterprise page, do not display products outside of the outgoing exchange 2013-11-15 15:08:45 +11:00
Rohan Mitchell
59935619e3 Rename OrderCycle#distributed_variants_by to variants_distributed_by 2013-11-15 14:34:05 +11:00
Rohan Mitchell
52b6c33aaa When converting an exchange to a hash for comparison, ensure id lists are sorted - ordering issues should not indicate inequality 2013-11-15 12:09:26 +11:00
Will Marshall
2ce687fc79 Adding variant update permissions to Enterprise users 2013-11-14 11:53:14 +11:00
Rohan Mitchell
27b8c4508f Split product distribution editing into its own admin page 2013-11-13 15:22:17 +11:00
Rohan Mitchell
48f18a93de Order shipping methods by name, not distributor 2013-11-07 16:25:43 +11:00
Rohan Mitchell
0755b515d1 Only show shipping methods that enterprise user has access to 2013-11-07 16:25:43 +11:00
Rohan Mitchell
04387aa6b7 Scope time since last oc expired to distributor 2013-11-06 16:17:36 +11:00