SmartDukaan – /

Rev 5619 – Trac#1495

anupam.singh — Tue, 17 Jul 2012 18:35:49 +0530

anupam.singh – 1 file(s) modified
Trac#1495

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java

Rev 5618 – Commit after each recharge voucher issued.

rajveer — Tue, 17 Jul 2012 18:18:10 +0530

rajveer – 1 file(s) modified
Commit after each recharge voucher issued.

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

Rev 5617 – Putting aggregation code inside try-catch block and logging exception count ...

amar.kumar — Tue, 17 Jul 2012 17:52:40 +0530

amar.kumar – 1 file(s) modified
Putting aggregation code inside try-catch block and logging exception count and last exception trace

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/comparison-stats.jsp

Rev 5616 – Bugfix - removed line that was overwriting catalogClient

mandeep.dhir — Tue, 17 Jul 2012 17:05:45 +0530

mandeep.dhir – 1 file(s) modified
Bugfix - removed line that was overwriting catalogClient

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

Rev 5615 – Corrected helper service port key.

rajveer — Tue, 17 Jul 2012 16:16:46 +0530

rajveer – 1 file(s) modified
Corrected helper service port key.

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

Rev 5614 – Reverting the UI changes for pickup from store.

rajveer — Tue, 17 Jul 2012 13:39:53 +0530

rajveer – 11 file(s) modified
Reverting the UI changes for pickup from store.

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
x /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 5613 – Set store id in cart if delivery to store is ...

rajveer — Tue, 17 Jul 2012 12:50:17 +0530

rajveer – 1 file(s) modified
Set store id in cart if delivery to store is selected. Also always show COD true if pickup is from store.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java

Rev 5612 – updated min price of partners api by reducing voucher amount ...

amit.gupta — Tue, 17 Jul 2012 12:33:24 +0530

amit.gupta – 1 file(s) modified
updated min price of partners api by reducing voucher amount associated with the entity.

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

Rev 5611 – Changes in shop2020.cfg for AlertService

amar.kumar — Tue, 17 Jul 2012 03:10:04 +0530

amar.kumar – 1 file(s) modified
Changes in shop2020.cfg for AlertService

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

Rev 5610 – Adding AlertClient and adding new keys for alertService in ConfigClientKeys

amar.kumar — Tue, 17 Jul 2012 00:39:57 +0530

amar.kumar – 2 file(s) modified
Adding AlertClient and adding new keys for alertService in ConfigClientKeys

+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/AlertClient.java
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java

Rev 5609 – Added new zone for OpenX images for promotions.

amit.gupta — Mon, 16 Jul 2012 15:05:08 +0530

amit.gupta – 1 file(s) modified
Added new zone for OpenX images for promotions.

~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 5608 – Added two new phones in recharge voucher promotion. Updated offer ...

rajveer — Mon, 16 Jul 2012 14:33:25 +0530

rajveer – 1 file(s) modified
Added two new phones in recharge voucher promotion. Updated offer price of two of them.

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 5607 – Trac # 1491 Removed the delete-address button from shipping page ...

anupam.singh — Mon, 16 Jul 2012 14:19:30 +0530

anupam.singh – 2 file(s) modified
Trac # 1491
Removed the delete-address button from shipping page
Reviewer : Mandeep Dhir

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 5606 – Most frequently searched terms for production goes live today.

amit.gupta — Mon, 16 Jul 2012 13:20:07 +0530

amit.gupta – 1 file(s) modified
Most frequently searched terms for production goes live today.

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

Rev 5605 – Added logic for assignment to Delhivery for Hyderabad pincodes.

rajveer — Mon, 16 Jul 2012 11:53:06 +0530

rajveer – 1 file(s) modified
Added logic for assignment to Delhivery for Hyderabad pincodes.

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

Rev 5604 – Most frequently searched terms for production goes live today.

amit.gupta — Mon, 16 Jul 2012 11:31:02 +0530

amit.gupta – 2 file(s) modified
Most frequently searched terms for production goes live today.

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

Rev 5603 – Made the changes in recharge offer terms and conditions for ...

rajveer — Mon, 16 Jul 2012 11:23:44 +0530

rajveer – 3 file(s) modified
Made the changes in recharge offer terms and conditions for spicedeck

+ /trunk/Website/src/main/webapp/images/spicedeck_login.jpg
~ /trunk/Website/src/main/webapp/images/spice_email.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 5602 – Changed the customer care contact number.

rajveer — Mon, 16 Jul 2012 11:15:51 +0530

rajveer – 1 file(s) modified
Changed the customer care contact number.

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

Rev 5601 – reverting most frequwntly searched terms.

amit.gupta — Sat, 14 Jul 2012 14:24:22 +0530

amit.gupta – 1 file(s) modified
reverting most frequwntly searched terms.

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

Rev 5600 – #1456 Level two hierarchy for most frequently searched terms.

amit.gupta — Fri, 13 Jul 2012 20:59:23 +0530

amit.gupta – 5 file(s) modified
#1456
Level two hierarchy for most frequently searched terms.

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/CompatibleAccessoriesIndexGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/LevelHierarchy.java
+ /trunk/ContentStore/src/main/java/in/shop2020/util/MostFrequentlySearchedKeywords.java

Rev 5599 – Updated Google Appdata log for most frequently searched terms.

amit.gupta — Fri, 13 Jul 2012 19:18:41 +0530

amit.gupta – 9 file(s) modified
Updated Google Appdata log for most frequently searched terms.

+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/ProductSearchActivity.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/SearchMetadata.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/ProductSearchActivityRepository.java
~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/SearchMetadata.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailySearchQueryAggregatorServlet.java
~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/ShowSocialDataLog.java
+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/export-search-activity.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/cron.xml
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml

Rev 5598 – added null check

anupam.singh — Fri, 13 Jul 2012 18:18:51 +0530

anupam.singh – 1 file(s) modified
added null check

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

Rev 5597 – Adding some sleep statements

mandeep.dhir — Fri, 13 Jul 2012 14:48:28 +0530

mandeep.dhir – 1 file(s) modified
Adding some sleep statements

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

Rev 5596 – Added Sandeep to the mailing list

anupam.singh — Fri, 13 Jul 2012 14:31:04 +0530

anupam.singh – 1 file(s) modified
Added Sandeep to the mailing list

~ /trunk/PyProj/src/shop2020/purchase/scripts/vendorFulfilmentReport.py

Rev 5595 – Closed session on method exit wherever it was not being ...

anupam.singh — Fri, 13 Jul 2012 12:57:53 +0530

anupam.singh – 1 file(s) modified
Closed session on method exit wherever it was not being done.

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

Rev 5594 – Improved UI and bug fixes for store pickup

anupam.singh — Fri, 13 Jul 2012 12:49:05 +0530

anupam.singh – 8 file(s) modified
Improved UI and bug fixes for store pickup

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 5593 – Trac#1295 Added method to auto accept order with scan IN

mandeep.dhir — Fri, 13 Jul 2012 12:30:14 +0530

mandeep.dhir – 6 file(s) modified
Trac#1295 Added method to auto accept order with scan IN

~ /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 5592 – Adding city

mandeep.dhir — Fri, 13 Jul 2012 12:16:36 +0530

mandeep.dhir – 1 file(s) modified
Adding city

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

Rev 5591 – Trac#1191 UI for CRUD operations on vendor/warehouse. Creation takes place ...

mandeep.dhir — Fri, 13 Jul 2012 12:13:41 +0530

mandeep.dhir – 16 file(s) modified
Trac#1191 UI for CRUD operations on vendor/warehouse.
Creation takes place now on staging and then goes live on production on next day.

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
+ /trunk/InventoryManager/src/main/webapp/js/supplier.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-index.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/Supplier.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/runutils/generate-content-from-catalog.sh
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 5590 – Trac# Making warranty Recommended from Mandatory since screen guards are ...

mandeep.dhir — Fri, 13 Jul 2012 12:10:47 +0530

mandeep.dhir – 1 file(s) modified
Trac# Making warranty Recommended from Mandatory since screen guards are not having warranty

~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 5589 – Trac#1414 Wrote agent for sarvottam that takes data from MS-Access ...

mandeep.dhir — Fri, 13 Jul 2012 12:10:12 +0530

mandeep.dhir – 2 file(s) modified
Trac#1414 Wrote agent for sarvottam that takes data from MS-Access dbgenerated out of Busy and creates stock report

~ /ClientAgent/pom.xml
+ /ClientAgent/src/main/java/in/shop2020/agent/utils/SarvottamAgent.java

Rev 5588 – added nofollow for these links :facebook, twitter and g+

amit.gupta — Fri, 13 Jul 2012 07:25:55 +0530

amit.gupta – 1 file(s) modified
added nofollow for these links :facebook, twitter and g+

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

Rev 5587 – Ticket # 1393 Slide - Networking Feature - Wireless ...

amit.gupta — Fri, 13 Jul 2012 07:11:50 +0530

amit.gupta – 1 file(s) modified
Ticket # 1393

Slide - Networking
Feature - Wireless LAN
Action - Make it skippable
Reason - Lenovo S110/59-328520 does not support

~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 5586 – changes in catalog dashboard to support hotspot reviewer: Mandeep Dhir

phani.kumar — Fri, 13 Jul 2012 00:33:28 +0530

phani.kumar – 15 file(s) modified
changes in catalog dashboard to support hotspot
reviewer: Mandeep Dhir

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/PyProj/src/shop2020/clients/CatalogClient.py
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5585 – AWB date same as billing date

mandeep.dhir — Thu, 12 Jul 2012 16:33:35 +0530

mandeep.dhir – 1 file(s) modified
AWB date same as billing date

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

Rev 5584 – mobile site links in header and footer imgaes

phani.kumar — Thu, 12 Jul 2012 16:07:07 +0530

phani.kumar – 2 file(s) modified
mobile site links in header and footer imgaes

+ /trunk/Website/src/main/webapp/images/mob_icon.png
+ /trunk/Website/src/main/webapp/images/new_icon.png

Rev 5583 – Reviewer : Mandeep Added orderType in commandline arguments

anupam.singh — Thu, 12 Jul 2012 14:15:05 +0530

anupam.singh – 1 file(s) modified
Reviewer : Mandeep
Added orderType in commandline arguments

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

Rev 5582 – recharge offer page url of spice deck changed and mobile ...

phani.kumar — Thu, 12 Jul 2012 13:57:36 +0530

phani.kumar – 4 file(s) modified
recharge offer page url of spice deck changed and mobile site links in header and footer

~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm

Rev 5581 – Url is corrected for hard-disks

amit.gupta — Wed, 11 Jul 2012 17:44:59 +0530

amit.gupta – 1 file(s) modified
Url is corrected for hard-disks

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

Rev 5580 – recharge offer page new t&c added

phani.kumar — Wed, 11 Jul 2012 16:37:19 +0530

phani.kumar – 1 file(s) modified
recharge offer page new t&c added

~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-offer.vm