SmartDukaan – /

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

Rev 2332 – Updated customer care number.

rajveer — Fri, 24 Jun 2011 13:47:16 +0530

rajveer – 2 file(s) modified
Updated customer care number.

~ /trunk/Website/src/main/resources/templates/customerservice.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm

Rev 2331 – Coupon is now disabled for HTC A8181 (White)

varun.gupta — Fri, 24 Jun 2011 13:37:53 +0530

varun.gupta – 1 file(s) modified
Coupon is now disabled for HTC A8181 (White)

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

Rev 2330 – Updated itemloader to skip changes in brand, model name and ...

rajveer — Fri, 24 Jun 2011 13:11:15 +0530

rajveer – 1 file(s) modified
Updated itemloader to skip changes in brand, model name and model number, in case of update time.

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

Rev 2329 – Migration script enabled for brand model number and model name

rajveer — Fri, 24 Jun 2011 12:15:42 +0530

rajveer – 1 file(s) modified
Migration script enabled for brand model number and model name

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

Rev 2328 – Added helpdocs paths in configuration file

rajveer — Fri, 24 Jun 2011 12:04:41 +0530

rajveer – 3 file(s) modified
Added helpdocs paths in configuration file

~ /trunk/Common/src/main/resources/shop2020.cfg
~ /trunk/Common/src/main/resources/shop2020_production.cfg
~ /trunk/Common/src/main/resources/shop2020_staging.cfg

Rev 2327 – Added the 3 new state banks that we may use ...

chandranshu — Fri, 24 Jun 2011 11:17:02 +0530

chandranshu – 1 file(s) modified
Added the 3 new state banks that we may use to accept payments through EBS now

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

Rev 2326 – Removing unused velocity files

rajveer — Thu, 23 Jun 2011 18:27:22 +0530

rajveer – 3 file(s) modified
Removing unused velocity files

x /trunk/ContentStore/src/velocity/categorydefinition.vm
x /trunk/ContentStore/src/velocity/category_carousal.vm
x /trunk/ContentStore/src/velocity/jquery_diff_slideguide.vm

Rev 2325 – Removed glossary link from footer and removed style from the ...

rajveer — Thu, 23 Jun 2011 17:05:20 +0530

rajveer – 2 file(s) modified
Removed glossary link from footer and removed style from the helpdoc terms

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

Rev 2324 – Changed update content to update the helpdocs.

rajveer — Thu, 23 Jun 2011 16:01:03 +0530

rajveer – 1 file(s) modified
Changed update content to update the helpdocs.

~ /trunk/runutils/update-content.sh

Rev 2323 – specified min-height for SlideGuide div

varun.gupta — Thu, 23 Jun 2011 15:35:25 +0530

varun.gupta – 1 file(s) modified
specified min-height for SlideGuide div

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

Rev 2322 – modified to add helpdocdefinitionid in slide

rajveer — Thu, 23 Jun 2011 14:57:07 +0530

rajveer – 1 file(s) modified
modified to add helpdocdefinitionid in slide

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/DefinitionsContainer.java

Rev 2321 – Added depandency for proper compilation.

rajveer — Thu, 23 Jun 2011 14:53:05 +0530

rajveer – 4 file(s) modified
Added depandency for proper compilation.

~ /trunk/Website/.project
~ /trunk/Website/.settings/org.eclipse.wst.common.component
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 2320 – Added support of helpdocs. Added link in footer for glossary ...

rajveer — Thu, 23 Jun 2011 14:52:03 +0530

rajveer – 7 file(s) modified
Added support of helpdocs. Added link in footer for glossary page. Added glossary page on website.

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GlossaryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/StaticController.java
~ /trunk/Website/src/main/resources/struts.xml
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/webapp/js/entity.js
+ /trunk/Website/src/main/webapp/js/jquery.qtip-1.0.0-rc3.min.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm