|
@@ -1,13 +1,49 @@
|
|
class Order(object):
|
|
class Order(object):
|
|
- def __init__(self, id, ticket, status, title, note, id_metaservice, is_global, is_visible, service, service_type,
|
|
|
|
- time_created, time_placed, time_start=None, time_start_predicted=None, time_finish_predicted=None,
|
|
|
|
- time_start_real=None, time_finish_real=None, order_place_type=None, order_place_start=None,
|
|
|
|
- order_place_start_gps=None, order_place_start_real=None, order_place_start_real_gps=None,
|
|
|
|
- order_place_finish_predicted=None, order_place_finish_predicted_gps=None, order_place_finish_real=None,
|
|
|
|
- order_place_finish_real_gps=None, predicted_price=None, real_price=None, payment_transaction_id=None,
|
|
|
|
- rating_id=None, provider=None, provider_screen_name=None, receiver=None, receiver_screen_name=None,
|
|
|
|
- client_id=None, resource_id=None, attempts=None, asap=None, money_limit=None, tasks=None,
|
|
|
|
- proceed_before_arrival=False, confirmation=False):
|
|
|
|
|
|
+ def __init__(
|
|
|
|
+ self,
|
|
|
|
+ id,
|
|
|
|
+ ticket,
|
|
|
|
+ status,
|
|
|
|
+ title,
|
|
|
|
+ note,
|
|
|
|
+ id_metaservice,
|
|
|
|
+ is_global,
|
|
|
|
+ is_visible,
|
|
|
|
+ service,
|
|
|
|
+ service_type,
|
|
|
|
+ time_created,
|
|
|
|
+ time_placed,
|
|
|
|
+ time_start=None,
|
|
|
|
+ time_start_predicted=None,
|
|
|
|
+ time_finish_predicted=None,
|
|
|
|
+ time_start_real=None,
|
|
|
|
+ time_finish_real=None,
|
|
|
|
+ order_place_type=None,
|
|
|
|
+ order_place_start=None,
|
|
|
|
+ order_place_start_gps=None,
|
|
|
|
+ order_place_start_real=None,
|
|
|
|
+ order_place_start_real_gps=None,
|
|
|
|
+ order_place_finish_predicted=None,
|
|
|
|
+ order_place_finish_predicted_gps=None,
|
|
|
|
+ order_place_finish_real=None,
|
|
|
|
+ order_place_finish_real_gps=None,
|
|
|
|
+ predicted_price=None,
|
|
|
|
+ real_price=None,
|
|
|
|
+ payment_transaction_id=None,
|
|
|
|
+ rating_id=None,
|
|
|
|
+ provider=None,
|
|
|
|
+ provider_screen_name=None,
|
|
|
|
+ receiver=None,
|
|
|
|
+ receiver_screen_name=None,
|
|
|
|
+ client_id=None,
|
|
|
|
+ resource_id=None,
|
|
|
|
+ attempts=None,
|
|
|
|
+ asap=None,
|
|
|
|
+ money_limit=None,
|
|
|
|
+ tasks=None,
|
|
|
|
+ proceed_before_arrival=False,
|
|
|
|
+ confirmation=False
|
|
|
|
+ ):
|
|
self.id = id
|
|
self.id = id
|
|
self.ticket = ticket
|
|
self.ticket = ticket
|
|
self.status = status
|
|
self.status = status
|
|
@@ -53,15 +89,49 @@ class Order(object):
|
|
|
|
|
|
def __str__(self):
|
|
def __str__(self):
|
|
return "{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10}, {11}, {12}, {13}, {14}, {15}, {16}, {17}, {18}, {19}, {20}, {21}, {22}, {23}, {24}, {25}, {26}, {27}, {28}, {29}, {30}, {31}, {32}, {33}, {34}, {35}, {36}, {37}, {38}".format(
|
|
return "{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10}, {11}, {12}, {13}, {14}, {15}, {16}, {17}, {18}, {19}, {20}, {21}, {22}, {23}, {24}, {25}, {26}, {27}, {28}, {29}, {30}, {31}, {32}, {33}, {34}, {35}, {36}, {37}, {38}".format(
|
|
- self.id, self.ticket, self.status, self.title, self.note, self.id_metaservice, self.is_global,
|
|
|
|
- self.is_visible, self.service, self.service_type, self.time_created, self.time_placed, self.time_start,
|
|
|
|
- self.time_start_predicted, self.time_finish_predicted, self.time_start_real, self.time_finish_real,
|
|
|
|
- self.order_place_type, self.order_place_start, self.order_place_start_gps, self.order_place_start_real,
|
|
|
|
- self.order_place_start_real_gps, self.order_place_finish_predicted, self.order_place_finish_predicted_gps,
|
|
|
|
- self.order_place_finish_real, self.order_place_finish_real_gps, self.predicted_price, self.real_price,
|
|
|
|
- self.payment_transaction_id, self.rating_id, self.provider, self.provider_screen_name, self.receiver,
|
|
|
|
- self.receiver_screen_name, self.client_id, self.resource_id, self.attempts, self.asap, self.money_limit,
|
|
|
|
- self.tasks, self.proceed_before_arrival, self.confirmation)
|
|
|
|
|
|
+ self.id,
|
|
|
|
+ self.ticket,
|
|
|
|
+ self.status,
|
|
|
|
+ self.title,
|
|
|
|
+ self.note,
|
|
|
|
+ self.id_metaservice,
|
|
|
|
+ self.is_global,
|
|
|
|
+ self.is_visible,
|
|
|
|
+ self.service,
|
|
|
|
+ self.service_type,
|
|
|
|
+ self.time_created,
|
|
|
|
+ self.time_placed,
|
|
|
|
+ self.time_start,
|
|
|
|
+ self.time_start_predicted,
|
|
|
|
+ self.time_finish_predicted,
|
|
|
|
+ self.time_start_real,
|
|
|
|
+ self.time_finish_real,
|
|
|
|
+ self.order_place_type,
|
|
|
|
+ self.order_place_start,
|
|
|
|
+ self.order_place_start_gps,
|
|
|
|
+ self.order_place_start_real,
|
|
|
|
+ self.order_place_start_real_gps,
|
|
|
|
+ self.order_place_finish_predicted,
|
|
|
|
+ self.order_place_finish_predicted_gps,
|
|
|
|
+ self.order_place_finish_real,
|
|
|
|
+ self.order_place_finish_real_gps,
|
|
|
|
+ self.predicted_price,
|
|
|
|
+ self.real_price,
|
|
|
|
+ self.payment_transaction_id,
|
|
|
|
+ self.rating_id,
|
|
|
|
+ self.provider,
|
|
|
|
+ self.provider_screen_name,
|
|
|
|
+ self.receiver,
|
|
|
|
+ self.receiver_screen_name,
|
|
|
|
+ self.client_id,
|
|
|
|
+ self.resource_id,
|
|
|
|
+ self.attempts,
|
|
|
|
+ self.asap,
|
|
|
|
+ self.money_limit,
|
|
|
|
+ self.tasks,
|
|
|
|
+ self.proceed_before_arrival,
|
|
|
|
+ self.confirmation
|
|
|
|
+ )
|
|
|
|
|
|
|
|
|
|
# Тестовый класс User и Address (ВАЖНО!!!) поля классов должны называться также как и поля json объекта
|
|
# Тестовый класс User и Address (ВАЖНО!!!) поля классов должны называться также как и поля json объекта
|