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
4,200 Commits 21 Branches 450 Tags
bf61d12bfaedabb0fe1dd117a4e2b6f4f0552e64
Commit Graph

76 Commits

Author SHA1 Message Date
Rob Harrington
eda0b16a5f Make state abbreviations upper case 2014-10-17 12:29:51 +11:00
Rob Harrington
28807d4f4d Merge migrate_ent_types into reg 2014-10-17 10:20:48 +11:00
Rafael Schouten
f0a3296e52 change enterprise category name ans use symbols instead of strings 2014-10-16 16:26:49 +11:00
Rob Harrington
0940af6b66 Remove bad pry 2014-10-15 16:21:11 +11:00
Rob Harrington
56f4d5af0f Visibility in the front end is contingent upon enterprise being confirmed 2014-10-15 12:27:55 +11:00
Rafael Schouten
76e170eb3a move icons into cached, for now 2014-10-06 10:44:49 +11:00
Rafael Schouten
884c111240 fix failing tests 2014-10-04 11:56:35 +10:00
Rafael Schouten
2670d2b0ad cleanup serializer 2014-10-04 00:59:41 +10:00
Rafael Schouten
47dc001735 merge has_shopfront and is_distibutor 2014-10-01 20:27:53 +10:00
Rafael Schouten
726340fc86 configure textAngular on enterprise edit page 2014-09-30 18:20:45 +10:00
Rafael Schouten
5c0d846643 bugfix sells and is_distributor specs and code 2014-09-28 11:55:46 +10:00
Rafael Schouten
beb85e862a get type > sells migration mostly working 2014-09-27 15:21:27 +10:00
Rob Harrington
1e31dd88ee Remove unrequired functions, add has_hub_listing 2014-09-25 17:19:57 +10:00
Rafael Schouten
cf13115d57 bugfix is_profile bool 2014-09-19 16:44:51 +10:00
Rafael Schouten
f9cbdcee0a swap profile name 2014-09-19 12:18:02 +10:00
Rafael Schouten
0d5106d571 refactor enterprise type logic and fix icons 2014-09-18 18:15:28 +10:00
Rafael Schouten
bd922085c4 icons and entity category logic 2014-09-18 15:14:55 +10:00
Rafael Schouten
d75076e1c9 producer icons and inital link logic 2014-09-18 13:59:47 +10:00
Rafael Schouten
21628ed069 Merge branch 'master' into ent_types_frontend2 2014-09-17 17:45:55 +10:00
Rafael Schouten
e9dd863462 Merge branch 'master' into payment_description 
Conflicts:
	app/views/spree/order_mailer/confirm_email.text.erb
 2014-09-17 17:07:43 +10:00
Rafael Schouten
e618c4c2c0 add payment description to checkout 2014-09-17 14:56:29 +10:00
Rafael Schouten
ac3c3f9f6c remove to_f on decimals 2014-09-17 13:19: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
Rafael Schouten
3ea29df111 12 option entity categories 2014-09-12 10:11:59 +10:00
Rafael Schouten
f33a9e1a58 16 enterprise categories from four checks. 2014-09-12 01:50:36 +10:00
Rob H
ef8f611458 Adding countries and states to registration 2014-09-11 17:07:05 +10:00
Rafael Schouten
0fa4540cec Merge branch 'master' into currency 2014-09-11 12:09:18 +10:00
Rafael Schouten
44e9cf5ade add currency spec file and update some class names 2014-09-10 18:22:33 +10:00
Rob H
78a70292ac Moved attributes are actually delcared in the right place for Enterprise Serializer 2014-09-08 15:39:17 +10:00
Rob H
dfa837cac6 Moved cached properties which should not be cached 2014-09-08 15:01:34 +10:00
Rafael Schouten
991d0029dd add currency localisation 2014-09-08 00:06:53 +10:00
Rob H
14aada1808 Add 'profile only' logic to maps icons 2014-09-05 15:09:15 +10:00
Rob H
32ee8afdce logic for producer shop icon in list view 2014-09-05 14:46:04 +10:00
Rob H
8f6d04a129 Adding properties to enterprise serialiser to allow differentiation between profile, shopfront and aggregators 2014-09-05 12:30:52 +10:00
summerscope
a4aa949499 Applying new icons for map view 2014-08-29 18:04:06 +10:00
Rohan Mitchell
50c559964c Display enterprise relationship permissions 2014-08-25 13:28:02 +10:00
Rohan Mitchell
cb615ba994 Render enterprise relationships JSON with AMS instead of rabl 2014-08-25 13:07:31 +10:00
Rohan Mitchell
6e17f0aaa2 Admin can create enterprise roles 2014-08-15 16:09:05 +10:00
Rohan Mitchell
8bc9def6ae Switch to AMS for enterprise role serialisation 2014-08-15 16:09:05 +10:00
Rob H
2f5b5e7ee5 Inject taxons into BPE 2014-08-08 14:05:52 +10:00
Rohan Mitchell
c814a0a2bf Merge branch 'master' into laura_and_will 2014-08-07 11:57:58 +10:00
Rob H
5a34fa41b3 Fixing cart total in checkout 2014-08-06 13:59:47 +10:00
Will Marshall
bb09236468 Merge branch 'laura_and_will' 2014-07-31 16:06:39 +10:00
Will Marshall
7ca618fb29 Moving to state_name 2014-07-31 15:38:26 +10:00
Will Marshall
d70ed02977 Restoring caching on addresses 2014-07-31 12:04:23 +10:00
Will Marshall
cf3fc7edbf Merge branch 'master' into laura_and_will 
Conflicts:
	app/serializers/api/address_serializer.rb
 2014-07-31 11:47:54 +10:00
Rohan Mitchell
8c41a6c909 Calculate fee breakdown 2014-07-31 11:36:53 +10:00
Will Marshall
e8045cac42 Renaming to state_name 2014-07-31 11:36:53 +10:00
Will Marshall
44bb53b137 Moving to state_name 2014-07-31 11:11:34 +10:00
Will Marshall
001db8d07e Renaming to state_name 2014-07-30 17:09:31 +10:00