Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
6725 4742 d 2 h rajveer /trunk/ Added billing type and delivery delay in inventory and logistics service.  
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BillingType.java
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
6524 4774 d 21 h rajveer /trunk/ Added code for on time guarantee.  
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
5110 5005 d 16 h mandeep.dhir /trunk/ Trac#969, Trac#976, Trac#1058, Trac#909, Trac#996, Trac#1067, Trac#1175
Virtual warehouse modelling
Bulk scan In feature
Categorization of Serialized vs NonSerialized items
Screen to display items whose inventory update was missed due to key mismatch
 
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/IgnoredItemMappingController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/LoginController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/ignored-item-mapping-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/item-number-mapping.vm
/trunk/InventoryManager/src/main/webapp/css/demo_page.css
/trunk/InventoryManager/src/main/webapp/css/demo_table.css
/trunk/InventoryManager/src/main/webapp/css/demo_table_jui.css
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/RaisePOController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-result.vm
/trunk/PyProj/src/shop2020/model/v1/catalog/script/PurchaseOrderProcessor.py
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Warehouse.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthResponse.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/resources/shiro.ini
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-edit.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/InventoryManager/src/main/webapp/js/current-inventory.js
/trunk/InventoryManager/src/main/webapp/js/purchase.js
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
4865 5038 d 21 h rajveer /trunk/ Changes method isCodAllowed to handle more conditions like based on pricing etc.  
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
4009 5182 d 1 h chandranshu /trunk/ Added support to set the expected shipping time of an order  
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
3430 5225 d 19 h rajveer /trunk/ThriftConfig/ Changes due to thrift revision upgrade from 0.2 to 0.7  
/trunk/ThriftConfig/pom.xml
/trunk/ThriftConfig/src/main/java/in/shop2020/config/ConfigException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/config/Configuration.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketPriority.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/datalogger/DataLogger.java
/trunk/ThriftConfig/src/main/java/in/shop2020/datalogger/MsgType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/generic/GenericService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/AwbUpdate.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/DeliveryType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/ProviderDetails.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/StationType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/WarehouseLocation.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventoryHistory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemShippingInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/status.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Alert.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Transaction.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/AccountStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Address.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/AddressType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Affiliate.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/AuthenticationException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Cart.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/CartStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Coupon.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/IPMap.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Line.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/LineStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/MasterAffiliate.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Phone.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PhoneType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Promotion.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionTracking.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Sex.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/ShoppingCartException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/SocialHandles.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLog.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/TrackLogType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Tracker.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserAffiliateException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunication.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunicationException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserCommunicationType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserInternalInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserNote.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserState.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserWidgetItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/WidgetException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/WidgetType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Attribute.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Payment.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentGateway.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentGatewayStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/payments/Refund.java
/trunk/ThriftConfig/src/main/java/in/shop2020/test/Address.java
/trunk/ThriftConfig/src/main/java/in/shop2020/test/TestServer.java
/trunk/ThriftConfig/src/main/java/in/shop2020/test/TestService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/CatalogDashboardUser.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/DashboardUser.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/LogisticsUser.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/Mail.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/Message.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/Report.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/ReportUser.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/Role.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/StatisticsUser.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/TextMessage.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/UserEmail.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/POStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Purchase.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/PurchaseOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Scan.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Supplier.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseServiceException.java
1013 5419 d 21 h chandranshu /trunk/ThriftConfig/ Configured Thriftconfig to use maven and cleaned up the build.xml  
/trunk/ThriftConfig/pom.xml
/trunk/ThriftConfig/src/main
/trunk/ThriftConfig/src/main/java
/trunk/ThriftConfig/src/main/java/in
/trunk/ThriftConfig/src/in
/trunk/ThriftConfig/.classpath
/trunk/ThriftConfig/.settings/org.eclipse.wst.common.component
/trunk/ThriftConfig/build.xml
648 5469 d 22 h chandranshu /trunk/ThriftConfig/src/in/shop2020/ Generated code for catalog service. New classes for the logistics service.  
/trunk/ThriftConfig/src/in/shop2020/logistics/AwbUpdate.java
/trunk/ThriftConfig/src/in/shop2020/logistics/StationType.java
/trunk/ThriftConfig/src/in/shop2020/logistics/WarehouseLocation.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/WarehouseLocation.java
/trunk/ThriftConfig/src/in/shop2020/logistics/ItemLogistics.java
/trunk/ThriftConfig/src/in/shop2020/logistics/Shipment.java
/trunk/ThriftConfig/src/in/shop2020/logistics/ShipmentStatusInfo.java
/trunk/ThriftConfig/src/in/shop2020/logistics/ShipmentUpdate.java
/trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/Warehouse.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/user/Line.java
510 5517 d 3 h rajveer /trunk/ OrderStatus enum description added.  
/trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/OrderStatus.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
483 5556 d 21 h rajveer /trunk/ Orderservice changes incorporated.
Catalogservice changes incorporated.
Logistic service changes to get logisticsinfo.
 
/trunk/PyProj/src/shop2020/logistics/service/logistics.sqlite
/trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/InventoryUpdate.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/OrderStatus.java
/trunk/ThriftConfig/src/in/shop2020/serving/page/PageContentKeys.java
/trunk/ThriftConfig/src/in/shop2020/serving/page/SessionInfo.java
/trunk/PyProj/src/shop2020/datalogging/DataLogger.py
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/test/CatalogTest.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/order/test/Test.py
/trunk/PyProj/src/shop2020/model/v1/user/test/user.sqlite
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/utils/OrderStatus.py
/trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/ItemInventory.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/Warehouse.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/Alert.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/LineItem.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/PaymentInfo.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/Transaction.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionStatus.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift