Subversion Repositories SmartDukaan

Rev

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

Rev 7427 Rev 7442
Line 73... Line 73...
73
    update_hotspot_store_password, get_source_detail, get_all_circles, delete_frcs,\
73
    update_hotspot_store_password, get_source_detail, get_all_circles, delete_frcs,\
74
    topup_company_wallet, get_wallet_balance_for_company, \
74
    topup_company_wallet, get_wallet_balance_for_company, \
75
    add_amazon_order, update_amazon_order_status,get_amazon_order, get_amazon_orders_shipped, \
75
    add_amazon_order, update_amazon_order_status,get_amazon_order, get_amazon_orders_shipped, \
76
    get_amazon_orders_cancelled, get_orders_for_store, get_store_order_advance_invoice, add_frc, \
76
    get_amazon_orders_cancelled, get_orders_for_store, get_store_order_advance_invoice, add_frc, \
77
    add_series, get_store_order_detail, save_store_order_detail, get_all_edc_banks, \
77
    add_series, get_store_order_detail, save_store_order_detail, get_all_edc_banks, \
78
    save_refund_amounts_for_store_order, get_collections_for_store
78
    save_refund_amounts_for_store_order, get_collections_for_store,get_amazon_orders_to_acknowledge, \
-
 
79
    change_amazon_order_status
79
 
80
 
80
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
81
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
81
from shop2020.model.v1.order.impl.model.DigitalTransaction import \
82
from shop2020.model.v1.order.impl.model.DigitalTransaction import \
82
    DigitalTransaction
83
    DigitalTransaction
83
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
84
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
84
    MobileRechargeOrder
85
    MobileRechargeOrder
85
from shop2020.thriftpy.model.v1.order.ttypes import TransactionServiceException, \
86
from shop2020.thriftpy.model.v1.order.ttypes import TransactionServiceException, \
86
    RechargeType
87
    RechargeType,AmazonOrdersToAcknowledge
87
from shop2020.utils.Utils import to_py_date, get_fdate_tdate, to_java_date
88
from shop2020.utils.Utils import to_py_date, get_fdate_tdate, to_java_date
88
import datetime
89
import datetime
89
 
90
 
90
 
91
 
91
 
92
 
Line 2129... Line 2130...
2129
    def getCollectionsForStore(self, storeId, startDate, endDate):
2130
    def getCollectionsForStore(self, storeId, startDate, endDate):
2130
        try:
2131
        try:
2131
            return [to_t_storeOrderCollection(collection) for collection in get_collections_for_store(storeId, startDate, endDate)]
2132
            return [to_t_storeOrderCollection(collection) for collection in get_collections_for_store(storeId, startDate, endDate)]
2132
        finally:
2133
        finally:
2133
            self.closeSession()
2134
            self.closeSession()
-
 
2135
            
-
 
2136
    def getAmazonOrdersToAcknowledge(self):
-
 
2137
        try:
-
 
2138
            ordersack = []
-
 
2139
            for amazonOrderId,amazonOrderCode,status,txnid,count in get_amazon_orders_to_acknowledge():
-
 
2140
                orderack = AmazonOrdersToAcknowledge()
-
 
2141
                orderack.amazonOrderId = amazonOrderId
-
 
2142
                orderack.amazonOrderItemId = amazonOrderCode
-
 
2143
                orderack.status = status
-
 
2144
                orderack.transaction_id = txnid
-
 
2145
                orderack.count = count
-
 
2146
                ordersack.append(orderack)
-
 
2147
            return ordersack    
-
 
2148
        except:
-
 
2149
            return None
-
 
2150
        finally:
-
 
2151
            self.closeSession()   
-
 
2152
                
-
 
2153
    def changeAmazonOrderStatus(self,amazonOrderCode,status):
-
 
2154
        try:
-
 
2155
            change_amazon_order_status(amazonOrderCode,status) 
-
 
2156
        finally:
-
 
2157
            self.closeSession()   
2134
        
2158
        
-
 
2159
               
2135
        
2160
        
2136
    def closeSession(self, ):
2161
    def closeSession(self, ):
2137
        close_session()
2162
        close_session()
2138
 
2163
 
2139
    def isAlive(self, ):
2164
    def isAlive(self, ):