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

             litem.quantity = line_item.quantity
             litem.unit_price = line_item.unit_price
             litem.unit_weight = line_item.unit_weight
             litem.total_price = line_item.total_price
             litem.total_weight = line_item.total_weight
-            litem.transfer_price = line_item.transfer_price
+            '''litem.transfer_price = line_item.transfer_price'''
             litem.dealText = line_item.dealText
             """
             if line_item.addedOn:
                 litem.added_on = to_py_date(line_item.addedOn)
             order.promised_delivery_time = order.expected_delivery_time
             catalog_client = CatalogClient().get_client()
             catalog_client.reserveItemInWarehouse(item_id, logistics_info.warehouseId, order.lineitems[0].quantity)
-            item_pricing = catalog_client.getItemPricing(item_id, order.warehouse_id)
+            '''item_pricing = catalog_client.getItemPricing(item_id, order.warehouse_id)
-            order.lineitems[0].transfer_price = item_pricing.transferPrice
+            order.lineitems[0].transfer_price = item_pricing.transferPrice'''
     elif new_status == TransactionStatus.COD_IN_PROCESS:
         for order in transaction.orders:
             order.status = OrderStatus.INIT
             order.statusDescription = "Verification Pending"
             order.cod = True
             order.promised_delivery_time = order.expected_delivery_time
             catalog_client = CatalogClient().get_client()
             catalog_client.reserveItemInWarehouse(item_id, logistics_info.warehouseId, order.lineitems[0].quantity)
-            item_pricing = catalog_client.getItemPricing(item_id, order.warehouse_id)
+            '''item_pricing = catalog_client.getItemPricing(item_id, order.warehouse_id)
-            order.lineitems[0].transfer_price = item_pricing.transferPrice
+            order.lineitems[0].transfer_price = item_pricing.transferPrice'''
     session.commit()
     try:
         if new_status == TransactionStatus.COD_IN_PROCESS:
         logging.info("Successfully captured payment for merchant txn:" + str(txnId))
         change_transaction_status(txnId, TransactionStatus.IN_PROCESS, "Payment received")
     else:
         raise TransactionServiceException(115, "Payment capture failed.")
-def bill_order(self, orderId):
-    order = get_order(orderId)
-    order.status = OrderStatus.BILLED
-    order.statusDescription = "Order Billed"
-    order.billing_timestamp = datetime.datetime.now()
-    session.commit()
-    return True
-def add_billing_details(orderId, invoice_number, billed_by, jacketNumber):
-    order = Order.get_by(id=orderId)
-    if not order:
-        raise TransactionServiceException(101, "No order found for the given order id:" + str(orderId))
-    order.invoice_number = invoice_number
-    order.billed_by = billed_by
-    order.jacket_number = jacketNumber
-    session.commit()
-    return True
-def add_jacket_number(self, orderId, jacket_number, imei_number, item_number, billed_by, billing_type):
+def add_billing_details(self, orderId, jacket_number, imei_number, item_number, invoice_number, billed_by, billing_type, vendor_id):
     if jacket_number is None or jacket_number <= 0:
         raise TransactionServiceException(110, "Invalid jacket number")
-    if item_number is None or item_number.strip() == "":
-        raise TransactionServiceException(110, "Invalid item number")
     if billed_by is None or billed_by.strip() == "":
         raise TransactionServiceException(110, "Invalid Biller")
     order = Order.get_by(id=orderId)
     if not order:
         raise TransactionServiceException(101, "No order found for the given order id" + str(orderId))
+    if order.status == OrderStatus.ACCEPTED:
-    order.jacket_number = jacket_number
+        order.jacket_number = jacket_number
-    if billing_type == BillingType.OURS:
+        if billing_type == BillingType.OURS:
+            if item_number is None or item_number.strip() == "":
+                raise TransactionServiceException(110, "Invalid item number")
-        order.invoice_number = get_next_invoice_number()
+            order.invoice_number = get_next_invoice_number()
+            lineitem = order.lineitems[0]
+            if lineitem.productGroup == "Handsets" and imei_number <= 0:
+                raise TransactionServiceException(110, "No IMEI number supplied for a handset.")
+            lineitem.item_number = item_number
+            if imei_number > 0:
+                lineitem.imei_number = str(imei_number)
+        else:
-        order.billed_by = billed_by
+            order.invoice_number = invoice_number
         order.status = OrderStatus.BILLED
         order.statusDescription = "Order Billed"
         order.billing_timestamp = datetime.datetime.now()
+        order.billed_by = billed_by
         lineitem = order.lineitems[0]
+        item_id = lineitem.item_id
-        if lineitem.productGroup == "Handsets" and imei_number <= 0:
+        catalog_client = CatalogClient().get_client()
+        '''catalog_client.reserveItemInWarehouse(item_id, logistics_info.warehouseId, order.lineitems[0].quantity)'''
-            raise TransactionServiceException(110, "No IMEI number supplied for a handset.")
+        item_pricing = catalog_client.getItemPricing(item_id, vendor_id)
+        order.vendorId = vendor_id
-        lineitem.item_number = item_number
+        lineitems = order.lineitems
-        if imei_number > 0:
+        for lineitem in lineitems:
+            catalog_client.reduceReservationCount(item_id, order.warehouse_id, lineitem.quantity)
-            lineitem.imei_number = str(imei_number)
+        order.lineitems[0].transfer_price = item_pricing.transferPrice
-    session.commit()
+        session.commit()
-    return True
+        return True
+    else:
+        return False
 def batch_orders(warehouseId):
     if not warehouseId:
         raise TransactionServiceException(101, "bad warehouse id")
         refund_order(order.id, refundedBy, reason)
     session.commit()
 def mark_order_cancellation_request_denied(orderId):
     """
-    If we decide to not to cancel order, we will move the order ro previous status.
+    If we decide to not to cancel order, we will move the order to previous status.
     Parameters:
      - orderId
     """
     order = get_order(orderId)

Subversion Repositories SmartDukaan

(root)/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py – Rev 4266 → 4283