raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,570 Commits 21 Branches 450 Tags
27e992ebcbe3cbcf2dd4e4e10f4c991f0e2a14ca
Commit Graph

1556 Commits

Author SHA1 Message Date
Rob H
27e992ebcb Staggered loading of products in BPE 2014-08-08 14:05:51 +10:00
Rob H
b9f49344b4 BPE: Switch column toggle to dropdown, clean up specs 2014-08-08 14:05:51 +10:00
Rob H
1abbc7fa86 Switch data injection for BPE over to AMS 2014-08-08 14:05:50 +10:00
Rob H
e02a742597 WIP: Removing requirment for refresh of products on BPE 2014-08-08 14:05:50 +10:00
Rob H
a14c2dbb04 Decouple bpe specs from update process 2014-08-08 14:05:50 +10:00
Rohan Mitchell
16847025dd Fix bug: local storage was not correctly keyed to user id 2014-08-08 11:14:50 +10:00
Rohan Mitchell
c30d7fe72a Fix broken JS specs 2014-08-08 09:56:55 +10:00
Rohan Mitchell
7476860b47 Comment out intermittently failing spec - we intend to remove product distributions soon anyway 2014-08-07 17:20:38 +10:00
Rohan Mitchell
dc49fbfe62 Merge branch 'laura_and_will' 2014-08-07 16:50:00 +10:00
Rohan Mitchell
f8c71ced45 Fix display of state_name, after attribute was renamed in serializer 2014-08-07 16:46:57 +10:00
Rohan Mitchell
769e8410cc Fix checkout total display 2014-08-07 14:53:30 +10:00
Rob H
30a14edb06 Adding 'Total Units' field to supplier report 2014-08-07 14:21:01 +10:00
Will Marshall
bb09236468 Merge branch 'laura_and_will' 2014-07-31 16:06:39 +10:00
Rohan Mitchell
494b572c69 Do not show zero fees 2014-07-31 15:36:26 +10:00
Rohan Mitchell
a26450d173 Remove unused spree searcher class - causing intermittent test failures 2014-07-31 14:58:18 +10:00
Rohan Mitchell
a1dd5dabac Replace sleep with wait, add cart_dirty spec helper 2014-07-31 11:36:53 +10:00
Rohan Mitchell
8c41a6c909 Calculate fee breakdown 2014-07-31 11:36:53 +10:00
Rohan Mitchell
45fd479ade WIP: Call create_order_adjustments_for on EnterpriseFeeCalculator 2014-07-31 11:36:53 +10:00
Rohan Mitchell
8fe355b6da WIP: Call create_line_item_adjustments_for on EnterpriseFeeCalculator 2014-07-31 11:36:53 +10:00
Rohan Mitchell
b40b6f9faf WIP: Call fees_for on EnterpriseFeeCalculator 2014-07-31 11:36:53 +10:00
Rohan Mitchell
66cece5903 WIP: Extract order cycle fee calculations to EnterpriseFeeCalculator 2014-07-31 11:36:53 +10:00
Rohan Mitchell
fc95e088df Show collapsed price breakdown 2014-07-30 14:59:16 +10:00
Rohan Mitchell
77b279ca97 Stub base_price and fees on variant serializer. Calculate basePricePercentage on variant. 2014-07-30 14:34:05 +10:00
Rohan Mitchell
1ac5b79aeb Fix failing JS specs 2014-07-30 14:33:36 +10:00
Will Marshall
606981dee9 Merge branch 'maps' 2014-07-29 15:32:23 +10:00
Will Marshall
4264e3b7b7 Fixing a time issue 2014-07-29 14:11:51 +10:00
Will Marshall
8496609cc2 Fixing up a couple of regressions 2014-07-29 13:46:38 +10:00
Will Marshall
c4f7c1af60 Lots of small bug fixes, changing image sizes 2014-07-29 11:33:25 +10:00
Will Marshall
20d7484134 Merge branch 'master' into laura_and_will 
Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee
 2014-07-28 13:43:31 +10:00
Will Marshall
9d0919d201 Further minor regressions 2014-07-28 13:41:38 +10:00
Will Marshall
a5f478bde7 Ajax submission of max quantity 2014-07-28 13:33:13 +10:00
Will Marshall
39f9e991ad Minor regressions and bug fixes 2014-07-28 11:30:35 +10:00
Rohan Mitchell
f73a63e944 Switch spec to better spree paypal express payment method 2014-07-25 13:47:31 +10:00
Rohan Mitchell
3b28981400 Adapt cancel redirect for better spree paypal express 2014-07-25 12:44:14 +10:00
Will Marshall
2120ab96ca Fixing bugs and spec regressions 2014-07-24 16:02:10 +10:00
Rob H
7fc80a0975 Fix failing enterprise spec 2014-07-24 11:05:14 +10:00
Rob H
9055a441fd Removing trailing whitespace 2014-07-24 10:28:28 +10:00
Rob H
37c16fb20c Add shipping method js infrastructure for angularising admin enterprises page 2014-07-24 10:16:54 +10:00
Rob H
2200392031 Angularising Admin enterprises form 2014-07-24 10:16:54 +10:00
Will Marshall
edaba844d9 Merge branch 'laura_and_will' into new_cart 
Conflicts:
	app/views/shop/products/_form.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
 2014-07-18 17:02:19 +10:00
Will Marshall
b25def810c Working version of the cart integration 2014-07-18 14:56:15 +10:00
Rohan Mitchell
03273a76ad Merge branch 'fix_units' 2014-07-18 14:11:41 +10:00
Rohan Mitchell
7db2aff398 Generate variantUnitOptions - DRY 2014-07-18 14:10:42 +10:00
Will Marshall
a3d402ad53 Moving variants to a service, backreferencing and linking 2014-07-18 13:59:34 +10:00
Rohan Mitchell
04eca9591b Derive unitScales from unitNames 2014-07-18 12:39:16 +10:00
Rohan Mitchell
ab1628681e Call VariantUnitManager directly 2014-07-18 12:39:16 +10:00
Rohan Mitchell
8d5f953f78 Extract getScale from BOM controller to VariantUnitManager, extract specs as well 2014-07-18 12:39:16 +10:00
Will Marshall
a2da7f7ede Merge branch 'caching' into new_cart 
Conflicts:
	app/serializers/api/variant_serializer.rb
 2014-07-18 11:23:25 +10:00
Will Marshall
562f8dbd4e Starting to restructure data injection 2014-07-18 11:21:51 +10:00
Rohan Mitchell
6c59ffc16f Switch to class case for OptionValueNamer 2014-07-18 10:06:13 +10:00