Subversion Repositories SmartDukaan

Rev

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

Rev 4264 Rev 4283
Line 9... Line 9...
9 
    get_line_items_for_order, get_transaction, get_transactions_for_shopping_cart_id,\
 9 
    get_line_items_for_order, get_transaction, get_transactions_for_shopping_cart_id,\
10 
    change_transaction_status, get_orders_for_customer,get_orders_for_transaction, get_order,\
 10 
    change_transaction_status, get_orders_for_customer,get_orders_for_transaction, get_order,\
11 
    get_returnable_orders_for_customer, get_cancellable_orders_for_customer, get_orders_by_billing_date,\
 11 
    get_returnable_orders_for_customer, get_cancellable_orders_for_customer, get_orders_by_billing_date,\
12 
    get_all_orders, change_order_status, get_alerts, set_alert, add_billing_details,\
 12 
    get_all_orders, change_order_status, get_alerts, set_alert, add_billing_details,\
13 
    mark_orders_as_manifested, close_session, accept_order, bill_order, mark_orders_as_picked_up,\
 13 
    mark_orders_as_manifested, close_session, accept_order, bill_order, mark_orders_as_picked_up,\
14 
    mark_orders_as_delivered, mark_orders_as_failed, add_jacket_number,\
 14 
    mark_orders_as_delivered, mark_orders_as_failed,\
15 
    order_outofstock, batch_orders, update_non_delivery_reason, enqueue_transaction_info_email,\
 15 
    order_outofstock, batch_orders, update_non_delivery_reason, enqueue_transaction_info_email,\
16 
    get_undelivered_orders, get_order_for_customer, get_valid_order_count,\
 16 
    get_undelivered_orders, get_order_for_customer, get_valid_order_count,\
17 
    get_cust_count_with_successful_txn, get_valid_orders_amount_range,\
 17 
    get_cust_count_with_successful_txn, get_valid_orders_amount_range,\
18 
    get_valid_orders, toggle_doa_flag, request_pickup_number, authorize_pickup,\
 18 
    get_valid_orders, toggle_doa_flag, request_pickup_number, authorize_pickup,\
19 
    receive_return, validate_doa, reship_order, refund_order, get_return_orders,\
 19 
    receive_return, validate_doa, reship_order, refund_order, get_return_orders,\
Line 278... Line 278...
278 
        try:
 278 
        try:
279 
            return accept_order(self, orderId)
 279 
            return accept_order(self, orderId)
280 
        finally:
 280 
        finally:
281 
            close_session()
 281 
            close_session()
282
282
283 
    def billOrder(self, orderId):
 - 
 
284 
        """
 - 
 
285 
        Parameters:
 - 
 
286 
         - orderId
 - 
 
287 
        """
 - 
 
288 
        try:
 - 
 
289 
            return bill_order(self, orderId)
 - 
 
290 
        finally:
 - 
 
291 
            close_session()
 - 
 
292
- 
 
293 
    def getOrdersForCustomer(self, customerId, from_date, to_date, statuses):
 283 
    def getOrdersForCustomer(self, customerId, from_date, to_date, statuses):
294 
        """
 284 
        """
295 
        Returns list of orders for the given customer created between the given dates and having the given statuses.
 285 
        Returns list of orders for the given customer created between the given dates and having the given statuses.
296 
        Pass and empty list to ignore filtering on statuses.
 286 
        Pass and empty list to ignore filtering on statuses.
297
287
Line 345... Line 335...
345 
                t_lineitems.append(to_t_lineitem(lineitem))
 335 
                t_lineitems.append(to_t_lineitem(lineitem))
346 
            return t_lineitems
 336 
            return t_lineitems
347 
        finally:
 337 
        finally:
348 
            close_session()
 338 
            close_session()
349 
 
 339 
 
350 
    def addBillingDetails(self, orderId, invoice_number, billed_by, jacketNumber):
 - 
 
351 
        """
 - 
 
352 
        Add billing details such as the bill number and the biller to the Order.
 - 
 
353
- 
 
354 
        Parameters:
 - 
 
355 
         - orderId
 - 
 
356 
         - invoice_number
 - 
 
357 
         - billed_by
 - 
 
358 
        """
 - 
 
359 
        try:
 - 
 
360 
            return add_billing_details(orderId, invoice_number, billed_by, jacketNumber)
 - 
 
361 
        finally:
 - 
 
362 
            close_session()
 - 
 
363 
 
 - 
 
364 
    def addJacketNumber(self, orderId, jacketNumber, imeiNumber, itemNumber, billedBy, billingType):
 340 
    def addBillingDetails(self, orderId, invoice_number, imeiNumber, itemNumber, billedBy, jacketNumber, billingType, vendorId):
365 
        """
 341 
        """
366 
        Adds jacket number and IMEI no. to the order. Doesn't update the IMEI no. if a -1 is supplied.
 342 
        Adds jacket number and IMEI no. to the order. Doesn't update the IMEI no. if a -1 is supplied.
367 
        Also marks the order as billed and sets the billing timestamp.
 343 
        Also marks the order as billed and sets the billing timestamp.
368 
        Return false if it doesn't find the order with the given ID.
 344 
        Return false if it doesn't find the order with the given ID.
369
345
Line 373... Line 349...
373 
         - imeiNumber
 349 
         - imeiNumber
374 
         - itemNumber
 350 
         - itemNumber
375 
         - billedBy
 351 
         - billedBy
376 
        """
 352 
        """
377 
        try:
 353 
        try:
378 
            return add_jacket_number(self, orderId, jacketNumber, imeiNumber, itemNumber, billedBy, billingType)
 354 
            return add_billing_details(self, orderId, jacketNumber, imeiNumber, itemNumber, billedBy, billingType, vendorId)
379 
        except TransactionServiceException:
 355 
        except TransactionServiceException:
380 
            print "ERROR: Couldn't find the order with the given id"
 356 
            print "ERROR: Couldn't find the order with the given id"
381 
            return False
 357 
            return False
382 
        finally:
 358 
        finally:
383 
            close_session()
 359 
            close_session()