SmartDukaan – /

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

Rev 5579 – recharge offer page images

phani.kumar — Wed, 11 Jul 2012 12:42:19 +0530

phani.kumar – 3 file(s) modified
recharge offer page images

+ /trunk/Website/src/main/webapp/images/spicedeck.png
+ /trunk/Website/src/main/webapp/images/spicedeck_step2.png
+ /trunk/Website/src/main/webapp/images/spice_email.png

Rev 5578 – Added Rajneesh to procurement report.

rajveer — Wed, 11 Jul 2012 12:42:17 +0530

rajveer – 1 file(s) modified
Added Rajneesh to procurement report.

~ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord/server/InventoryReportProcessor.properties

Rev 5577 – Added Rajneesh to cancelled and slipped orders report.

rajveer — Wed, 11 Jul 2012 12:41:51 +0530

rajveer – 1 file(s) modified
Added Rajneesh to cancelled and slipped orders report.

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

Rev 5576 – Absoluting the quantity mismatch

mandeep.dhir — Wed, 11 Jul 2012 12:19:18 +0530

mandeep.dhir – 1 file(s) modified
Absoluting the quantity mismatch

~ /trunk/PyProj/src/shop2020/purchase/main/script/UnscannedItemsReporter.py

Rev 5575 – Added shipping.css to minification

anupam.singh — Wed, 11 Jul 2012 11:47:20 +0530

anupam.singh – 1 file(s) modified
Added shipping.css to minification

~ /trunk/Website/pom.xml

Rev 5574 – Deleted an image tag which was added inadvertently

anupam.singh — Wed, 11 Jul 2012 11:19:36 +0530

anupam.singh – 1 file(s) modified
Deleted an image tag which was added inadvertently

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

Rev 5573 – Corrected the mail template for order placement and added delhivery ...

amit.gupta — Wed, 11 Jul 2012 10:38:27 +0530

amit.gupta – 1 file(s) modified
Corrected the mail template for order placement and added delhivery as the courier partner.

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

Rev 5572 – Trac # 1472 InStore pickUp UI.

anupam.singh — Tue, 10 Jul 2012 19:21:41 +0530

anupam.singh – 55 file(s) modified
Trac # 1472
InStore pickUp UI.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /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/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/address-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cache-admin-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/careers.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/coming-soon-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/easy-linux.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-maybe.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/exception.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/generated-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/get-paid-for-your-reviews.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/privacy-policy.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/product-index-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/quicklinks-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/register-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/test-index.vm

Rev 5571 – Reverting back

amit.gupta — Tue, 10 Jul 2012 17:47:29 +0530

amit.gupta – 2 file(s) modified
Reverting back

~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 5570 – Reverting back

amit.gupta — Tue, 10 Jul 2012 17:31:55 +0530

amit.gupta – 1 file(s) modified
Reverting back

~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 5569 – New columns in sales return report

mandeep.dhir — Tue, 10 Jul 2012 17:25:16 +0530

mandeep.dhir – 1 file(s) modified
New columns in sales return report

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

Rev 5568 – recharge offer page

phani.kumar — Tue, 10 Jul 2012 16:03:29 +0530

phani.kumar – 1 file(s) modified
recharge offer page

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

Rev 5567 – Corrected the format of selling price.

amit.gupta — Tue, 10 Jul 2012 16:02:46 +0530

amit.gupta – 1 file(s) modified
Corrected the format of selling price.

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

Rev 5566 – #1457 Added two level hierarchy for Accessories compatibility index. Reviewer ...

amit.gupta — Tue, 10 Jul 2012 14:39:05 +0530

amit.gupta – 3 file(s) modified
#1457 Added two level hierarchy for Accessories compatibility index.
Reviewer : Anupam

~ /trunk/ContentStore/src/main/java/in/shop2020/util/CompatibleAccessoriesIndexGenerator.java
+ /trunk/ContentStore/src/main/java/in/shop2020/util/LevelHierarchy.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GeneratedController.java

Rev 5565 – Sharing only one product at a time.

rajveer — Tue, 10 Jul 2012 13:11:30 +0530

rajveer – 1 file(s) modified
Sharing only one product at a time.

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

Rev 5564 – XML special chars now being handled in XML data for ...

varun.gupta — Tue, 10 Jul 2012 13:07:47 +0530

varun.gupta – 1 file(s) modified
XML special chars now being handled in XML data for mobile site

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

Rev 5563 – Changes in Alert Service for changes in mail sending task ...

amar.kumar — Mon, 09 Jul 2012 17:45:51 +0530

amar.kumar – 5 file(s) modified
Changes in Alert Service for changes in mail sending task and sending alertedEntity object while inserting alertedEntity instead of sending monitoredEntity

~ /trunk/AlertService/src/main/java/in/shop2020/alert/handler/EntityHandler.java
~ /trunk/AlertService/src/main/java/in/shop2020/alert/persistence/EntityMapper.java
~ /trunk/AlertService/src/main/java/in/shop2020/alert/util/AlertTask.java
+ /trunk/AlertService/src/main/java/in/shop2020/alert/util/GmailUtils.java
~ /trunk/AlertService/src/main/resources/in/shop2020/alert/persistence/EntityMapper.xml

Rev 5562 – added appropriate links for facebook, twitter and g+

amit.gupta — Mon, 09 Jul 2012 17:00:22 +0530

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

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

Rev 5561 – Removed number of days clause while assigning coupons to customers.

rajveer — Mon, 09 Jul 2012 16:42:02 +0530

rajveer – 1 file(s) modified
Removed number of days clause while assigning coupons to customers.

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

Rev 5560 – Added pickupStoreId to the cart in Java User service.

rajveer — Mon, 09 Jul 2012 16:12:30 +0530

rajveer – 5 file(s) modified
Added pickupStoreId to the cart in Java User service.

~ /trunk/UserService/src/main/java/in/shop2020/user/domain/Cart.java
~ /trunk/UserService/src/main/java/in/shop2020/user/handler/CartHandler.java
~ /trunk/UserService/src/main/java/in/shop2020/user/handler/UserServiceHandler.java
~ /trunk/UserService/src/main/java/in/shop2020/user/util/Converter.java
~ /trunk/UserService/src/main/resources/in/shop2020/user/persistence/CartMapper.xml

Rev 5559 – Store Admin interface to manage in store pick up orders.

rajveer — Mon, 09 Jul 2012 15:38:17 +0530

rajveer – 2 file(s) modified
Store Admin interface to manage in store pick up orders.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-index.vm

Rev 5558 – Bug fix. Adding quantity check

mandeep.dhir — Mon, 09 Jul 2012 15:36:20 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Adding quantity check

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

Rev 5557 – Bug fix. Updating cache when inventory is updated

mandeep.dhir — Mon, 09 Jul 2012 15:35:35 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Updating cache when inventory is updated

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

Rev 5556 – All InStore orders should be treated as prepaid for logistic ...

rajveer — Mon, 09 Jul 2012 15:35:27 +0530

rajveer – 3 file(s) modified
All InStore orders should be treated as prepaid for logistic partners.

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

Rev 5555 – Implementation of Instore pickup interfaces.

rajveer — Mon, 09 Jul 2012 15:35:02 +0530

rajveer – 12 file(s) modified
Implementation of Instore pickup interfaces.

Rev 5554 – All InStore orders should be treated as prepaid for logistic ...

rajveer — Mon, 09 Jul 2012 15:29:25 +0530

rajveer – 4 file(s) modified
All InStore orders should be treated as prepaid for logistic partners.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierPerformanceController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java