SmartDukaan – /

Rev 8203 – both emails are converted to lower case before compared with ...

amit.gupta — Wed, 25 Sep 2013 15:25:22 +0530

amit.gupta – 1 file(s) modified
both emails are converted to lower case before compared with each other.

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

Rev 8202 – Explicitly type-casting int to string

anupam.singh — Wed, 25 Sep 2013 14:49:04 +0530

anupam.singh – 1 file(s) modified
Explicitly type-casting int to string

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

Rev 8201 – Add source to the user table.

rajveer — Wed, 25 Sep 2013 14:40:56 +0530

rajveer – 7 file(s) modified
Add source to the user table.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 8200 – Adding velocity.properties file to the project to avoid velocity logging ...

amar.kumar — Wed, 25 Sep 2013 14:24:42 +0530

amar.kumar – 1 file(s) modified
Adding velocity.properties file to the project to avoid velocity logging exception

+ /trunk/InventoryManager/src/main/resources/velocity.properties

Rev 8199 – Change to add logging in case of exception while getting ...

amar.kumar — Wed, 25 Sep 2013 14:19:18 +0530

amar.kumar – 1 file(s) modified
Change to add logging in case of exception while getting Pending Purchase Order

~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py

Rev 8198 – Changes for adding source while sending mail for Hold Inventory ...

amar.kumar — Wed, 25 Sep 2013 14:06:48 +0530

amar.kumar – 1 file(s) modified
Changes for adding source while sending mail for Hold Inventory addition/updation

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

Rev 8197 – Updating variable name for holdInventoryDetail for adding/updating HoldInventoryDetails

amar.kumar — Wed, 25 Sep 2013 14:00:36 +0530

amar.kumar – 1 file(s) modified
Updating variable name for holdInventoryDetail for adding/updating HoldInventoryDetails

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

Rev 8196 – Change for updating payment gateway for Ebay

amar.kumar — Wed, 25 Sep 2013 12:37:16 +0530

amar.kumar – 2 file(s) modified
Change for updating payment gateway for Ebay

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

Rev 8195 – recharge collection problem fixed.

rajveer — Wed, 25 Sep 2013 12:11:13 +0530

rajveer – 1 file(s) modified
recharge collection problem fixed.

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

Rev 8194 – Uncommenting variable declaration commented by mistake

amar.kumar — Wed, 25 Sep 2013 12:02:11 +0530

amar.kumar – 1 file(s) modified
Uncommenting variable declaration commented by mistake

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

Rev 8193 – FTPClient server port changed to 22.

amit.gupta — Wed, 25 Sep 2013 11:03:59 +0530

amit.gupta – 1 file(s) modified
FTPClient server port changed to 22.

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

Rev 8192 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Wed, 25 Sep 2013 10:42:17 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Sep-25-2013

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

Rev 8191 – Emergency fix for amazon order process

kshitij.sood — Wed, 25 Sep 2013 00:28:39 +0530

kshitij.sood – 1 file(s) modified
Emergency fix for amazon order process

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/AmazonOrder.java

Rev 8190 –

amit.gupta — Wed, 25 Sep 2013 00:11:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 8189 – added check for count 2013.

amit.gupta — Tue, 24 Sep 2013 23:54:43 +0530

amit.gupta – 1 file(s) modified
added check for count 2013.

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

Rev 8188 –

kshitij.sood — Tue, 24 Sep 2013 20:37:18 +0530

kshitij.sood – 1 file(s) modified

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

Rev 8187 –

amar.kumar — Tue, 24 Sep 2013 20:19:14 +0530

amar.kumar – 1 file(s) modified

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/HotspotStockReportSender.java

Rev 8186 – check npe.

rajveer — Tue, 24 Sep 2013 20:15:02 +0530

rajveer – 1 file(s) modified
check npe.

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

Rev 8185 –

amar.kumar — Tue, 24 Sep 2013 20:06:12 +0530

amar.kumar – 1 file(s) modified

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/HotspotStockReportSender.java

Rev 8184 – Adding password for Sending Report for HotspotStock to Chaitanya

amar.kumar — Tue, 24 Sep 2013 20:02:51 +0530

amar.kumar – 1 file(s) modified
Adding password for Sending Report for HotspotStock to Chaitanya

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/HotspotStockReportSender.java

Rev 8183 – Changes for Sending Report for HotspotStock to Chaitanya

amar.kumar — Tue, 24 Sep 2013 19:50:58 +0530

amar.kumar – 2 file(s) modified
Changes for Sending Report for HotspotStock to Chaitanya

+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/HotspotStockReportSender.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java

Rev 8182 – Changes related to EBAY and minor changes related to use ...

amar.kumar — Tue, 24 Sep 2013 19:33:26 +0530

amar.kumar – 80 file(s) modified
Changes related to EBAY and minor changes related to use of rto orders for PO creation

Reviewed By: Rajveer Singh

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitEbayOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitEbayOrderEventHandler.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/OrderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SplitEbayOrderBox.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayAramexInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayBluedartInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayDTDCInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayFedexInvoiceHelper.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayHeaderFooterProvider.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayInvoiceGenerationService.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChooseColorHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitEbayOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitEbayOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitEbayOrderResponse.java
+ /trunk/HotspotDashboard/src/main/resources/ebay-logo-grey-bg.jpg
+ /trunk/HotspotDashboard/src/main/resources/ebay-logo.jpg
+ /trunk/HotspotDashboard/src/main/resources/paisapay-logo.jpg
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
~ /trunk/InventoryManager/src/main/webapp/js/current-inventory.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /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/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.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/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayColorChangeController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayDashboardController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayListingUploaderController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/EbaySubsidyUploaderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/SourceOrderCreationController.java
+ /trunk/Support/src/main/webapp/css/ebay.css
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-color-change-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-dashboard-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-listing-uploader-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-normal-order-creator-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-ps-order-creator-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-ps-order-update-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/ebay-subsidy-uploader-authsuccess.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/source-order-creation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/EbayItem.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/holdInventoryDetail.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HoldInventoryDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/OOSStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EbayOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 8181 – Send forgot password mail through email sender.

rajveer — Tue, 24 Sep 2013 15:08:21 +0530

rajveer – 1 file(s) modified
Send forgot password mail through email sender.

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

Rev 8180 – Added category laptop chargers.

amit.gupta — Tue, 24 Sep 2013 12:16:57 +0530

amit.gupta – 1 file(s) modified
Added category laptop chargers.

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

Rev 8179 – Mobile Phones changed to Mobile Phone

amit.gupta — Tue, 24 Sep 2013 12:03:09 +0530

amit.gupta – 3 file(s) modified
Mobile Phones changed to Mobile Phone

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm

Rev 8178 – Added sub-category mobile phones id 10006

amit.gupta — Tue, 24 Sep 2013 11:47:14 +0530

amit.gupta – 4 file(s) modified
Added sub-category mobile phones id 10006

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

Rev 8177 –

kshitij.sood — Tue, 24 Sep 2013 00:07:03 +0530

kshitij.sood – 1 file(s) modified

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

Rev 8176 – Update summary for available and not in stock products.

rajveer — Mon, 23 Sep 2013 19:23:58 +0530

rajveer – 1 file(s) modified
Update summary for available and not in stock products.

~ /trunk/PyProj/src/shop2020/model/v1/inventory/script/DailyStockReportGenerator.py

Rev 8175 – FTP password updated

amit.gupta — Mon, 23 Sep 2013 18:08:29 +0530

amit.gupta – 1 file(s) modified
FTP password updated

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

Rev 8174 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Mon, 23 Sep 2013 18:01:18 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Sep-23-2013

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

Rev 8173 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Mon, 23 Sep 2013 17:48:59 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Sep-23-2013

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

Rev 8172 –

kshitij.sood — Mon, 23 Sep 2013 17:06:37 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-index.vm

Rev 8171 –

kshitij.sood — Mon, 23 Sep 2013 17:00:16 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/Support/src/main/webapp/js/jquery-1.5.1.min.js

Rev 8170 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Mon, 23 Sep 2013 16:56:14 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Sep-23-2013

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

Rev 8169 – Committed by Manish Sharma for FedEx Tracking and Shipment Creation ...

manish.sharma — Mon, 23 Sep 2013 16:45:13 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Tracking and Shipment Creation on Sep-23-2013

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

Rev 8168 – Bulk update for amazon and some other changes.

kshitij.sood — Mon, 23 Sep 2013 16:23:20 +0530

kshitij.sood – 13 file(s) modified
Bulk update for amazon and some other changes.

~ /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/script/91MobilesScraper.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-bulk-upload.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-shipping-upload.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/asinjob.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/options.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 8167 –

kshitij.sood — Mon, 23 Sep 2013 14:56:55 +0530

kshitij.sood – 1 file(s) modified

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

Rev 8166 – Changes suggested by Pramit.

amit.gupta — Mon, 23 Sep 2013 11:21:00 +0530

amit.gupta – 1 file(s) modified
Changes suggested by Pramit.

~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-overview.vm

Rev 8165 – updated other para

amit.gupta — Sat, 21 Sep 2013 22:52:33 +0530

amit.gupta – 1 file(s) modified
updated other para

~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-store.vm

Rev 8164 – updated and checked in nursery rhymes.

amit.gupta — Sat, 21 Sep 2013 21:33:27 +0530

amit.gupta – 1 file(s) modified
updated and checked in nursery rhymes.

~ /trunk/Website/src/main/webapp/WEB-INF/content/android-land-apps.vm