SmartDukaan – /

Rev 8343 – Change in Ebay Order creation to skip the row if ...

amar.kumar — Wed, 09 Oct 2013 13:08:12 +0530

amar.kumar – 2 file(s) modified
Change in Ebay Order creation to skip the row if some issue occurs during setting Shipping/Delivery date

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

Rev 8342 – Skipping row if order is already created

amar.kumar — Wed, 09 Oct 2013 12:50:53 +0530

amar.kumar – 2 file(s) modified
Skipping row if order is already created

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

Rev 8341 – Removed mobile site icon and link

anupam.singh — Wed, 09 Oct 2013 12:36:08 +0530

anupam.singh – 1 file(s) modified
Removed mobile site icon and link

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

Rev 8340 – Removed coming soon.

amit.gupta — Wed, 09 Oct 2013 10:14:08 +0530

amit.gupta – 1 file(s) modified
Removed coming soon.

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

Rev 8339 – removed androidland

amit.gupta — Wed, 09 Oct 2013 09:52:37 +0530

amit.gupta – 1 file(s) modified
removed androidland

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

Rev 8338 – adjusted line-height.

amit.gupta — Wed, 09 Oct 2013 09:30:07 +0530

amit.gupta – 2 file(s) modified
adjusted line-height.

~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-devices.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-overview.vm

Rev 8337 – Added social plugins with box.

amit.gupta — Wed, 09 Oct 2013 09:14:03 +0530

amit.gupta – 4 file(s) modified
Added social plugins with box.

~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-devices.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-overview.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland.vm

Rev 8336 – Changed FB page.

amit.gupta — Tue, 08 Oct 2013 23:20:20 +0530

amit.gupta – 3 file(s) modified
Changed FB page.

Rev 8335 – removed footer for androidland for now.

amit.gupta — Tue, 08 Oct 2013 21:13:10 +0530

amit.gupta – 1 file(s) modified
removed footer for androidland for now.

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

Rev 8334 – Androidland like/font/header changes

amit.gupta — Tue, 08 Oct 2013 21:10:23 +0530

amit.gupta – 9 file(s) modified
Androidland like/font/header changes

~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/androidland/main.css
~ /trunk/Website/src/main/webapp/css/androidland/style.css
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-devices.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-overview.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland.vm

Rev 8333 –

amar.kumar — Tue, 08 Oct 2013 16:43:51 +0530

amar.kumar – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayInvoiceGenerationService.java

Rev 8332 – Updating correct physicalWarehouseId in case of Receiving inventory from OURS_THIRDPARTY ...

amar.kumar — Tue, 08 Oct 2013 15:18:19 +0530

amar.kumar – 1 file(s) modified
Updating correct physicalWarehouseId in case of Receiving inventory from OURS_THIRDPARTY warehouse

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

Rev 8331 – Changes to set nlc and transfer price while creating Ebay ...

amar.kumar — Tue, 08 Oct 2013 14:51:36 +0530

amar.kumar – 1 file(s) modified
Changes to set nlc and transfer price while creating Ebay Orders

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

Rev 8330 – Fixed SFTP upload, tested it.

amit.gupta — Tue, 08 Oct 2013 14:40:37 +0530

amit.gupta – 1 file(s) modified
Fixed SFTP upload, tested it.

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

Rev 8329 – Updating correct currentQuantity in inventoryItem for Non Serialized Inventory

amar.kumar — Tue, 08 Oct 2013 14:37:41 +0530

amar.kumar – 1 file(s) modified
Updating correct currentQuantity in inventoryItem for Non Serialized Inventory

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

Rev 8328 –

amit.gupta — Tue, 08 Oct 2013 13:52:50 +0530

amit.gupta – 1 file(s) modified

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

Rev 8327 – fixed search terms are searchable with special characters.

amit.gupta — Tue, 08 Oct 2013 13:10:35 +0530

amit.gupta – 1 file(s) modified
fixed search terms are searchable with special characters.

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

Rev 8326 – Stopped encoding search term.

amit.gupta — Tue, 08 Oct 2013 13:09:30 +0530

amit.gupta – 1 file(s) modified
Stopped encoding search term.

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

Rev 8325 – Stopped encoding search term.

amit.gupta — Tue, 08 Oct 2013 12:57:20 +0530

amit.gupta – 1 file(s) modified
Stopped encoding search term.

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

Rev 8324 – Stopped encoding search term.

amit.gupta — Tue, 08 Oct 2013 12:41:43 +0530

amit.gupta – 1 file(s) modified
Stopped encoding search term.

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

Rev 8323 – Getting new transaction client for every row

amar.kumar — Tue, 08 Oct 2013 12:36:32 +0530

amar.kumar – 1 file(s) modified
Getting new transaction client for every row

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

Rev 8322 – Stopped encoding search term.

amit.gupta — Tue, 08 Oct 2013 12:33:20 +0530

amit.gupta – 1 file(s) modified
Stopped encoding search term.

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

Rev 8321 – Added two app icons

anupam.singh — Tue, 08 Oct 2013 00:04:08 +0530

anupam.singh – 2 file(s) modified
Added two app icons

+ /trunk/Website/src/main/webapp/images/androidland/cut-the-rope.jpg
+ /trunk/Website/src/main/webapp/images/androidland/photo-grid.jpg

Rev 8320 – Hidden funzone

anupam.singh — Tue, 08 Oct 2013 00:02:57 +0530

anupam.singh – 8 file(s) modified
Hidden funzone

+ /trunk/Website/src/main/webapp/images/androidland/galaxy-gear.png
+ /trunk/Website/src/main/webapp/images/androidland/mi-550.png
~ /trunk/Website/src/main/webapp/images/androidland/panorama.jpg
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-devices.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-fun-zone.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-overview.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland.vm

Rev 8319 –

kshitij.sood — Mon, 07 Oct 2013 21:59:03 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/Website/src/main/webapp/images/androidland/score-center.jpg

Rev 8318 –

kshitij.sood — Mon, 07 Oct 2013 21:58:32 +0530

kshitij.sood – 60 file(s) modified

+ /trunk/Website/src/main/webapp/images/androidland/adobe-photoshop-express.jpg
+ /trunk/Website/src/main/webapp/images/androidland/angry-birds-star-wars.jpg
+ /trunk/Website/src/main/webapp/images/androidland/book-my-show.jpg
+ /trunk/Website/src/main/webapp/images/androidland/camcard-free-business-card.jpg
+ /trunk/Website/src/main/webapp/images/androidland/candy-crush-saga.jpg
+ /trunk/Website/src/main/webapp/images/androidland/cardiograph.jpg
+ /trunk/Website/src/main/webapp/images/androidland/cartoon-camera.jpg
+ /trunk/Website/src/main/webapp/images/androidland/csr-racing.jpg
+ /trunk/Website/src/main/webapp/images/androidland/duolingo.jpg
+ /trunk/Website/src/main/webapp/images/androidland/edmondo-sports-tracker.jpg
+ /trunk/Website/src/main/webapp/images/androidland/face-changer.jpg
+ /trunk/Website/src/main/webapp/images/androidland/file-manager.jpg
+ /trunk/Website/src/main/webapp/images/androidland/flickr.jpg
+ /trunk/Website/src/main/webapp/images/androidland/four-square.jpg
+ /trunk/Website/src/main/webapp/images/androidland/google+.jpg
+ /trunk/Website/src/main/webapp/images/androidland/google-play-books.jpg
+ /trunk/Website/src/main/webapp/images/androidland/hike.jpg
+ /trunk/Website/src/main/webapp/images/androidland/imdb.jpg
~ /trunk/Website/src/main/webapp/images/androidland/instagram.jpg
+ /trunk/Website/src/main/webapp/images/androidland/kids-abc-letters-lite.jpg
+ /trunk/Website/src/main/webapp/images/androidland/kids-numbers-math-lite.jpg
+ /trunk/Website/src/main/webapp/images/androidland/kings-office.jpg
+ /trunk/Website/src/main/webapp/images/androidland/line.jpg
+ /trunk/Website/src/main/webapp/images/androidland/linkedin.jpg
+ /trunk/Website/src/main/webapp/images/androidland/LiveScore.jpg
+ /trunk/Website/src/main/webapp/images/androidland/map-my-ride-cycling.jpg
+ /trunk/Website/src/main/webapp/images/androidland/moneycontrol-markets.jpg
+ /trunk/Website/src/main/webapp/images/androidland/mx-player.jpg
+ /trunk/Website/src/main/webapp/images/androidland/naukri.jpg
+ /trunk/Website/src/main/webapp/images/androidland/nexgtv-mobiletv.jpg
+ /trunk/Website/src/main/webapp/images/androidland/nimbuzz-messenger.jpg
+ /trunk/Website/src/main/webapp/images/androidland/noom-weight-loss.jpg
+ /trunk/Website/src/main/webapp/images/androidland/pba-bowling-challenge.jpg
+ /trunk/Website/src/main/webapp/images/androidland/photo-editor.jpg
+ /trunk/Website/src/main/webapp/images/androidland/Picsart-for-kids.jpg
+ /trunk/Website/src/main/webapp/images/androidland/picsart-photo.jpg
+ /trunk/Website/src/main/webapp/images/androidland/pinterest.jpg
+ /trunk/Website/src/main/webapp/images/androidland/pixlr-express.jpg
+ /trunk/Website/src/main/webapp/images/androidland/recipe-search.jpg
+ /trunk/Website/src/main/webapp/images/androidland/runtastic-running-fitness.jpg
+ /trunk/Website/src/main/webapp/images/androidland/saavn.jpg
+ /trunk/Website/src/main/webapp/images/androidland/snapseed.jpg
+ /trunk/Website/src/main/webapp/images/androidland/star-sports-com.jpg
+ /trunk/Website/src/main/webapp/images/androidland/subway-surfers.jpg
+ /trunk/Website/src/main/webapp/images/androidland/super-stickman-golf-2.jpg
+ /trunk/Website/src/main/webapp/images/androidland/taking-cat2.jpg
+ /trunk/Website/src/main/webapp/images/androidland/task-manager.jpg
+ /trunk/Website/src/main/webapp/images/androidland/ted.jpg
+ /trunk/Website/src/main/webapp/images/androidland/temple-run2.jpg
+ /trunk/Website/src/main/webapp/images/androidland/the-masters-golf.jpg
+ /trunk/Website/src/main/webapp/images/androidland/the-offical.jpg
+ /trunk/Website/src/main/webapp/images/androidland/true.jpg
+ /trunk/Website/src/main/webapp/images/androidland/tumblr.jpg
+ /trunk/Website/src/main/webapp/images/androidland/tuneIn-radio.jpg
+ /trunk/Website/src/main/webapp/images/androidland/virtuagym-fitness-home.jpg
+ /trunk/Website/src/main/webapp/images/androidland/web-md.jpg
+ /trunk/Website/src/main/webapp/images/androidland/wechat.jpg
+ /trunk/Website/src/main/webapp/images/androidland/wwe.jpg
+ /trunk/Website/src/main/webapp/images/androidland/yahoo-cricket.jpg
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-apps.vm

Rev 8317 – Added like us/follow for all pages except androidland page

amit.gupta — Mon, 07 Oct 2013 21:24:39 +0530

amit.gupta – 6 file(s) modified
Added like us/follow for all pages except androidland page

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-devices.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-overview.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-store-in-bangalore.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland.vm

Rev 8316 – UI Changes

anupam.singh — Mon, 07 Oct 2013 19:23:05 +0530

anupam.singh – 8 file(s) modified
UI Changes

~ /trunk/Website/src/main/webapp/images/androidland/overview-advice.jpg
~ /trunk/Website/src/main/webapp/images/androidland/overview-apps.jpg
~ /trunk/Website/src/main/webapp/images/androidland/overview-device.jpg
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-devices.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-fun-zone.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-overview.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland.vm

Rev 8315 – updated header with androidland.

amit.gupta — Mon, 07 Oct 2013 16:25:16 +0530

amit.gupta – 4 file(s) modified
updated header with androidland.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 8314 – Added funzone page. Updated images with real ones.

anupam.singh — Mon, 07 Oct 2013 16:04:25 +0530

anupam.singh – 21 file(s) modified
Added funzone page. Updated images with real ones.

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AndroidlandFunZoneController.java
+ /trunk/Website/src/main/webapp/images/androidland/advice-block.jpg
+ /trunk/Website/src/main/webapp/images/androidland/brands-block.jpg
+ /trunk/Website/src/main/webapp/images/androidland/free-wifi.jpg
~ /trunk/Website/src/main/webapp/images/androidland/panorama.jpg
+ /trunk/Website/src/main/webapp/images/androidland/play-zone.jpg
~ /trunk/Website/src/main/webapp/images/androidland/slide-1.jpg
~ /trunk/Website/src/main/webapp/images/androidland/slide-2.jpg
~ /trunk/Website/src/main/webapp/images/androidland/slide-3.jpg
~ /trunk/Website/src/main/webapp/images/androidland/slide-4.jpg
~ /trunk/Website/src/main/webapp/images/androidland/slide-5.jpg
~ /trunk/Website/src/main/webapp/images/androidland/slide-6.jpg
+ /trunk/Website/src/main/webapp/images/androidland/space-block.jpg
+ /trunk/Website/src/main/webapp/images/androidland/special-deals.jpg
x /trunk/Website/src/main/webapp/images/androidland/store-image-1.png
x /trunk/Website/src/main/webapp/images/androidland/store-image-2.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-apps.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-devices.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-fun-zone.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland-overview.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/androidland.vm

Rev 8313 – Correcting syntactical error

amar.kumar — Mon, 07 Oct 2013 14:38:17 +0530

amar.kumar – 1 file(s) modified
Correcting syntactical error

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm

Rev 8312 – Changes related for Search Option for Source Specific login

amar.kumar — Mon, 07 Oct 2013 12:55:16 +0530

amar.kumar – 6 file(s) modified
Changes related for Search Option for Source Specific login

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchOrderEvent.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/SearchBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchOrderRequest.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 8311 –

kshitij.sood — Mon, 07 Oct 2013 11:16:32 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 8310 – Smart watches category added.

amit.gupta — Mon, 07 Oct 2013 09:22:30 +0530

amit.gupta – 1 file(s) modified
Smart watches category added.

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

Rev 8309 –

amit.gupta — Mon, 07 Oct 2013 09:03:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 8308 – Smart watches category added.

amit.gupta — Mon, 07 Oct 2013 08:47:34 +0530

amit.gupta – 2 file(s) modified
Smart watches category added.

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

Rev 8307 – Removing warehouseId as mandatory field for getOrderCount method

amar.kumar — Mon, 07 Oct 2013 04:33:44 +0530

amar.kumar – 1 file(s) modified
Removing warehouseId as mandatory field for getOrderCount method

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

Rev 8306 – Removing warehouseId as mandatory field for getOrderCount method

amar.kumar — Mon, 07 Oct 2013 04:27:10 +0530

amar.kumar – 1 file(s) modified
Removing warehouseId as mandatory field for getOrderCount method

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

Rev 8305 – Removing warehouseId as mandatory field for getOrderCount method

amar.kumar — Mon, 07 Oct 2013 04:23:39 +0530

amar.kumar – 1 file(s) modified
Removing warehouseId as mandatory field for getOrderCount method

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

Rev 8304 – Additional Changes related to Ebay

amar.kumar — Mon, 07 Oct 2013 04:04:57 +0530

amar.kumar – 2 file(s) modified
Additional Changes related to Ebay

~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java