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

     orders = Order.query.filter(Order.logisticsTransactionId==logisticsTxnId).all()
     if not orders:
         orders = []
     return orders
-def add_billing_details_for_groupped_orders(orderIds, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize, invoiceType, packageDimensions):
+def add_billing_details_for_groupped_orders(orderIds, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize, invoiceType):
 #    print 'orderIds',orderIds
 #    print 'invoice_number', invoice_number
 #    print 'itemNumbersMap', itemNumbersMap
 #    print 'serialNumbersMap', serialNumbersMap
 #    print 'freebieWarehouseIdMap', freebieWarehouseIdMap
     for order in ordersList:
         order.invoice_number = invoiceNumber
         order.seller_id = seller_id
         order.warehouse_address_id = whaddressmapping.address_id
-    logisticCostDetail= ShipmentLogisticsCostDetail.get_by(logisticsTransactionId=ordersList[0].logisticsTransactionId)
+#    logisticCostDetail= ShipmentLogisticsCostDetail.get_by(logisticsTransactionId=ordersList[0].logisticsTransactionId)
-    logisticCostDetail.packageDimensions = packageDimensions
+#    logisticCostDetail.packageDimensions = packageDimensions
     session.commit()
     return True
         order.tracking_id = airwaybill_no
         shipmentAmount = shipmentAmount + order.total_amount
         shipmentWeight = shipmentWeight + order.total_weight
         shipmentLogisticsCost = shipmentLogisticsCost + order.lineitems[0].logisticsCost
         shipmentCodCollectionCharges = shipmentCodCollectionCharges + order.lineitems[0].codCollectionCharges
-    session.commit()
     shipmentLogisticsCostObj = TShipmentLogisticsCostDetail()
     shipmentLogisticsCostObj.airwayBillNo = airwaybill_no
     shipmentLogisticsCostObj.logisticsTransactionId = logisticsTransactionId
     shipmentLogisticsCostObj.shipmentAmount = shipmentAmount
     shipmentLogisticsCostObj.shipmentCodCollectionCharges = shipmentCodCollectionCharges
     return True
 def add_or_update_shipment_logistics_cost_details(shipmentLogisticsCostDetails):
     currentTime = datetime.datetime.now()
     for shipmentLogisticsCostDetail in shipmentLogisticsCostDetails:
-        shipment_logisticsCostDetail = ShipmentLogisticsCostDetail.get_by(logisticsTransactionId=shipmentLogisticsCostDetail.logisticsTransactionId, airwayBillNo = shipmentLogisticsCostDetail.airwayBillNo)
+        shipment_logisticsCostDetail = ShipmentLogisticsCostDetail.get_by(logisticsTransactionId=shipmentLogisticsCostDetail.logisticsTransactionId)
         if shipment_logisticsCostDetail:
             shipment_logisticsCostDetail.shipmentAmount = round(shipmentLogisticsCostDetail.shipmentAmount,2)
             shipment_logisticsCostDetail.shipmentWeight = round(shipmentLogisticsCostDetail.shipmentWeight,3)
             shipment_logisticsCostDetail.shipmentLogsiticsCost = round(shipmentLogisticsCostDetail.shipmentLogsiticsCost,2)
             shipment_logisticsCostDetail.shipmentCodCollectionCharges = round(shipmentLogisticsCostDetail.shipmentCodCollectionCharges,2)
             shipment_logisticsCostDetail.updatedAt = currentTime
+            shipment_logisticsCostDetail.airwayBillNo = shipmentLogisticsCostDetail.airwayBillNo
         else:
-            shipment_logisticsCostDetail = ShipmentLogisticsCostDetail()
+            raise RuntimeError("Unable to add ShipmentLogisticsCostDetail.")
-            shipment_logisticsCostDetail.logisticsTransactionId = shipmentLogisticsCostDetail.logisticsTransactionId
-            shipment_logisticsCostDetail.airwayBillNo = shipmentLogisticsCostDetail.airwayBillNo
-            shipment_logisticsCostDetail.shipmentAmount = round(shipmentLogisticsCostDetail.shipmentAmount,2)
-            shipment_logisticsCostDetail.shipmentWeight = round(shipmentLogisticsCostDetail.shipmentWeight,3)
-            shipment_logisticsCostDetail.shipmentLogsiticsCost = round(shipmentLogisticsCostDetail.shipmentLogsiticsCost,2)
-            shipment_logisticsCostDetail.shipmentCodCollectionCharges = round(shipmentLogisticsCostDetail.shipmentCodCollectionCharges,2)
-            shipment_logisticsCostDetail.updatedAt = currentTime
     session.commit()
     return True
 def logisticsProviderFinalCheck(ordersList):
     shipmentAmount = 0
 def get_cost_detail_for_logistics_txn_id(logisticsTxnId):
     logisticCostDetail= ShipmentLogisticsCostDetail.get_by(logisticsTransactionId=logisticsTxnId)
     if logisticCostDetail is None:
         raise
     return logisticCostDetail
+def add_shipment_logistic_detail(shipmentLogisticsCostDetail):
+    if shipmentLogisticsCostDetail.logisticsTransactionId is None or shipmentLogisticsCostDetail.packageDimensions is None:
+        raise ValueError("Null fields logisticsTransactionId/packageDimensions")
+    logisticCostDetail = get_cost_detail_for_logistics_txn_id(shipmentLogisticsCostDetail.logisticsTransactionId)
+    if logisticCostDetail is not None:
+        raise ValueError("Something is wrong with the order")
+    d_ShipmentLogisticsCostDetail = ShipmentLogisticsCostDetail()
+    d_ShipmentLogisticsCostDetail.logisticsTransactionId = shipmentLogisticsCostDetail.logisticsTransactionId
+    d_ShipmentLogisticsCostDetail.packageDimensions = shipmentLogisticsCostDetail.packageDimensions
+    session.commit()
 if __name__ == '__main__':
     pass

Subversion Repositories SmartDukaan

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