SmartDukaan – /

Rev 1355 – Added the new pricing info for handsets

chandranshu — Mon, 11 Apr 2011 15:02:39 +0530

chandranshu – 1 file(s) modified
Added the new pricing info for handsets

+ /trunk/PyProj/src/samplesheets/ItemList-Handset-11-Apr-2011.xls

Rev 1354 – Fix for userinfo not getting restored from cookie.

vikas — Mon, 11 Apr 2011 13:41:44 +0530

vikas – 1 file(s) modified
Fix for userinfo not getting restored from cookie.

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 1353 – take cfg file frm cmdline.

vikas — Mon, 11 Apr 2011 13:34:47 +0530

vikas – 1 file(s) modified
take cfg file frm cmdline.

~ /trunk/Website/src/test/resources/scripts/test-setup.sh

Rev 1352 – Added a field for vendor category

chandranshu — Mon, 11 Apr 2011 13:21:41 +0530

chandranshu – 1 file(s) modified
Added a field for vendor category

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

Rev 1351 – Code, to email transaction info, to customer modified to call ...

varun.gupta — Mon, 11 Apr 2011 12:31:34 +0530

varun.gupta – 2 file(s) modified
Code, to email transaction info, to customer modified to call HelperClient.sendMail()

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

Rev 1350 – Changed the VendorItemPricing type to be lightweight.

chandranshu — Mon, 11 Apr 2011 11:45:16 +0530

chandranshu – 2 file(s) modified
Changed the VendorItemPricing type to be lightweight.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java

Rev 1349 – Changed the VendorItemPricing type to be lightweight.

chandranshu — Mon, 11 Apr 2011 11:44:53 +0530

chandranshu – 1 file(s) modified
Changed the VendorItemPricing type to be lightweight.

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

Rev 1348 – Changed the VendorItemPricing type to be lightweight. Added missing return ...

chandranshu — Mon, 11 Apr 2011 11:44:15 +0530

chandranshu – 3 file(s) modified
Changed the VendorItemPricing type to be lightweight. Added missing return statements

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 1347 – Converted the db object to a thrift object

chandranshu — Mon, 11 Apr 2011 11:00:26 +0530

chandranshu – 2 file(s) modified
Converted the db object to a thrift object

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

Rev 1346 – Deleted unnecessary files

chandranshu — Fri, 08 Apr 2011 19:35:35 +0530

chandranshu – 11 file(s) modified
Deleted unnecessary files

x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Billing.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/BillingInfo.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ExtraOrderInfo.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Item.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderInfo.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Payment.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PaymentInfo.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PaymentStatus.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Shipment.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ShipmentInfo.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ShipmentStatus.java

Rev 1345 – Removing unnecessary thrift config files

chandranshu — Fri, 08 Apr 2011 19:32:33 +0530

chandranshu – 4 file(s) modified
Removing unnecessary thrift config files

x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogServiceException.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemAttribs.java

Rev 1344 – Removed vendor item id from display

chandranshu — Fri, 08 Apr 2011 19:13:16 +0530

chandranshu – 4 file(s) modified
Removed vendor item id from display

~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/client/inbox/ItemDetails.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/client/inbox/ItemDetails.ui.xml
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/shared/actions/Item.java

Rev 1343 – Added a thrift structure to handle the pricing information

chandranshu — Fri, 08 Apr 2011 19:12:04 +0530

chandranshu – 1 file(s) modified
Added a thrift structure to handle the pricing information

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

Rev 1342 – Added a thrift structure to handle the pricing information

chandranshu — Fri, 08 Apr 2011 19:11:40 +0530

chandranshu – 2 file(s) modified
Added a thrift structure to handle the pricing information

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java

Rev 1341 – Added support to get the transfer price from the vendor ...

chandranshu — Fri, 08 Apr 2011 19:11:02 +0530

chandranshu – 5 file(s) modified
Added support to get the transfer price from the vendor item pricing table after the warehouse has been decided

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.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/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 1340 – Corrected a spelling

varun.gupta — Fri, 08 Apr 2011 18:55:34 +0530

varun.gupta – 1 file(s) modified
Corrected a spelling

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

Rev 1339 – Updated shop2020.cfg to point to shop2020.in

rajveer — Fri, 08 Apr 2011 18:46:25 +0530

rajveer – 1 file(s) modified
Updated shop2020.cfg to point to shop2020.in

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

Rev 1338 – Moved action message to proper place

rajveer — Fri, 08 Apr 2011 18:42:11 +0530

rajveer – 1 file(s) modified
Moved action message to proper place

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java

Rev 1337 – Removed password from web.xml. Corrected title of Forgot password page

rajveer — Fri, 08 Apr 2011 18:16:31 +0530

rajveer – 2 file(s) modified
Removed password from web.xml. Corrected title of Forgot password page

~ /trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/web.xml

Rev 1336 – Added orphan files

rajveer — Fri, 08 Apr 2011 17:56:59 +0530

rajveer – 18 file(s) modified
Added orphan files

+ /prototype/consetup.py
+ /prototype/description
+ /prototype/extra
+ /prototype/forms.py
+ /prototype/forms_initiate.py
+ /prototype/mail.py
+ /prototype/mail.pyc
+ /prototype/runindiaplaza.py
+ /prototype/runinfibeam.py
+ /prototype/runmobstore.py
+ /prototype/test.py
+ /prototype/tg2/src/devdata.db
~ /prototype/tg2/src/development.ini
~ /prototype/tg2/src/wiki20/controllers/root.py
~ /prototype/tg2/src/wiki20/development.ini
~ /prototype/tg2/src/wiki20/launch_tg.py
+ /prototype/tg2/src/wiki20/templates/about1.html
~ /prototype/tg2/src/wiki20/templates/index.html

Rev 1335 – compress js and css.

vikas — Fri, 08 Apr 2011 16:43:39 +0530

vikas – 1 file(s) modified
compress js and css.

~ /trunk/Website/pom.xml

Rev 1334 – Added the catalog for 7th April

chandranshu — Fri, 08 Apr 2011 16:39:41 +0530

chandranshu – 6 file(s) modified
Added the catalog for 7th April

+ /trunk/PyProj/src/samplesheets/ItemList-Handset-07-Apr-2011.xls
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/model/v1/catalog/ttypes.py

Rev 1333 – Fixed CSS and JS

varun.gupta — Fri, 08 Apr 2011 15:22:50 +0530

varun.gupta – 3 file(s) modified
Fixed CSS and JS

~ /trunk/Website/src/main/webapp/css/contactus.css
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm

Rev 1332 – remove empty lines and extra bullets.

vikas — Fri, 08 Apr 2011 14:22:10 +0530

vikas – 1 file(s) modified
remove empty lines and extra bullets.

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

Rev 1331 –

varun.gupta — Fri, 08 Apr 2011 13:28:47 +0530

varun.gupta – 1 file(s) modified

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

Rev 1330 – Added new catalog service types

chandranshu — Fri, 08 Apr 2011 13:28:33 +0530

chandranshu – 1 file(s) modified
Added new catalog service types

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

Rev 1329 – Committing new catalog types

chandranshu — Fri, 08 Apr 2011 13:27:47 +0530

chandranshu – 5 file(s) modified
Committing new catalog types

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/status.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java

Rev 1328 – Committing new catalog types

chandranshu — Fri, 08 Apr 2011 13:27:24 +0530

chandranshu – 2 file(s) modified
Committing new catalog types

+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/VendorItemKeyGenerator.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 1327 – Added logic to populate transfer price while creating order

rajveer — Fri, 08 Apr 2011 13:03:31 +0530

rajveer – 1 file(s) modified
Added logic to populate transfer price while creating order

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

Rev 1326 – Remove empty li's appearing in product slides.

vikas — Fri, 08 Apr 2011 12:56:45 +0530

vikas – 1 file(s) modified
Remove empty li's appearing in product slides.

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

Rev 1325 – 'Like Button' behaviour rolled back

varun.gupta — Fri, 08 Apr 2011 12:43:51 +0530

varun.gupta – 3 file(s) modified
'Like Button' behaviour rolled back

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/resources/templates/socialutils.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 1324 – Added logic to populate transfer price while creating order

rajveer — Fri, 08 Apr 2011 12:36:25 +0530

rajveer – 1 file(s) modified
Added logic to populate transfer price while creating order

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

Rev 1323 – OG tags commented

varun.gupta — Fri, 08 Apr 2011 12:11:30 +0530

varun.gupta – 1 file(s) modified
OG tags commented

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

Rev 1322 – Changed Invoice format as per the new requirements

chandranshu — Fri, 08 Apr 2011 11:23:30 +0530

chandranshu – 1 file(s) modified
Changed Invoice format as per the new requirements

~ /trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java

Rev 1321 – Started escaping XML entities for brand and model as well

chandranshu — Fri, 08 Apr 2011 11:22:02 +0530

chandranshu – 1 file(s) modified
Started escaping XML entities for brand and model as well

~ /trunk/ClientAgent/src/main/java/in/shop2020/agent/utils/Agent.java

Rev 1320 – Removed the check about increasing MRPs

chandranshu — Fri, 08 Apr 2011 11:20:40 +0530

chandranshu – 1 file(s) modified
Removed the check about increasing MRPs

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

Rev 1319 – Changed the best selling loader as per the received info

chandranshu — Thu, 07 Apr 2011 18:09:10 +0530

chandranshu – 1 file(s) modified
Changed the best selling loader as per the received info

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

Rev 1318 – Moved hdfcpayment service from controller to Service class

rajveer — Thu, 07 Apr 2011 17:27:09 +0530

rajveer – 3 file(s) modified
Moved hdfcpayment service from controller to Service class

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/order-success.vm

Rev 1317 –

varun.gupta — Thu, 07 Apr 2011 16:09:48 +0530

varun.gupta – 1 file(s) modified

~ /trunk/Website/src/main/webapp/js/myaccount.js

Rev 1316 – Fixed 'Shipping Updates' issue (#Ticket 269). Fixed 'Completed Orders' page.

varun.gupta — Thu, 07 Apr 2011 16:09:06 +0530

varun.gupta – 5 file(s) modified
Fixed 'Shipping Updates' issue (#Ticket 269). Fixed 'Completed Orders' page.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/completedorders.vm
~ /trunk/Website/src/main/resources/templates/myaccount.vm
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/bluedart-updates-show.vm