SmartDukaan – /

Rev 7186 – Wrong commit.. reverting

amit.gupta — Mon, 22 Apr 2013 18:26:46 +0530

amit.gupta – 1 file(s) modified
Wrong commit.. reverting

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

Rev 7185 – Added new status to scantype.

amit.gupta — Mon, 22 Apr 2013 17:52:31 +0530

amit.gupta – 4 file(s) modified
Added new status to scantype.

~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 7184 – Deleted omg contest page and its tnc.

amit.gupta — Mon, 22 Apr 2013 15:19:48 +0530

amit.gupta – 2 file(s) modified
Deleted omg contest page and its tnc.

x /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god-contest.vm
x /trunk/Website/src/main/webapp/WEB-INF/content/oh-my-god.vm

Rev 7183 – Deleted omg contest page and its tnc.

amit.gupta — Mon, 22 Apr 2013 15:18:43 +0530

amit.gupta – 1 file(s) modified
Deleted omg contest page and its tnc.

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

Rev 7182 – Added serialization to be updated on production while updating item.

amit.gupta — Fri, 19 Apr 2013 08:42:33 +0530

amit.gupta – 2 file(s) modified
Added serialization to be updated on production while updating item.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java

Rev 7181 – Changed name from Amit to Shiv.

rajveer — Thu, 18 Apr 2013 18:09:12 +0530

rajveer – 1 file(s) modified
Changed name from Amit to Shiv.

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

Rev 7180 – Store serial number in case of billing with hotspot.

rajveer — Thu, 18 Apr 2013 18:02:58 +0530

rajveer – 1 file(s) modified
Store serial number in case of billing with hotspot.

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

Rev 7179 – Get IMEI number in case of hotspot billing.

rajveer — Thu, 18 Apr 2013 18:01:32 +0530

rajveer – 6 file(s) modified
Get IMEI number in case of hotspot billing.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/BilledOrderEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/BillConfirmationBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/BillingInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/BillOrderRequest.java

Rev 7178 – Minor UI changes

anupam.singh — Thu, 18 Apr 2013 17:35:08 +0530

anupam.singh – 8 file(s) modified
Minor UI changes

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeResultController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ReportController.java
+ /RechargeDashboard/src/main/webapp/css/rechargewebapp_18042013.css (copied from /RechargeDashboard/src/main/webapp/css/rechargewebapp.css@7176)
+ /RechargeDashboard/src/main/webapp/js/rechargewebapp_18042013.js (copied from /RechargeDashboard/src/main/webapp/js/rechargewebapp.js@7176)
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/recharge-result.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7177 – Daily balance email for insurer.

rajveer — Thu, 18 Apr 2013 17:05:16 +0530

rajveer – 1 file(s) modified
Daily balance email for insurer.

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

Rev 7176 – Improved UI

anupam.singh — Thu, 18 Apr 2013 16:55:30 +0530

anupam.singh – 11 file(s) modified
Improved UI

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeResultController.java
~ /RechargeDashboard/src/main/webapp/css/rechargewebapp.css
+ /RechargeDashboard/src/main/webapp/images/Hotspot-Logo.jpg
+ /RechargeDashboard/src/main/webapp/images/menubar-separator-sprite.png
+ /RechargeDashboard/src/main/webapp/images/Saholic-Logo.jpg
~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/recharge-result.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7175 – Send daily email on wallet balance.

rajveer — Thu, 18 Apr 2013 16:37:11 +0530

rajveer – 1 file(s) modified
Send daily email on wallet balance.

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

Rev 7174 – Fetching todays transactions only instead of all transactions

anupam.singh — Wed, 17 Apr 2013 17:14:40 +0530

anupam.singh – 1 file(s) modified
Fetching todays transactions only instead of all transactions

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ReportController.java

Rev 7173 – Commented to category waiting for full run.

amit.gupta — Wed, 17 Apr 2013 17:11:57 +0530

amit.gupta – 1 file(s) modified
Commented to category waiting for full run.

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

Rev 7172 – Searching a mobile number now filtered by storeId as well

anupam.singh — Wed, 17 Apr 2013 16:14:46 +0530

anupam.singh – 8 file(s) modified
Searching a mobile number now filtered by storeId as well

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ReportController.java
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-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 7171 – minor bug.

amit.gupta — Wed, 17 Apr 2013 15:48:35 +0530

amit.gupta – 1 file(s) modified
minor bug.

~ /trunk/ContentStore/src/jython/irdatarules/tablets/callingfacility.py

Rev 7170 – think digit feed started.

amit.gupta — Wed, 17 Apr 2013 15:03:49 +0530

amit.gupta – 1 file(s) modified
think digit feed started.

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

Rev 7169 – Changes in ReportController of RechargeWebapp 1.Added search by device ...

anupam.singh — Wed, 17 Apr 2013 14:59:38 +0530

anupam.singh – 15 file(s) modified
Changes in ReportController of RechargeWebapp
1.Added search by device number
2.Ability to download collection report for today
3.Reprint Invoice
4.Request new password

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/LoginController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ReportController.java
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm
~ /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/thriftpy/model/v1/order/TransactionService-remote
~ /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/order/HotspotStore.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeTransaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7168 – Added tabs for tablets.

amit.gupta — Wed, 17 Apr 2013 14:51:31 +0530

amit.gupta – 4 file(s) modified
Added tabs for tablets.

+ /trunk/ContentStore/src/jython/irdatarules/tablets/callingfacility.py
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/Website/src/main/resources/templates/header.vm

Rev 7167 – Corrected issue.

rajveer — Wed, 17 Apr 2013 14:33:38 +0530

rajveer – 1 file(s) modified
Corrected issue.

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

Rev 7166 – Fixed small issues.

rajveer — Wed, 17 Apr 2013 12:52:32 +0530

rajveer – 1 file(s) modified
Fixed small issues.

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

Rev 7165 – spelling correction.

amit.gupta — Wed, 17 Apr 2013 12:47:57 +0530

amit.gupta – 1 file(s) modified
spelling correction.

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

Rev 7164 – think digit feed stopped.

amit.gupta — Wed, 17 Apr 2013 11:36:05 +0530

amit.gupta – 1 file(s) modified
think digit feed stopped.

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

Rev 7163 – Reconcile wallet balance. Also process unknown recharges as per expected.

rajveer — Tue, 16 Apr 2013 18:05:23 +0530

rajveer – 2 file(s) modified
Reconcile wallet balance. Also process unknown recharges as per expected.

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

Rev 7162 –

kshitij.sood — Tue, 16 Apr 2013 17:36:58 +0530

kshitij.sood – 4 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/agent-index.vm

Rev 7161 – minor gui fixes

amit.gupta — Tue, 16 Apr 2013 14:50:36 +0530

amit.gupta – 1 file(s) modified
minor gui fixes

~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js

Rev 7160 – minor gui fixes

amit.gupta — Tue, 16 Apr 2013 14:49:32 +0530

amit.gupta – 1 file(s) modified
minor gui fixes

~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js

Rev 7159 – Category - Headsets/ Headphones Slide - Power Battery type Add ...

amit.gupta — Tue, 16 Apr 2013 14:19:39 +0530

amit.gupta – 1 file(s) modified
Category - Headsets/ Headphones
Slide - Power
Battery type
Add option AAA battery
Sennheiser RS 110 II

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

Rev 7158 – Category - Headset and headphones Slide - Connectivity Feature - ...

amit.gupta — Tue, 16 Apr 2013 12:26:44 +0530

amit.gupta – 1 file(s) modified
Category - Headset and headphones
Slide - Connectivity
Feature - Operating frequency
Action - Unit GHz to be added

Sennheiser Wireless RS 160

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

Rev 7157 – Adding color field to indent sheet

amar.kumar — Mon, 15 Apr 2013 16:35:50 +0530

amar.kumar – 1 file(s) modified
Adding color field to indent sheet

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

Rev 7156 –

kshitij.sood — Mon, 15 Apr 2013 15:35:57 +0530

kshitij.sood – 20 file(s) modified

~ /trunk/Seleniumtests/src/com/Buyproductonprod.java
~ /trunk/Seleniumtests/src/com/Buyproductonprod_Accessories.java
~ /trunk/Seleniumtests/src/com/Buyproductonprod_Camera.java
~ /trunk/Seleniumtests/src/com/Buyproductonprod_clearance.java
~ /trunk/Seleniumtests/src/com/Buyproductonprod_Laptops.java
~ /trunk/Seleniumtests/src/com/Buyproductonprod_Mobiles.java
~ /trunk/Seleniumtests/src/com/Buyproductonprod_Pickup.java
~ /trunk/Seleniumtests/src/com/Buyproductonprod_Recharge.java
~ /trunk/Seleniumtests/src/com/Buyproductonprod_specialdeals.java
~ /trunk/Seleniumtests/src/com/Buyproductonprod_Tablets.java
~ /trunk/Seleniumtests/src/com/Buyproductonshop2020.java
~ /trunk/Seleniumtests/src/com/Buyproductonshop2020_Accessories.java
~ /trunk/Seleniumtests/src/com/Buyproductonshop2020_Camera.java
~ /trunk/Seleniumtests/src/com/Buyproductonshop2020_clearance.java
~ /trunk/Seleniumtests/src/com/Buyproductonshop2020_Laptops.java
~ /trunk/Seleniumtests/src/com/Buyproductonshop2020_Mobiles.java
~ /trunk/Seleniumtests/src/com/Buyproductonshop2020_Pickup.java
~ /trunk/Seleniumtests/src/com/Buyproductonshop2020_Recharge.java
~ /trunk/Seleniumtests/src/com/Buyproductonshop2020_specialdeals.java
~ /trunk/Seleniumtests/src/com/Buyproductonshop2020_Tablets.java

Rev 7155 – Made the changes to correct cash and card issue.

rajveer — Mon, 15 Apr 2013 14:32:08 +0530

rajveer – 1 file(s) modified
Made the changes to correct cash and card issue.

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

Rev 7154 – Cancelled insurance should have order id in the xls sheet.

rajveer — Mon, 15 Apr 2013 14:22:35 +0530

rajveer – 1 file(s) modified
Cancelled insurance should have order id in the xls sheet.

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

Rev 7153 – Converting ItemId to Long

amar.kumar — Mon, 15 Apr 2013 14:20:24 +0530

amar.kumar – 1 file(s) modified
Converting ItemId to Long

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

Rev 7152 – Categories -Headsets/Headphones Slide - Power Feature - Battery type ...

amit.gupta — Mon, 15 Apr 2013 12:52:53 +0530

amit.gupta – 1 file(s) modified
Categories -Headsets/Headphones

Slide - Power
Feature - Battery type
Action - Add option NiMH
Ref - Sennheiser Wireless RS 220

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

Rev 7151 – Enhanced functionalities for On store recharge.

amit.gupta — Mon, 15 Apr 2013 11:49:16 +0530

amit.gupta – 15 file(s) modified
Enhanced functionalities for On store recharge.

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeResultController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ReportController.java
~ /RechargeDashboard/src/main/webapp/css/rechargewebapp.css
~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/recharge-result.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-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 7150 – Dashboard to create indent sheet for Hotspot

amar.kumar — Mon, 15 Apr 2013 11:32:16 +0530

amar.kumar – 1 file(s) modified
Dashboard to create indent sheet for Hotspot

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

Rev 7149 – Dashboard to create indent sheet for Hotspot

amar.kumar — Mon, 15 Apr 2013 11:30:40 +0530

amar.kumar – 10 file(s) modified
Dashboard to create indent sheet for Hotspot

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/HotspotIndentController.java
~ /trunk/InventoryManager/src/main/webapp/css/common.css
+ /trunk/InventoryManager/src/main/webapp/js/hotspot-indent.js
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/hotspot-indent-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/A110Processor.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 7148 – Corrected collection in case of push.

rajveer — Fri, 12 Apr 2013 19:12:31 +0530

rajveer – 1 file(s) modified
Corrected collection in case of push.

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

Rev 7147 – Method to update wallet of the company.

rajveer — Fri, 12 Apr 2013 16:30:26 +0530

rajveer – 1 file(s) modified
Method to update wallet of the company.

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