raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,764 Commits 18 Branches 452 Tags
e92d21ec4e8cc78329ebcdc574fa63b44b07ca61
Commit Graph

362 Commits

Author SHA1 Message Date
Will Marshall
85606b2a0d Merge branch 'master' into checkout 2014-02-27 10:41:39 +11:00
Will Marshall
a0abd9c95a Merge branch 'master' into checkout 2014-02-26 15:52:37 +11:00
Rohan Mitchell
11fb6c96a1 Charge per-order fees on orders exactly once 2014-02-26 14:34:30 +11:00
Rohan Mitchell
b720a1d8f2 EnterpriseFee.clear_all_adjustments_on_order clears adjustments from per-order fees 2014-02-26 14:33:28 +11:00
Rohan Mitchell
9dec40703a Find exchanges with any of a number of variants 2014-02-26 13:49:10 +11:00
Rohan Mitchell
5057e236a9 Find enterprise fees with per-order calculators 2014-02-26 13:48:51 +11:00
Rohan Mitchell
75c8da1774 Rename create_adjustments_for to create_line_item_adjustments_for, only show per-item fees 2014-02-26 12:07:38 +11:00
Rohan Mitchell
febbe087e9 Find EnterpriseFees with per-item calculators 2014-02-26 10:39:39 +11:00
Rohan Mitchell
da8a8e8a1a Rename method 2014-02-21 15:49:10 +11:00
Rohan Mitchell
08009d4020 Extract application of enterprise fees as adjustments into its own class 2014-02-21 15:48:58 +11:00
Will Marshall
04ac6f466c Forcing the class of Country 2014-02-21 15:15:06 +11:00
Rohan Mitchell
7b80518621 On admin variant edit page, do not show option values for unit-related option types 2014-02-19 11:29:26 +11:00
Rohan Mitchell
701896be95 BPE: Add variant and save it to server. Edit the saved variant. 2014-02-13 11:52:44 +11:00
Rohan Mitchell
4aa43cfbe0 Set the master unit value for a product without variants 2014-02-12 13:57:49 +11:00
Will Marshall
202f95a8fc Fix for broken percentage Enterprise Fees in place, no test yet 2014-02-07 11:09:47 +11:00
Rohan Mitchell
f187041606 Do not display a space separating units and scaled values. eg. 1kg, 4 boxes 2014-02-06 14:05:26 +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
Rohan Mitchell
d0fd48456e Variant calculates fees and its price inclusive of fees 2014-02-05 14:01:10 +11:00
Rohan Mitchell
04487da22a Decouple OrderCycle#fees_for from LineItem 2014-02-05 13:27:17 +11:00
Will Marshall
2bb004ebaa Adding notes field to products 2014-02-04 14:11:32 +11:00
Rohan Mitchell
5adc4f27f4 Do not display option type when showing variant options_text. This makes variant names cleaner. 2014-01-22 09:24:09 +11:00
Will Marshall
aec5894c70 Adding a promo image to enterprises 2014-01-21 16:32:55 +11:00
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