Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
12580 4153 d 22 h amit.gupta /trunk/ Added new Source.  
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
11526 4246 d 3 h amit.gupta /trunk/ Added mobile as source while creating orders. Logging related changes.  
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/AddressController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CartController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EbsPayController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/LoginController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/interceptors/UserInterceptor.java
/trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/ContentServingService.java
/trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/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/model/v1/order/OrderSource.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
8982 4425 d 2 h vikram.raghav /trunk/ Added Flipkart Order Source in Order Sevice thrift  
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
8488 4474 d 1 h amar.kumar /trunk/ Changes for creating/invoicing/accepting Snapdeal orders  
/trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealDashboardController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealOrderCreatorController.java
/trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-dashboard-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-order-creator-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SnapdealOrder.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.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/order/impl/OrderServiceHandler.py
/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/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreStatisticsController.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
7410 4606 d 6 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
7356 4619 d 13 h vikram.raghav /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ Source defined for amazon  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
7293 4627 d 2 h anupam.singh / - Changes related to StoreWebsite
- Added source to "change_transaction_status" method		  
/StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
/StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
/StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
/StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
/StoreWebsite/src/main/webapp/js/storewebsite.js
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.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/CreateRTGSBulkOrders.py
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java