| Line 34... |
Line 34... |
| 34 |
from shop2020.model.v1.order.impl.DataAccessors import get_recharge_orders_for_status, update_recharge_order_status,\
|
34 |
from shop2020.model.v1.order.impl.DataAccessors import get_recharge_orders_for_status, update_recharge_order_status,\
|
| 35 |
update_recharge_transaction_status, get_next_invoice_number
|
35 |
update_recharge_transaction_status, get_next_invoice_number
|
| 36 |
from shop2020.model.v1.order.impl import DataService
|
36 |
from shop2020.model.v1.order.impl import DataService
|
| 37 |
from shop2020.model.v1.order.impl.DataService import RechargeTransaction, HotspotStore,\
|
37 |
from shop2020.model.v1.order.impl.DataService import RechargeTransaction, HotspotStore,\
|
| 38 |
WalletForCompany, WalletHistoryForCompany, RechargeCollection, Company, HotspotServiceMatrix,\
|
38 |
WalletForCompany, WalletHistoryForCompany, RechargeCollection, Company, HotspotServiceMatrix,\
|
| 39 |
RechargeVoucherTracker, SpiceTransactionHistory
|
39 |
RechargeVoucherTracker, SpiceTransactionHistory, DtrBatchCreditTracker
|
| 40 |
from shop2020.model.v1.order.impl.model.RechargeOrder import RechargeOrder
|
40 |
from shop2020.model.v1.order.impl.model.RechargeOrder import RechargeOrder
|
| 41 |
from shop2020.model.v1.order.impl.RechargeService import checkTransactionStatus, getRefunds, getBalance,\
|
41 |
from shop2020.model.v1.order.impl.RechargeService import checkTransactionStatus, getRefunds, getBalance,\
|
| 42 |
getRechargeClient, checkTransactionStatus, getAllTransactions, getRechargeStatus
|
42 |
getRechargeClient, checkTransactionStatus, getAllTransactions, getRechargeStatus
|
| 43 |
from sqlalchemy.sql.expression import and_, or_, desc, not_, distinct, cast, between
|
43 |
from sqlalchemy.sql.expression import and_, or_, desc, not_, distinct, cast, between
|
| 44 |
|
44 |
|
| Line 288... |
Line 288... |
| 288 |
X2 = X2 + A2 + B2 - C2
|
288 |
X2 = X2 + A2 + B2 - C2
|
| 289 |
|
289 |
|
| 290 |
rv = session.query(func.sum(RechargeVoucherTracker.amount)).filter(RechargeVoucherTracker.issuedOn.between(startTime,endTime)).first()
|
290 |
rv = session.query(func.sum(RechargeVoucherTracker.amount)).filter(RechargeVoucherTracker.issuedOn.between(startTime,endTime)).first()
|
| 291 |
if rv and rv[0]:
|
291 |
if rv and rv[0]:
|
| 292 |
X3 = int(rv[0])
|
292 |
X3 = int(rv[0])
|
| - |
|
293 |
|
| - |
|
294 |
rv1 = session.query(func.sum(DtrBatchCreditTracker.amount)).filter(DtrBatchCreditTracker.creditedOn.between(startTime,endTime)).first()
|
| - |
|
295 |
if rv1 and rv1[0]:
|
| - |
|
296 |
X3 += int(rv1[0])
|
| 293 |
|
297 |
|
| 294 |
uw = session.query(func.sum(UserWalletHistory.amount)).filter(UserWalletHistory.timestamp.between(startTime,endTime)).first()
|
298 |
uw = session.query(func.sum(UserWalletHistory.amount)).filter(UserWalletHistory.timestamp.between(startTime,endTime)).first()
|
| 295 |
if uw and uw[0]:
|
299 |
if uw and uw[0]:
|
| 296 |
X4 = int(uw[0])
|
300 |
X4 = int(uw[0])
|
| 297 |
|
301 |
|