Merge branch 'feature/renting' of https://github.com/eReuse/devicehub-teal into feature/renting

This commit is contained in:
Cayo Puigdefabregas 2020-12-01 15:53:51 +01:00
commit 567a575e36
1 changed files with 10 additions and 25 deletions

View File

@ -447,26 +447,8 @@ class Prepare(ActionWithMultipleDevices):
class Live(ActionWithOneDevice):
ip = ... # type: Column
subdivision_confidence = ... # type: Column
subdivision = ... # type: Column
city = ... # type: Column
city_confidence = ... # type: Column
isp = ... # type: Column
organization = ... # type: Column
organization_type = ... # type: Column
def __init__(self, **kwargs) -> None:
super().__init__(**kwargs)
self.ip = ... # type: Union[ipaddress.IPv4Address, ipaddress.IPv6Address]
self.subdivision_confidence = ... # type: int
self.subdivision = ... # type: enums.Subdivision
self.city = ... # type: str
self.city_confidence = ... # type: int
self.isp = ... # type: str
self.organization = ... # type: str
self.organization_type = ... # type: str
self.country = ... # type: Country
serial_number = ... # type: Column
time = ... # type: Column
class Organize(ActionWithMultipleDevices):
@ -527,12 +509,15 @@ class DisposeProduct(Trade):
class TransferOwnershipBlockchain(Trade):
pass
class Allocate(ActionWithMultipleDevices):
code = ... # type: Column
end_users = ... # type: Column
class Receive(ActionWithMultipleDevices):
agent_from = ... # type: relationship
agent_to = ... # type: relationship
action = ... # type: relationship
class Deallocate(ActionWithMultipleDevices):
code = ... # type: Column
class Migrate(ActionWithMultipleDevices):