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



            
            if order.pickupStoreId:
                order.otg = False
                
            inventory_client = InventoryClient().get_client()
            if order.productCondition != ProductCondition.BAD:
                inventory_client.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)
 
            try:
                item_pricing = inventory_client.getItemPricing(item_id, -1)
                order.lineitems[0].transfer_price = item_pricing.transferPrice
                order.lineitems[0].nlc = item_pricing.nlc

            order.promised_shipping_time = order.expected_shipping_time
            order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
            order.promised_delivery_time = order.expected_delivery_time
            
            inventory_client = InventoryClient().get_client()
            if order.productCondition != ProductCondition.BAD:
                inventory_client.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)
 
            try:
                item_pricing = inventory_client.getItemPricing(item_id, -1)
                order.lineitems[0].transfer_price = item_pricing.transferPrice
                order.lineitems[0].nlc = item_pricing.nlc        

                attr2.name = "freebie_nlc"
                attr2.value = str(inventoryItem.nlc)
            except Exception as e:
                print e.message
                raise TransactionServiceException(110,'Error in billing freebie for warehouseId ' + str(freebieWarehouseId))
        if order.productCondition != ProductCondition.BAD:
            __update_inventory_reservation(order)
        order.fulfilmentWarehouseId = warehouse.id
        if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
            order.invoice_number = get_next_invoice_number(order.orderType)
        session.commit()

            print "Allowing item change for split Freebie Order"
        else:    
            raise TransactionServiceException(121, "You can't ship a different item. You can only ship the same item in a different color.")
    
    inventoryClient = InventoryClient().get_client()
    if order.productCondition != ProductCondition.BAD:
        inventoryClient.updateReservationForOrder(item_id, order.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)
    #inventoryClient.reserveItemInWarehouse(item_id, order.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)
    #__update_inventory_reservation(order)
    #TODO: Check that this new item has the same price
        
    lineitem.item_id = item_id

                            warehouse = goodWarehouse
        else:
            raise TransactionServiceException(119, "Shifting of warehouse allowed to GOOD inventory type warehouse with billing support")
 
    #inventoryClient.reserveItemInWarehouse(lineitem.item_id, warehouse.id, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), lineitem.quantity)
    if order.productCondition != ProductCondition.BAD:
        inventoryClient.updateReservationForOrder(lineitem.item_id, warehouse.id, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), lineitem.quantity)
    #__update_inventory_reservation(order)
    if order.status == OrderStatus.ACCEPTED:
        __update_transfer_price(order, warehouse.id)
    order.warehouse_id = warehouse.billingWarehouseId
    order.fulfilmentWarehouseId = warehouse.id

Subversion Repositories SmartDukaan

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

Rev 8927		Rev 8928
Line 383...		Line 383...
383		383
384	`if order.pickupStoreId:`	384	`if order.pickupStoreId:`
385	`order.otg = False`	385	`order.otg = False`
386		386
387	`inventory_client = InventoryClient().get_client()`	387	`inventory_client = InventoryClient().get_client()`
-		388	`if order.productCondition != ProductCondition.BAD:`
388	`inventory_client.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)`	389	`inventory_client.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)`
389		390
390	`try:`	391	`try:`
391	`item_pricing = inventory_client.getItemPricing(item_id, -1)`	392	`item_pricing = inventory_client.getItemPricing(item_id, -1)`
392	`order.lineitems[0].transfer_price = item_pricing.transferPrice`	393	`order.lineitems[0].transfer_price = item_pricing.transferPrice`
393	`order.lineitems[0].nlc = item_pricing.nlc`	394	`order.lineitems[0].nlc = item_pricing.nlc`
Line 445...		Line 446...
445	`order.promised_shipping_time = order.expected_shipping_time`	446	`order.promised_shipping_time = order.expected_shipping_time`
446	`order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	447	`order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
447	`order.promised_delivery_time = order.expected_delivery_time`	448	`order.promised_delivery_time = order.expected_delivery_time`
448		449
449	`inventory_client = InventoryClient().get_client()`	450	`inventory_client = InventoryClient().get_client()`
-		451	`if order.productCondition != ProductCondition.BAD:`
450	`inventory_client.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)`	452	`inventory_client.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)`
451		453
452	`try:`	454	`try:`
453	`item_pricing = inventory_client.getItemPricing(item_id, -1)`	455	`item_pricing = inventory_client.getItemPricing(item_id, -1)`
454	`order.lineitems[0].transfer_price = item_pricing.transferPrice`	456	`order.lineitems[0].transfer_price = item_pricing.transferPrice`
455	`order.lineitems[0].nlc = item_pricing.nlc`	457	`order.lineitems[0].nlc = item_pricing.nlc`
Line 1556...		Line 1558...
1556	`attr2.name = "freebie_nlc"`	1558	`attr2.name = "freebie_nlc"`
1557	`attr2.value = str(inventoryItem.nlc)`	1559	`attr2.value = str(inventoryItem.nlc)`
1558	`except Exception as e:`	1560	`except Exception as e:`
1559	`print e.message`	1561	`print e.message`
1560	`raise TransactionServiceException(110,'Error in billing freebie for warehouseId ' + str(freebieWarehouseId))`	1562	`raise TransactionServiceException(110,'Error in billing freebie for warehouseId ' + str(freebieWarehouseId))`
1561	`if order.productCondition == ProductCondition.GOOD:`	1563	`if order.productCondition != ProductCondition.BAD:`
1562	`__update_inventory_reservation(order)`	1564	`__update_inventory_reservation(order)`
1563	`order.fulfilmentWarehouseId = warehouse.id`	1565	`order.fulfilmentWarehouseId = warehouse.id`
1564	`if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:`	1566	`if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:`
1565	`order.invoice_number = get_next_invoice_number(order.orderType)`	1567	`order.invoice_number = get_next_invoice_number(order.orderType)`
1566	`session.commit()`	1568	`session.commit()`
Line 3303...		Line 3305...
3303	`print "Allowing item change for split Freebie Order"`	3305	`print "Allowing item change for split Freebie Order"`
3304	`else:`	3306	`else:`
3305	`raise TransactionServiceException(121, "You can't ship a different item. You can only ship the same item in a different color.")`	3307	`raise TransactionServiceException(121, "You can't ship a different item. You can only ship the same item in a different color.")`
3306		3308
3307	`inventoryClient = InventoryClient().get_client()`	3309	`inventoryClient = InventoryClient().get_client()`
-		3310	`if order.productCondition != ProductCondition.BAD:`
3308	`inventoryClient.updateReservationForOrder(item_id, order.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)`	3311	`inventoryClient.updateReservationForOrder(item_id, order.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)`
3309	`#inventoryClient.reserveItemInWarehouse(item_id, order.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)`	3312	`#inventoryClient.reserveItemInWarehouse(item_id, order.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)`
3310	`#__update_inventory_reservation(order)`	3313	`#__update_inventory_reservation(order)`
3311	`#TODO: Check that this new item has the same price`	3314	`#TODO: Check that this new item has the same price`
3312		3315
3313	`lineitem.item_id = item_id`	3316	`lineitem.item_id = item_id`
Line 3365...		Line 3368...
3365	`warehouse = goodWarehouse`	3368	`warehouse = goodWarehouse`
3366	`else:`	3369	`else:`
3367	`raise TransactionServiceException(119, "Shifting of warehouse allowed to GOOD inventory type warehouse with billing support")`	3370	`raise TransactionServiceException(119, "Shifting of warehouse allowed to GOOD inventory type warehouse with billing support")`
3368		3371
3369	`#inventoryClient.reserveItemInWarehouse(lineitem.item_id, warehouse.id, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), lineitem.quantity)`	3372	`#inventoryClient.reserveItemInWarehouse(lineitem.item_id, warehouse.id, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), lineitem.quantity)`
-		3373	`if order.productCondition != ProductCondition.BAD:`
3370	`inventoryClient.updateReservationForOrder(lineitem.item_id, warehouse.id, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), lineitem.quantity)`	3374	`inventoryClient.updateReservationForOrder(lineitem.item_id, warehouse.id, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), lineitem.quantity)`
3371	`#__update_inventory_reservation(order)`	3375	`#__update_inventory_reservation(order)`
3372	`if order.status == OrderStatus.ACCEPTED:`	3376	`if order.status == OrderStatus.ACCEPTED:`
3373	`__update_transfer_price(order, warehouse.id)`	3377	`__update_transfer_price(order, warehouse.id)`
3374	`order.warehouse_id = warehouse.billingWarehouseId`	3378	`order.warehouse_id = warehouse.billingWarehouseId`
3375	`order.fulfilmentWarehouseId = warehouse.id`	3379	`order.fulfilmentWarehouseId = warehouse.id`