SmartDukaan – /

Rev 7267 – Service changes for recharge dashboard admin console

anupam.singh — Mon, 13 May 2013 11:35:11 +0530

anupam.singh – 6 file(s) modified
Service changes for recharge dashboard admin console

~ /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 7266 – Added option to delete FRC's and reset passwords

anupam.singh — Mon, 13 May 2013 11:32:16 +0530

anupam.singh – 6 file(s) modified
Added option to delete FRC's and reset passwords

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/DeleteFrcController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ManageStoreController.java
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-show.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/delete-frc-index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/manage-store-index.vm

Rev 7265 – Added methods to update store pricing

rajveer — Mon, 13 May 2013 10:45:45 +0530

rajveer – 5 file(s) modified
Added methods to update store pricing

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7264 – Adding admin console for RechargeDashboard

anupam.singh — Sat, 11 May 2013 15:34:33 +0530

anupam.singh – 3 file(s) modified
Adding admin console for RechargeDashboard

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/AdminController.java
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-show.vm

Rev 7263 – Checkin for SnippetCaching, SourceDetail, CSS and JS changes etc.

anupam.singh — Fri, 10 May 2013 16:53:39 +0530

anupam.singh – 35 file(s) modified
Checkin for SnippetCaching, SourceDetail, CSS and JS changes etc.

~ /StoreWebsite/pom.xml
+ /StoreWebsite/src/main/java/in/shop2020/serving/cache
+ /StoreWebsite/src/main/java/in/shop2020/serving/cache/CategorySnippetCacheWrapper.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/cache/SearchSnippetCacheWrapper.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/cache/SnippetCacheWrapper.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/SearchController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/service/ContentServingService.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/Category.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/DesEncrypter.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/FileUtils.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/FormattingUtils.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/SnippetType.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/UserMessage.java
x /StoreWebsite/src/main/webapp/css/rechargewebapp_18042013.css
+ /StoreWebsite/src/main/webapp/css/storewebsite.css (copied from /StoreWebsite/src/main/webapp/css/rechargewebapp_18042013.css@7226)
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
+ /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
~ /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/WEB-INF/content/search-index.vm
~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SourceDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7262 – Adding AgentId "45" to Escalation Matrix

amar.kumar — Fri, 10 May 2013 12:18:22 +0530

amar.kumar – 1 file(s) modified
Adding AgentId "45" to Escalation Matrix

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

Rev 7261 – removed clearance from UI

rajveer — Fri, 10 May 2013 12:09:29 +0530

rajveer – 1 file(s) modified
removed clearance from UI

~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml

Rev 7260 – Removed Clearance button from catalog dashboard

rajveer — Fri, 10 May 2013 12:08:25 +0530

rajveer – 5 file(s) modified
Removed Clearance button from catalog dashboard

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.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/Item.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportGenerator.java

Rev 7259 – Added blue color highliting.

amit.gupta — Fri, 10 May 2013 11:55:17 +0530

amit.gupta – 1 file(s) modified
Added blue color highliting.

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

Rev 7258 – Removed clearance sale Controller and template.

amit.gupta — Thu, 09 May 2013 18:46:50 +0530

amit.gupta – 2 file(s) modified
Removed clearance sale Controller and template.

x /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
x /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm

Rev 7257 – Commented alert for store pricing.

rajveer — Thu, 09 May 2013 18:16:18 +0530

rajveer – 1 file(s) modified
Commented alert for store pricing.

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

Rev 7256 – Added infra for store delivery estimate.

rajveer — Thu, 09 May 2013 17:53:22 +0530

rajveer – 17 file(s) modified
Added infra for store delivery estimate.

~ /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/CatalogServiceHandler.py
~ /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/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.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/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /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/catalog/StorePricing.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 7255 – Added auto suggest.

amit.gupta — Thu, 09 May 2013 16:55:02 +0530

amit.gupta – 9 file(s) modified
Added auto suggest.

x /StoreWebsite/src/main/java/in/shop2020/serving/auth/InventoryAuthorizingRealm.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/AutoSuggestController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/SearchController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/service/AutoSuggestService.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
+ /StoreWebsite/src/main/webapp/WEB-INF/content/auto-suggest-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm

Rev 7254 – Corrected IP hotspot data push.

rajveer — Thu, 09 May 2013 16:34:46 +0530

rajveer – 1 file(s) modified
Corrected IP hotspot data push.

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

Rev 7253 – Changed IP for store collection push.

rajveer — Thu, 09 May 2013 16:17:54 +0530

rajveer – 1 file(s) modified
Changed IP for store collection push.

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

Rev 7252 – Add alert for possible problem while sending alert.

rajveer — Thu, 09 May 2013 14:35:59 +0530

rajveer – 1 file(s) modified
Add alert for possible problem while sending alert.

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

Rev 7251 – Added provision to store data before sending to ocr.

rajveer — Thu, 09 May 2013 13:19:39 +0530

rajveer – 1 file(s) modified
Added provision to store data before sending to ocr.

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

Rev 7250 – Added provision to store data before sending to ocr.

rajveer — Thu, 09 May 2013 13:18:57 +0530

rajveer – 1 file(s) modified
Added provision to store data before sending to ocr.

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

Rev 7249 – Transaction to be created only if entry has been added ...

rajveer — Thu, 09 May 2013 12:28:37 +0530

rajveer – 1 file(s) modified
Transaction to be created only if entry has been added in wallethistory.

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

Rev 7248 – New changes

anupam.singh — Thu, 09 May 2013 11:48:44 +0530

anupam.singh – 6 file(s) modified
New changes

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/webapp/images/1.jpg
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm

Rev 7247 – Adding classpath to storewebsite

anupam.singh — Thu, 09 May 2013 11:29:39 +0530

anupam.singh – 1 file(s) modified
Adding classpath to storewebsite

+ /StoreWebsite/.classpath

Rev 7246 – Change to include transfer price change info in alert mail ...

amar.kumar — Thu, 09 May 2013 11:03:28 +0530

amar.kumar – 1 file(s) modified
Change to include transfer price change info in alert mail when both nlc and transfer price is changed for an item

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

Rev 7245 – Corrected all the status at the time of refund.

rajveer — Wed, 08 May 2013 20:07:31 +0530

rajveer – 1 file(s) modified
Corrected all the status at the time of refund.

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

Rev 7244 – Corrected all the status at the time of refund.

rajveer — Wed, 08 May 2013 19:51:14 +0530

rajveer – 1 file(s) modified
Corrected all the status at the time of refund.

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

Rev 7243 – Add todays date at the time of refund.

rajveer — Wed, 08 May 2013 19:48:37 +0530

rajveer – 1 file(s) modified
Add todays date at the time of refund.

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

Rev 7242 – Change to use reserved count as 0 in itemavailability calculation, ...

amar.kumar — Wed, 08 May 2013 16:23:52 +0530

amar.kumar – 1 file(s) modified
Change to use reserved count as 0 in itemavailability calculation, when reserved count is negative

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

Rev 7241 – Added alcatel as brand.

amit.gupta — Wed, 08 May 2013 15:58:54 +0530

amit.gupta – 1 file(s) modified
Added alcatel as brand.

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

Rev 7240 – Removed statistics summary from the stats part

rajveer — Wed, 08 May 2013 13:09:33 +0530

rajveer – 2 file(s) modified
Removed statistics summary from the stats part

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

Rev 7239 – Change to set freebieItemId for similar items and Removing ...

amar.kumar — Wed, 08 May 2013 12:28:33 +0530

amar.kumar – 2 file(s) modified
Change to set freebieItemId for similar items and
Removing freebieItemIds for items

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java

Rev 7238 – added log

amit.gupta — Wed, 08 May 2013 10:09:20 +0530

amit.gupta – 1 file(s) modified
added log

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

Rev 7237 – Folder updated

anupam.singh — Tue, 07 May 2013 17:11:44 +0530

anupam.singh – 1 file(s) modified
Folder updated

x /RechargeDashboard/src/main/webapp/js/rechargewebapp_25042013.js

Rev 7236 – Total amount was being used instead of amount in confirmController. ...

anupam.singh — Tue, 07 May 2013 17:10:16 +0530

anupam.singh – 6 file(s) modified
Total amount was being used instead of amount in confirmController. Fixed a couple of javascript bugs.

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
+ /RechargeDashboard/src/main/webapp/js/rechargewebapp_07052013.js (copied from /RechargeDashboard/src/main/webapp/js/rechargewebapp_25042013.js@7189)
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/recharge-result.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7235 – On logout we are now invalidating the session.

anupam.singh — Tue, 07 May 2013 14:37:41 +0530

anupam.singh – 2 file(s) modified
On logout we are now invalidating the session.

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/LoginController.java
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/logout.vm

Rev 7234 – changed to html format.

amit.gupta — Tue, 07 May 2013 12:13:09 +0530

amit.gupta – 1 file(s) modified
changed to html format.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CouponAlert.py

Rev 7233 – bug fix.

amit.gupta — Tue, 07 May 2013 12:07:37 +0530

amit.gupta – 1 file(s) modified
bug fix.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CouponAlert.py

Rev 7232 – Removed email ids.

amit.gupta — Tue, 07 May 2013 11:46:04 +0530