SmartDukaan – /

Rev 2372 – Adding support to move content to production on "Push prices ...

rajveer — Wed, 29 Jun 2011 19:53:32 +0530

rajveer – 1 file(s) modified
Adding support to move content to production on "Push prices to production" button press.

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

Rev 2371 – Added class path for velocity tools

rajveer — Wed, 29 Jun 2011 19:51:26 +0530

rajveer – 1 file(s) modified
Added class path for velocity tools

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

Rev 2370 – Added support for multiple solr updates

rajveer — Wed, 29 Jun 2011 19:50:07 +0530

rajveer – 1 file(s) modified
Added support for multiple solr updates

~ /trunk/runutils/update-content.sh

Rev 2369 – Changed code to delete directory

rajveer — Wed, 29 Jun 2011 19:26:12 +0530

rajveer – 1 file(s) modified
Changed code to delete directory

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

Rev 2368 – Modification: change item status PAUSED/ACTIVE at the time of changing ...

ankur.singhal — Wed, 29 Jun 2011 18:40:07 +0530

ankur.singhal – 1 file(s) modified
Modification: change item status PAUSED/ACTIVE at the time of changing risky flag. Also for changing the status to PAUSED, check for current inventory of all warehouses.

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

Rev 2367 – Separated content generation and price insertion into two parts. ...

rajveer — Wed, 29 Jun 2011 18:33:51 +0530

rajveer – 18 file(s) modified
Separated content generation and price insertion into two parts. First content will be generated from cms. Later on prices will be updated in the generated content.

~ /trunk/ContentStore/pom.xml
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/HelpdocsGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
+ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/velocity.properties
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewIR.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/ContentStore/src/velocity/entity_snippet_for_categorypage.vm
~ /trunk/ContentStore/src/velocity/entity_snippet_for_comparisonpage.vm
~ /trunk/ContentStore/src/velocity/entity_snippet_for_comparisonpage_summary.vm
~ /trunk/ContentStore/src/velocity/entity_snippet_for_homepage.vm
~ /trunk/ContentStore/src/velocity/entity_snippet_for_phones_i_own.vm
~ /trunk/ContentStore/src/velocity/entity_snippet_for_searchpage.vm
~ /trunk/ContentStore/src/velocity/entity_snippet_for_widget.vm
~ /trunk/ContentStore/src/velocity/product_summary.vm

Rev 2366 – Added scripts for generating content

rajveer — Wed, 29 Jun 2011 18:28:53 +0530

rajveer – 3 file(s) modified
Added scripts for generating content

+ /trunk/runutils/generate-content-from-catalog.sh
+ /trunk/runutils/generate-content-from-cms.sh
+ /trunk/runutils/push-content-to-production.sh

Rev 2365 – Fixed the side control and multimedia key helpdocs

rajveer — Wed, 29 Jun 2011 18:20:36 +0530

rajveer – 1 file(s) modified
Fixed the side control and multimedia key helpdocs

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

Rev 2364 – Generated files for the addition of IMEI number to line ...

chandranshu — Wed, 29 Jun 2011 17:21:22 +0530

chandranshu – 2 file(s) modified
Generated files for the addition of IMEI number to line item

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

Rev 2363 – Added support to enter IMEI number from the OM dashboard

chandranshu — Wed, 29 Jun 2011 17:20:36 +0530

chandranshu – 1 file(s) modified
Added support to enter IMEI number from the OM dashboard

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

Rev 2362 – Added a check to ensure that only the items past ...

chandranshu — Wed, 29 Jun 2011 15:58:40 +0530

chandranshu – 1 file(s) modified
Added a check to ensure that only the items past their start date are activated.

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

Rev 2361 – Made helpdocs live on website

rajveer — Wed, 29 Jun 2011 15:55:33 +0530

rajveer – 3 file(s) modified
Made helpdocs live on website

~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/resources/templates/mainmenu.vm
~ /trunk/Website/src/main/webapp/css/product.css

Rev 2360 – [Trac#410]: Added order Id

ankur.singhal — Wed, 29 Jun 2011 14:16:06 +0530

ankur.singhal – 1 file(s) modified
[Trac#410]: Added order Id

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

Rev 2359 – Enhancements: Push prices to production, download master sheet. Bug fixes.

ankur.singhal — Wed, 29 Jun 2011 11:05:57 +0530

ankur.singhal – 28 file(s) modified
Enhancements: Push prices to production, download master sheet. Bug fixes.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/CatalogDashboard.gwt.xml
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/AuthenticateDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
~ /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/CatalogTree.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/FileUploadParams.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.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/client/ItemList.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/LoginService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/LoginServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/Shortcuts.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/VendorMappingDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/FileDownloadServlet.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/LoginServiceImpl.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/AuthenticateDialog.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/CatalogDashboard.ui.xml
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/FileUploadParams.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemActions.ui.xml
~ /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/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/Shortcuts.ui.xml

Rev 2358 – Enhancements in Catalog dashboard.

ankur.singhal — Tue, 28 Jun 2011 20:52:10 +0530

ankur.singhal – 11 file(s) modified
Enhancements in Catalog dashboard.

~ /trunk/PyProj/src/shop2020/helpers/impl/Converters.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/test/CatalogTest.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py

Rev 2357 – Added role in CatalogDashboardUser. Enhancements in catalog dashboard.

ankur.singhal — Tue, 28 Jun 2011 20:50:45 +0530

ankur.singhal – 3 file(s) modified
Added role in CatalogDashboardUser. Enhancements in catalog dashboard.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/CatalogDashboardUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java

Rev 2356 – Added role in catalogdashboarduser. Enhancements in catalog dashboard.

ankur.singhal — Tue, 28 Jun 2011 20:49:20 +0530

ankur.singhal – 2 file(s) modified
Added role in catalogdashboarduser. Enhancements in catalog dashboard.

~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 2355 – Reversing the order of orders to be displayed to user

rajveer — Tue, 28 Jun 2011 18:33:03 +0530

rajveer – 2 file(s) modified
Reversing the order of orders to be displayed to user

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

Rev 2354 – Added pom.xml to build HotspotDashboard using maven

chandranshu — Tue, 28 Jun 2011 18:27:43 +0530

chandranshu – 3 file(s) modified
Added pom.xml to build HotspotDashboard using maven

~ /trunk/HotspotDashboard
+ /trunk/HotspotDashboard/pom.xml
x /trunk/HotspotDashboard/war

Rev 2353 – Removed unused templates

rajveer — Tue, 28 Jun 2011 18:26:08 +0530

rajveer – 4 file(s) modified
Removed unused templates

x /trunk/Website/src/main/resources/templates/cartdetails.vm
x /trunk/Website/src/main/resources/templates/cartheader.vm
x /trunk/Website/src/main/resources/templates/completedorders.vm
x /trunk/Website/src/main/resources/templates/myaccount.vm

Rev 2352 – Warehouse executive can now enter IMEI no.

chandranshu — Tue, 28 Jun 2011 18:23:47 +0530

chandranshu – 7 file(s) modified
Warehouse executive can now enter IMEI no.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java

Rev 2351 – Community Promotion

varun.gupta — Tue, 28 Jun 2011 17:34:26 +0530

varun.gupta – 4 file(s) modified
Community Promotion

+ /trunk/Social/src/main/java/in/shop2020/social/controllers/CommunityPromotionController.java
+ /trunk/Social/src/main/webapp/images/community-promo-banner-like.jpg
+ /trunk/Social/src/main/webapp/images/community-promo-banner-unlike.jpg
+ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

Rev 2350 – Removed margin-bottom from SlideGuide div

varun.gupta — Tue, 28 Jun 2011 15:44:38 +0530

varun.gupta – 1 file(s) modified
Removed margin-bottom from SlideGuide div

~ /trunk/Website/src/main/webapp/css/product.css

Rev 2349 – Added helpdocs with features, slides and enumerated data types

rajveer — Tue, 28 Jun 2011 15:37:12 +0530

rajveer – 3 file(s) modified
Added helpdocs with features, slides and enumerated data types

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

Rev 2348 – 'Payment Modes' widget introduced on 'My Account' pages and removed ...

varun.gupta — Tue, 28 Jun 2011 12:40:42 +0530

varun.gupta – 7 file(s) modified
'Payment Modes' widget introduced on 'My Account' pages and removed extra space between the sidebar and footer div.

~ /trunk/Website/src/main/webapp/WEB-INF/content/address-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm

Rev 2347 – updatedOn bug fixed.

ankur.singhal — Mon, 27 Jun 2011 18:04:52 +0530

ankur.singhal – 1 file(s) modified
updatedOn bug fixed.

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

Rev 2346 – Changed name from S II to S 2

rajveer — Mon, 27 Jun 2011 17:45:00 +0530

rajveer – 1 file(s) modified
Changed name from S II to S 2

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

Rev 2345 – Fix some bugs in affiliate reports.

vikas — Mon, 27 Jun 2011 16:29:18 +0530

vikas – 1 file(s) modified
Fix some bugs in affiliate reports.

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

Rev 2344 – Took out the line to get warehouse from the try ...

chandranshu — Mon, 27 Jun 2011 14:30:32 +0530

chandranshu – 1 file(s) modified
Took out the line to get warehouse from the try clause since preferred warehouse will always be set

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

Rev 2343 – Moved the query to get the warehouse inside the try ...

chandranshu — Mon, 27 Jun 2011 14:13:12 +0530

chandranshu – 1 file(s) modified
Moved the query to get the warehouse inside the try block

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

Rev 2342 – Added the for update clause to the AWB query

chandranshu — Mon, 27 Jun 2011 14:09:59 +0530

chandranshu – 1 file(s) modified
Added the for update clause to the AWB query

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 2341 – Trac#354 Show the final estimate based on the final warehouse ...

chandranshu — Mon, 27 Jun 2011 13:46:41 +0530

chandranshu – 3 file(s) modified
Trac#354 Show the final estimate based on the final warehouse selected and not the original allocation for the pincode

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 2340 – add item name and amount in affiliate report.

vikas — Mon, 27 Jun 2011 13:40:34 +0530

vikas – 1 file(s) modified
add item name and amount in affiliate report.

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

Rev 2339 – Started updating order status description in case of payment failure

chandranshu — Mon, 27 Jun 2011 13:35:32 +0530

chandranshu – 1 file(s) modified
Started updating order status description in case of payment failure

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

Rev 2338 – Made coupon tracking on cart generic for all coupons

varun.gupta — Mon, 27 Jun 2011 12:27:47 +0530

varun.gupta – 1 file(s) modified
Made coupon tracking on cart generic for all coupons

~ /trunk/runutils/PromotionReporter.sh

Rev 2337 – Updated inventory comparison script to use vendor keys for comparison

chandranshu — Mon, 27 Jun 2011 12:24:03 +0530

chandranshu – 1 file(s) modified
Updated inventory comparison script to use vendor keys for comparison

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

Rev 2336 – Added cart tracking for SAHOLIC500. Genereated files now getting cleaned ...

varun.gupta — Mon, 27 Jun 2011 12:02:54 +0530

varun.gupta – 1 file(s) modified
Added cart tracking for SAHOLIC500. Genereated files now getting cleaned up

~ /trunk/runutils/PromotionReporter.sh

Rev 2335 – Standardised the Sold directory path

chandranshu — Mon, 27 Jun 2011 11:28:42 +0530

chandranshu – 1 file(s) modified
Standardised the Sold directory path

~ /trunk/runutils/update-content.sh

Rev 2334 – Split HDFC purchase into auth and capture

chandranshu — Mon, 27 Jun 2011 11:20:46 +0530

chandranshu – 6 file(s) modified
Split HDFC purchase into auth and capture

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java

Rev 2333 – FIXED #435 - Correct labels now appearing below Product images

varun.gupta — Fri, 24 Jun 2011 19:04:34 +0530

varun.gupta – 2 file(s) modified
FIXED #435 - Correct labels now appearing below Product images

~ /trunk/ContentStore/src/velocity/slideguide_img_video.vm
~ /trunk/Website/src/main/webapp/js/gallery.js