SmartDukaan – /

Rev 4515 – Fixed minor things in OM for return workflow

mandeep.dhir — Wed, 15 Feb 2012 14:44:40 +0530

mandeep.dhir – 9 file(s) modified
Fixed minor things in OM for return workflow

Rev 4514 – Ticket #895 Create Sub Menu Under Laptop Menu Bar reviewer: ...

phani.kumar — Wed, 15 Feb 2012 13:53:30 +0530

phani.kumar – 1 file(s) modified
Ticket #895 Create Sub Menu Under Laptop Menu Bar
reviewer: Varun Gupta

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 4513 – Changed email reader logic to search using flag instead of ...

anupam.singh — Wed, 15 Feb 2012 11:45:29 +0530

anupam.singh – 1 file(s) modified
Changed email reader logic to search using flag instead of last received time

Reviewer : Mandeep.dhir

trac #903

~ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.java

Rev 4512 – Content model is generated for laptop Accessories

amit.gupta — Tue, 14 Feb 2012 18:01:20 +0530

amit.gupta – 5 file(s) modified
Content model is generated for laptop Accessories

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml
~ /trunk/ContentStore/src/xml/model/units.xml

Rev 4511 – Removing warehouse-server and adding purchase server

mandeep.dhir — Tue, 14 Feb 2012 17:44:31 +0530

mandeep.dhir – 2 file(s) modified
Removing warehouse-server and adding purchase server

~ /trunk/runutils/kill.sh
~ /trunk/runutils/start-py-services.sh

Rev 4510 – corrcted the max usage count in doc string

varun.gupta — Tue, 14 Feb 2012 17:39:35 +0530

varun.gupta – 1 file(s) modified
corrcted the max usage count in doc string

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_HDFC_campaign.py

Rev 4509 – Fixing pom

mandeep.dhir — Tue, 14 Feb 2012 16:50:03 +0530

mandeep.dhir – 1 file(s) modified
Fixing pom

~ /trunk/WarehouseService/pom.xml

Rev 4508 – Ticket #889 Aramex Logistics Reconcilation using thier api reviewer: Mandeep ...

phani.kumar — Tue, 14 Feb 2012 16:41:35 +0530

phani.kumar – 1 file(s) modified
Ticket #889 Aramex Logistics Reconcilation using thier api
reviewer: Mandeep Dhir

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 4507 – removed extra script tag

varun.gupta — Tue, 14 Feb 2012 15:23:12 +0530

varun.gupta – 1 file(s) modified
removed extra script tag

~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 4506 – Ticket #889 Aramex Logistics Reconcilation using thier api Ticket #891 ...

phani.kumar — Tue, 14 Feb 2012 14:47:59 +0530

phani.kumar – 24 file(s) modified
Ticket #889 Aramex Logistics Reconcilation using thier api
Ticket #891 Support for Preferred vendor in Catalog
reviewer: Mandeep Dhir

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /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/order/impl/Convertors.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/order/script/AramexLogisticsReconciliation.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/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/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.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/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4505 – Increased the count of max allowed coupon uses to 2000

varun.gupta — Tue, 14 Feb 2012 11:16:43 +0530

varun.gupta – 1 file(s) modified
Increased the count of max allowed coupon uses to 2000

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_HDFC_campaign.py

Rev 4504 – Adding script to run warehouseservice

mandeep.dhir — Tue, 14 Feb 2012 10:17:17 +0530

mandeep.dhir – 1 file(s) modified
Adding script to run warehouseservice

+ /trunk/runutils/run-warehouse-service.sh

Rev 4503 – Trac#888 Inventory/Warehouse management for serialized items. Separeted purchase order service ...

mandeep.dhir — Tue, 14 Feb 2012 01:12:34 +0530

mandeep.dhir – 18 file(s) modified
Trac#888 Inventory/Warehouse management for serialized items.
Separeted purchase order service and warehouseservice
Added form in UI to create item number mapping
Added validation to avoid repeated scan of same item

+ /trunk/PyProj/src/shop2020/purchase
+ /trunk/PyProj/src/shop2020/purchase/main
+ /trunk/PyProj/src/shop2020/purchase/main/handler
+ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
+ /trunk/PyProj/src/shop2020/purchase/main/handler/__init__.py
+ /trunk/PyProj/src/shop2020/purchase/main/model
+ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
+ /trunk/PyProj/src/shop2020/purchase/main/model/Purchase.py
+ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
+ /trunk/PyProj/src/shop2020/purchase/main/model/Supplier.py
+ /trunk/PyProj/src/shop2020/purchase/main/model/__init__.py
+ /trunk/PyProj/src/shop2020/purchase/main/PurchaseServer.py
+ /trunk/PyProj/src/shop2020/purchase/main/script
+ /trunk/PyProj/src/shop2020/purchase/main/script/__init__.py
+ /trunk/PyProj/src/shop2020/purchase/main/__init__.py
+ /trunk/PyProj/src/shop2020/purchase/test
+ /trunk/PyProj/src/shop2020/purchase/test/__init__.py
+ /trunk/PyProj/src/shop2020/purchase/__init__.py

Rev 4502 – Trac#888 Inventory/Warehouse management for serialized items. Separeted purchase order service ...

mandeep.dhir — Tue, 14 Feb 2012 01:04:51 +0530

mandeep.dhir – 6 file(s) modified
Trac#888 Inventory/Warehouse management for serialized items.
Separeted purchase order service and warehouseservice
Added form in UI to create item number mapping
Added validation to avoid repeated scan of same item

+ /trunk/PyProj/src/shop2020/thriftpy/purchase
+ /trunk/PyProj/src/shop2020/thriftpy/purchase/constants.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/purchase/__init__.py

Rev 4501 – Trac#888 Inventory/Warehouse management for serialized items. Separeted purchase order service ...

mandeep.dhir — Tue, 14 Feb 2012 01:04:13 +0530

mandeep.dhir – 11 file(s) modified
Trac#888 Inventory/Warehouse management for serialized items.
Separeted purchase order service and warehouseservice
Added form in UI to create item number mapping
Added validation to avoid repeated scan of same item

+ /trunk/PyProj/src/shop2020/clients/PurchaseClient.py
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.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/thriftpy/generic/constants.py
~ /trunk/PyProj/src/shop2020/thriftpy/generic/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
x /trunk/PyProj/src/shop2020/warehouse

Rev 4500 – Commiting warehouseservice

mandeep.dhir — Tue, 14 Feb 2012 00:55:07 +0530

mandeep.dhir – 76 file(s) modified
Commiting warehouseservice

+ /trunk/WarehouseService
+ /trunk/WarehouseService/.classpath
+ /trunk/WarehouseService/.project
+ /trunk/WarehouseService/.settings
+ /trunk/WarehouseService/.settings/org.eclipse.jdt.core.prefs
+ /trunk/WarehouseService/.settings/org.maven.ide.eclipse.prefs
+ /trunk/WarehouseService/pom.xml
+ /trunk/WarehouseService/src
+ /trunk/WarehouseService/src/main
+ /trunk/WarehouseService/src/main/java
+ /trunk/WarehouseService/src/main/java/in
+ /trunk/WarehouseService/src/main/java/in/shop2020
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain
+ /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
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ItemNumberHandler.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ItemNumberMapper.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/WarehouseServer.java
+ /trunk/WarehouseService/src/main/resources
+ /trunk/WarehouseService/src/main/resources/context.xml
+ /trunk/WarehouseService/src/main/resources/in
+ /trunk/WarehouseService/src/main/resources/in/shop2020
+ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse
+ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence
+ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
+ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ItemNumberMapper.xml
+ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
+ /trunk/WarehouseService/src/main/resources/jdbc.properties
+ /trunk/WarehouseService/src/main/resources/log4j.properties
+ /trunk/WarehouseService/src/main/resources/mybatis-config.xml
+ /trunk/WarehouseService/src/test
+ /trunk/WarehouseService/src/test/java
+ /trunk/WarehouseService/src/test/resources
+ /trunk/WarehouseService/target
+ /trunk/WarehouseService/target/classes
+ /trunk/WarehouseService/target/classes/context.xml
+ /trunk/WarehouseService/target/classes/in
+ /trunk/WarehouseService/target/classes/in.shop2020.warehouse.persistence
+ /trunk/WarehouseService/target/classes/in/shop2020
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/domain
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/domain/InventoryItem.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/domain/Scan.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/handler
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/handler/InventoryItemHandler.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/handler/ItemNumberHandler.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/handler/ScanHandler.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/InventoryItemMapper.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/ItemNumberMapper.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/ItemNumberMapper.xml
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/ScanMapper.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/persistence/ScanMapper.xml
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/service
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/service/handler
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.class
+ /trunk/WarehouseService/target/classes/in/shop2020/warehouse/service/WarehouseServer.class
+ /trunk/WarehouseService/target/classes/jdbc.properties
+ /trunk/WarehouseService/target/classes/log4j.properties
+ /trunk/WarehouseService/target/classes/mybatis-config.xml
+ /trunk/WarehouseService/target/maven-archiver
+ /trunk/WarehouseService/target/maven-archiver/pom.properties
+ /trunk/WarehouseService/target/surefire
+ /trunk/WarehouseService/target/test-classes
+ /trunk/WarehouseService/target/WarehouseService-0.0.1-SNAPSHOT.jar

Rev 4499 – Trac#888 Inventory/Warehouse management for serialized items. Separeted purchase order service ...

mandeep.dhir — Tue, 14 Feb 2012 00:46:41 +0530

mandeep.dhir – 4 file(s) modified
Trac#888 Inventory/Warehouse management for serialized items.
Separeted purchase order service and warehouseservice
Added form in UI to create item number mapping
Added validation to avoid repeated scan of same item

+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/PurchaseClient.java
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/PoSheetGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/WareHouseUtils.java

Rev 4498 – Trac#888 renaming script

mandeep.dhir — Tue, 14 Feb 2012 00:45:44 +0530

mandeep.dhir – 2 file(s) modified
Trac#888 renaming script

+ /trunk/runutils/init.d/purchase-server (copied from /trunk/runutils/init.d/warehouse-server@4482)
x /trunk/runutils/init.d/warehouse-server

Rev 4497 – Trac#888 Inventory/Warehouse management for serialized items. Separeted purchase order service ...

mandeep.dhir — Tue, 14 Feb 2012 00:43:39 +0530

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RaisePOController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PdfPoSheetGenerator.java
+ /trunk/Support/src/main/webapp/js/purchase.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm

Rev 4496 – Trac#888 Inventory/Warehouse management for serialized items. Separeted purchase order service ...

mandeep.dhir — Tue, 14 Feb 2012 00:43:02 +0530

mandeep.dhir – 27 file(s) modified
Trac#888 Inventory/Warehouse management for serialized items.
Separeted purchase order service and warehouseservice
Added form in UI to create item number mapping
Added validation to avoid repeated scan of same item

+ /trunk/ThriftConfig/src/main/java/in/shop2020/generic/Constants.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/generic/ExceptionType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/POStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Purchase.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseServiceException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchasingServiceException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Supplier.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/LineItem.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/POStatus.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Purchase.java
x /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
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/StockLedgerStatus.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Supplier.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseServiceException.java
~ /trunk/ThriftGen/thriftsrc/GenericService/GenericService.thrift
+ /trunk/ThriftGen/thriftsrc/PurchaseService
+ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 4495 – Added return flow handling both in backend and front end.

rajveer — Mon, 13 Feb 2012 19:49:36 +0530

rajveer – 22 file(s) modified
Added return flow handling both in backend and front end.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ValidateProductEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ValidateProductEventHandler.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/OrderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ProductValidationBox.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/OrderDetailsHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ValidateProductHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InventoryReportProcessor.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/DetailsMask.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ValidateProductRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ValidateProductResponse.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4494 – Ticket #867 - Coupon code and relevant discount applicable on ...

varun.gupta — Mon, 13 Feb 2012 17:22:06 +0530

varun.gupta – 8 file(s) modified
Ticket #867 - Coupon code and relevant discount applicable on a product will be exposed to it's product page

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 4493 – added new Description feature

amit.gupta — Mon, 13 Feb 2012 15:27:14 +0530

amit.gupta – 1 file(s) modified
added new Description feature

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonFeatures.java

Rev 4492 – Added incremental saving of the product ad files.

amit.gupta — Mon, 13 Feb 2012 15:06:45 +0530

amit.gupta – 1 file(s) modified
Added incremental saving of the product ad files.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 4491 – Added support for incremental entity generation in AmazonSCD

amit.gupta — Mon, 13 Feb 2012 15:06:21 +0530

amit.gupta – 1 file(s) modified
Added support for incremental entity generation in AmazonSCD

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 4490 – Added DOA Request and return request raised handling in CRM. ...

anupam.singh — Mon, 13 Feb 2012 13:45:46 +0530

anupam.singh – 15 file(s) modified
Added DOA Request and return request raised handling in CRM. On ticket info page clicking on activity now shows attachments as well.

Trac #894, #862, #863

Reviewer : Mandeep Dhir

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.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/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4489 – Track #822 - Default title below Product page's main image ...

varun.gupta — Mon, 13 Feb 2012 11:52:51 +0530

varun.gupta – 1 file(s) modified
Track #822 - Default title below Product page's main image fixed

~ /trunk/Website/src/main/webapp/js/entity.js

Rev 4488 – Added support of return requesting and request authorisation.

rajveer — Fri, 10 Feb 2012 17:54:55 +0530

rajveer – 8 file(s) modified
Added support of return requesting and request authorisation.

~ /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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /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/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4487 – Changed name of some of the group of orders.

rajveer — Fri, 10 Feb 2012 15:52:12 +0530

rajveer – 1 file(s) modified
Changed name of some of the group of orders.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.java

Rev 4486 – Implemented the RTO flow. Added some new statuses.

rajveer — Fri, 10 Feb 2012 15:45:26 +0530

rajveer – 3 file(s) modified
Implemented the RTO flow. Added some new statuses.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4485 – Added statuses for RTO Flow.

rajveer — Fri, 10 Feb 2012 15:24:00 +0530

rajveer – 1 file(s) modified
Added statuses for RTO Flow.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 4484 – Changed the name of various order statuses.

rajveer — Fri, 10 Feb 2012 13:57:32 +0530

rajveer – 13 file(s) modified
Changed the name of various order statuses.

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/services/PaymentDetailsGenerator.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/controllers/FailedOrdersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyaccountController.java

Rev 4483 – Changed name of the order statuses.

rajveer — Fri, 10 Feb 2012 13:48:40 +0530

rajveer – 1 file(s) modified
Changed name of the order statuses.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 4482 – Added aramex url in shop2020.cfg

rajveer — Thu, 09 Feb 2012 20:10:07 +0530

rajveer – 1 file(s) modified
Added aramex url in shop2020.cfg

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 4481 – import was missing for two methods

anupam.singh — Thu, 09 Feb 2012 19:44:54 +0530

anupam.singh – 1 file(s) modified
import was missing for two methods

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 4480 – Added feature values for Laptops

amit.gupta — Thu, 09 Feb 2012 19:14:17 +0530

amit.gupta – 1 file(s) modified
Added feature values for Laptops

~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java

Rev 4479 – Added support to reship or refund the lost and damaged ...

rajveer — Thu, 09 Feb 2012 18:20:42 +0530

rajveer – 4 file(s) modified
Added support to reship or refund the lost and damaged orders.

Rev 4478 – Added support to receive return in three conditions and than ...

rajveer — Thu, 09 Feb 2012 18:19:17 +0530

rajveer – 14 file(s) modified
Added support to receive return in three conditions and than reship or refund them accordingly.

~ /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/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/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReceiveReturnHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReceiveReturnRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReturnShipmentCondition.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4477 – modified the A/B Test experiment ID

varun.gupta — Thu, 09 Feb 2012 17:42:15 +0530

varun.gupta – 1 file(s) modified
modified the A/B Test experiment ID

~ /trunk/Website/src/main/filters/staging/filters.properties

Rev 4476 – trac #882 Reviewer : Rajveer If warehouse preference ...

anupam.singh — Thu, 09 Feb 2012 17:27:59 +0530

anupam.singh – 1 file(s) modified
trac #882

Reviewer : Rajveer

If warehouse preference is set then delivery estimate should be linked to availability in preferred warehouse rather than total availability.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py