WebSVN – SmartDukaan – Diff – //trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

     process_return, get_return_order, mark_doas_as_picked_up
 from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
     to_t_alert, to_t_order, to_t_lineitem
 from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
-    LineItem, Order
+    LineItem, Order, TransactionServiceException
 from shop2020.utils.Utils import to_py_date, get_fdate_tdate
 class OrderServiceHandler:
     def __init__(self, dbname='transaction'):
         try:
             return add_billing_details(orderId, invoice_number, billed_by)
         finally:
             close_session()
-    def addJacketNumber(self, orderId, jacketNumber):
+    def addJacketNumber(self, orderId, jacketNumber, imeiNumber, itemNumber, billedBy):
         """
+        Adds jacket number and IMEI no. to the order. Doesn't update the IMEI no. if a -1 is supplied.
+        Also marks the order as billed and sets the billing timestamp.
-        Adds jacket number to the order. Return false if it doesn't find the order with the given ID.
+        Return false if it doesn't find the order with the given ID.
         Parameters:
          - orderId
          - jacketNumber
+         - imeiNumber
+         - itemNumber
+         - billedBy
         """
         try:
-            return add_jacket_number(orderId, jacketNumber)
+            return add_jacket_number(self, orderId, jacketNumber, imeiNumber, itemNumber, billedBy)
+        except TransactionServiceException:
+            print "ERROR: Couldn't find the order with the given id"
+            return False
         finally:
             close_session()
     def batchOrders(self, warehouseId):
         """

Subversion Repositories SmartDukaan

(root)//trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py – Rev 2764 → 2783