raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,782 Commits 18 Branches 451 Tags
01397b2e49a5000a3d25eaf3531e7c19fe654341
Commit Graph

347 Commits

Author SHA1 Message Date
Rob H
3ee0cf46e0 Merge branch 'working' into merging 2014-09-08 10:12:31 +10:00
Rob H
b8fadb50ae Special Instructions in checkout are actually wired up 2014-09-06 12:00:27 +10:00
Rob H
428e4c63d4 Profile hubs don't show up in hubs list 2014-09-05 16:18:25 +10:00
Rohan Mitchell
c43c35601b Set product.largeImage in JS, use for product modal 2014-09-05 15:10:16 +10:00
Rohan Mitchell
2cd5afbf9c Set product.largeImage in JS, use for product modal 2014-09-01 16:21:23 +10:00
Rob H
400f2ea9b9 Don't add payment forms to checkout DOM unless required 2014-08-27 15:09:41 +10:00
Rohan Mitchell
4ceaec0ef5 Do not error when checking out with a pre-loaded shipping/billing address 2014-08-22 17:34:42 +10:00
Rohan Mitchell
d05e5e430a Revert "Adding CTA button for crowdfunding site to homepage & countdown timer directive" 
This reverts commit 75f3358e2a.
 2014-08-12 14:06:13 +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
f3e43ebd29 Use .location for testability 2014-08-08 11:10:51 +10:00
Rohan Mitchell
769e8410cc Fix checkout total display 2014-08-07 14:53:30 +10:00
Will Marshall
6b00b1c14c MOAR COMMENTS 2014-07-31 15:58:03 +10:00
Will Marshall
647495465a Comments and minor refactoring 2014-07-31 15:14:11 +10:00
Will Marshall
042db2d150 Some comments and refactoring 2014-07-31 15:14:11 +10:00
Will Marshall
d9f3dfb571 Removing a pointless error message 2014-07-31 12:23:22 +10:00
Will Marshall
0f76892a5b Handling max quantity magically 2014-07-31 12:23:10 +10:00
Will Marshall
dc1963497a SORTING BY PRIMARY TAXON NAME 2014-07-31 12:04:22 +10:00
summerscope
33a177ed47 Make map input placeholder message useful 2014-07-31 12:00:46 +10:00
Will Marshall
86c1d010e7 Default quantity to null rather than zero 2014-07-31 11:49:34 +10:00
Rohan Mitchell
126e0a1f6d Link variants -> products, fixes group buy 2014-07-31 11:36:53 +10:00
Rohan Mitchell
9fa0413e8e Add full price breakdown 2014-07-30 15:11:59 +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
339e5975fa Merge branch 'master' into breakdowns 2014-07-30 13:45:46 +10:00
Will Marshall
88c3f7f9b3 Removing a couple of pointless files 2014-07-30 13:45:37 +10:00
Will Marshall
10fcf80be1 Switching back to proper bounds fitting 2014-07-29 15:34:14 +10:00
Will Marshall
606981dee9 Merge branch 'maps' 2014-07-29 15:32:23 +10:00
Will Marshall
90eea5cb16 Switching to a single directive to render variants on /shop 2014-07-29 15:23:10 +10:00
Will Marshall
21cc5bc05a Tweaking product image logic 2014-07-29 13:05:45 +10:00
Will Marshall
f1c4ca98a1 Defaulting to OFN logo 2014-07-29 12:55:58 +10:00
Will Marshall
2d40a8f023 Fixing links on modals 2014-07-29 12:20:06 +10:00
Will Marshall
c4f7c1af60 Lots of small bug fixes, changing image sizes 2014-07-29 11:33:25 +10:00
Will Marshall
39a79869c0 Disabling buttons and some work on the price breakdowns, including commenting them out for now 2014-07-29 11:33:25 +10:00
Will Marshall
a5f478bde7 Ajax submission of max quantity 2014-07-28 13:33:13 +10:00
Will Marshall
2120ab96ca Fixing bugs and spec regressions 2014-07-24 16:02:10 +10:00
Will Marshall
f45dd24803 Patched up popovers for our nefarious purposes + cart pretties 2014-07-24 14:56:13 +10:00
Will Marshall
63807fd2cd Fixing case when order doesn't axshully exist 2014-07-24 11:24:09 +10:00
Will Marshall
92b7966941 Triggering dialog if page unsaved 2014-07-18 17:07:40 +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
a480353158 Working bindings 2014-07-18 16:05:58 +10:00
Will Marshall
b25def810c Working version of the cart integration 2014-07-18 14:56:15 +10:00
Will Marshall
a3d402ad53 Moving variants to a service, backreferencing and linking 2014-07-18 13:59:34 +10:00
Will Marshall
562f8dbd4e Starting to restructure data injection 2014-07-18 11:21:51 +10:00
Will Marshall
33611ddb20 Renaming Product to Products and starting to figure out cart 2014-07-17 15:04:39 +10:00
Will Marshall
67922f38df Fixing some regressions to data submission 2014-07-17 14:46:46 +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