raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-02 02:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,609 Commits 17 Branches 455 Tags
dbfcbc6db903386474a57fd35bf2dfbc1825be21
Commit Graph

47 Commits

Author SHA1 Message Date
Pau Perez
cca15e75a6 Refactor to reveal how we load enterprises in shop 
By sticking to Rails conventions we make it more obvious how (badly) we
are loading enterprises in EnterprisesController#shop and shed some
light on the obscure InjectionHelper.

This will also make it easier to improve its performance in the future as
it's among the top offenders. See https://www.skylight.io/app/applications/ibo3NOqCYMnq/1545851520/1d/endpoints/EnterprisesController%23shop?responseType=html
 2019-01-03 11:17:10 +01:00
Pau Perez
41d988176c Pass enterprises to inject method from controller 2018-11-28 13:54:42 +01:00
Rob Harrington
ddb9ae1140 Load all shops that a user is associated with as a customer 
Regardless of the presence of an order
 2018-06-24 16:28:47 +10:00
Rob Harrington
18c211e97c Ensure that savedCreditCards always exists 2018-06-08 15:30:08 +10:00
Pau Perez
6a830a3843 Isolate ArraySerializer case in injection helper 
This makes this special case with the ArraySerializer stand out so that
the reader notices it.
 2017-11-09 10:22:30 +01:00
stveep
f065cbe251 Fix specs for saved credit cards: Add payment profile ID to fixture (now denotes that a card has been saved), check for current user to avoid error attempting to inject saved cards as a guest 2017-09-23 14:58:33 +10:00
Rob Harrington
41b7be900c Restrict the meaning of 'Saved Cards' to mean those with a payment profile 2017-09-23 14:58:33 +10:00
Rob Harrington
b9d72ce4cf Refactoring logic for displaying orders on the front-end account page 2017-09-23 14:58:32 +10:00
Rob Harrington
f4c3fbf8bc Refactoring credit cards interface, and backend logic 2017-09-23 14:58:32 +10:00
stveep
300dc3084c Add default card, disable inputs when a card is selected 2017-09-23 14:58:31 +10:00
stveep
298fd057f5 Check for current user before injecting credit cards 2017-09-23 14:58:31 +10:00
stveep
33b570b117 Inject cards for current user into checkout and add selector dropdown to gateway partial. 2017-09-23 14:58:31 +10:00
Rohan Mitchell
f4f38b4183 Re-apply shop property filters - including performance regression 
This reverts commit 7d149ed198.
 2016-11-25 14:14:42 +11:00
Maikel Linke
f733c7f207 Include shop enterprise on shop front 2016-07-06 12:45:12 +10:00
Maikel Linke
f984871b23 Inject only needed enterprises into cart and checkout 2016-07-06 11:14:13 +10:00
Maikel Linke
08fdc8a5bd Load producers of all or selected order cycles into shop 2016-06-29 12:57:09 +10:00
Maikel Linke
e284ad62b2 Inject only relative enterprises into shopfront 
Other shops displayed in producer modals are lazy loaded when opening
their modal.
 2016-06-17 17:15:16 +10:00
Rob Harrington
7028fbe288 Find current_customer via current_distributor and current_user rather than current_order 
Moving available_payment_methods to enterprises_helper, as per available_shipping_methods
 2016-05-28 00:31:59 +10:00
Maikel Linke
a624a57bfb Pass current order to PaymentMethodSerializer 2016-05-25 17:12:47 +10:00
Steve Pettitt
fe3c0b8d29 Move data processing to model, add payment method preload 2016-03-10 21:42:42 +00:00
Steve Pettitt
b84f49a1c3 Satisfy style police 2016-02-24 20:39:26 +00:00
Steve Pettitt
ec3e158781 Merge current master 2016-02-20 17:24:57 +00:00
Maikel Linke
fbdeb557ca Loading only visible enterprises for group 2016-01-20 13:32:08 +11:00
stveep
698d36180d Move query from injector to User instance method 2016-01-07 13:25:15 +00:00
stveep
59adf88cad Feature spec 2015-12-22 22:59:07 +00:00
stveep
48896ab3d8 More serializer specs 2015-12-22 15:09:24 +00:00
stveep
da0810382b Sorting by most orders, currency symbol, hide until clicked, reformatting table headers 2015-12-21 22:19:00 +00:00
stveep
90e627ad60 Data manipulation and balance calc in rails instead 2015-12-21 17:40:36 +00:00
stveep
7e50cc9ce8 Data organisation in angular, basic table structure and balance calculation. 2015-12-21 14:12:38 +00:00
stveep
16ab8f04c3 Angularise /account page: Order service/controller, rough layout 2015-12-18 17:06:04 +00:00
Rohan Mitchell
31b726613d Avoid loading enterprise injection data when it's not be needed due to caching 2015-05-27 15:44:01 +10:00
Rohan Mitchell
1a887df412 Pull taxon computation out of the serialization loop 2015-05-27 15:44:01 +10:00
Rohan Mitchell
3afd636577 Pull relatives computation out of the serialization loop 2015-05-27 15:44:01 +10:00
Rohan Mitchell
4a59c85b3e Inject current hub from AMS rather than RABL 2015-05-27 15:44:01 +10:00
Rohan Mitchell
704955a185 Load active distributors where they're needed rather than in most controllers 2015-05-27 15:44:01 +10:00
Rohan Mitchell
ee8db23fd9 Pull shipping method service computations out of the serialization loop 2015-05-27 15:44:01 +10:00
Rohan Mitchell
f940984ca3 Pull earliest closing time computations out of the serialization loop 2015-05-27 15:44:01 +10:00
Rob Harrington
06f10398da Adding product property filter to shop page 2015-03-06 11:22:52 +11:00
Rob Harrington
45ed3a4cff Only pushes activated enterprises through to the frontend 2014-10-22 15:39:49 +11: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
6ee3010fa7 Differentiation of on-boarding process by url 2014-09-12 11:00:34 +10:00
Rob H
ef8f611458 Adding countries and states to registration 2014-09-11 17:07:05 +10:00
Rob H
7dc42c9e39 Creating an enterprise works in registration process 2014-09-11 17:07:05 +10:00
Rafael Schouten
dc266e066f another few class names 2014-09-10 19:43:14 +10:00
Rafael Schouten
991d0029dd add currency localisation 2014-09-08 00:06:53 +10:00
Will Marshall
562f8dbd4e Starting to restructure data injection 2014-07-18 11:21:51 +10:00
Will Marshall
158bdd145f All the new serializers and some specs 2014-07-17 14:23:09 +10:00