raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,803 Commits 18 Branches 452 Tags
ba0701457e4a40407fab11bcfa4ade04ccf8d6d8
Commit Graph

1073 Commits

Author SHA1 Message Date
Matt-Yorkley
ba0701457e Apply distributor td override 2018-09-11 11:42:08 +01:00
Matt-Yorkley
6389c552ca Apply distributor th override 2018-09-11 11:41:25 +01:00
Matt-Yorkley
1958ac9932 Apply distributor filter inputs override 2018-09-11 11:39:05 +01:00
Matt-Yorkley
c7e2f817ed Apply colgroup override 2018-09-11 11:34:34 +01:00
Matt-Yorkley
5a2491cb47 Apply ng-app override 2018-09-11 11:30:14 +01:00
Matt-Yorkley
980c46c63f Convert Spree view to HAML 2018-09-11 11:22:54 +01:00
stveep
17f2ba47ca Add label for card field 2018-08-19 12:00:31 +01:00
stveep
8c6b8d5e84 Move injectors outside Stripe partial to satisfy dependencies 2018-08-19 11:50:34 +01:00
stveep
286101c934 PR changes: switch syntax for mapCC, remove ng-init 2018-08-19 10:43:53 +01:00
stveep
f9a221e2ff add to manifest, tidy up requirements, hide postcode similar to frontend 2018-08-19 10:43:53 +01:00
stveep
8272aebe29 Add Stripe form and duplicate Stripe Elements in backend Angular app 2018-08-19 10:43:53 +01:00
Maikel
933ff63de2 Merge pull request #2389 from luisramos0/bulk_prod_edit_fix 
admin page fetcher is now synchronously fetching all pages before reso…
 2018-07-26 14:09:21 +10:00
Kristina Lim
5179f7fd63 Move logic for toggling by column into SortOptions 2018-07-23 10:33:40 +10:00
Kristina Lim
2bba72c5a9 Fix frontend sorting in "Bulk Order Management" 2018-07-23 10:33:40 +10:00
luisramos0
8246893652 Added notice for unexpected mail in confirmation instructions mail (HugsDaniel) 2018-07-19 09:26:29 +10: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
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
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
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
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
Maikel Linke
6243640bca Unify sales tax report rendering with others 2018-06-18 11:08:58 +10:00
Maikel Linke
66567fd9e6 Unify report table rendering 
There is a lot of code duplication in the report views and we would like
to change that code. So we move it into one file first.
 2018-06-18 11:08:58 +10:00
Rob Harrington
d0f8e9fba6 Reimplement import date filter as an actual Filter 2018-06-15 11:31:47 +10:00
Pau Perez
78e59d059a Show product import's UI only to superadmins 
We still need to iterate on its implementation and it's too early to
make it publicly available.
 2018-06-11 19:50:53 +02:00
Rob Harrington
5cbc4cbf30 Use scoped keys for table headers in saved card partial 2018-06-08 15:30:08 +10:00
Rob Harrington
18c211e97c Ensure that savedCreditCards always exists 2018-06-08 15:30:08 +10:00
Rob Harrington
e88e963b4c Alter cards interface to allow updating of default card 2018-06-08 15:30:07 +10:00
Matt-Yorkley
ffbb67d480 PI inventories additions 2018-05-26 19:34:19 +01:00
Matt-Yorkley
e362c2d867 PI timestamps 2018-05-26 19:34:19 +01:00
Pau Perez
2a3772dba0 Do not show icons for producer-enterprises 
Payment and shipping methods don't apply to them.
 2018-05-22 16:50:27 +02:00
Pau Perez
208e3bbadd Ensure non-distributors are listed in dashboard 
We want to show all enterprises in a single list regardless of their
type.
 2018-05-22 10:21:35 +02:00