SmartDukaan – /

Rev 7328 – Fixed URL

anupam.singh — Wed, 22 May 2013 19:54:21 +0530

anupam.singh – 1 file(s) modified
Fixed URL

~ /StoreWebsite/src/main/webapp/css/entity.css

Rev 7327 – Removed today's collection from header

anupam.singh — Wed, 22 May 2013 19:50:10 +0530

anupam.singh – 6 file(s) modified
Removed today's collection from header

~ /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.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm

Rev 7326 – Css and image fixes

anupam.singh — Wed, 22 May 2013 19:43:11 +0530

anupam.singh – 3 file(s) modified
Css and image fixes

~ /StoreWebsite/src/main/webapp/css/entity.css
+ /StoreWebsite/src/main/webapp/images/ButtonAddtoCart_ALLSTATES.png
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm

Rev 7325 – fixed links to storewebsite

anupam.singh — Wed, 22 May 2013 19:16:44 +0530

anupam.singh – 5 file(s) modified
fixed links to storewebsite

~ /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/order-success.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm

Rev 7324 – Added missing CSS and changed rch to storewebsite in links

anupam.singh — Wed, 22 May 2013 18:35:18 +0530

anupam.singh – 8 file(s) modified
Added missing CSS and changed rch to storewebsite in links

+ /StoreWebsite/src/main/webapp/css/jquery.ui.autocomplete.css
~ /StoreWebsite/src/main/webapp/css/storewebsite.css
~ /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.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm

Rev 7323 – Changes for StoreWebsite

anupam.singh — Wed, 22 May 2013 18:10:12 +0530

anupam.singh – 16 file(s) modified
Changes for StoreWebsite

~ /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/webapp/css/entity.css
~ /StoreWebsite/src/main/webapp/css/product.css
+ /StoreWebsite/src/main/webapp/css/style.css
+ /StoreWebsite/src/main/webapp/css/widget.css
+ /StoreWebsite/src/main/webapp/css/widgets.css
+ /StoreWebsite/src/main/webapp/images/filter-divider.gif
+ /StoreWebsite/src/main/webapp/images/grey-ver-bar.gif
~ /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/search-index.vm

Rev 7322 – Changes to add Orders fetched from Amazon.

vikram.raghav — Wed, 22 May 2013 17:09:18 +0530

vikram.raghav – 10 file(s) modified
Changes to add Orders fetched from Amazon.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7321 – Amar:Allowing scan-ins if item's lastScanType is purchase-return

amit.gupta — Wed, 22 May 2013 15:27:48 +0530

amit.gupta – 1 file(s) modified
Amar:Allowing scan-ins if item's lastScanType is purchase-return

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

Rev 7320 – Amar:Allowing scan-ins if item's lastScanType is purchase-return

amit.gupta — Wed, 22 May 2013 14:53:58 +0530

amit.gupta – 1 file(s) modified
Amar:Allowing scan-ins if item's lastScanType is purchase-return

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

Rev 7319 – Temporary change to scan in Mi-1010

kshitij.sood — Wed, 22 May 2013 14:40:03 +0530

kshitij.sood – 1 file(s) modified
Temporary change to scan in Mi-1010

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

Rev 7318 – Added logos for hotspot and saholic

rajveer — Wed, 22 May 2013 14:39:16 +0530

rajveer – 3 file(s) modified
Added logos for hotspot and saholic

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
+ /trunk/HotspotDashboard/src/main/resources/Hotspot-Logo.jpg
+ /trunk/HotspotDashboard/src/main/resources/Saholic-Logo.jpg

Rev 7317 – Made offertext unavailable for stores.

amit.gupta — Wed, 22 May 2013 14:20:58 +0530

amit.gupta – 4 file(s) modified
Made offertext unavailable for stores.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/HomeSnippet.vm
~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 7316 – Handled null cases and minor enhancements.

kshitij.sood — Wed, 22 May 2013 12:28:14 +0530

kshitij.sood – 3 file(s) modified
Handled null cases and minor enhancements.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm

Rev 7315 – minor bug fix

amit.gupta — Wed, 22 May 2013 11:56:50 +0530

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

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

Rev 7314 – Handled case of empty list.

kshitij.sood — Tue, 21 May 2013 20:09:54 +0530

kshitij.sood – 1 file(s) modified
Handled case of empty list.

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

Rev 7313 – Handle Prepaid case.

rajveer — Tue, 21 May 2013 19:43:04 +0530

rajveer – 1 file(s) modified
Handle Prepaid case.

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

Rev 7312 – Changes requested by Pramit.

amit.gupta — Tue, 21 May 2013 19:33:34 +0530

amit.gupta – 6 file(s) modified
Changes requested by Pramit.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ExpertReviewController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-edit-new.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-index.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-show.vm
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/ExpertReview.java
~ /trunk/ContentStore/src/xml/model/users.xml

Rev 7311 – Changes regarding amazon order processing.

kshitij.sood — Tue, 21 May 2013 18:55:40 +0530

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

~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7310 – Made small changes.

rajveer — Tue, 21 May 2013 18:10:04 +0530

rajveer – 1 file(s) modified
Made small changes.

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

Rev 7309 – Display cancellation in case of website only.

rajveer — Tue, 21 May 2013 17:36:18 +0530

rajveer – 1 file(s) modified
Display cancellation in case of website only.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java

Rev 7308 – Added support to send mail for verification.

rajveer — Tue, 21 May 2013 17:35:05 +0530

rajveer – 16 file(s) modified
Added support to send mail for verification.

~ /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/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.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/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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/HotspotStore.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7307 – Other features - No learned

amit.gupta — Tue, 21 May 2013 11:42:02 +0530

amit.gupta – 1 file(s) modified
Other features - No learned

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

Rev 7306 – Added more code for store pricing.

rajveer — Mon, 20 May 2013 18:55:03 +0530

rajveer – 8 file(s) modified
Added more code for 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/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 7305 – Hold and default Inventory Changes

amit.gupta — Mon, 20 May 2013 17:44:49 +0530

amit.gupta – 1 file(s) modified
Hold and default Inventory Changes

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

Rev 7304 – If no circle is selected, use store's circle Id.

rajveer — Mon, 20 May 2013 17:15:27 +0530

rajveer – 1 file(s) modified
If no circle is selected, use store's circle Id.

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

Rev 7303 – Removing spelling mistake fulfillmentWarehouseId-->fulfilmentWarehouseId

amar.kumar — Mon, 20 May 2013 16:49:53 +0530

amar.kumar – 1 file(s) modified
Removing spelling mistake fulfillmentWarehouseId-->fulfilmentWarehouseId

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

Rev 7302 – Avinash new user.

amit.gupta — Mon, 20 May 2013 15:57:59 +0530

amit.gupta – 1 file(s) modified
Avinash new user.

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

Rev 7301 – Content model for powerbanks.

amit.gupta — Mon, 20 May 2013 15:35:52 +0530

amit.gupta – 1 file(s) modified
Content model for powerbanks.

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

Rev 7300 – Content model for powerbanks.

amit.gupta — Mon, 20 May 2013 14:04:29 +0530

amit.gupta – 1 file(s) modified
Content model for powerbanks.

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

Rev 7299 – Content model for powerbanks.

amit.gupta — Mon, 20 May 2013 13:56:05 +0530

amit.gupta – 1 file(s) modified
Content model for powerbanks.

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

Rev 7298 – Content model for powerbanks.

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

amit.gupta – 4 file(s) modified
Content model for powerbanks.

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 7297 – Upon encountering an Exception we mark that mail as processed

anupam.singh — Fri, 17 May 2013 16:59:26 +0530

anupam.singh – 1 file(s) modified
Upon encountering an Exception we mark that mail as processed

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

Rev 7296 – fixed namespace import issues related to datetime.

amit.gupta — Fri, 17 May 2013 16:50:30 +0530

amit.gupta – 1 file(s) modified
fixed namespace import issues related to datetime.

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

Rev 7295 – Not displaying shipment updates of redexpress.

kshitij.sood — Fri, 17 May 2013 16:01:11 +0530

kshitij.sood – 1 file(s) modified
Not displaying shipment updates of redexpress.

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

Rev 7294 – Moved static block to index() method for deleteFrcController

anupam.singh — Fri, 17 May 2013 14:50:51 +0530

anupam.singh – 1 file(s) modified
Moved static block to index() method for deleteFrcController

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/DeleteFrcController.java

Rev 7293 – - Changes related to StoreWebsite - Added source to ...

anupam.singh — Fri, 17 May 2013 13:30:57 +0530

anupam.singh – 23 file(s) modified
- Changes related to StoreWebsite
- Added source to "change_transaction_status" method

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
x /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm (copied from /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm@7272)
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /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/model/v1/order/script/CreateRTGSBulkOrders.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.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/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 7292 – changing method name of scanFreebie to scanfreebie

amar.kumar — Fri, 17 May 2013 12:52:55 +0530

amar.kumar – 1 file(s) modified
changing method name of scanFreebie to scanfreebie

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

Rev 7291 – Changes For Hold Inventory,Default Inventory and ASIN to add on ...

vikram.raghav — Thu, 16 May 2013 17:14:45 +0530

vikram.raghav – 17 file(s) modified
Changes For Hold Inventory,Default Inventory and ASIN to add on 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
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /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/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7290 – Added price approval mechanism.

rajveer — Thu, 16 May 2013 14:36:36 +0530

rajveer – 2 file(s) modified
Added price approval mechanism.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PriceApprovalController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/price-approval-index.vm

Rev 7289 – DTH maxlength was limited to 10. Fixing that

anupam.singh — Thu, 16 May 2013 12:22:27 +0530

anupam.singh – 6 file(s) modified
DTH maxlength was limited to 10. Fixing that

x /RechargeDashboard/src/main/webapp/js/rechargewebapp_07052013.js
+ /RechargeDashboard/src/main/webapp/js/rechargewebapp_16052013.js (copied from /RechargeDashboard/src/main/webapp/js/rechargewebapp_07052013.js@7236)
~ /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