raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,023 Commits 20 Branches 451 Tags
6e699b2e8bb86c8ceddc78a3da332bbfd683f035
Commit Graph

168 Commits

Author SHA1 Message Date
Rob Harrington
1e31dd88ee Remove unrequired functions, add has_hub_listing 2014-09-25 17:19:57 +10:00
Rafael Schouten
da620f3723 Merge branch 'master' into ent_types_frontend 2014-09-25 10:09:42 +10:00
Rob Harrington
5bceb81479 Fixing image upload in onboarding 2014-09-19 23:37:02 +10:00
Rafael Schouten
abc5a215a2 add map modals, profile filters and bugfixes 2014-09-19 17:07:07 +10:00
Rob Harrington
d3e72b5a2a Adding images to registration process 2014-09-19 12:41:24 +10:00
Rafael Schouten
01c98bf6e4 refactor and bugfix for tests 2014-09-17 01:07:34 +10:00
Rafael Schouten
1aa80e53b1 Merge branch 'master' into currency 
Conflicts:
	app/helpers/injection_helper.rb
	db/suburb_seeds.rb
 2014-09-16 10:25:22 +10:00
Rob H
cc65faadd0 Specing out enterprise registration service properly 2014-09-12 11:48:17 +10:00
Rob H
6ee3010fa7 Differentiation of on-boarding process by url 2014-09-12 11:00:34 +10:00
Rob H
12f5e48479 Replace is not with isnt - damn you CoffeeScript 2014-09-11 17:58:38 +10:00
Rob H
19565a5f3b Rename service 2014-09-11 17:10:59 +10:00
Rob H
a16da4eae0 Commenting out enterprise creation 2014-09-11 17:07:07 +10:00
Rob H
f1ef8ba3c7 Getting signup to work and authentication to load in reg specific template 2014-09-11 17:07:07 +10:00
Rob H
f1f9a2e7fc Updating on later pages of registration process 2014-09-11 17:07:06 +10:00
Rob H
e341b12d3a Adding loading message when creating enterprise 2014-09-11 17:07:05 +10:00
Rob H
4d106129ee Creating an about page including flash boxes for registration 2014-09-11 17:07:05 +10:00
Rob H
ef8f611458 Adding countries and states to registration 2014-09-11 17:07:05 +10:00
Rob H
95bfc74b3f No need to deal with locations in registration 2014-09-11 16:34:20 +10:00
Rob H
5f09f1b4f7 Pull out styling for registration process 2014-09-11 16:34:20 +10:00
Rob H
c92aa41e28 Adding introduction and details pages to registration process 2014-09-11 16:34:19 +10:00
Rafael Schouten
0fa4540cec Merge branch 'master' into currency 2014-09-11 12:09:18 +10:00
Rob H
3ee0cf46e0 Merge branch 'working' into merging 2014-09-08 10:12:31 +10:00
Rafael Schouten
991d0029dd add currency localisation 2014-09-08 00:06:53 +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
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
769e8410cc Fix checkout total display 2014-08-07 14:53:30 +10:00
Will Marshall
647495465a Comments and minor 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
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
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
88c3f7f9b3 Removing a couple of pointless files 2014-07-30 13:45:37 +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
c4f7c1af60 Lots of small bug fixes, changing image sizes 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