Cayo Puigdefabregas
|
1e05f600a7
|
fixing schema in migration file
|
2021-06-15 14:29:38 +02:00 |
|
|
Cayo Puigdefabregas
|
b1f7b629c7
|
fixing url
|
2021-06-15 13:11:49 +02:00 |
|
|
Cayo Puigdefabregas
|
80b7b98ec8
|
adding trade documents to migration file
|
2021-06-15 12:58:10 +02:00 |
|
|
Cayo Puigdefabregas
|
315eb097c9
|
change view for save hash
|
2021-06-15 12:38:24 +02:00 |
|
|
Cayo Puigdefabregas
|
b1414cf143
|
redefine models
|
2021-06-15 12:38:02 +02:00 |
|
|
Cayo Puigdefabregas
|
7cee2693ff
|
resolve conflict
|
2021-06-15 11:22:17 +02:00 |
|
|
Cayo Puigdefabregas
|
0d4c70a74e
|
fixing bug
|
2021-06-11 15:49:31 +02:00 |
|
|
Cayo Puigdefabregas
|
ab32b996bd
|
resolve conflict
|
2021-06-11 12:52:39 +02:00 |
|
|
Cayo Puigdefabregas
|
b12d54d6f1
|
drop id of trade action
|
2021-06-11 12:27:14 +02:00 |
|
|
Cayo Puigdefabregas
|
2cfb126c6c
|
fixing litle bug in delete dev of a lot
|
2021-06-11 12:26:36 +02:00 |
|
|
Cayo Puigdefabregas
|
94d4b57be9
|
fixing id of trading
|
2021-06-09 12:02:31 +02:00 |
|
cayop
|
a0d26a104f
|
Merge pull request #140 from eReuse/feature/endpoint-confirm
Feature/endpoint confirm
|
2021-06-09 11:46:32 +02:00 |
|
|
Cayo Puigdefabregas
|
c0558733ec
|
fixing remove decvices from a temporary lot
|
2021-06-09 11:36:11 +02:00 |
|
|
Cayo Puigdefabregas
|
eaea1c3fa3
|
Merge branch 'feature/endpoint-confirm' into feature/trade-documents
|
2021-06-08 16:14:54 +02:00 |
|
|
Cayo Puigdefabregas
|
99fe0407f0
|
clean
|
2021-06-08 16:14:30 +02:00 |
|
|
Cayo Puigdefabregas
|
1e0d993cfe
|
resolve conflict
|
2021-06-08 09:30:13 +02:00 |
|
|
Cayo Puigdefabregas
|
24e05b4ecd
|
fixing foreinkey action for confirm actions
|
2021-06-07 18:18:09 +02:00 |
|
|
Cayo Puigdefabregas
|
1da5a6cc0e
|
fixing migration
|
2021-06-07 17:12:53 +02:00 |
|
|
Cayo Puigdefabregas
|
e9a09ec2ae
|
fixing automatic confirmation
|
2021-06-07 17:12:30 +02:00 |
|
|
Cayo Puigdefabregas
|
6546332fe5
|
swap @s for _s in code
|
2021-06-07 16:04:33 +02:00 |
|
|
Cayo Puigdefabregas
|
a9b341076a
|
fixed
|
2021-06-07 15:48:55 +02:00 |
|
|
Cayo Puigdefabregas
|
eb52c39ca3
|
fixing migrations
|
2021-06-07 15:45:48 +02:00 |
|
|
Cayo Puigdefabregas
|
f9189ea413
|
confirm check
|
2021-06-07 15:45:32 +02:00 |
|
|
Cayo Puigdefabregas
|
8289f24b69
|
fixing confirm and code in schema
|
2021-06-07 15:45:04 +02:00 |
|
|
Cayo Puigdefabregas
|
efbc74f7fb
|
fixing confirm in migrate
|
2021-06-07 14:37:56 +02:00 |
|
|
Cayo Puigdefabregas
|
589c399231
|
fixing relation files interdependences
|
2021-06-07 13:10:28 +02:00 |
|
|
Cayo Puigdefabregas
|
f3f65efeaf
|
resolve conflicts
|
2021-06-07 12:08:55 +02:00 |
|
|
Cayo Puigdefabregas
|
289126a8a7
|
fixing revoke
|
2021-06-07 11:48:50 +02:00 |
|
|
Cayo Puigdefabregas
|
21cdcb5350
|
simplify the algorithm for to manager the confirms flow
|
2021-06-07 10:50:08 +02:00 |
|
|
Cayo Puigdefabregas
|
6dc7fb830b
|
fixing bug of filter devices
|
2021-06-06 10:02:24 +02:00 |
|
|
Cayo Puigdefabregas
|
80e74b6d3d
|
fixing supplier and receiver
|
2021-06-04 19:27:01 +02:00 |
|
|
Cayo Puigdefabregas
|
a0824f986b
|
not allow than other users can insert devices, show better the status of trade for devices
|
2021-06-03 19:05:57 +02:00 |
|
|
Cayo Puigdefabregas
|
8d1e6bb2d7
|
drop istemporary lot
|
2021-06-03 12:11:14 +02:00 |
|
|
Cayo Puigdefabregas
|
e4554a9e27
|
use open filter for checke frontend trade
|
2021-06-02 15:33:03 +02:00 |
|
|
Cayo Puigdefabregas
|
0c99a85361
|
add raise instead of assert
|
2021-06-02 13:46:28 +02:00 |
|
|
Cayo Puigdefabregas
|
20e029b359
|
bugfix: restriction delete lot by the owner
|
2021-06-02 10:11:20 +02:00 |
|
|
Cayo Puigdefabregas
|
57c9269907
|
add trade instead of deliverynote in lots view
|
2021-06-02 10:10:36 +02:00 |
|
|
Cayo Puigdefabregas
|
6c689878a4
|
Fixing schema trade
|
2021-06-01 15:59:54 +02:00 |
|
|
Cayo Puigdefabregas
|
e1348e3809
|
adding isTemporary lot
|
2021-05-31 11:34:46 +02:00 |
|
|
Cayo Puigdefabregas
|
6142b89f41
|
adding confirm_status in devices
|
2021-05-27 15:56:10 +02:00 |
|
|
Cayo Puigdefabregas
|
ef2e800281
|
change confirm for confirms field
|
2021-05-27 15:55:24 +02:00 |
|
|
Cayo Puigdefabregas
|
8731d90d9a
|
add lots in csv of devices
|
2021-05-26 11:43:53 +02:00 |
|
|
Cayo Puigdefabregas
|
145cc2ec3e
|
Merge branch 'testing' of https://github.com/eReuse/devicehub-teal into testing
|
2021-05-26 11:01:13 +02:00 |
|
|
Cayo Puigdefabregas
|
816411aa7b
|
fixing settings.ini wbconf
|
2021-05-26 11:00:43 +02:00 |
|
|
Cayo Puigdefabregas
|
ab3510b67b
|
fixed bug
|
2021-05-25 12:57:21 +02:00 |
|
|
Cayo Puigdefabregas
|
dd03b4d203
|
change id of migration fixied
|
2021-05-25 11:46:13 +02:00 |
|
|
Cayo Puigdefabregas
|
1098ef773f
|
resolve conflict
|
2021-05-25 09:03:34 +02:00 |
|
|
Cayo Puigdefabregas
|
b34feee800
|
fixing bug
|
2021-05-24 13:00:03 +02:00 |
|
|
Cayo Puigdefabregas
|
2a66fb94a3
|
actions trade for documents
|
2021-05-21 13:16:30 +02:00 |
|
|
Cayo Puigdefabregas
|
28da6a953d
|
adding trade for documents
|
2021-05-19 13:59:59 +02:00 |
|
|
Cayo Puigdefabregas
|
020e6afd53
|
saved phisical documents to disk
|
2021-05-19 09:47:14 +02:00 |
|
|
Cayo Puigdefabregas
|
4b11372719
|
Definition of endpoint, view and scheme for basic document
|
2021-05-14 12:58:56 +02:00 |
|
|
Cayo Puigdefabregas
|
a3f5401e1f
|
fixing versions of alembic
|
2021-05-13 17:27:19 +02:00 |
|
|
Cayo Puigdefabregas
|
c21de78982
|
base for documents
|
2021-05-13 13:35:46 +02:00 |
|
|
Cayo Puigdefabregas
|
821178359e
|
resolve conflicts
|
2021-05-12 19:06:03 +02:00 |
|
|
Cayo Puigdefabregas
|
a1119b6130
|
Merge branch 'testing' into feature/endpoint-confirm
|
2021-05-12 18:52:50 +02:00 |
|
|
Cayo Puigdefabregas
|
3fc3828326
|
up version
|
2021-05-12 17:31:44 +02:00 |
|
|
Cayo Puigdefabregas
|
c7ff58273f
|
fixing bug changing database model
|
2021-05-12 13:02:36 +02:00 |
|
|
Cayo Puigdefabregas
|
5222f2ceb7
|
add actionDocuments and drop documents field from Trade action
|
2021-05-12 11:48:52 +02:00 |
|
|
Cayo Puigdefabregas
|
f36fa2bb7d
|
add var in config
|
2021-05-12 11:47:03 +02:00 |
|
|
Cayo Puigdefabregas
|
e2898b22a3
|
fixing defs
|
2021-05-10 11:52:10 +02:00 |
|
|
Cayo Puigdefabregas
|
dc5d8fcbe0
|
fixing representation classes
|
2021-05-10 11:51:28 +02:00 |
|
|
Cayo Puigdefabregas
|
7593c4e7df
|
cleaning and fixing validates of trade and confirms
|
2021-05-10 11:50:13 +02:00 |
|
|
Cayo Puigdefabregas
|
2808da24ba
|
adding Confirm and Revoke in the lots when it is a trade lot
|
2021-05-10 11:48:43 +02:00 |
|
|
Cayo Puigdefabregas
|
a2f106bed0
|
move views actions in more files
|
2021-05-10 11:47:56 +02:00 |
|
|
Cayo Puigdefabregas
|
951d067dd6
|
adding revoke and fixing ConfigRevike
|
2021-04-30 17:54:03 +02:00 |
|
|
Cayo Puigdefabregas
|
34fbf0dca6
|
ConfirmRevoke as a new action
|
2021-04-30 12:44:32 +02:00 |
|
|
Cayo Puigdefabregas
|
b2bd820d50
|
resolve conflict
|
2021-04-29 17:04:25 +02:00 |
|
|
Cayo Puigdefabregas
|
76271ce430
|
drop tradeNotes
|
2021-04-29 11:25:17 +02:00 |
|
|
Cayo Puigdefabregas
|
4afa21d7d7
|
Merge branch 'testing' into feature/#135-trade-without-to
|
2021-04-29 11:23:00 +02:00 |
|
|
Cayo Puigdefabregas
|
faf45e118b
|
upgrade version to 1.0.6b
|
2021-04-27 21:33:38 +02:00 |
|
|
Cayo Puigdefabregas
|
ec4d87d8ec
|
add blank line
|
2021-04-27 15:39:37 +02:00 |
|
|
Cayo Puigdefabregas
|
035c4fa269
|
validate schema confirm
|
2021-04-27 15:39:11 +02:00 |
|
|
Cayo Puigdefabregas
|
c1081994de
|
fixing model
|
2021-04-27 13:54:13 +02:00 |
|
|
Cayo Puigdefabregas
|
77ddb79d64
|
fixing versions of migrations
|
2021-04-26 18:16:38 +02:00 |
|
|
Cayo Puigdefabregas
|
97d784f849
|
Merge branch 'testing' into feature/endpoint-confirm
|
2021-04-26 17:11:35 +02:00 |
|
|
Cayo Puigdefabregas
|
a65e4ffb82
|
fixing bug
|
2021-04-26 15:22:30 +02:00 |
|
|
Cayo Puigdefabregas
|
e2fbe87c6a
|
clean actionView of Snapshot section put in other class
|
2021-04-22 13:40:45 +02:00 |
|
|
Cayo Puigdefabregas
|
39dc489cb3
|
clean ActionView with more classes
|
2021-04-22 13:04:38 +02:00 |
|
|
Cayo Puigdefabregas
|
310d92169b
|
fixed view confirm
|
2021-04-22 11:13:04 +02:00 |
|
|
Cayo Puigdefabregas
|
e65dfbdc0c
|
fixing schema confirm
|
2021-04-22 11:12:14 +02:00 |
|
|
Cayo Puigdefabregas
|
865c9d5d07
|
fixing model confirm
|
2021-04-22 11:11:23 +02:00 |
|
|
Cayo Puigdefabregas
|
21a5d14adc
|
def confirm endpoint
|
2021-04-22 11:10:13 +02:00 |
|
|
Cayo Puigdefabregas
|
939a2bff71
|
clean tradeview for obsolet
|
2021-04-21 14:45:53 +02:00 |
|
|
Cayo Puigdefabregas
|
4e6f43a8bb
|
new tradenote schema
|
2021-04-21 14:43:41 +02:00 |
|
|
Cayo Puigdefabregas
|
57ca10be38
|
fixing model tradenote
|
2021-04-21 14:43:21 +02:00 |
|
|
Cayo Puigdefabregas
|
17b409c9ee
|
redefine tradenoteDef
|
2021-04-21 14:37:32 +02:00 |
|
|
Cayo Puigdefabregas
|
f57b65107e
|
fixing enum in migration
|
2021-04-20 21:45:43 +02:00 |
|
|
Cayo Puigdefabregas
|
85e514bb6d
|
fixing enum in migration
|
2021-04-20 21:37:00 +02:00 |
|
|
Cayo Puigdefabregas
|
1b9aaf538a
|
fixing migrations
|
2021-04-20 19:12:07 +02:00 |
|
|
Cayo Puigdefabregas
|
c6f908041b
|
adding tradenote to migration
|
2021-04-20 16:26:58 +02:00 |
|
|
Cayo Puigdefabregas
|
6822c5bbf8
|
made one automatic note when add/remove one device of one lot
|
2021-04-20 16:21:02 +02:00 |
|
|
Cayo Puigdefabregas
|
afea2cff79
|
adding confirmation model
|
2021-04-20 16:19:40 +02:00 |
|
|
Cayo Puigdefabregas
|
006fe4b855
|
fixing definitions
|
2021-04-19 19:37:26 +02:00 |
|
|
Cayo Puigdefabregas
|
387c2e15e5
|
fixing view action trade
|
2021-04-19 19:34:22 +02:00 |
|
|
Cayo Puigdefabregas
|
3bb7482876
|
fixing schemas and states
|
2021-04-19 19:33:35 +02:00 |
|
|
Cayo Puigdefabregas
|
e058e2491f
|
change model for trade
|
2021-04-19 19:33:05 +02:00 |
|
|
Cayo Puigdefabregas
|
55e27caa83
|
change migrations
|
2021-04-19 19:32:32 +02:00 |
|
|
Cayo Puigdefabregas
|
149255bcfe
|
resolve conflicts
|
2021-04-16 18:16:07 +02:00 |
|
|
Cayo Puigdefabregas
|
e9d85e3d9e
|
resolv conflict
|
2021-04-16 15:46:19 +02:00 |
|
|
Cayo Puigdefabregas
|
e6f098abc8
|
Merge branch 'testing' into feature/#130-code-for-device
|
2021-04-16 14:44:49 +02:00 |
|
|
Cayo Puigdefabregas
|
70188f43a2
|
simplify get_token method
|
2021-04-15 21:21:41 +02:00 |
|
|
Cayo Puigdefabregas
|
3f423e7712
|
drop schema users for view
|
2021-04-15 21:20:08 +02:00 |
|
|
Cayo Puigdefabregas
|
e1f8f89a9b
|
fixing auth for token
|
2021-04-15 21:19:20 +02:00 |
|
|
Cayo Puigdefabregas
|
b3d77ba212
|
fixing model and migration
|
2021-04-15 21:18:15 +02:00 |
|
|
Cayo Puigdefabregas
|
bae5a1d2b1
|
add session schema
|
2021-04-15 21:17:24 +02:00 |
|
|
Cayo Puigdefabregas
|
9c489c7564
|
fixing create new users
|
2021-04-15 21:16:32 +02:00 |
|
|
Cayo Puigdefabregas
|
d46db11813
|
adding devices from lot
|
2021-04-14 13:02:39 +02:00 |
|
|
Cayo Puigdefabregas
|
e1cca540c4
|
change verification link for erasure certificate doc
|
2021-04-13 19:02:16 +02:00 |
|
|
Cayo Puigdefabregas
|
21f019dc14
|
useing session table in wbconf
|
2021-04-13 18:33:49 +02:00 |
|
|
Cayo Puigdefabregas
|
bfa9746de1
|
session table and model
|
2021-04-13 18:33:15 +02:00 |
|
|
Cayo Puigdefabregas
|
7e4513f5d2
|
Merge branch 'testing' into feature/#128-endpoint-config-wb
|
2021-04-12 19:48:23 +02:00 |
|
|
Cayo Puigdefabregas
|
4704045da8
|
more easy to read
|
2021-04-12 19:34:33 +02:00 |
|
|
Cayo Puigdefabregas
|
3be8678328
|
resolve bad name of var logout1
|
2021-04-12 12:10:57 +02:00 |
|
|
Cayo Puigdefabregas
|
aa09413011
|
fixing review comments
|
2021-04-12 12:05:52 +02:00 |
|
|
Cayo Puigdefabregas
|
22633054ba
|
fixing phantom account existing
|
2021-04-09 22:21:13 +02:00 |
|
|
Cayo Puigdefabregas
|
a882396f09
|
check the propertary of the devices
|
2021-04-09 22:20:30 +02:00 |
|
|
Cayo Puigdefabregas
|
48894567c3
|
check if the validate user is one of the users of the trade
|
2021-04-09 20:12:30 +02:00 |
|
|
Cayo Puigdefabregas
|
eae5422d42
|
resolve conflict
|
2021-04-09 14:57:26 +02:00 |
|
|
Cayo Puigdefabregas
|
c5ef11e670
|
fixing for todo trade pr
|
2021-04-09 14:43:20 +02:00 |
|
|
Cayo Puigdefabregas
|
2ab9afa1e4
|
fixing migration
|
2021-04-08 21:31:50 +02:00 |
|
|
Cayo Puigdefabregas
|
e88a508efb
|
create correct migrations
|
2021-04-08 21:22:10 +02:00 |
|
|
Cayo Puigdefabregas
|
b80322355f
|
create automatic trade and creation of phantom account in the view
|
2021-04-08 21:21:29 +02:00 |
|
|
Cayo Puigdefabregas
|
f7f60f6988
|
remove pdbs
|
2021-04-08 21:20:14 +02:00 |
|
|
Cayo Puigdefabregas
|
17a744a660
|
add filter active and phantom for login view
|
2021-04-08 21:19:24 +02:00 |
|
|
Cayo Puigdefabregas
|
9a43ab0097
|
add new columns in user model, (active and phantom fields)
|
2021-04-08 19:13:28 +02:00 |
|
|
Cayo Puigdefabregas
|
a9ec5de237
|
do a better check from schema
|
2021-04-08 19:11:27 +02:00 |
|
|
Cayo Puigdefabregas
|
054f59453d
|
fixing tests
|
2021-04-08 19:09:52 +02:00 |
|
|
Cayo Puigdefabregas
|
6fde0cabc6
|
change offer with new requirements
|
2021-04-07 10:49:28 +02:00 |
|
|
Cayo Puigdefabregas
|
84fac3f04a
|
fixing schema offer
|
2021-04-03 17:47:30 +02:00 |
|
|
Cayo Puigdefabregas
|
98daa0e3ad
|
fixing enum currency in migration
|
2021-04-03 17:46:16 +02:00 |
|
|
Cayo Puigdefabregas
|
799c2a49bc
|
fixing migration
|
2021-04-03 15:09:53 +02:00 |
|
|
Cayo Puigdefabregas
|
5df9c46f43
|
fixing shema and model
|
2021-04-03 15:09:35 +02:00 |
|
|
Cayo Puigdefabregas
|
bbc22f4a53
|
Merge branch 'testing' into feature/trade-without-from
|
2021-04-03 15:02:06 +02:00 |
|
|
Cayo Puigdefabregas
|
47dd5b24d8
|
change offer-trade for 2192 aproach
|
2021-04-03 13:33:56 +02:00 |
|
|
Cayo Puigdefabregas
|
83eeace6fa
|
fixing migrations
|
2021-03-26 17:58:05 +01:00 |
|
|
Cayo Puigdefabregas
|
8f1eee0e89
|
fixing url to device
|
2021-03-26 17:57:45 +01:00 |
|
|
Cayo Puigdefabregas
|
ee55020f3c
|
resolve conflict
|
2021-03-26 11:04:04 +01:00 |
|
|
Cayo Puigdefabregas
|
45b44ce17b
|
fixing tests
|
2021-03-25 11:26:30 +01:00 |
|
|
Cayo Puigdefabregas
|
e884ced4d1
|
try define offer
|
2021-03-24 14:17:18 +01:00 |
|
|
Cayo Puigdefabregas
|
edf3700fde
|
Adding Offer action
|
2021-03-19 11:53:04 +01:00 |
|
|
Cayo Puigdefabregas
|
a66ddc8390
|
bugfix trade action
|
2021-03-18 16:36:19 +01:00 |
|
|
Cayo Puigdefabregas
|
acbc252fe8
|
new version of trade
|
2021-03-18 10:59:38 +01:00 |
|
|
Cayo Puigdefabregas
|
361c4946fe
|
fixing migrations
|
2021-03-16 21:43:57 +01:00 |
|
|
Cayo Puigdefabregas
|
34aeae9908
|
fixing models
|
2021-03-16 21:39:17 +01:00 |
|
|
Cayo Puigdefabregas
|
4cbe28d591
|
fixing comment
|
2021-03-16 20:55:07 +01:00 |
|
|
Cayo Puigdefabregas
|
b13d8e5b97
|
fixing merge
|
2021-03-16 20:50:57 +01:00 |
|
|
Cayo Puigdefabregas
|
f9281fbdc0
|
Merge branch 'testing' into feature/#126-named-system-tags
|
2021-03-16 20:01:55 +01:00 |
|
|
Cayo Puigdefabregas
|
4d01e7f05d
|
fixing bug unamed in csv
|
2021-03-16 15:43:42 +01:00 |
|
|
Cayo Puigdefabregas
|
d7e50be052
|
models of new trade
|
2021-03-16 14:31:38 +01:00 |
|