| Line 1174... |
Line 1174... |
| 1174 |
if order.status == OrderStatus.ACCEPTED:
|
1174 |
if order.status == OrderStatus.ACCEPTED:
|
| 1175 |
order.jacket_number = jacketNumber
|
1175 |
order.jacket_number = jacketNumber
|
| 1176 |
|
1176 |
|
| 1177 |
if itemNumbers:
|
1177 |
if itemNumbers:
|
| 1178 |
lineitem.item_number = itemNumbers[0]
|
1178 |
lineitem.item_number = itemNumbers[0]
|
| 1179 |
if ItemType.SERIALIZED == item.type and not (serialNumbers and serialNumbers[0]):
|
- |
|
| 1180 |
raise TransactionServiceException(110, "No Serial Number supplied")
|
- |
|
| 1181 |
if serialNumbers:
|
- |
|
| 1182 |
lineitem.serial_number = serialNumbers[0]
|
- |
|
| 1183 |
|
1179 |
|
| 1184 |
if billingType == BillingType.EXTERNAL or billingType == BillingType.OURS_EXTERNAL:
|
1180 |
if billingType == BillingType.EXTERNAL or billingType == BillingType.OURS_EXTERNAL:
|
| 1185 |
if itemNumbers:
|
1181 |
if itemNumbers:
|
| 1186 |
lineitem.item_number = itemNumbers[0]
|
1182 |
lineitem.item_number = itemNumbers[0]
|
| 1187 |
if ItemType.SERIALIZED == item.type and not (serialNumbers and serialNumbers[0]):
|
- |
|
| 1188 |
raise TransactionServiceException(110, "No Serial Number supplied")
|
- |
|
| 1189 |
if serialNumbers:
|
1183 |
|
| 1190 |
lineitem.serial_number = serialNumbers[0]
|
- |
|
| 1191 |
|
- |
|
| 1192 |
if billedOrdersColorMap.has_key(orderId):
|
1184 |
if billedOrdersColorMap.has_key(orderId):
|
| 1193 |
etpColor = billedOrdersColorMap.get(orderId)
|
1185 |
etpColor = billedOrdersColorMap.get(orderId)
|
| 1194 |
ourColor = order.lineitems[0].color
|
1186 |
ourColor = order.lineitems[0].color
|
| 1195 |
if ourColor and etpColor != ourColor and not authorize:
|
1187 |
if ourColor and etpColor != ourColor and not authorize:
|
| 1196 |
raise TransactionServiceException(777, "ETP color: " + etpColor + " and Order color: " + ourColor)
|
1188 |
raise TransactionServiceException(777, "ETP color: " + etpColor + " and Order color: " + ourColor)
|
| Line 1199... |
Line 1191... |
| 1199 |
|
1191 |
|
| 1200 |
if billingType == BillingType.EXTERNAL:
|
1192 |
if billingType == BillingType.EXTERNAL:
|
| 1201 |
order.invoice_number = invoice_number
|
1193 |
order.invoice_number = invoice_number
|
| 1202 |
|
1194 |
|
| 1203 |
if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
|
1195 |
if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
|
| - |
|
1196 |
if ItemType.SERIALIZED == item.type and not (serialNumbers and serialNumbers[0]):
|
| - |
|
1197 |
raise TransactionServiceException(110, "No Serial Number supplied")
|
| - |
|
1198 |
if serialNumbers:
|
| - |
|
1199 |
lineitem.serial_number = serialNumbers[0]
|
| 1204 |
order.invoice_number = get_next_invoice_number(order.orderType)
|
1200 |
order.invoice_number = get_next_invoice_number(order.orderType)
|
| 1205 |
|
1201 |
|
| 1206 |
order.status = OrderStatus.BILLED
|
1202 |
order.status = OrderStatus.BILLED
|
| 1207 |
order.statusDescription = "Order Billed"
|
1203 |
order.statusDescription = "Order Billed"
|
| 1208 |
order.billing_timestamp = datetime.datetime.now()
|
1204 |
order.billing_timestamp = datetime.datetime.now()
|