SmartDukaan – /

Rev 7356 – Source defined for amazon

vikram.raghav — Sat, 25 May 2013 03:16:18 +0530

vikram.raghav – 1 file(s) modified
Source defined for amazon

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

Rev 7355 – Source defined for amazon

vikram.raghav — Sat, 25 May 2013 03:13:47 +0530

vikram.raghav – 1 file(s) modified
Source defined for amazon

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

Rev 7354 – Source defined for amazon

vikram.raghav — Sat, 25 May 2013 03:08:49 +0530

vikram.raghav – 1 file(s) modified
Source defined for amazon

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py

Rev 7353 – Added one extra break.

rajveer — Fri, 24 May 2013 20:04:55 +0530

rajveer – 1 file(s) modified
Added one extra break.

~ /trunk/Support/src/main/webapp/WEB-INF/content/price-approval-index.vm

Rev 7352 – Fixed small bug/

rajveer — Fri, 24 May 2013 19:59:21 +0530

rajveer – 1 file(s) modified
Fixed small bug/

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

Rev 7351 – Added absolute minimum price.

rajveer — Fri, 24 May 2013 19:55:35 +0530

rajveer – 7 file(s) modified
Added absolute minimum price.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StoreAdminController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/store-admin-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StorePricing.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7350 – Corrected amount in push to ocr.

rajveer — Fri, 24 May 2013 19:37:18 +0530

rajveer – 1 file(s) modified
Corrected amount in push to ocr.

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

Rev 7349 – Refund Flow changes

anupam.singh — Fri, 24 May 2013 18:36:48 +0530

anupam.singh – 3 file(s) modified
Refund Flow changes

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7348 – Cancellation and Return FrontEnd

anupam.singh — Fri, 24 May 2013 16:57:30 +0530

anupam.singh – 3 file(s) modified
Cancellation and Return FrontEnd

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7347 – Added note for expiry of coupon while sending otg coupon.

amit.gupta — Fri, 24 May 2013 14:34:37 +0530

amit.gupta – 1 file(s) modified
Added note for expiry of coupon while sending otg coupon.

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

Rev 7346 – Storewebsite changes

anupam.singh — Fri, 24 May 2013 14:12:35 +0530

anupam.singh – 4 file(s) modified
Storewebsite changes

~ /StoreWebsite/.project
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7345 – Changed main dashboard title

rajveer — Fri, 24 May 2013 14:08:42 +0530

rajveer – 1 file(s) modified
Changed main dashboard title

~ /trunk/Support/src/main/webapp/WEB-INF/content/store-admin-index.vm

Rev 7344 – Push advance amount collection to ocr once store order is ...

rajveer — Fri, 24 May 2013 13:23:16 +0530

rajveer – 1 file(s) modified
Push advance amount collection to ocr once store order is placed successfully.

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

Rev 7343 – Changes for Store Website

anupam.singh — Fri, 24 May 2013 12:12:12 +0530

anupam.singh – 21 file(s) modified
Changes for Store Website

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderSuccessController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/css/storewebsite.css
+ /StoreWebsite/src/main/webapp/images/rupee-symbol.png
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm (copied from /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm@7327)
x /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm
~ /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 7342 – Added changes for snippet.

amit.gupta — Fri, 24 May 2013 11:13:37 +0530

amit.gupta – 1 file(s) modified
Added changes for snippet.

~ /trunk/ContentStore/src/velocity/CategorySnippet.vm

Rev 7341 – Memory RAM Pl make data type decimal ...

amit.gupta — Fri, 24 May 2013 10:53:49 +0530

amit.gupta – 1 file(s) modified
Memory

RAM

Pl make data type decimal

Ref - Samsung Galaxy Mega

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

Rev 7340 – changes related to vat implementation. state can only refer to ...

amit.gupta — Thu, 23 May 2013 18:21:29 +0530

amit.gupta – 5 file(s) modified
changes related to vat implementation.
state can only refer to its own vat rates.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7339 – Amar:Getting latest inventoryItem for serialNumber

amit.gupta — Thu, 23 May 2013 15:07:55 +0530

amit.gupta – 1 file(s) modified
Amar:Getting latest inventoryItem for serialNumber

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 7338 – Amar:Null/Empty check for SerialNumber for getting inventoryItem

amit.gupta — Thu, 23 May 2013 15:06:59 +0530

amit.gupta – 1 file(s) modified
Amar:Null/Empty check for SerialNumber for getting inventoryItem

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

Rev 7337 – new custom domain for store is added.

amit.gupta — Thu, 23 May 2013 14:57:08 +0530

amit.gupta – 1 file(s) modified
new custom domain for store is added.

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

Rev 7336 – minor changes related to store website.

amit.gupta — Thu, 23 May 2013 14:56:10 +0530

amit.gupta – 3 file(s) modified
minor changes related to store website.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/velocity/SearchSnippet.vm

Rev 7335 – Added finance team mail ids in report.

rajveer — Thu, 23 May 2013 12:06:41 +0530

rajveer – 1 file(s) modified
Added finance team mail ids in report.

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

Rev 7334 – Added classpath and project file

amit.gupta — Thu, 23 May 2013 11:17:51 +0530

amit.gupta – 2 file(s) modified
Added classpath and project file

~ /StoreWebsite/.classpath
+ /StoreWebsite/.project

Rev 7333 – minor issue in content.

amit.gupta — Thu, 23 May 2013 10:19:01 +0530

amit.gupta – 1 file(s) modified
minor issue in content.

~ /trunk/ContentStore/src/velocity/ProductDetail.vm

Rev 7332 – Added loading image

anupam.singh — Wed, 22 May 2013 20:01:09 +0530

anupam.singh – 2 file(s) modified
Added loading image

+ /StoreWebsite/src/main/webapp/images/loader_l.gif
~ /StoreWebsite/src/main/webapp/js/entity.js

Rev 7331 – removed old users from send mail.

amit.gupta — Wed, 22 May 2013 19:58:55 +0530

amit.gupta – 3 file(s) modified
removed old users from send mail.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelhiveryLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/InformUsers.py

Rev 7330 – State is also considered now while calculating vat rates.

amit.gupta — Wed, 22 May 2013 19:57:41 +0530

amit.gupta – 20 file(s) modified
State is also considered now while calculating vat rates.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 7329 – Fixed js

anupam.singh — Wed, 22 May 2013 19:57:23 +0530

anupam.singh – 1 file(s) modified
Fixed js

~ /StoreWebsite/src/main/webapp/js/entity.js

Rev 7328 – Fixed URL

anupam.singh — Wed, 22 May 2013 19:54:21 +0530

anupam.singh – 1 file(s) modified
Fixed URL

~ /StoreWebsite/src/main/webapp/css/entity.css

Rev 7327 – Removed today's collection from header

anupam.singh — Wed, 22 May 2013 19:50:10 +0530

anupam.singh – 6 file(s) modified
Removed today's collection from header

~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm

Rev 7326 – Css and image fixes

anupam.singh — Wed, 22 May 2013 19:43:11 +0530

anupam.singh – 3 file(s) modified
Css and image fixes

~ /StoreWebsite/src/main/webapp/css/entity.css
+ /StoreWebsite/src/main/webapp/images/ButtonAddtoCart_ALLSTATES.png
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm

Rev 7325 – fixed links to storewebsite

anupam.singh — Wed, 22 May 2013 19:16:44 +0530

anupam.singh – 5 file(s) modified
fixed links to storewebsite

~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm

Rev 7324 – Added missing CSS and changed rch to storewebsite in links

anupam.singh — Wed, 22 May 2013 18:35:18 +0530

anupam.singh – 8 file(s) modified
Added missing CSS and changed rch to storewebsite in links

+ /StoreWebsite/src/main/webapp/css/jquery.ui.autocomplete.css
~ /StoreWebsite/src/main/webapp/css/storewebsite.css
~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm

Rev 7323 – Changes for StoreWebsite

anupam.singh — Wed, 22 May 2013 18:10:12 +0530

anupam.singh – 16 file(s) modified
Changes for StoreWebsite

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/webapp/css/entity.css
~ /StoreWebsite/src/main/webapp/css/product.css
+ /StoreWebsite/src/main/webapp/css/style.css
+ /StoreWebsite/src/main/webapp/css/widget.css
+ /StoreWebsite/src/main/webapp/css/widgets.css
+ /StoreWebsite/src/main/webapp/images/filter-divider.gif
+ /StoreWebsite/src/main/webapp/images/grey-ver-bar.gif
~ /StoreWebsite/src/main/webapp/js/entity.js
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm

Rev 7322 – Changes to add Orders fetched from Amazon.

vikram.raghav — Wed, 22 May 2013 17:09:18 +0530

vikram.raghav – 10 file(s) modified
Changes to add Orders fetched from Amazon.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7321 – Amar:Allowing scan-ins if item's lastScanType is purchase-return

amit.gupta — Wed, 22 May 2013 15:27:48 +0530

amit.gupta – 1 file(s) modified
Amar:Allowing scan-ins if item's lastScanType is purchase-return

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

Rev 7320 – Amar:Allowing scan-ins if item's lastScanType is purchase-return

amit.gupta — Wed, 22 May 2013 14:53:58 +0530

amit.gupta – 1 file(s) modified
Amar:Allowing scan-ins if item's lastScanType is purchase-return

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

Rev 7319 – Temporary change to scan in Mi-1010

kshitij.sood — Wed, 22 May 2013 14:40:03 +0530

kshitij.sood – 1 file(s) modified
Temporary change to scan in Mi-1010

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

Rev 7318 – Added logos for hotspot and saholic

rajveer — Wed, 22 May 2013 14:39:16 +0530

rajveer – 3 file(s) modified
Added logos for hotspot and saholic

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
+ /trunk/HotspotDashboard/src/main/resources/Hotspot-Logo.jpg
+ /trunk/HotspotDashboard/src/main/resources/Saholic-Logo.jpg

Rev 7317 – Made offertext unavailable for stores.

amit.gupta — Wed, 22 May 2013 14:20:58 +0530

amit.gupta – 4 file(s) modified
Made offertext unavailable for stores.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/HomeSnippet.vm
~ /trunk/ContentStore/src/velocity/ProductDetail.vm