Subversion Repositories SmartDukaan

Rev

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

Rev 12979 Rev 12982
Line 4645... Line 4645...
4645
        deviceNumber = recharge_order.dthAccountNumber
4645
        deviceNumber = recharge_order.dthAccountNumber
4646
        strProviderCode = get_provider_code(recharge_order.dthOperatorId)
4646
        strProviderCode = get_provider_code(recharge_order.dthOperatorId)
4647
        plan = ''
4647
        plan = ''
4648
        if recharge_order.dthOperatorId in (getAsyncOperatorsForRecharge()):
4648
        if recharge_order.dthOperatorId in (getAsyncOperatorsForRecharge()):
4649
            __activate_recharge_txn_asynchronously(recharge_order,rechargeType,deviceNumber,strProviderCode,plan)
4649
            __activate_recharge_txn_asynchronously(recharge_order,rechargeType,deviceNumber,strProviderCode,plan)
4650
    retStatus, retCode, spiceTID, description, aggTID, providerTID = RechargeService.rechargeDevice(recharge_order.id, rechargeType, strProviderCode, deviceNumber, recharge_order.totalAmount, plan, )
4650
    retStatus, retCode, spiceTID, description, aggTID, providerTID = RechargeService.rechargeDevice(recharge_order.id, rechargeType, strProviderCode, deviceNumber, recharge_order.totalAmount, plan, RechargeMode._NAMES_TO_VALUES.get('SYNC'))
4651
    recharge_order.spiceTID = spiceTID
4651
    recharge_order.spiceTID = spiceTID
4652
    recharge_order.responseTimestamp = datetime.datetime.now()
4652
    recharge_order.responseTimestamp = datetime.datetime.now()
4653
    recharge_order.description = description
4653
    recharge_order.description = description
4654
    session.commit()
4654
    session.commit()
4655
    if retCode == '00' and retStatus == 'S':
4655
    if retCode == '00' and retStatus == 'S':
Line 5697... Line 5697...
5697
    if rechargeMode == RechargeMode._NAMES_TO_VALUES.get('SYNC'):
5697
    if rechargeMode == RechargeMode._NAMES_TO_VALUES.get('SYNC'):
5698
        if retCode == '00' and retStatus == 'S':
5698
        if retCode == '00' and retStatus == 'S':
5699
            rechargeTransaction.status = RechargeOrderStatus.RECHARGE_SUCCESSFUL
5699
            rechargeTransaction.status = RechargeOrderStatus.RECHARGE_SUCCESSFUL
5700
            rechargeTransaction.invoiceNumber = get_next_invoice_number(OrderType.RCH4HOTSPOT)
5700
            rechargeTransaction.invoiceNumber = get_next_invoice_number(OrderType.RCH4HOTSPOT)
5701
    
5701
    
5702
        elif retCode in ('STO', 'US', 'UP') and retStatus == 'S':
5702
        elif retCode in ('STO', 'US', 'UP','STP') and retStatus == 'S':
5703
            rechargeTransaction.status = RechargeOrderStatus.RECHARGE_UNKNOWN
5703
            rechargeTransaction.status = RechargeOrderStatus.RECHARGE_UNKNOWN
5704
        else:
5704
        else:
5705
            rechargeTransaction.status = RechargeOrderStatus.RECHARGE_FAILED
5705
            rechargeTransaction.status = RechargeOrderStatus.RECHARGE_FAILED
5706
            if retCode in ('SVAI', 'SVIA', 'AI', 'IA', 'EAI', 'SVEAI'):
5706
            if retCode in ('SVAI', 'SVIA', 'AI', 'IA', 'EAI', 'SVEAI'):
5707
                rechargeTransaction.description = "Invalid Amount"
5707
                rechargeTransaction.description = "Invalid Amount"
Line 6599... Line 6599...
6599
    
6599
    
6600
    session.commit()
6600
    session.commit()
6601
    return new_order
6601
    return new_order
6602
 
6602
 
6603
def add_or_update_amazon_fba_sales_snapshot(amazonfbasalessnapshot):
6603
def add_or_update_amazon_fba_sales_snapshot(amazonfbasalessnapshot):
6604
    print "********",amazonfbasalessnapshot.fcLocation 
-
 
6605
    salesnapshotfordate = AmazonFbaSalesSnapshot.get_by(item_id = amazonfbasalessnapshot.item_id,dateOfSale=to_py_date(amazonfbasalessnapshot.dateOfSale).date(),fcLocation=amazonfbasalessnapshot.fcLocation)
6604
    salesnapshotfordate = AmazonFbaSalesSnapshot.get_by(item_id = amazonfbasalessnapshot.item_id,dateOfSale=to_py_date(amazonfbasalessnapshot.dateOfSale).date(),fcLocation=amazonfbasalessnapshot.fcLocation)
6606
    if salesnapshotfordate is None:
6605
    if salesnapshotfordate is None:
6607
        amazon_fba_sales_snapshot = AmazonFbaSalesSnapshot()
6606
        amazon_fba_sales_snapshot = AmazonFbaSalesSnapshot()
6608
        amazon_fba_sales_snapshot.dateOfSale = to_py_date(amazonfbasalessnapshot.dateOfSale).date()
6607
        amazon_fba_sales_snapshot.dateOfSale = to_py_date(amazonfbasalessnapshot.dateOfSale).date()
6609
        amazon_fba_sales_snapshot.item_id = amazonfbasalessnapshot.item_id
6608
        amazon_fba_sales_snapshot.item_id = amazonfbasalessnapshot.item_id
Line 7332... Line 7331...
7332
            else:
7331
            else:
7333
                update_recharge_order_status(rechargeOrderId, RechargeOrderStatus.RECHARGE_FAILED)
7332
                update_recharge_order_status(rechargeOrderId, RechargeOrderStatus.RECHARGE_FAILED)
7334
        except:
7333
        except:
7335
            if final:
7334
            if final:
7336
                d_rechargeOrder.status = RechargeOrderStatus.PAYMENT_SUCCESSFUL
7335
                d_rechargeOrder.status = RechargeOrderStatus.PAYMENT_SUCCESSFUL
-
 
7336
                d_rechargeOrder.responseTimestamp = datetime.datetime.now()
7337
        finally:
7337
        finally:
7338
            return get_recharge_order(rechargeOrderId)
7338
            return get_recharge_order(rechargeOrderId)
7339
    else:
7339
    else:
7340
        return d_rechargeOrder
7340
        return d_rechargeOrder
7341
 
7341
 
Line 7350... Line 7350...
7350
            else:
7350
            else:
7351
                update_recharge_transaction_status(rechargeTransactionId, RechargeOrderStatus.RECHARGE_FAILED)
7351
                update_recharge_transaction_status(rechargeTransactionId, RechargeOrderStatus.RECHARGE_FAILED)
7352
        except:
7352
        except:
7353
            if final:
7353
            if final:
7354
                d_rechargeTransaction.status = RechargeOrderStatus.RECHARGE_UNKNOWN
7354
                d_rechargeTransaction.status = RechargeOrderStatus.RECHARGE_UNKNOWN
-
 
7355
                d_rechargeTransaction.responseTime = datetime.datetime.now()
7355
        finally:
7356
        finally:
7356
            return get_recharge_transaction(rechargeTransactionId)
7357
            return get_recharge_transaction(rechargeTransactionId)
7357
    else:
7358
    else:
7358
        return d_rechargeTransaction
7359
        return d_rechargeTransaction
7359
        
7360