1
0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-09-06 01:09:48 +08:00

1018 Commits

Author SHA1 Message Date
Phoenix
206cbe2bdd Changing spot to ex-rack 2019-09-16 16:33:53 +01:00
Phoenix
256eb48d36 Account and user search now working, same as before will be a bit buggy if you want to navigate through paginate tabs with an unfiltered list with text in the input field, if that's a big problem we can rethink it :) 2019-09-16 16:09:31 +01:00
Phoenix
bc81cbb6e2 List now working properly for user, user search with substring and without, one caveat is that if you type something into the search bar but don't search it'll act as if you're trying to do a substring search.. Might be an annoying bug or might not matter 2019-09-16 13:59:00 +01:00
Phoenix
32cf6f0d11 Subsearch now work, backend still needs to be perfected, paginate doesn't work properly with the logic I tried to implement 2019-09-16 12:10:04 +01:00
Chad Derya
310c9f4784 made seller specific account stuff only for de a 2019-09-12 18:45:39 +01:00
Chad Derya
41eb5552dc added user type to germany users list 2019-09-12 18:22:53 +01:00
Chad Derya
b95bd2a23d minoe fixes, removed status from terminal as it doesnt exist 2019-09-12 18:06:17 +01:00
Chad Derya
48c2c14e94 hide full name of a terminal from DE 2019-09-12 11:34:52 +01:00
Chad Derya
a23b0611b0 clear out terminal create after save ,show id in UK, show fullname inDE 2019-09-11 23:33:16 +01:00
Chad Derya
8f29a42338 made some terminal display fields only for DE 2019-09-11 23:09:15 +01:00
Chad Derya
557a556476 updated label for consistency 2019-09-11 22:03:39 +01:00
Chad Derya
e0b367c1da Added rest of the germany fuel columns 2019-09-11 21:58:05 +01:00
Chad Derya
cef39fe5c0 prroduct type edit works 2019-09-11 21:43:24 +01:00
Chad Derya
1d063b9850 Hide unnecessary fields from UK product edit/create 2019-09-11 20:49:56 +01:00
Chad Derya
0a4f337f00 Removed testing thingy 2019-09-11 20:42:16 +01:00
Chad Derya
c99fdb28b3 Silly eslint 2019-09-11 20:40:36 +01:00
Chad Derya
f3ee6a38b2 Merge branch 'OLFBP-885' into OLFBP-885 2019-09-11 20:09:52 +01:00
Chad Derya
c1b858c3e8 First commit 2019-09-11 19:42:06 +01:00
Chad Derya
131e790e26 Added user name and user status fields to user view 2019-09-11 19:17:39 +01:00
Chad Derya
cb86b920be Updated user edit acording to feed back 2019-09-11 18:54:25 +01:00
Chad Derya
ab754e7f1b Getting the correct list of accounts on edit users 2019-09-11 18:02:17 +01:00
Chad Derya
a464270171 Show region name in the DE terminals table 2019-09-11 13:56:33 +01:00
Chad Derya
1dad28d2ae Terminals list refreshes once a teminal is deleted 2019-09-11 12:05:35 +01:00
Chad Derya
02d9a1765d Added terminal Identifier to UK admin 2019-09-11 12:02:03 +01:00
Chad Derya
abdc79688a bug with created terminal data not going to edit page 2019-09-11 11:46:42 +01:00
Chad Derya
dd467e8ef8 re labeled all instances of account to terminal, clear create terminal
after save
2019-09-11 09:52:04 +01:00
Dean Bartok-Thomas
a242a18e52 Fix foraccounts not defaulting the conf email 2019-09-11 08:46:24 +01:00
Dean Bartok-Thomas
2f4f82ee11 remove the order conf field 2019-09-10 22:00:16 +01:00
Dean Bartok-Thomas
013b12988f Added new orderCompleteEmail alert fields 2019-09-10 21:50:54 +01:00
Chad Derya
a9d8cce29e showing only the required cols 2019-09-10 20:37:16 +01:00
Chad Derya
7f3a8eedf0 Adding rest of the columns WIP 2019-09-10 20:24:04 +01:00
Chad Derya
8605cb1b87 filter by name works, removed some more code 2019-09-10 19:26:08 +01:00
Chad Derya
3823ba30ad removed pagination from terminals for now (wasnt working anyway) 2019-09-10 19:24:26 +01:00
Chad Derya
bb15b8f258 renamed terminal file, temporary fix for an error 2019-09-10 18:58:28 +01:00
Chad Derya
84a41f2276 Made fuel type radio for uk, page refresh after closing popup 2019-09-10 16:49:16 +01:00
Dean Bartok-Thomas
fd265ae8bb Add ability to manage account lifting periods and payment terms in admin 2019-09-10 15:31:16 +01:00
Chad Derya
f7c2b15c46 re fetch products after succesfull delete 2019-09-10 14:29:29 +01:00
Chad Derya
776efdd2ad deleting individual fuels and terminals work 2019-09-10 13:45:55 +01:00
Chad Derya
b3ac795200 Improve loading message 2019-09-10 11:42:55 +01:00
Chad Derya
6ae0a40529 delete confirmation screen dynamic and pretty for success and error 2019-09-10 09:56:57 +01:00
Chad Derya
11dca03aa8 Added delete to terminals 2019-09-09 22:09:35 +01:00
Chad Derya
ea34bf3e80 renamed and relocated delete popup 2019-09-09 21:55:20 +01:00
Chad Derya
619ae1b940 Delete only the selected fuel, but lets not play with fire at this time of the night, and accidentally delete all fuels
Test in the morning
2019-09-09 20:11:18 +01:00
Chad Derya
08349b68e8 Confirm delete button becomes enabled if item name matches the input text 2019-09-09 19:28:40 +01:00
Chad Derya
51aeb7629f made delete component reusable, added error and success place holder 2019-09-09 19:03:32 +01:00
Chad Derya
0ee3fc3722 made the delete component look all pretty, some place holders, removed 2019-09-09 17:13:59 +01:00
Chad Derya
22b113e76c Have a pop up for deleting 2019-09-09 16:27:28 +01:00
Chad Derya
353fc9b39c Properly clearing the create product fuel, after creating
apparently we cannot  Deep Clone using Object.assign({}, obj);
2019-09-09 15:21:37 +01:00
Chad Derya
c7d3ce9a99 fixed a bug where admin create a fuel then, edit page not showing correct details of fuel 2019-09-09 15:04:48 +01:00
Chad Derya
7fa961b5b8 Added the missing fields in to fuels 2019-09-09 14:36:31 +01:00