raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-19 00:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 17 Branches 453 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

6861 Commits

Author SHA1 Message Date
Maikel
1dbd265b30 Merge pull request #2384 from luisramos0/open_new_tab 
added directive to make links open in new tab by default in textangul…
 2018-07-19 09:17:09 +10:00
Matt-Yorkley
583f16b38d Add guest label to admin customers index 2018-07-18 22:56:10 +01:00
Matt-Yorkley
5e142205bd Use relative translation keys 2018-07-18 13:35:23 +01:00
Matt-Yorkley
b37bea35fa Use relative translation keys 2018-07-18 11:43:31 +01:00
Matt-Yorkley
18206c9369 Remove old view file 2018-07-18 11:42:07 +01:00
Matt-Yorkley
c4af50e95c Add sidebar to Import index page 2018-07-15 23:12:26 +01:00
Matt-Yorkley
f344b7893d Remove Product Import guide page 2018-07-15 20:49:55 +01:00
Matt-Yorkley
8aed78b0e6 Don't allow save if invalid entries are present 2018-07-15 10:21:36 +01:00
Matt-Yorkley
a4210a1cab PI post-save UI changes 2018-07-15 00:27:21 +01:00
luisramos0
dfb510debe admin page fetcher is now receiving a onLastPageComplete function that is used to show "no results" messages only after the last page is fetched 2018-07-13 15:01:43 +10:00
Maikel Linke
43883d1ab4 Simplify email confirmation directive 
Making better use of Angular features.
Adding a spec for this functionality.
 2018-07-13 09:04:42 +10:00
Maikel Linke
a531135804 Remove unused data-hooks 2018-07-13 09:04:41 +10:00
Maikel Linke
e37213f6a5 Remove redundant edit action 2018-07-13 09:04:41 +10:00
Maikel Linke
28c2ad7160 Move override into view 2018-07-13 09:04:41 +10:00
Maikel Linke
a347837044 Move override into view 2018-07-13 09:04:41 +10:00
Maikel Linke
ab9975cb6c Move override into view 2018-07-13 09:04:41 +10:00
Maikel Linke
339b04a044 Convert spree admin user list to haml 2018-07-13 09:04:41 +10:00
Maikel Linke
9020e7ddd9 Import admin user list from Spree 2018-07-13 09:04:41 +10:00
Maikel Linke
60b66540df Add resend email button to admin user form 
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/1589
 2018-07-13 09:04:41 +10:00
Maikel Linke
6a58deb436 Add message about unconfirmed email to user form 2018-07-13 09:04:41 +10:00
Maikel Linke
8157897f76 Remove unused data hooks 2018-07-13 09:04:41 +10:00
Maikel Linke
9050a52cc2 Move admin user form override into view 2018-07-13 09:04:41 +10:00
Maikel Linke
2032ed6328 Convert admin user edit form to haml 2018-07-13 09:04:41 +10:00
Maikel Linke
cb1dc6e657 Import admin user edit form from spree_auth_devise 2018-07-13 09:04:41 +10:00
Maikel Linke
23dd09a8fa Convert Spree view from erb to haml 2018-07-13 09:04:41 +10:00
Maikel Linke
652cc6e677 Import admin user edit view from spree_auth_devise 
We would like to do some customisations and importing the whole file is
simpler and less error prone than using Spree's overrides.
 2018-07-13 09:04:40 +10:00
luisramos0
b302a1d03d added Enterprise registration exit message and moved step TYPE translations to a new structure on en.yml (test if transifex picks up the existing translations) 2018-07-12 08:53:06 +10:00
Rob Harrington
c71a5ec0df Update subscription form to use new card validations for Stripe payment method 2018-07-05 19:26:11 +10:00
Maikel
f5346289c7 Merge pull request #2388 from Matt-Yorkley/uk/pi_available_on 
Add available_on notes to PI guide
 2018-06-26 17:58:39 +10:00
Rob Harrington
d1d9c5a092 Add help button to saved cards list on account page 
Describes the purpose of the default card
 2018-06-22 15:39:47 +10:00
Rob Harrington
7db7084008 Use help-modal to display help text for authorised shops 
Also updated the text slightly to make it more clear when the purpose of authorised shops are
 2018-06-22 15:39:47 +10:00
Rob Harrington
6457a17fde Add basic view allowing customers to authorise shop use of their credit cards 2018-06-22 15:39:47 +10:00
Rob Harrington
e25574790b Split out float: right css from .help-btn.tiny selector 2018-06-22 15:39:46 +10:00
Keir Osborn
bd7e072938 embedded groups layout changes 2018-06-22 14:03:00 +10:00
Matt-Yorkley
aaba6da162 Add available_on notes to PI guide 2018-06-21 14:20:59 +10:00
Pau Pérez Fabregat
6cf09c936b Merge pull request #2345 from luisramos0/do-not-upcase-state 
removed uppercase from state on shops and producers lists in the frontoffice
 2018-06-20 21:30:10 +02:00
Maikel
3399eba428 Merge pull request #2367 from frank-west-iii/issue-2297-edit-product-cancel 
Move product bulk edit to product index route
 2018-06-20 17:53:57 +10:00
Rob Harrington
86d7453d26 Ask user to confirm oc date change for open order cycles with subsciptions 2018-06-20 13:06:05 +10:00
luisramos0
b8f1571282 added directive to make links open in new tab by default in textangular text areas in enterprise description, enterprise group description and in shopfront open and closed messages 2018-06-19 16:53:21 +01:00
Frank West
8324b00999 Renames product bulk edit action to index 
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.

It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
 2018-06-19 17:51:23 +10:00
Pau Pérez Fabregat
236920d28f Merge pull request #2357 from luisramos0/enterprises_country_state 
changed the country and state selectors to angular on enterprises admin
 2018-06-19 09:30:24 +02:00
Pau Pérez Fabregat
b1bccb07f2 Merge pull request #2369 from coopdevs/product-import-for-superadmins-only 
Show product import's UI only to superadmins
 2018-06-19 09:23:58 +02:00
Rob Harrington
dabef16606 Use ofn-select2 directive for country and state selectors on enterprise forms 2018-06-19 10:34:02 +10:00
luisramos0
d1019fcc5e changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed 2018-06-19 10:34:02 +10:00
Maikel
2bfb635bcc Merge pull request #2341 from luisramos0/checkout_country_state 
fixed country_state selectors on checkout
 2018-06-19 09:34:21 +10:00
luisramos0
ea9ea83fee improved checkout country and state selectors code 2018-06-18 14:50:03 +10:00
luisramos0
3cb0b76d21 fixed checkout tests by replacing state abbr with name in address selector boxes 2018-06-18 14:50:03 +10:00
luisramos0
836a5836d9 fixed country_state selectors on checkout 2018-06-18 14:50:03 +10:00
Maikel Linke
b7770510a7 Use CSS for layout 2018-06-18 11:08:58 +10:00
Maikel Linke
67c2574b0b Show report search instructions 
Solves: https://github.com/openfoodfoundation/openfoodnetwork/issues/2356
 2018-06-18 11:08:58 +10:00