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,555 Commits 21 Branches 450 Tags
e28e86a82cc71bc10fb6347254dca6c99c70df81
Commit Graph

240 Commits

Author SHA1 Message Date
Rohan Mitchell
769e8410cc Fix checkout total display 2014-08-07 14:53:30 +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
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
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
b25def810c Working version of the cart integration 2014-07-18 14:56:15 +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
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
Rohan Mitchell
989a14fa37 Change KL to kL, update specs for ML to kL change 2014-07-17 16:16:08 +10:00
Will Marshall
541fe9ec37 Switching Checkout service to use CurrentOrder 2014-07-17 14:26:54 +10:00
Will Marshall
158bdd145f All the new serializers and some specs 2014-07-17 14:23:09 +10:00
Will Marshall
547d9f9f5c Moving payment methods and shipping methods into their own services 2014-07-17 14:19:39 +10:00
Will Marshall
2b1ab53d8e Fixing regressions and refactoring our tests 2014-07-16 16:00:44 +10:00
Will Marshall
eb8f59d65b Tests for the taxon filtering 2014-07-04 15:19:45 +10:00
Will Marshall
f335b6a576 Taxon selectors and show/hide behaviour 2014-07-04 14:09:53 +10:00
Will Marshall
487b8616c0 Adding dereferencing to taxons and reducing our data-set 2014-07-04 13:51:22 +10:00
Will Marshall
55bf59ba96 adding by producer id filtering 2014-07-04 13:51:22 +10:00
Will Marshall
1955048502 Moving taxon filter to ID instead of name 2014-07-04 13:51:22 +10:00
Will Marshall
f19a02264e Adding all the Angular filters required to make this work 2014-07-04 13:51:22 +10:00
Will Marshall
e8ba36041b Tests and patch for group filter 2014-06-27 15:01:12 +10:00
Rohan Mitchell
5a235be110 Fix regressed JS spec 2014-06-27 11:56:09 +10:00
Rohan Mitchell
4075854440 Navigation.go supports full URLs 2014-06-27 11:51:53 +10:00
Rohan Mitchell
b678a2f7fd Move navigation spec to services dir 2014-06-27 11:34:02 +10:00
Will Marshall
4f3d468db6 Dereferencing groups and adding modals to page 2014-06-24 17:15:31 +10:00
Will Marshall
1ed634239d Major refactoring 2014-06-20 16:31:49 +10:00
Will Marshall
7f4816c9a5 Adding new producer modal and dereferencing shopfront 2014-06-19 14:00:37 +10:00
Will Marshall
8905b45333 Fixing a minor regression 2014-06-19 12:10:05 +10:00
Will Marshall
b9561ecf20 Minor refactoring from code review with Rohan 2014-06-19 11:41:24 +10:00
Will Marshall
c02c7cf7ca Further patches to the damned RABL system, patching everything up to use our new Service structure 2014-06-18 17:54:13 +10:00
Will Marshall
224a70c11f Refactoring JSON injection a bit further 2014-06-18 16:43:57 +10:00
Will Marshall
45404f1475 Adding dereferencing on construct to Enterprises service - this is MAGIC 2014-06-18 15:48:24 +10:00
Will Marshall
deb6c8a05a Refactoring the RABL injection and the Hubs/Producers/Enterprises services 2014-06-18 15:40:02 +10:00
Will Marshall
e7c301da83 Reworking the RABL templates for simplicity AND fixing up all the tests 2014-06-18 13:05:44 +10:00
Rohan Mitchell
88c41df201 BPE uses soft-delete for products 2014-06-12 14:59:27 +10:00
Rob H
d8f1153817 Add js spec for option value namer 2014-06-11 14:21:13 +10:00
Rob H
8e960c817a Merge branch 'master' into units 2014-06-11 12:43:40 +10:00
Rob H
44f4ee822c Move dynamic placeholder logic to directive so that it can be used for master variants too 2014-06-11 12:41:51 +10:00
Will Marshall
69e5459afd Finishing off the merge with localStorage refactoring with sekrets 2014-06-04 17:22:10 +10:00
Will Marshall
a6a4d28072 Fixing up bugs in the Checkout form 2014-06-04 17:13:18 +10:00
Will Marshall
59c433881e Making the auto-closing more granular on checkout 2014-06-04 17:12:16 +10:00
Rohan Mitchell
fc3402bbd0 Determine whether to send card field attributes by payment method type 2014-06-04 16:55:27 +10:00
Rohan Mitchell
6a8def3d76 Do not send attributes for card fields when no card is supplied 2014-06-04 16:30:57 +10:00