| Line 44... |
Line 44... |
| 44 |
for k,v in line_item.additionalInfo.iteritems():
|
44 |
for k,v in line_item.additionalInfo.iteritems():
|
| 45 |
additional_info = AdditionalInfo()
|
45 |
additional_info = AdditionalInfo()
|
| 46 |
additional_info.key = k
|
46 |
additional_info.key = k
|
| 47 |
additional_info.value = v
|
47 |
additional_info.value = v
|
| 48 |
litem.additional_info.append(additional_info)
|
48 |
litem.additional_info.append(additional_info)
|
| - |
|
49 |
if t_transaction.warehouse_id:
|
| - |
|
50 |
transaction.warehouse_id = t_transaction.warehouse_id
|
| 49 |
if t_transaction.shoppingCartid:
|
51 |
if t_transaction.shoppingCartid:
|
| 50 |
transaction.shopping_cart_id = t_transaction.shoppingCartid
|
52 |
transaction.shopping_cart_id = t_transaction.shoppingCartid
|
| 51 |
transaction.customer_id = t_transaction.customer_id
|
53 |
transaction.customer_id = t_transaction.customer_id
|
| 52 |
transaction.expected_delivery_time = to_py_date(t_transaction.expectedDeliveryTime)
|
54 |
transaction.expected_delivery_time = to_py_date(t_transaction.expectedDeliveryTime)
|
| 53 |
#no need to set status. It is already set.
|
55 |
#no need to set status. It is already set.
|
| Line 92... |
Line 94... |
| 92 |
if not transaction:
|
94 |
if not transaction:
|
| 93 |
raise TransactionServiceException(108, "no such transaction")
|
95 |
raise TransactionServiceException(108, "no such transaction")
|
| 94 |
|
96 |
|
| 95 |
return transaction
|
97 |
return transaction
|
| 96 |
|
98 |
|
| 97 |
def get_all_transactions(status, from_date, to_date):
|
99 |
def get_all_transactions(status, from_date, to_date, warehouse_id):
|
| - |
|
100 |
|
| - |
|
101 |
query = Transaction.query
|
| - |
|
102 |
if warehouse_id:
|
| - |
|
103 |
query = query.filter_by(warehouse_id=warehouse_id)
|
| - |
|
104 |
|
| 98 |
if not status:
|
105 |
if not status:
|
| 99 |
if not from_date and not to_date:
|
106 |
if not from_date and not to_date:
|
| 100 |
#get all between from_date and to_date
|
107 |
#get all between from_date and to_date
|
| 101 |
return Transaction.query.all()
|
108 |
return query.all()
|
| 102 |
|
109 |
|
| 103 |
if not from_date:
|
110 |
if not from_date:
|
| 104 |
return Transaction.query.filter(Transaction.createdOn < to_date).all()
|
111 |
return query.filter(Transaction.createdOn < to_date).all()
|
| 105 |
|
112 |
|
| 106 |
if not to_date:
|
113 |
if not to_date:
|
| 107 |
return Transaction.query.filter(Transaction.createdOn > to_date).all()
|
114 |
return query.filter(Transaction.createdOn > to_date).all()
|
| 108 |
return Transaction.query.filter(and_(Transaction.createdOn < to_date , Transaction.createdOn > from_date)).all()
|
115 |
return query.filter(and_(Transaction.createdOn < to_date , Transaction.createdOn > from_date)).all()
|
| 109 |
|
116 |
|
| 110 |
|
117 |
|
| 111 |
if not from_date and not to_date:
|
118 |
if not from_date and not to_date:
|
| 112 |
return Transaction.query.filter(Transaction.status == status).all()
|
119 |
return query.filter(Transaction.status == status).all()
|
| 113 |
if not from_date:
|
120 |
if not from_date:
|
| 114 |
return Transaction.query.filter(and_(Transaction.status == status, Transaction.createdOn <to_date)).all()
|
121 |
return query.filter(and_(Transaction.status == status, Transaction.createdOn <to_date)).all()
|
| 115 |
if not from_date:
|
122 |
if not from_date:
|
| 116 |
return Transaction.query.filter(and_(Transaction.status == status, Transaction.createdOn >from_date)).all()
|
123 |
return query.filter(and_(Transaction.status == status, Transaction.createdOn >from_date)).all()
|
| 117 |
if not from_date:
|
124 |
if not from_date:
|
| 118 |
return Transaction.query.filter(and_(Transaction.status == status, and_(Transaction.createdOn <to_date, Transaction.createdOn > from_date))).all()
|
125 |
return query.filter(and_(Transaction.status == status, and_(Transaction.createdOn <to_date, Transaction.createdOn > from_date))).all()
|
| 119 |
|
126 |
|
| 120 |
|
127 |
|
| 121 |
def get_transactions_for_shipment_status(status, from_date, to_date):
|
128 |
def get_transactions_for_shipment_status(status, from_date, to_date):
|
| 122 |
|
129 |
|
| 123 |
if not status:
|
130 |
if not status:
|