SmartDukaan – //trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java

Rev 5766 – Provision to get airway bill number for runner. Other improvements ...

rajveer — Fri, 10 Aug 2012 14:48:54 +0530

rajveer – 7 file(s) modified
Provision to get airway bill number for runner. Other improvements in pickup store.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
+ /trunk/Support/src/main/webapp/css/colorbox.css
+ /trunk/Support/src/main/webapp/css/lightbox_inline.css
~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 5719 – Added support of hotspot store id in our system.

rajveer — Fri, 03 Aug 2012 13:57:16 +0530

rajveer – 12 file(s) modified
Added support of hotspot store id in our system.

Rev 5553 – Service infrastructure for In Store Pickup.

rajveer — Mon, 09 Jul 2012 15:27:38 +0530

rajveer – 19 file(s) modified
Service infrastructure for In Store Pickup.

~ /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/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/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/PickupStore.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/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Cart.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 5527 – Trac # 1453 B2B support Phase-1

anupam.singh — Mon, 02 Jul 2012 14:58:59 +0530

anupam.singh – 33 file(s) modified
Trac # 1453
B2B support Phase-1

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.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/shared/actions/Order.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/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/script/ProcessTransaction.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/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/BulkOrderController.java
~ /trunk/Support/src/main/webapp/js/bulk-order-common.js
~ /trunk/Support/src/main/webapp/js/bulk-order-events.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/PickUpType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Attribute.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 5247 – Changed interface to get empty awb number.

rajveer — Wed, 23 May 2012 12:46:53 +0530

rajveer – 5 file(s) modified
Changed interface to get empty awb number.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 4934 – Added changes for Loading items with least delivery date on ...

amit.gupta — Mon, 09 Apr 2012 15:02:59 +0530

amit.gupta – 15 file(s) modified
Added changes for Loading items with least delivery date on top...

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 4865 – Changes method isCodAllowed to handle more conditions like based on ...

rajveer — Sat, 31 Mar 2012 19:52:56 +0530

rajveer – 7 file(s) modified
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

Rev 4630 – Bugfix: Change estimate considering COD while address is changed

mandeep.dhir — Tue, 06 Mar 2012 13:54:44 +0530

mandeep.dhir – 7 file(s) modified
Bugfix: Change estimate considering COD while address is changed

~ /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/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /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

Rev 4391 – Removed getAwbForNumber method Reviewer : Rajveer

anupam.singh — Mon, 30 Jan 2012 12:00:13 +0530

anupam.singh – 9 file(s) modified
Removed getAwbForNumber method
Reviewer : Rajveer

Rev 4386 – On courier-details dashboard gave functionality to get details given an ...

anupam.singh — Fri, 27 Jan 2012 03:00:14 +0530

anupam.singh – 20 file(s) modified
On courier-details dashboard gave functionality to get details given an AWB number.

~ /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/LogisticsServiceHandler.py
~ /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/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/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/models/AwbDetails.java
+ /trunk/Support/src/main/webapp/js/courier-details.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-info.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Awb.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 3430 – Changes due to thrift revision upgrade from 0.2 to 0.7

rajveer — Mon, 26 Sep 2011 21:34:41 +0530

rajveer – 120 file(s) modified
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/status.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/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/Tracker.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/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

Rev 3374 – Added GenericService and isAlive call in this service. Extended other ...

rajveer — Tue, 20 Sep 2011 13:06:51 +0530

rajveer – 21 file(s) modified
Added GenericService and isAlive call in this service. Extended other services from this service.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/generic
+ /trunk/ThriftConfig/src/main/java/in/shop2020/generic/GenericService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
+ /trunk/ThriftGen/thriftsrc/GenericService
+ /trunk/ThriftGen/thriftsrc/GenericService/GenericService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 3103 – Added support for alerting the Operations Manager when the no. ...

chandranshu — Wed, 31 Aug 2011 12:36:28 +0530

chandranshu – 7 file(s) modified
Added support for alerting the Operations Manager when the no. of free AWB nos. for COD falls below a threshold

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberAlerter.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 3061 – Changes to support COD

chandranshu — Fri, 26 Aug 2011 19:34:25 +0530

chandranshu – 5 file(s) modified
Changes to support COD

~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.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/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionStatus.java

Rev 3044 – Changes to accomodate multiple details for the same provider ensuring ...

chandranshu — Thu, 25 Aug 2011 13:37:14 +0530

chandranshu – 18 file(s) modified
Changes to accomodate multiple details for the same provider ensuring all existing things will continue to work

~ /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/DeliveryType.java
~ /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/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 1730 – Adjustment of delivery time taking into account Holidays and Sundays.

ankur.singhal — Thu, 05 May 2011 16:19:46 +0530

ankur.singhal – 11 file(s) modified
Adjustment of delivery time taking into account Holidays and Sundays.

~ /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/HolidaysLoader.py
+ /trunk/PyProj/src/shop2020/logistics/service/test/TestHolidays.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/order/test/TestDeliveryEstimate.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 1139 – Added a call to get the count of free AWB ...

chandranshu — Fri, 25 Mar 2011 12:03:32 +0530

chandranshu – 1 file(s) modified
Added a call to get the count of free AWB numbers for a provider

~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java

Rev 1013 – Configured Thriftconfig to use maven and cleaned up the build.xml

chandranshu — Wed, 16 Mar 2011 19:17:07 +0530

chandranshu – 8 file(s) modified
Configured Thriftconfig to use maven and cleaned up the build.xml

~ /trunk/ThriftConfig/.classpath
~ /trunk/ThriftConfig/.settings/org.eclipse.wst.common.component
~ /trunk/ThriftConfig/build.xml
+ /trunk/ThriftConfig/pom.xml
x /trunk/ThriftConfig/src/in
+ /trunk/ThriftConfig/src/main
+ /trunk/ThriftConfig/src/main/java
+ /trunk/ThriftConfig/src/main/java/in (copied from /trunk/ThriftConfig/src/in@981)

Rev 764 – Added closeSession function in all services

rajveer — Wed, 09 Feb 2011 17:25:55 +0530

rajveer – 8 file(s) modified
Added closeSession function in all services

~ /trunk/ThriftConfig/src/in/shop2020/datalogger/DataLogger.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/order/OrderStatus.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftConfig/src/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftConfig/src/in/shop2020/utils/HelperService.java

Rev 730 – Added a method to get the destination code of a ...

chandranshu — Tue, 01 Feb 2011 17:20:52 +0530

chandranshu – 1 file(s) modified
Added a method to get the destination code of a pincode for a provider

~ /trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java

Rev 715 – changed itemid from string to int

rajveer — Fri, 28 Jan 2011 16:03:08 +0530

rajveer – 1 file(s) modified
changed itemid from string to int

~ /trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java

Rev 674 – Generated java code for an added method

chandranshu — Thu, 27 Jan 2011 01:43:58 +0530

chandranshu – 1 file(s) modified
Generated java code for an added method

~ /trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java

Rev 668 – Generated java files for changed to Order, LineItem and Provider

chandranshu — Wed, 26 Jan 2011 18:54:26 +0530

chandranshu – 4 file(s) modified
Generated java files for changed to Order, LineItem and Provider

~ /trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/in/shop2020/logistics/Provider.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/Order.java

Rev 648 – Generated code for catalog service. New classes for the logistics ...

chandranshu — Tue, 25 Jan 2011 18:56:09 +0530

chandranshu – 13 file(s) modified
Generated code for catalog service. New classes for the logistics service.

+ /trunk/ThriftConfig/src/in/shop2020/logistics/AwbUpdate.java
x /trunk/ThriftConfig/src/in/shop2020/logistics/ItemLogistics.java
~ /trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsInfo.java
~ /trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java
x /trunk/ThriftConfig/src/in/shop2020/logistics/Shipment.java
x /trunk/ThriftConfig/src/in/shop2020/logistics/ShipmentStatusInfo.java
x /trunk/ThriftConfig/src/in/shop2020/logistics/ShipmentUpdate.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/InventoryService.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/Warehouse.java
+ /trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/WarehouseLocation.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/user/Line.java

Rev 483 – Orderservice changes incorporated. Catalogservice changes incorporated. Logistic service changes to ...

rajveer — Sat, 30 Oct 2010 19:20:28 +0530

rajveer – 45 file(s) modified
Orderservice changes incorporated.
Catalogservice changes incorporated.
Logistic service changes to get logisticsinfo.

~ /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/logistics/service/logistics.sqlite
~ /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/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/InventoryUpdate.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/Order.java
+ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/OrderStatus.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/ThriftConfig/src/in/shop2020/serving/page/PageContentKeys.java
+ /trunk/ThriftConfig/src/in/shop2020/serving/page/SessionInfo.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 477 – Logistics service changes as suggested by Pankaj.

rajveer — Mon, 11 Oct 2010 15:47:45 +0530

rajveer – 8 file(s) modified
Logistics service changes as suggested by Pankaj.

Rev 471 – Logistics service and widget Service changes.

rajveer — Wed, 06 Oct 2010 21:26:56 +0530

rajveer – 6 file(s) modified
Logistics service and widget Service changes.

+ /trunk/ThriftConfig/src/in/shop2020/logistics/ItemLogistics.java
~ /trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java
+ /trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsServiceException.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/widgets/WidgetService.java
~ /trunk/ThriftConfig/src/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/in/shop2020/utils/Mail.java

Rev 442 – Logistic service implemented

rajveer — Wed, 15 Sep 2010 12:46:08 +0530

rajveer – 12 file(s) modified
Logistic service implemented

+ /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/test/Test.py
+ /trunk/PyProj/src/shop2020/model/v1/widget/test/Test.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/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/in/shop2020/logistics/ShipmentStatusInfo.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 412 – 1. Api for aramex 2. Logistic service stubs and part ...

ashish — Thu, 05 Aug 2010 17:24:17 +0530

ashish – 33 file(s) modified
1. Api for aramex
2. Logistic service stubs and part implementation
3.thrift files
4. updated config properties

~ /trunk/Common/conf/shop2020.cfg
+ /trunk/Common/src/in/shop2020/thrift/clients/LogisticsServiceClient.java
~ /trunk/Common/src/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/PyProj/.pydevproject
+ /trunk/PyProj/src/shop2020/clients/LogisticsClient.py
+ /trunk/PyProj/src/shop2020/logistics
+ /trunk/PyProj/src/shop2020/logistics/external
+ /trunk/PyProj/src/shop2020/logistics/external/ExternalServer.py
+ /trunk/PyProj/src/shop2020/logistics/external/xlsprocessor.py
+ /trunk/PyProj/src/shop2020/logistics/external/__init__.py
+ /trunk/PyProj/src/shop2020/logistics/service
+ /trunk/PyProj/src/shop2020/logistics/service/impl
+ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
+ /trunk/PyProj/src/shop2020/logistics/service/impl/__init__.py
+ /trunk/PyProj/src/shop2020/logistics/service/LogisticsServer.py
+ /trunk/PyProj/src/shop2020/logistics/service/test
+ /trunk/PyProj/src/shop2020/logistics/service/test/__init__.py
+ /trunk/PyProj/src/shop2020/logistics/service/__init__.py
+ /trunk/PyProj/src/shop2020/logistics/__init__.py
+ /trunk/PyProj/src/shop2020/thriftpy/logistics
+ /trunk/PyProj/src/shop2020/thriftpy/logistics/constants.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/PyProj/src/shop2020/thriftpy/logistics/__init__.py
+ /trunk/ThriftConfig/src/in/shop2020/logistics
+ /trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java
+ /trunk/ThriftConfig/src/in/shop2020/logistics/Provider.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/ThriftGen/thriftsrc/LogisticsService
+ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift