SmartDukaan – /

Rev 5151 – logging userAgent and Request method in Exception controller

amar.kumar — Fri, 11 May 2012 14:07:05 +0530

amar.kumar – 1 file(s) modified
logging userAgent and Request method in Exception controller

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

Rev 5150 – Added openings in Careers page

amar.kumar — Fri, 11 May 2012 13:57:55 +0530

amar.kumar – 1 file(s) modified
Added openings in Careers page

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

Rev 5149 – Uncommented the authentication

varun.gupta — Thu, 10 May 2012 18:02:06 +0530

varun.gupta – 1 file(s) modified
Uncommented the authentication

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PromotionsController.java

Rev 5148 – Added catching for org.json.JSONException

varun.gupta — Thu, 10 May 2012 17:55:54 +0530

varun.gupta – 1 file(s) modified
Added catching for org.json.JSONException

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PromotionsController.java

Rev 5147 – Trac#1173 Fixed PO amendment logic Trac#1237 Using preferredVendor when no ...

mandeep.dhir — Thu, 10 May 2012 10:21:57 +0530

mandeep.dhir – 4 file(s) modified
Trac#1173 Fixed PO amendment logic
Trac#1237 Using preferredVendor when no availability found at warehouses for arriving at fulfilment warehouse

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py

Rev 5146 – js error becoz of wrong positioning of java script

phani.kumar — Wed, 09 May 2012 13:33:05 +0530

phani.kumar – 1 file(s) modified
js error becoz of wrong positioning of java script

~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm

Rev 5145 – Ticket #1202 script to delete unused images reviewer: Rajveer

phani.kumar — Wed, 09 May 2012 13:26:13 +0530

phani.kumar – 57 file(s) modified
Ticket #1202 script to delete unused images
reviewer: Rajveer

~ /trunk/Website/src/main/resources/templates/accessories.vm
~ /trunk/Website/src/main/resources/templates/browsehistory.vm
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/header.vm
x /trunk/Website/src/main/resources/templates/locator.vm
~ /trunk/Website/src/main/resources/templates/logindetails.vm
~ /trunk/Website/src/main/resources/templates/mainmenu.vm
~ /trunk/Website/src/main/resources/templates/mostcompared.vm
~ /trunk/Website/src/main/resources/templates/personaldetails.vm
~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/webapp/css/cart.css
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/css/comparision.css
~ /trunk/Website/src/main/webapp/css/demoStyles.css
~ /trunk/Website/src/main/webapp/css/entity.css
~ /trunk/Website/src/main/webapp/css/gc_safari.css
~ /trunk/Website/src/main/webapp/css/home.css
~ /trunk/Website/src/main/webapp/css/ie7.css
~ /trunk/Website/src/main/webapp/css/ie8.css
~ /trunk/Website/src/main/webapp/css/jquery-ui-1.8.6.custom.css
~ /trunk/Website/src/main/webapp/css/lightbox_inline.css
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/css/nav.css
~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/css/signinsignup.css
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/css/widget.css
~ /trunk/Website/src/main/webapp/css/widgets.css
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/comparison.js
~ /trunk/Website/src/main/webapp/js/contact-us.js
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/js/gallery.js
~ /trunk/Website/src/main/webapp/js/jquery.jscrollpane.js
~ /trunk/Website/src/main/webapp/js/myaccount.js
~ /trunk/Website/src/main/webapp/js/priceSlider.js
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/js/productCategory.js
~ /trunk/Website/src/main/webapp/js/scrolltab.js
~ /trunk/Website/src/main/webapp/js/shippingAddress.js
~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/browse-history-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-index.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/most-compared-products-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/register-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/related-accessories-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/test-index.vm

Rev 5144 – For orders in state [SUBMITTED_FOR_PROCESSING, INVENTORY_LOW, LOW_INV_PO_RAISED, LOW_INV_REVERSAL_IN_PROCESS and ...

anupam.singh — Wed, 09 May 2012 11:32:47 +0530

anupam.singh – 1 file(s) modified
For orders in state [SUBMITTED_FOR_PROCESSING, INVENTORY_LOW, LOW_INV_PO_RAISED, LOW_INV_REVERSAL_IN_PROCESS and LOW_INV_NOT_AVAILABLE_AT_HOTSPOT] we should not call create_refund method.

Trac#1229
Reviewer : Rajveer

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

Rev 5143 – Using Hadb1 instead of Hadb2. Reviewer : Mandeep

anupam.singh — Tue, 08 May 2012 19:09:03 +0530

anupam.singh – 1 file(s) modified
Using Hadb1 instead of Hadb2.
Reviewer : Mandeep

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

Rev 5142 – Separating Delayed delivery, COD processing and Pending payment tasks from ...

anupam.singh — Tue, 08 May 2012 16:30:41 +0530

anupam.singh – 4 file(s) modified
Separating Delayed delivery, COD processing and Pending payment tasks from CRM server. These tasks would run as separate processes.
Trac # 1238
Reveiwer : Mandeep Dhir

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/DelayedOrderProcessorTask.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/PaymentProcessorTask.java

Rev 5141 – Changing the width of refund_reason field in Order table Reviewer ...

anupam.singh — Tue, 08 May 2012 15:33:47 +0530

anupam.singh – 1 file(s) modified
Changing the width of refund_reason field in Order table
Reviewer : Amar

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

Rev 5140 – Removed new util method to send ssl mail with Bytes ...

amit.gupta — Tue, 08 May 2012 14:49:25 +0530

amit.gupta – 2 file(s) modified
Removed new util method to send ssl mail with Bytes as attachment, and its usage.
Reviewer: Anupam

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
~ /trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.java

Rev 5139 – Ticket #1214 - Customized email content based on courier provider

varun.gupta — Tue, 08 May 2012 14:20:41 +0530

varun.gupta – 1 file(s) modified
Ticket #1214 - Customized email content based on courier provider

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

Rev 5138 – Trac#1219 Distributing mails across domains in case we get an ...

mandeep.dhir — Tue, 08 May 2012 11:49:48 +0530

mandeep.dhir – 1 file(s) modified
Trac#1219 Distributing mails across domains in case we get an error while sending the email

~ /trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.java

Rev 5137 – Trac#1230 Tab separated files for vendor mappings

mandeep.dhir — Mon, 07 May 2012 20:43:39 +0530

mandeep.dhir – 1 file(s) modified
Trac#1230 Tab separated files for vendor mappings

~ /trunk/runutils/daily-inventory-report.sh

Rev 5136 – Trac#1230 Tab separated files for vendor mappings

mandeep.dhir — Mon, 07 May 2012 20:43:26 +0530

mandeep.dhir – 1 file(s) modified
Trac#1230 Tab separated files for vendor mappings

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

Rev 5135 – Making default item type as non-serialized

mandeep.dhir — Mon, 07 May 2012 17:08:09 +0530

mandeep.dhir – 1 file(s) modified
Making default item type as non-serialized

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

Rev 5134 – Pointing to HADB1

anupam.singh — Mon, 07 May 2012 16:34:25 +0530

anupam.singh – 1 file(s) modified
Pointing to HADB1

~ /trunk/PyProj/src/shop2020/utils/orderTablePoller.py

Rev 5133 – Bug fix. Warehouse to vendor relationship updated. Reviewer: Anupam

mandeep.dhir — Mon, 07 May 2012 13:39:48 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Warehouse to vendor relationship updated.
Reviewer: Anupam

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

Rev 5132 – Users registered till May 7, 2012 will be allowed to ...

varun.gupta — Mon, 07 May 2012 13:11:57 +0530

varun.gupta – 1 file(s) modified
Users registered till May 7, 2012 will be allowed to avail this discount

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Phone_and_Accessory.py

Rev 5131 – changed the recipients of the report.

amit.gupta — Mon, 07 May 2012 13:04:28 +0530

amit.gupta – 1 file(s) modified
changed the recipients of the report.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java

Rev 5130 – Ticket #1182 - Discount will be 5% of selling price ...

varun.gupta — Mon, 07 May 2012 13:02:04 +0530

varun.gupta – 1 file(s) modified
Ticket #1182 - Discount will be 5% of selling price of the highest priced phone

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_Phone_and_Accessory.py

Rev 5129 – Disallowed COD for SAccessory coupon

varun.gupta — Mon, 07 May 2012 12:54:45 +0530

varun.gupta – 1 file(s) modified
Disallowed COD for SAccessory coupon

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 5128 – Ticket#1085 New Reports/alerts related to items in catalog

amit.gupta — Mon, 07 May 2012 12:50:37 +0530

amit.gupta – 12 file(s) modified
Ticket#1085
New Reports/alerts related to items in catalog

~ /trunk/CatalogDashboard/pom.xml
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogTree.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/InactiveWithInventoryServlet.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/ItemsBelowBreakevenServlet.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util
+ /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/java/in/shop2020/catalog/util/ReportSenderScheduler.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/CatalogDashboard.gwt.xml
~ /trunk/CatalogDashboard/src/main/webapp/WEB-INF/web.xml
~ /trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.java

Rev 5127 – Not selecting the null values

mandeep.dhir — Mon, 07 May 2012 12:32:06 +0530

mandeep.dhir – 1 file(s) modified
Not selecting the null values

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

Rev 5126 – Making the table sortable, searchable etc.

mandeep.dhir — Mon, 07 May 2012 10:16:43 +0530

mandeep.dhir – 1 file(s) modified
Making the table sortable, searchable etc.

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/ignored-item-mapping-index.vm

Rev 5125 – Bug Fix. For risky items only status check is not ...

mandeep.dhir — Mon, 07 May 2012 09:45:30 +0530

mandeep.dhir – 1 file(s) modified
Bug Fix. For risky items only status check is not safe. One should check for availability as well before sending product notifications.

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

Rev 5124 – Bug fix. Putting vendor object instead of vendorid

mandeep.dhir — Mon, 07 May 2012 09:14:29 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Putting vendor object instead of vendorid

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

Rev 5123 – Bug fix. Availability of the GGN like warehouses should be ...

mandeep.dhir — Mon, 07 May 2012 09:14:18 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Availability of the GGN like warehouses should be updated

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

Rev 5122 – Removed discounts link

varun.gupta — Sun, 06 May 2012 14:12:32 +0530

varun.gupta – 1 file(s) modified
Removed discounts link

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

Rev 5121 – A common controller to display pre-generated HTML content (like product ...

varun.gupta — Sun, 06 May 2012 14:01:01 +0530

varun.gupta – 3 file(s) modified
A common controller to display pre-generated HTML content (like product index)

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GeneratedController.java
~ /trunk/Website/src/main/resources/templates/footer.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/generated-show.vm

Rev 5120 – Bugfix. Adding items earlier than setting index

mandeep.dhir — Sat, 05 May 2012 23:36:29 +0530

mandeep.dhir – 1 file(s) modified
Bugfix. Adding items earlier than setting index

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

Rev 5119 – Bugfix. Clearing cache with every request

mandeep.dhir — Sat, 05 May 2012 23:25:17 +0530

mandeep.dhir – 1 file(s) modified
Bugfix. Clearing cache with every request

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

Rev 5118 – Display only shipping locations for preferred and default warehouse

mandeep.dhir — Sat, 05 May 2012 22:24:53 +0530

mandeep.dhir – 7 file(s) modified
Display only shipping locations for preferred and default warehouse

~ /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/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/Utils.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml

Rev 5117 – Ticket #1098 - Added Accessories Compatibility Index generator and included ...

varun.gupta — Sat, 05 May 2012 22:02:05 +0530

varun.gupta – 2 file(s) modified
Ticket #1098 - Added Accessories Compatibility Index generator and included it in content generation process.

+ /trunk/ContentStore/src/main/java/in/shop2020/util/CompatibleAccessoriesIndexGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 5116 – Bug fix. Putting vendor object instead of vendorid

mandeep.dhir — Sat, 05 May 2012 12:23:52 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Putting vendor object instead of vendorid

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

Rev 5115 – Showing all warehouses in CurrentInventory

mandeep.dhir — Sat, 05 May 2012 07:45:34 +0530

mandeep.dhir – 1 file(s) modified
Showing all warehouses in CurrentInventory

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

Rev 5114 – Bug fix. Returning all warehouses as active ones

mandeep.dhir — Fri, 04 May 2012 23:32:52 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Returning all warehouses as active ones

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

Rev 5113 – Ticket #1188 Add Availibility estimate to the Product feed.

amit.gupta — Fri, 04 May 2012 18:27:57 +0530

amit.gupta – 2 file(s) modified
Ticket #1188
Add Availibility estimate to the Product feed.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5112 – Logging the uri and referer in the request.

rajveer — Fri, 04 May 2012 17:46:14 +0530

rajveer – 1 file(s) modified
Logging the uri and referer in the request.

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