SmartDukaan – /

Rev 7398 – minor migration for accessory

amit.gupta — Wed, 05 Jun 2013 23:06:34 +0530

amit.gupta – 1 file(s) modified
minor migration for accessory

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

Rev 7397 –

kshitij.sood — Wed, 05 Jun 2013 21:16:36 +0530

kshitij.sood – 1 file(s) modified

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

Rev 7396 –

kshitij.sood — Wed, 05 Jun 2013 21:10:25 +0530

kshitij.sood – 1 file(s) modified

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

Rev 7395 – updated content generation script

rajveer — Wed, 05 Jun 2013 18:35:38 +0530

rajveer – 1 file(s) modified
updated content generation script

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 7394 – updated content generation script

rajveer — Wed, 05 Jun 2013 18:09:10 +0530

rajveer – 1 file(s) modified
updated content generation script

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 7393 – Added options in CRM to cancel storeWebsite orders

anupam.singh — Wed, 05 Jun 2013 16:47:44 +0530

anupam.singh – 17 file(s) modified
Added options in CRM to cancel storeWebsite orders

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-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/StoreOrderDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7392 – Changed mail text.

rajveer — Wed, 05 Jun 2013 15:26:41 +0530

rajveer – 1 file(s) modified
Changed mail text.

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

Rev 7391 – Approval mechanism for store orders.

rajveer — Wed, 05 Jun 2013 15:20:42 +0530

rajveer – 3 file(s) modified
Approval mechanism for store orders.

~ /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/StorePricingApprovalsReader.py

Rev 7390 – Commited by Manish Sharma for Hiding wallet amount at Recharge ...

manish.sharma — Wed, 05 Jun 2013 14:51:42 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Hiding wallet amount at Recharge Order Page on June-05-2013

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java

Rev 7389 – Commited by Manish Sharma for Hiding wallet amount at Recharge ...

manish.sharma — Wed, 05 Jun 2013 14:50:52 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Hiding wallet amount at Recharge Order Page on June-05-2013

~ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm

Rev 7388 – Commited by Manish Sharma for Displaying wallet amount at user ...

manish.sharma — Wed, 05 Jun 2013 14:50:17 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Displaying wallet amount at user page on June-05-2013

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

Rev 7387 – Commited by Manish Sharma for Displaying wallet amount at user ...

manish.sharma — Wed, 05 Jun 2013 14:48:23 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Displaying wallet amount at user page on June-05-2013

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java

Rev 7386 – Changes for store website

anupam.singh — Wed, 05 Jun 2013 12:05:09 +0530

anupam.singh – 32 file(s) modified
Changes for store website

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/HomeController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderSuccessController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /StoreWebsite/src/main/webapp/css/storewebsite.css
~ /StoreWebsite/src/main/webapp/js/entity.js
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/logout.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-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/StoreOrderDetail.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StorePaymentStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7385 – Push advance collection to hotspot for store.

rajveer — Tue, 04 Jun 2013 19:25:30 +0530

rajveer – 1 file(s) modified
Push advance collection to hotspot for store.

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

Rev 7384 – Added all alerts to store people wherever required.

rajveer — Tue, 04 Jun 2013 18:08:58 +0530

rajveer – 1 file(s) modified
Added all alerts to store people wherever required.

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

Rev 7383 – Changed name of pricings.

rajveer — Tue, 04 Jun 2013 14:48:18 +0530

rajveer – 1 file(s) modified
Changed name of pricings.

~ /trunk/Support/src/main/webapp/WEB-INF/content/store-admin-index.vm

Rev 7382 – Updates in store pricing admin dashborad.

rajveer — Tue, 04 Jun 2013 14:44:39 +0530

rajveer – 8 file(s) modified
Updates in store pricing admin dashborad.

~ /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/Support/src/main/java/in/shop2020/support/controllers/StoreAdminController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/store-admin-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7381 – Added id to a div.

anupam.singh — Tue, 04 Jun 2013 14:33:56 +0530

anupam.singh – 1 file(s) modified
Added id to a div.

~ /trunk/ContentStore/src/velocity/SlideGuide.vm

Rev 7380 – Added support of recharge in new machine.

rajveer — Tue, 04 Jun 2013 11:19:47 +0530

rajveer – 1 file(s) modified
Added support of recharge in new machine.

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

Rev 7379 – Added amit.sirohi@shop2020.in Remove amit.gupta@shop2020.in and rajveer.singh@shop2020.in

amit.gupta — Mon, 03 Jun 2013 16:08:32 +0530

amit.gupta – 1 file(s) modified
Added amit.sirohi@shop2020.in
Remove amit.gupta@shop2020.in and rajveer.singh@shop2020.in

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

Rev 7378 – Added code to handle backdate cases for Red Express.

rajveer — Mon, 03 Jun 2013 13:51:51 +0530

rajveer – 1 file(s) modified
Added code to handle backdate cases for Red Express.

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

Rev 7377 – marking hotspot bold.

amit.gupta — Mon, 03 Jun 2013 12:36:00 +0530

amit.gupta – 1 file(s) modified
marking hotspot bold.

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

Rev 7376 – Used radio button instead of tags for pickup type

amit.gupta — Fri, 31 May 2013 12:53:09 +0530

amit.gupta – 3 file(s) modified
Used radio button instead of tags for pickup type

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/shipping.css
~ /trunk/Website/src/main/webapp/js/shippingAddress.js

Rev 7375 – Add FRC form was hidden in case of no FRCs.

anupam.singh — Fri, 31 May 2013 11:52:06 +0530

anupam.singh – 1 file(s) modified
Add FRC form was hidden in case of no FRCs.

~ /RechargeDashboard/src/main/webapp/WEB-INF/content/add-frc-index.vm

Rev 7374 – added logs to improve debugging

amit.gupta — Fri, 31 May 2013 11:16:37 +0530

amit.gupta – 1 file(s) modified
added logs to improve debugging

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

Rev 7373 – added logging to find the reason for NPE.

amit.gupta — Fri, 31 May 2013 11:02:14 +0530

amit.gupta – 1 file(s) modified
added logging to find the reason for NPE.

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

Rev 7372 – Added low inventory cancelled order category.

kshitij.sood — Thu, 30 May 2013 18:29:31 +0530

kshitij.sood – 10 file(s) modified
Added low inventory cancelled order category.

~ /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/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/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 7371 – Added ability to add OperatorSeries

anupam.singh — Thu, 30 May 2013 02:16:23 +0530

anupam.singh – 9 file(s) modified
Added ability to add OperatorSeries

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/AddSeriesController.java
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/add-series-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-show.vm
~ /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 7370 – Provision to add/update FRC. Differentiating between normal and admin user ...

anupam.singh — Wed, 29 May 2013 20:36:43 +0530

anupam.singh – 13 file(s) modified
Provision to add/update FRC. Differentiating between normal and admin user on login.

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/AddFrcController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/AdminController.java
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/add-frc-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/report-index.vm
~ /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/RechargeTransaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7369 – Added aggregator TID and provider TID in recharge transaction table;

rajveer — Wed, 29 May 2013 16:35:43 +0530

rajveer – 6 file(s) modified
Added aggregator TID and provider TID in recharge transaction table;

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

Rev 7368 – Add color attribute

vikram.raghav — Tue, 28 May 2013 20:06:57 +0530

vikram.raghav – 1 file(s) modified
Add color attribute

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

Rev 7367 – Changes regarding amazon listing.

kshitij.sood — Tue, 28 May 2013 18:44:02 +0530

kshitij.sood – 9 file(s) modified
Changes regarding amazon listing.

~ /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/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7366 –

kshitij.sood — Tue, 28 May 2013 17:40:59 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm

Rev 7365 – Enhancements.

kshitij.sood — Tue, 28 May 2013 17:36:34 +0530

kshitij.sood – 3 file(s) modified
Enhancements.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-index.vm

Rev 7364 – Commited by Manish Sharma for Change Shipping Address functionality on ...

manish.sharma — Tue, 28 May 2013 13:50:10 +0530

manish.sharma – 2 file(s) modified
Commited by Manish Sharma for Change Shipping Address functionality on 28-May-2013

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7363 – Added support to add recharge balance

rajveer — Tue, 28 May 2013 13:48:34 +0530

rajveer – 7 file(s) modified
Added support to add recharge balance

~ /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/Support/src/main/java/in/shop2020/support/controllers/RechargeTopupController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-topup-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7362 – Entities can be now deleted irrespective to their states.

amit.gupta — Tue, 28 May 2013 12:21:43 +0530

amit.gupta – 1 file(s) modified
Entities can be now deleted irrespective to their states.

~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/UserManager.java

Rev 7361 – Change in Terms and Conditions page regarding Cancellation and Refunds ...

amar.kumar — Mon, 27 May 2013 15:34:53 +0530

amar.kumar – 1 file(s) modified
Change in Terms and Conditions page regarding Cancellation and Refunds as per instructions by Crm Team

~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm

Rev 7360 – minor UI fix

anupam.singh — Mon, 27 May 2013 11:55:03 +0530

anupam.singh – 1 file(s) modified
minor UI fix

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java

Rev 7359 – Minor error

amit.gupta — Mon, 27 May 2013 11:42:08 +0530

amit.gupta – 1 file(s) modified
Minor error

~ /trunk/ContentStore/src/velocity/CategorySnippet.vm