Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
17470 3714 d 4 h manish.sharma /trunk/ Committed by Manish Sharma for Bulk Order Creation and Shipping Charges Implementation on 16-Nov-2015  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SplitEbayOrderBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitEbayOrderHandler.java
/trunk/MobileSite/application/widgets/cart/views/carts.php
/trunk/MobileSite/application/widgets/checkout/views/shipping_process.php
/trunk/MobileSite/application/widgets/productinfo/views/product_details_b.php
/trunk/MobileSite/application/widgets/productinfo/views/product_details_d.php
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.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/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.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/ThriftGen/thriftsrc/OrderService/OrderService.thrift
13407 4045 d 19 h manish.sharma /trunk/Support/src/main/java/in/shop2020/support/services/ Committed by Manish Sharma for Bulk Shipment Creation Process on 19-Dec-2014  
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
13276 4055 d 0 h manish.sharma /trunk/ Committed by Manish Sharma for Bulk Shipment Creation Process on 10-Dec-2014  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchOrdersByMasterOrderEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchOrdersByMasterOrderEventHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketNewInfoBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SearchOrdersByMasterOrderIdBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchOrdersByMasterOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LoadAcceptOrdersRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LoadAcceptOrdersResponse.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchOrdersByMasterOrderIdRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ReceiveReturnEvent.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/InboxWidget.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/client/inbox/ReceiveReturnBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.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/ReceiveReturnHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchFlipkartOrderHandler.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/ReceiveReturnRequest.java
/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/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
7792 4560 d 21 h anupam.singh /trunk/ - Changes to logistics provider details
- Added support for uploading awb list in file as well as downloading reports in excel		  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
/trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
/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/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/models/AwbDetails.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm
/trunk/Support/src/main/webapp/js/courier-details.js
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.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/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
6318 4816 d 1 h rajveer /trunk/ Added support for gift vouchers.  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/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/user/impl/CartDataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/StoreCollectionController.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierReconciliationGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
5945 4878 d 20 h mandeep.dhir /trunk/ Separating catalog and inventory services Trac#1594 Reviewer: Rajveer  
/trunk/Common/src/main/java/in/shop2020/thrift/clients/InventoryClient.java
/trunk/Support/Converted-2-2012-08-06-16:29:31.xls
/trunk/Support/Converted-2-2012-08-11-14:58:00.xls
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AvailableAndReservedStock.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BillingType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HolidayType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventoryHistory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Vendor.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemMapping.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemPricing.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
/trunk/ThriftGen/thriftsrc/InventoryService
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/runutils/.project
/trunk/runutils/.pydevproject
/trunk/runutils/init.d/inventory-server
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AvailableAndReservedStock.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HolidayType.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/InventoryType.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/ItemNotificationRequestCount.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotification.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/WarehouseType.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.java
/trunk/Common/src/main/java/in/shop2020/utils/CategoryManager.java
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
/trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
/trunk/ContentStore/src/main/java/in/shop2020/util/MobileSiteDataXMLGenerator.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.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/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/IgnoredItemMappingController.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/java/in/shop2020/inventory/controllers/SupplierController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ComingSoonController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
5554 4938 d 21 h rajveer /trunk/Support/src/main/java/in/shop2020/support/ All InStore orders should be treated as prepaid for logistic partners.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierPerformanceController.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
4801 5043 d 23 h anupam.singh /trunk/ Trac #1025

Created a dashboard for viewing courier performance report in Support webapp.		  
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierPerformanceController.java
/trunk/Support/src/main/webapp/WEB-INF/content/courier-performance-index.vm
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
3125 5251 d 17 h rajveer /trunk/Support/src/main/java/in/shop2020/support/ Side effect of name changing of clients.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ReportsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UserCommunicationsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
/trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/utils/ReportsUtils.java
3107 5251 d 23 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/services/ Added more logging statements and removed the newline in warehouse location  
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/PendingOrdersGenerator.java
3062 5256 d 17 h chandranshu /trunk/Support/src/main/ Changes for COD  
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm
3044 5257 d 23 h chandranshu /trunk/ Changes to accomodate multiple details for the same provider ensuring all existing things will continue to work  
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/DeliveryType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/ProviderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
/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/logistics/service/script/AwbNumberLoader.py
/trunk/PyProj/src/shop2020/logistics/service/script/ServiceDetailsLoader.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/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
1023 5419 d 1 h chandranshu /trunk/Support/ Removed unused jar files from build declaration  
/trunk/Support/pom.xml
/trunk/Support/src/main
/trunk/Support/src/main/java
/trunk/Support/src/main/java/in
/trunk/Support/src/main/resources
/trunk/Support/src/in
/trunk/Support/.classpath
/trunk/Support/build.properties
/trunk/Support/build.xml
919 5431 d 21 h rajveer /trunk/Support/src/in/shop2020/support/services/ Weight display fixed. Null removed from name. Paymode made prepaid.  
/trunk/Support/src/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/in/shop2020/support/services/InvoiceGenerationService.java
/trunk/Support/src/in/shop2020/support/services/ManifestGenerator.java
749 5460 d 20 h chandranshu /trunk/Support/ Added a login/password check to protect the courier-details report  
/trunk/Support/WebContent/WEB-INF/content/courier-details-authfail.vm
/trunk/Support/WebContent/WEB-INF/content/courier-details-authsuccess.vm
/trunk/Support/WebContent/js
/trunk/Support/WebContent/js/jquery-1.4.2.js
/trunk/Support/src/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/in/shop2020/support/services/CourierDetailsGenerator.java
744 5461 d 21 h chandranshu /trunk/Support/src/in/shop2020/support/services/ Made the changes requested by BlueDart  
/trunk/Support/src/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/in/shop2020/support/services/ManifestGenerator.java
734 5462 d 17 h chandranshu /trunk/Support/ Started using provider specific barcode. Added the 3-letter code to the invoice. Started using the new logo.  
/trunk/Support/WebContent/WEB-INF/classes/aramex
/trunk/Support/WebContent/WEB-INF/classes/aramex/barcode.TTF
/trunk/Support/WebContent/WEB-INF/classes/bluedart
/trunk/Support/WebContent/WEB-INF/classes/bluedart/barcode.TTF
/trunk/Support/WebContent/WEB-INF/classes/bluedart/carrier.TTF
/trunk/Support/WebContent/WEB-INF/classes/logo.jpg
/trunk/Support/WebContent/WEB-INF/classes/logo.png
/trunk/Support/build.xml
/trunk/Support/src/in/shop2020/support/controllers/InvoiceController.java
/trunk/Support/src/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/in/shop2020/support/services/InvoiceGenerationService.java
679 5468 d 9 h chandranshu /trunk/Support/ Added support for courier companies to download the daily report  
/trunk/Support/WebContent/WEB-INF/content/courier-details-lsuccess.vm
/trunk/Support/src/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/.classpath
/trunk/Support/build.xml
/trunk/Support/src/in/shop2020/support/services/ManifestGenerator.java