Subversion Repositories SmartDukaan

Rev

Rev 8445 | Rev 8492 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8445 Rev 8488
Line 42... Line 42...
42
    OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary, \
42
    OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary, \
43
    CodVerificationAgent, Attribute, RechargeVoucherTracker, EmiScheme, MiscCharges, \
43
    CodVerificationAgent, Attribute, RechargeVoucherTracker, EmiScheme, MiscCharges, \
44
    BlockedIpRange, DeniedIpAddress, InsuranceDetailForOrder, DocumentStore, \
44
    BlockedIpRange, DeniedIpAddress, InsuranceDetailForOrder, DocumentStore, \
45
    RechargeTransaction, HotspotStore, WalletForCompany, WalletHistoryForCompany, \
45
    RechargeTransaction, HotspotStore, WalletForCompany, WalletHistoryForCompany, \
46
    FRC, OperatorSeries, SourceDetail, Company, EbayOrder,AmazonFbaSalesSnapshot, \
46
    FRC, OperatorSeries, SourceDetail, Company, EbayOrder,AmazonFbaSalesSnapshot, \
47
    AmazonOrder, StoreOrderDetail, EdcBank, StoreOrderCollection, HotspotServiceMatrix
47
    AmazonOrder, StoreOrderDetail, EdcBank, StoreOrderCollection, HotspotServiceMatrix,\
-
 
48
    SnapdealOrder
48
from shop2020.model.v1.order.impl.model.BaseOrder import BaseOrder
49
from shop2020.model.v1.order.impl.model.BaseOrder import BaseOrder
49
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
50
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
50
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
51
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
51
    MobileRechargeOrder
52
    MobileRechargeOrder
52
from shop2020.model.v1.order.impl.model.RechargeDenomination import \
53
from shop2020.model.v1.order.impl.model.RechargeDenomination import \
Line 176... Line 177...
176
    #new status and status description to be added    
177
    #new status and status description to be added    
177
    order.status = t_order.status  
178
    order.status = t_order.status  
178
    order.statusDescription = t_order.statusDescription
179
    order.statusDescription = t_order.statusDescription
179
    order.total_amount = t_order.total_amount
180
    order.total_amount = t_order.total_amount
180
    order.gvAmount = t_order.gvAmount
181
    order.gvAmount = t_order.gvAmount
-
 
182
    order.cod = t_order.cod
181
    order.total_weight = t_order.total_weight
183
    order.total_weight = t_order.total_weight
182
    if t_order.created_timestamp:
184
    if t_order.created_timestamp:
183
        order.created_timestamp = to_py_date(t_order.created_timestamp)
185
        order.created_timestamp = to_py_date(t_order.created_timestamp)
184
    else:
186
    else:
185
        order.created_timestamp = datetime.datetime.now()
187
        order.created_timestamp = datetime.datetime.now()
Line 194... Line 196...
194
        insuranceDetail.order = order
196
        insuranceDetail.order = order
195
    if t_order.freebieItemId:
197
    if t_order.freebieItemId:
196
        order.freebieItemId = t_order.freebieItemId
198
        order.freebieItemId = t_order.freebieItemId
197
    order.source = t_order.source
199
    order.source = t_order.source
198
    #Change this temporary
200
    #Change this temporary
199
    if t_order.orderType is None:
201
    if t_order.orderType is None or t_order.orderType ==OrderType.B2C:
200
        order.orderType = 0
202
        order.orderType = 0
201
    order.advanceAmount = t_order.advanceAmount
203
    order.advanceAmount = t_order.advanceAmount
202
    order.storeId = t_order.storeId
204
    order.storeId = t_order.storeId
203
    return order
205
    return order
204
    
206
    
Line 1276... Line 1278...
1276
            if order.transaction.status == TransactionStatus.AUTHORIZED:
1278
            if order.transaction.status == TransactionStatus.AUTHORIZED:
1277
                __capture_txn(order)
1279
                __capture_txn(order)
1278
        order.status = OrderStatus.ACCEPTED
1280
        order.status = OrderStatus.ACCEPTED
1279
        order.statusDescription = "Order Accepted"
1281
        order.statusDescription = "Order Accepted"
1280
        order.accepted_timestamp = datetime.datetime.now()
1282
        order.accepted_timestamp = datetime.datetime.now()
1281
        if order.source == 6:
1283
        if order.source == 6 or order.source == 7:
1282
            session.commit()
1284
            session.commit()
1283
            return "True"
1285
            return "True"
1284
        __amend_fulfilment_warehouse(order)
1286
        __amend_fulfilment_warehouse(order)
1285
        __update_transfer_price(order, order.fulfilmentWarehouseId)
1287
        __update_transfer_price(order, order.fulfilmentWarehouseId)
1286
        session.commit()
1288
        session.commit()
Line 1348... Line 1350...
1348
    order = Order.get_by(id=orderId)
1350
    order = Order.get_by(id=orderId)
1349
    if not order:
1351
    if not order:
1350
        raise TransactionServiceException(101, "No order found for the given order id" + str(orderId))
1352
        raise TransactionServiceException(101, "No order found for the given order id" + str(orderId))
1351
    
1353
    
1352
    if jacketNumber is None or jacketNumber <= 0:
1354
    if jacketNumber is None or jacketNumber <= 0:
1353
        if order.source == 6:
1355
        if order.source == 6 or order.source == 7:
1354
            print "Skipping Jacket Number field for OrderId " + str(orderId)
1356
            print "Skipping Jacket Number field for OrderId " + str(orderId)
1355
        else:
1357
        else:
1356
            raise TransactionServiceException(110, "Invalid jacket number")
1358
            raise TransactionServiceException(110, "Invalid jacket number")
1357
 
1359
 
1358
    '''
1360
    '''
Line 1396... Line 1398...
1396
    item = catalog_client.getItem(item_id)
1398
    item = catalog_client.getItem(item_id)
1397
    if order.status == OrderStatus.ACCEPTED:
1399
    if order.status == OrderStatus.ACCEPTED:
1398
        order.jacket_number = jacketNumber
1400
        order.jacket_number = jacketNumber
1399
        if order.source == 6:
1401
        if order.source == 6:
1400
            order.jacket_number = "eby"+str(orderId)
1402
            order.jacket_number = "eby"+str(orderId)
-
 
1403
        if order.source == 7:
-
 
1404
            order.jacket_number = "snp"+str(orderId)
1401
        if itemNumbers:
1405
        if itemNumbers:
1402
            lineitem.item_number = itemNumbers[0]    
1406
            lineitem.item_number = itemNumbers[0]    
1403
        if serialNumbers:
1407
        if serialNumbers:
1404
            lineitem.serial_number = serialNumbers[0]                
1408
            lineitem.serial_number = serialNumbers[0]                
1405
            
1409
            
Line 2962... Line 2966...
2962
        ebay_order.subsidyAmount= old_ebay_order.subsidyAmount
2966
        ebay_order.subsidyAmount= old_ebay_order.subsidyAmount
2963
        ebay_order.ebayTxnDate= old_ebay_order.ebayTxnDate
2967
        ebay_order.ebayTxnDate= old_ebay_order.ebayTxnDate
2964
        ebay_order.transactionId= old_ebay_order.transactionId
2968
        ebay_order.transactionId= old_ebay_order.transactionId
2965
        ebay_order.listingName= old_ebay_order.listingName
2969
        ebay_order.listingName= old_ebay_order.listingName
2966
        session.commit()
2970
        session.commit()
-
 
2971
    if order.source == 7:
-
 
2972
        old_snapdeal_order = SnapdealOrder.get_by(orderId=order.id)
-
 
2973
        snapdeal_order = SnapdealOrder()
-
 
2974
        snapdeal_order.orderId = new_order.id
-
 
2975
        snapdeal_order.subOrderId = old_snapdeal_order.subOrderId
-
 
2976
        snapdeal_order.referenceCode = old_snapdeal_order.referenceCode
-
 
2977
        snapdeal_order.productName = old_snapdeal_order.productName
-
 
2978
        snapdeal_order.listingPrice = old_snapdeal_order.listingPrice
-
 
2979
        snapdeal_order.snapdealTxnDate = old_snapdeal_order.snapdealTxnDate
-
 
2980
        session.commit()
2967
    
2981
    
2968
    attributes = Attribute.query.filter(Attribute.orderId == order.id).all()
2982
    attributes = Attribute.query.filter(Attribute.orderId == order.id).all()
2969
    if attributes:
2983
    if attributes:
2970
        for attribute in attributes:
2984
        for attribute in attributes:
2971
            newattribute = Attribute()
2985
            newattribute = Attribute()
Line 6121... Line 6135...
6121
    fromDate = toDate-timedelta(days = interval)
6135
    fromDate = toDate-timedelta(days = interval)
6122
    fbasalessnapshot = AmazonFbaSalesSnapshot.query.filter(AmazonFbaSalesSnapshot.dateOfSale.between (fromDate.date(),toDate.date())).order_by(AmazonFbaSalesSnapshot.dateOfSale).all()
6136
    fbasalessnapshot = AmazonFbaSalesSnapshot.query.filter(AmazonFbaSalesSnapshot.dateOfSale.between (fromDate.date(),toDate.date())).order_by(AmazonFbaSalesSnapshot.dateOfSale).all()
6123
    print fbasalessnapshot
6137
    print fbasalessnapshot
6124
    return fbasalessnapshot        
6138
    return fbasalessnapshot        
6125
 
6139
 
-
 
6140
def create_snapdeal_order(t_snapdeal_order):
-
 
6141
    snapdealOrder = SnapdealOrder()
-
 
6142
    snapdealOrder.orderId = t_snapdeal_order.orderId
-
 
6143
    snapdealOrder.subOrderId = t_snapdeal_order.subOrderId
-
 
6144
    snapdealOrder.referenceCode = t_snapdeal_order.referenceCode
-
 
6145
    snapdealOrder.productName = t_snapdeal_order.productName
-
 
6146
    snapdealOrder.listingPrice = t_snapdeal_order.listingPrice
-
 
6147
    snapdealOrder.snapdealTxnDate = to_py_date(t_snapdeal_order.snapdealTxnDate)
-
 
6148
    session.commit()
-
 
6149
    
-
 
6150
def get_snapdeal_order(order_id, reference_code, subOrder_id):
-
 
6151
    query = SnapdealOrder.query
-
 
6152
    if order_id:
-
 
6153
        query = query.filter(SnapdealOrder.orderId == order_id)
-
 
6154
    if reference_code:
-
 
6155
        query = query.filter(SnapdealOrder.referenceCode == reference_code)
-
 
6156
    if subOrder_id:
-
 
6157
        query = query.filter(SnapdealOrder.subOrderId == subOrder_id)
-
 
6158
    return query.one()
-
 
6159
 
-
 
6160
def snapdeal_order_exists(suborder_id):
-
 
6161
    snapdeal_order = SnapdealOrder.get_by(subOrderId = suborder_id)
-
 
6162
    if snapdeal_order is not None:
-
 
6163
        return True
-
 
6164
    else:
-
 
6165
        return False 
-
 
6166
 
6126
def get_amazon_fba_sales_latest_snapshot_for_item(item_id):
6167
def get_amazon_fba_sales_latest_snapshot_for_item(item_id):
6127
    return AmazonFbaSalesSnapshot.query.filter(AmazonFbaSalesSnapshot.item_id==item_id).order_by(desc(AmazonFbaSalesSnapshot.dateOfSale)).first()
6168
    return AmazonFbaSalesSnapshot.query.filter(AmazonFbaSalesSnapshot.item_id==item_id).order_by(desc(AmazonFbaSalesSnapshot.dateOfSale)).first()
6128
 
6169
 
6129
    
6170
    
6130
if __name__ == '__main__':
6171
if __name__ == '__main__':