Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
13214 4062 d 16 h kshitij.sood /trunk/ Campaign & gosf  
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/Campaigns.java
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/DataService.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
12696 4137 d 22 h amit.gupta /trunk/ Added Counter Registration logic  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Counter.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/DealerAuth.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/DealerAuthRole.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/Location.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/ForgotPasswordController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/LoginController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/NotificationPojo.java
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/DataService.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
12691 4141 d 15 h manish.sharma /trunk/ Committed by Manish Sharma for Sms Integration on 18-Sep-2014  
/trunk/PyProj/src/shop2020/helpers/impl/SmsSender.py
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/SmsDeliveryStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/SmsStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/SmsType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/UserSms.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/UserSmsInfo.java
/trunk/PyProj/src/shop2020/helpers/impl/Converters.py
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/DataService.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
8020 4528 d 17 h rajveer /trunk/ Create users based on amazon email id. Stop sending email to other sources users.  
/trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/AmazonOrder.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/script/LogisticUtils.py
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py
/trunk/PyProj/src/shop2020/model/v1/order/script/SpicedeckRechargeVoucherService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
7410 4609 d 22 h amar.kumar /trunk/ Changes for
1)Multiple Ours Physical Warehouses
2)Movement of Goods across our warehouses
3)Creation of orders for different sources through Excel Upload

Reviewed By Amit Gupta		  
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/TransferLotController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/TransferLotReceiveController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-new.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-output.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-receive-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-show.vm
/trunk/InventoryManager/src/main/webapp/css/colorbox.css
/trunk/InventoryManager/src/main/webapp/css/images
/trunk/InventoryManager/src/main/webapp/css/images/border.png
/trunk/InventoryManager/src/main/webapp/css/images/controls.png
/trunk/InventoryManager/src/main/webapp/css/images/loading.gif
/trunk/InventoryManager/src/main/webapp/css/images/loading_background.png
/trunk/InventoryManager/src/main/webapp/css/images/overlay.png
/trunk/InventoryManager/src/main/webapp/images/sort_asc.png
/trunk/InventoryManager/src/main/webapp/images/sort_asc_disabled.png
/trunk/InventoryManager/src/main/webapp/images/sort_both.png
/trunk/InventoryManager/src/main/webapp/images/sort_desc.png
/trunk/InventoryManager/src/main/webapp/images/sort_desc_disabled.png
/trunk/InventoryManager/src/main/webapp/js/common.js
/trunk/InventoryManager/src/main/webapp/js/jquery.colorbox.js
/trunk/InventoryManager/src/main/webapp/js/transfer-lot.js
/trunk/Support/src/main/java/in/shop2020/support/controllers/SourceOrderCreationController.java
/trunk/Support/src/main/webapp/WEB-INF/content/source-order-creation-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/AgentWarehouseMapping.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/PossibleWarehouseMovement.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferLot.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferLotStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/transferLot.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/PossibleWarehouseMovement.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/TransferLot.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/TransferLotHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/TransferLotMapper.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/TransferLotMapper.xml
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.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/InventoryReaderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InvoiceController.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/PurchaseReturnController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/ScanRecordController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
/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/invoice-editNew.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/InventoryManager/src/main/webapp/js/jquery.colorbox-min.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
/trunk/InventoryManager/src/main/webapp/js/purchase.js
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/DataService.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/script/A110Processor.py
/trunk/PyProj/src/shop2020/model/v1/order/script/FreebieBulkOrderCreator.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/Invoice.py
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/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/crm/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SourceDetail.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Invoice.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.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/WarehouseService.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.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/domain/Scan.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
/trunk/WarehouseService/src/main/resources/mybatis-config.xml
7221 4644 d 15 h kshitij.sood /trunk/ Red expresss tracker and added link to retrieve order delivery mail.  
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
6788 4731 d 15 h rajveer /trunk/ Make action fields as disabled in case of readonly user.  
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/AuthenticateDialog.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/LoginService.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/LoginServiceAsync.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/LoginServiceImpl.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
6322 4817 d 20 h amar.kumar /trunk/ Changes for Following:
1) Option to download Order Confirmation Mail from CRM
2) Option to add new pincode or update/disable serviceability for a provider from Support Reports (Cod-Reconciliation)
3) Option to get Scan Details for a given ItemId/Serial-Number from Inventory Webapp

Reviewed by Anupam Singh		  
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/ScanRecordController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/scan-record-index.vm
/trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
/trunk/Support/src/main/webapp/css/pincode.css
/trunk/Support/src/main/webapp/js/pincode.js
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.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/script/CatalogComparer.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
5864 4898 d 16 h rajveer /trunk/ Changes in email sender to support cc and bcc.  
/trunk/PyProj/src/shop2020/helpers/impl/Converters.py
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/DataService.py
/trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/UserEmail.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
5055 5018 d 14 h varun.gupta /trunk/ Ticket #1156 - Email addresses from product notifications, sent in past, can now be downloaded  
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
/trunk/Support/src/main/webapp/WEB-INF/content/product-notifications-index.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
4996 5026 d 20 h varun.gupta /trunk/ Trac #1127 - Added functionality to modify existing quick-links  
/trunk/PyProj/src/shop2020/helpers/impl/Converters.py
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/QuicklinksController.java
/trunk/Support/src/main/webapp/WEB-INF/content/quicklinks-index.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/QuickLink.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
4806 5047 d 16 h varun.gupta /trunk/ Ticket #1008 - Helper service modified to store quick links and a UI created to manage these  
/trunk/Support/src/main/java/in/shop2020/support/controllers/QuicklinksController.java
/trunk/Support/src/main/webapp/WEB-INF/content/quicklinks-index.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/QuickLink.java
/trunk/PyProj/src/shop2020/helpers/impl/Converters.py
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/DataService.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
4691 5060 d 20 h mandeep.dhir /trunk/PyProj/src/shop2020/ Adding support for user agents  
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
4544 5081 d 20 h varun.gupta /trunk/ Added functionality to share entityIds with an email  
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShareProducts.java
/trunk/Website/src/main/webapp/WEB-INF/content/share-products-success.vm
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
3431 5229 d 11 h rajveer /trunk/PyProj/src/shop2020/thriftpy/ Thrift version updated from 0.2 to 0.7  
/trunk/PyProj/src/shop2020/thriftpy/config/Configuration-remote
/trunk/PyProj/src/shop2020/thriftpy/config/Configuration.py
/trunk/PyProj/src/shop2020/thriftpy/config/constants.py
/trunk/PyProj/src/shop2020/thriftpy/config/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
/trunk/PyProj/src/shop2020/thriftpy/crm/constants.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/datalogger/DataLogger-remote
/trunk/PyProj/src/shop2020/thriftpy/datalogger/DataLogger.py
/trunk/PyProj/src/shop2020/thriftpy/datalogger/constants.py
/trunk/PyProj/src/shop2020/thriftpy/datalogger/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/generic/GenericService-remote
/trunk/PyProj/src/shop2020/thriftpy/generic/GenericService.py
/trunk/PyProj/src/shop2020/thriftpy/generic/constants.py
/trunk/PyProj/src/shop2020/thriftpy/generic/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/constants.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/constants.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/constants.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/constants.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
/trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
/trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/constants.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/constants.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
3376 5235 d 19 h rajveer /trunk/PyProj/src/shop2020/ Implemented new method isAlive()  
/trunk/PyProj/src/shop2020/thriftpy/generic
/trunk/PyProj/src/shop2020/thriftpy/generic/GenericService-remote
/trunk/PyProj/src/shop2020/thriftpy/generic/GenericService.py
/trunk/PyProj/src/shop2020/thriftpy/generic/__init__.py
/trunk/PyProj/src/shop2020/thriftpy/generic/constants.py
/trunk/PyProj/src/shop2020/thriftpy/generic/ttypes.py
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.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/DataAcessors.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/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService-remote
/trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.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/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/model/v1/user/PromotionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
/trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
/trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
3206 5249 d 21 h mandeep.dhir /trunk/ Trac#488 Added support to mail a customer from CRM as part of an activity done on a ticket  
/trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java
/trunk/Crm/src/main/java/in/shop2020/util
/trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
/trunk/Crm/src/main/webapp/css/colorbox.css
/trunk/Crm/src/main/webapp/css/images
/trunk/Crm/src/main/webapp/css/images/border.png
/trunk/Crm/src/main/webapp/css/images/controls.png
/trunk/Crm/src/main/webapp/css/images/loading.gif
/trunk/Crm/src/main/webapp/css/images/loading_background.png
/trunk/Crm/src/main/webapp/js/dataTables.fnDisplayRow.js
/trunk/Crm/src/main/webapp/js/jquery.colorbox-min.js
/trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java
/trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
/trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
/trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
/trunk/CRMService/src/main/resources/log4j.properties
/trunk/Crm/pom.xml
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
/trunk/Crm/src/main/resources/shiro.ini
/trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
/trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
/trunk/Crm/src/main/webapp/css/common.css
/trunk/Crm/src/main/webapp/images/ajax-loader.gif
/trunk/Crm/src/main/webapp/js/common.js
/trunk/Crm/src/main/webapp/js/events.js
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
3086 5257 d 12 h rajveer /trunk/ Added email notification sender. We will send email to the users who want to receive the notifications for the out of stock products.  
/trunk/PyProj/src/shop2020/model/v1/catalog/script/ProductNotifier.py
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.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/model/v1/catalog/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
2783 5285 d 17 h chandranshu /trunk/PyProj/src/shop2020/ Added support for our billing  
/trunk/PyProj/src/shop2020/helpers/impl/model/DashboardUser.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/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/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
2447 5311 d 16 h chandranshu /trunk/PyProj/src/shop2020/thriftpy/utils/ Added attributes to the dashboard user and changed the return type of the authenticateUser method  
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py

←Prev12Next→

Show All