SmartDukaan – /

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

Rev 7358 – cosmetic changes

anupam.singh — Mon, 27 May 2013 11:10:21 +0530

anupam.singh – 7 file(s) modified
cosmetic changes

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /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/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7357 – Creating another client for autoverification

anupam.singh — Sun, 26 May 2013 15:18:33 +0530

anupam.singh – 1 file(s) modified
Creating another client for autoverification

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

Rev 7356 – Source defined for amazon

vikram.raghav — Sat, 25 May 2013 03:16:18 +0530

vikram.raghav – 1 file(s) modified
Source defined for amazon

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

Rev 7355 – Source defined for amazon

vikram.raghav — Sat, 25 May 2013 03:13:47 +0530

vikram.raghav – 1 file(s) modified
Source defined for amazon

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7354 – Source defined for amazon

vikram.raghav — Sat, 25 May 2013 03:08:49 +0530

vikram.raghav – 1 file(s) modified
Source defined for amazon

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py

Rev 7353 – Added one extra break.

rajveer — Fri, 24 May 2013 20:04:55 +0530

rajveer – 1 file(s) modified
Added one extra break.

~ /trunk/Support/src/main/webapp/WEB-INF/content/price-approval-index.vm

Rev 7352 – Fixed small bug/

rajveer — Fri, 24 May 2013 19:59:21 +0530

rajveer – 1 file(s) modified
Fixed small bug/

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

Rev 7351 – Added absolute minimum price.

rajveer — Fri, 24 May 2013 19:55:35 +0530

rajveer – 7 file(s) modified
Added absolute minimum price.

~ /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/ttypes.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/StorePricing.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7350 – Corrected amount in push to ocr.

rajveer — Fri, 24 May 2013 19:37:18 +0530

rajveer – 1 file(s) modified
Corrected amount in push to ocr.

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

Rev 7349 – Refund Flow changes

anupam.singh — Fri, 24 May 2013 18:36:48 +0530

anupam.singh – 3 file(s) modified
Refund Flow changes

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7348 – Cancellation and Return FrontEnd

anupam.singh — Fri, 24 May 2013 16:57:30 +0530

anupam.singh – 3 file(s) modified
Cancellation and Return FrontEnd

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7347 – Added note for expiry of coupon while sending otg coupon.

amit.gupta — Fri, 24 May 2013 14:34:37 +0530

amit.gupta – 1 file(s) modified
Added note for expiry of coupon while sending otg coupon.

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

Rev 7346 – Storewebsite changes

anupam.singh — Fri, 24 May 2013 14:12:35 +0530

anupam.singh – 4 file(s) modified
Storewebsite changes

~ /StoreWebsite/.project
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7345 – Changed main dashboard title

rajveer — Fri, 24 May 2013 14:08:42 +0530

rajveer – 1 file(s) modified
Changed main dashboard title

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

Rev 7344 – Push advance amount collection to ocr once store order is ...

rajveer — Fri, 24 May 2013 13:23:16 +0530

rajveer – 1 file(s) modified
Push advance amount collection to ocr once store order is placed successfully.

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

Rev 7343 – Changes for Store Website

anupam.singh — Fri, 24 May 2013 12:12:12 +0530

anupam.singh – 21 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/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/webapp/css/storewebsite.css
+ /StoreWebsite/src/main/webapp/images/rupee-symbol.png
~ /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/order-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm (copied from /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm@7327)
x /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.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/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 7342 – Added changes for snippet.

amit.gupta — Fri, 24 May 2013 11:13:37 +0530

amit.gupta – 1 file(s) modified
Added changes for snippet.

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

Rev 7341 – Memory RAM Pl make data type decimal ...

amit.gupta — Fri, 24 May 2013 10:53:49 +0530

amit.gupta – 1 file(s) modified
Memory

RAM

Pl make data type decimal

Ref - Samsung Galaxy Mega

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

Rev 7340 – changes related to vat implementation. state can only refer to ...

amit.gupta — Thu, 23 May 2013 18:21:29 +0530

amit.gupta – 5 file(s) modified
changes related to vat implementation.
state can only refer to its own vat rates.

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

Rev 7339 – Amar:Getting latest inventoryItem for serialNumber

amit.gupta — Thu, 23 May 2013 15:07:55 +0530

amit.gupta – 1 file(s) modified
Amar:Getting latest inventoryItem for serialNumber

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 7338 – Amar:Null/Empty check for SerialNumber for getting inventoryItem

amit.gupta — Thu, 23 May 2013 15:06:59 +0530

amit.gupta – 1 file(s) modified
Amar:Null/Empty check for SerialNumber for getting inventoryItem

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 7337 – new custom domain for store is added.

amit.gupta — Thu, 23 May 2013 14:57:08 +0530

amit.gupta – 1 file(s) modified
new custom domain for store is added.

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