SmartDukaan – /

Rev 6048 – Committing the code after integrating with spicedeck services.

rajveer — Wed, 26 Sep 2012 12:43:33 +0530

rajveer – 11 file(s) modified
Committing the code after integrating with spicedeck services.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/RechargeOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/ServiceProvider.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.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/RechargeOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6047 – Commit on change jacket number.

rajveer — Tue, 25 Sep 2012 16:02:47 +0530

rajveer – 1 file(s) modified
Commit on change jacket number.

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

Rev 6046 – Changed the name and pincode of saholic

rajveer — Tue, 25 Sep 2012 10:26:57 +0530

rajveer – 1 file(s) modified
Changed the name and pincode of saholic

~ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord/server/InvoiceGenerationService.properties

Rev 6045 – Added width of 710 and height 1600

amit.gupta — Mon, 24 Sep 2012 20:14:44 +0530

amit.gupta – 1 file(s) modified
Added width of 710 and height 1600

~ /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god-contest.vm

Rev 6044 – adjusted height 1450

amit.gupta — Mon, 24 Sep 2012 20:06:31 +0530

amit.gupta – 1 file(s) modified
adjusted height 1450

~ /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god-contest.vm

Rev 6043 – adjusted height 1550

amit.gupta — Mon, 24 Sep 2012 20:04:56 +0530

amit.gupta – 1 file(s) modified
adjusted height 1550

~ /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god-contest.vm

Rev 6042 – New omg contest launch.

amit.gupta — Mon, 24 Sep 2012 18:54:34 +0530

amit.gupta – 2 file(s) modified
New omg contest launch.

+ /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god-contest.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/thankyou.vm

Rev 6041 – Fixed NPE in case of accessories.

amit.gupta — Mon, 24 Sep 2012 17:27:04 +0530

amit.gupta – 1 file(s) modified
Fixed NPE in case of accessories.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 6040 – Affiliate id added for thinkdigit.

amit.gupta — Mon, 24 Sep 2012 14:53:42 +0530

amit.gupta – 1 file(s) modified
Affiliate id added for thinkdigit.

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

Rev 6039 – New Vat rate implementation.

amit.gupta — Mon, 24 Sep 2012 12:43:12 +0530

amit.gupta – 15 file(s) modified
New Vat rate implementation.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.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/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6038 – getting numeric value from numeric value instead of text value ...

amar.kumar — Sun, 23 Sep 2012 03:03:05 +0530

amar.kumar – 1 file(s) modified
getting numeric value from numeric value instead of text value from Sarvottam sheet

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java

Rev 6037 – Temporary check to push inventory changes for Sarvottam even in ...

amar.kumar — Sun, 23 Sep 2012 02:18:47 +0530

amar.kumar – 1 file(s) modified
Temporary check to push inventory changes for Sarvottam even in case of less matches of item keys

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java

Rev 6036 –

amar.kumar — Fri, 21 Sep 2012 19:18:00 +0530

amar.kumar – 1 file(s) modified

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java

Rev 6035 – Improvements in correction of malformed tags for SNCA xml

amar.kumar — Fri, 21 Sep 2012 17:48:18 +0530

amar.kumar – 1 file(s) modified
Improvements in correction of malformed tags for SNCA xml

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FileArchiveController.java

Rev 6034 – Improvements in correction of malformed tags for SNCA xml

amar.kumar — Fri, 21 Sep 2012 17:25:12 +0530

amar.kumar – 1 file(s) modified
Improvements in correction of malformed tags for SNCA xml

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FileArchiveController.java

Rev 6033 – Changes in parsing logic of Xml sheet sent by SNCA ...

amar.kumar — Fri, 21 Sep 2012 16:20:05 +0530

amar.kumar – 2 file(s) modified
Changes in parsing logic of Xml sheet sent by SNCA tally Agent and correction for malformedtags in xml

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FileArchiveController.java

Rev 6032 – Added delivered status in the list of statuses which can ...

rajveer — Fri, 21 Sep 2012 11:00:20 +0530

rajveer – 1 file(s) modified
Added delivered status in the list of statuses which can be marked as RTO transit.

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

Rev 6031 – Created infrastructure to support mobile/dth recharge through our website.

rajveer — Thu, 20 Sep 2012 19:07:48 +0530

rajveer – 20 file(s) modified
Created infrastructure to support mobile/dth recharge through our website.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/DigitalTransaction.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/DTHRechargeOrder.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/ImmediateConsumedOrder.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/MobileRechargeOrder.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/RechargeOrder.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/UserWallet.py
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/UserWalletHistory.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/OrderStatusGroups.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/UserWallet.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/UserWalletHistory.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6030 – Changes for automatic upload of SNCA inventory Reviewed by : ...

amar.kumar — Thu, 20 Sep 2012 16:27:12 +0530

amar.kumar – 2 file(s) modified
Changes for automatic upload of SNCA inventory
Reviewed by : Rajveer Singh

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/FileArchiveController.java

Rev 6029 – Parameterising domain name and company name.

rajveer — Wed, 19 Sep 2012 11:20:15 +0530

rajveer – 3 file(s) modified
Parameterising domain name and company name.

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

Rev 6028 – Reverted back the changes.

rajveer — Tue, 18 Sep 2012 13:59:35 +0530

rajveer – 1 file(s) modified
Reverted back the changes.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java

Rev 6027 – importing ConfigClientKeys

amit.gupta — Tue, 18 Sep 2012 11:43:07 +0530

amit.gupta – 1 file(s) modified
importing ConfigClientKeys

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

Rev 6026 – Removed S3 from SJunglee. Created new coupon SGalaxyS3 (public) worth ...

amit.gupta — Mon, 17 Sep 2012 21:46:01 +0530

amit.gupta – 2 file(s) modified
Removed S3 from SJunglee.
Created new coupon SGalaxyS3 (public) worth Rs.1000.

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_junglee_coupons.py
+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_SGalaxyS3.py

Rev 6025 – removed prices from coming soon items.

amit.gupta — Mon, 17 Sep 2012 19:17:34 +0530

amit.gupta – 9 file(s) modified
removed prices from coming soon items.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/ContentStore/src/velocity/SearchSnippet.vm
~ /trunk/ContentStore/src/velocity/WidgetSnippet.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java

Rev 6024 – Adding "http://" in front of product_url

amar.kumar — Mon, 17 Sep 2012 19:11:47 +0530

amar.kumar – 1 file(s) modified
Adding "http://" in front of product_url

~ /trunk/PriceComparisonFramework/src/Scrapers/TradusScraper.py

Rev 6023 – Changes in xml request for getting data in proper format ...

amar.kumar — Mon, 17 Sep 2012 18:14:15 +0530

amar.kumar – 1 file(s) modified
Changes in xml request for getting data in proper format
Reviewed by : Mandeep Singh

~ /ClientAgent/src/main/java/in/shop2020/agent/utils/TallyAgent.java

Rev 6022 – Change in Tradus Scraper to accommodate the changes in UI ...

amar.kumar — Mon, 17 Sep 2012 14:46:52 +0530

amar.kumar – 1 file(s) modified
Change in Tradus Scraper to accommodate the changes in UI of Tradus listing and product page

~ /trunk/PriceComparisonFramework/src/Scrapers/TradusScraper.py

Rev 6021 – Made changes in case of product is coming soon.

amit.gupta — Mon, 17 Sep 2012 14:39:28 +0530

amit.gupta – 2 file(s) modified
Made changes in case of product is coming soon.

~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/Website/src/main/webapp/js/entity.js

Rev 6020 – Added jellybeans for Note 2 Ticket #1635

amit.gupta — Mon, 17 Sep 2012 13:58:59 +0530

amit.gupta – 2 file(s) modified
Added jellybeans for Note 2
Ticket #1635

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 6019 – Added support to unaccept, mark rto in transit and change ...

rajveer — Mon, 17 Sep 2012 12:27:15 +0530

rajveer – 30 file(s) modified
Added support to unaccept, mark rto in transit and change jacket number to admin.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChangeJacketNumberEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChangeJacketNumberEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/MarkRtoInTransitEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/MarkRtoInTransitEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/UnacceptOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/UnacceptOrderEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ChangeJacketBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ChooseColorBox.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/MarkDeliveredBox.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/SearchBox.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/ChangeJacketNumberHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/MarkRtoInTransitHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/UnacceptOrderhandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChangeJacketNumberRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChangeJacketNumberResponse.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkRtoInTransitRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkRtoInTransitResponse.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/UnacceptOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/UnacceptOrderResponse.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/OrderStatusGroups.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6018 – Made Rs.500 discount in Junglee for SIII 16GB

amit.gupta — Mon, 17 Sep 2012 11:01:38 +0530

amit.gupta – 1 file(s) modified
Made Rs.500 discount in Junglee for SIII 16GB

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

Rev 6017 – Change to get destination codes for disabled pincodes for printing ...

amar.kumar — Fri, 14 Sep 2012 18:24:46 +0530

amar.kumar – 2 file(s) modified
Change to get destination codes for disabled pincodes for printing invoices of old orders whose pincode is now disabled.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py

Rev 6016 – Changed from tuser to euser.

rajveer — Fri, 14 Sep 2012 16:56:20 +0530

rajveer – 1 file(s) modified
Changed from tuser to euser.

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 6015 – Fixed error in updating vendor item pricing.

amit.gupta — Fri, 14 Sep 2012 16:08:58 +0530

amit.gupta – 1 file(s) modified
Fixed error in updating vendor item pricing.

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

Rev 6014 – Fixed error in updating vendor item pricing.

amit.gupta — Fri, 14 Sep 2012 16:05:05 +0530

amit.gupta – 1 file(s) modified
Fixed error in updating vendor item pricing.

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

Rev 6013 – Change to use cumulative availability for warehouses sharing common billing ...

amar.kumar — Fri, 14 Sep 2012 14:52:28 +0530

amar.kumar – 1 file(s) modified
Change to use cumulative availability for warehouses sharing common billing warehouse for calculating transfer delay
Reviewed By : Rajveer Singh

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

Rev 6012 – Escaped html in values

amit.gupta — Fri, 14 Sep 2012 14:24:35 +0530

amit.gupta – 1 file(s) modified
Escaped html in values

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 6011 – Added check of start date and end date while applying ...

rajveer — Fri, 14 Sep 2012 12:39:00 +0530

rajveer – 1 file(s) modified
Added check of start date and end date while applying coupon.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py

Rev 6010 – Added last status timestamp field.

rajveer — Fri, 14 Sep 2012 11:23:55 +0530

rajveer – 2 file(s) modified
Added last status timestamp field.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreStatisticsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-statistics-authsuccess.vm

Rev 6009 – Corrected the calculation of logic for specific user coupons.

amit.gupta — Thu, 13 Sep 2012 17:14:38 +0530

amit.gupta – 1 file(s) modified
Corrected the calculation of logic for specific user coupons.

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