SmartDukaan – /

Rev 7104 – Changed max discount message

anupam.singh — Fri, 05 Apr 2013 11:54:02 +0530

anupam.singh – 1 file(s) modified
Changed max discount message

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

Rev 7103 – Adding additional line in product notification mail to state that ...

amar.kumar — Thu, 04 Apr 2013 18:29:24 +0530

amar.kumar – 1 file(s) modified
Adding additional line in product notification mail to state that we have limited stocks of the product

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

Rev 7102 – Changed Float type to integer.

rajveer — Thu, 04 Apr 2013 17:51:08 +0530

rajveer – 1 file(s) modified
Changed Float type to integer.

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

Rev 7101 – Rechargetype convert to string.

rajveer — Thu, 04 Apr 2013 17:47:10 +0530

rajveer – 1 file(s) modified
Rechargetype convert to string.

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

Rev 7100 – Changed 1hour to 15 mins

amit.gupta — Thu, 04 Apr 2013 17:35:10 +0530

amit.gupta – 1 file(s) modified
Changed 1hour to 15 mins

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

Rev 7099 – Changed 1hour to 15 mins

amit.gupta — Thu, 04 Apr 2013 17:27:52 +0530

amit.gupta – 1 file(s) modified
Changed 1hour to 15 mins

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

Rev 7098 – Correcting url

anupam.singh — Thu, 04 Apr 2013 16:30:48 +0530

anupam.singh – 1 file(s) modified
Correcting url

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

Rev 7097 – Added nfc tags

amit.gupta — Thu, 04 Apr 2013 15:58:29 +0530

amit.gupta – 1 file(s) modified
Added nfc tags

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

Rev 7096 – Changes for rechargeWebapp

anupam.singh — Thu, 04 Apr 2013 15:40:53 +0530

anupam.singh – 26 file(s) modified
Changes for rechargeWebapp

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/HomeController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/LoginController.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/authfail.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/home-index.vm (copied from /RechargeDashboard/src/main/webapp/WEB-INF/content/index.vm@7087)
~ /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
~ /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/model/TelecomCircle.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/OrderType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeTransaction.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TelecomCircle.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7095 – Changing getAllAliveItems to only get items in following statuses 1) ...

amar.kumar — Thu, 04 Apr 2013 11:44:08 +0530

amar.kumar – 1 file(s) modified
Changing getAllAliveItems to only get items in following statuses
1) Active
2) Paused
3) Paused By Risk

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

Rev 7094 – added executable permission to popularity.sh

amit.gupta — Thu, 04 Apr 2013 11:18:16 +0530

amit.gupta – 1 file(s) modified
added executable permission to popularity.sh

+ /trunk/runutils/popularity.sh

Rev 7093 –

amit.gupta — Thu, 04 Apr 2013 11:15:38 +0530

amit.gupta – 1 file(s) modified

x /trunk/runutils/popularity.sh

Rev 7092 – added service method to get all promotions by cart.

amit.gupta — Thu, 04 Apr 2013 10:46:44 +0530

amit.gupta – 6 file(s) modified
added service method to get all promotions by cart.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 7091 – Changing mailing list

amar.kumar — Wed, 03 Apr 2013 18:16:49 +0530

amar.kumar – 1 file(s) modified
Changing mailing list

~ /trunk/PyProj/src/shop2020/purchase/main/script/UnscannedItemsReporter.py

Rev 7090 – Changing query to get scan mismatch report

amar.kumar — Wed, 03 Apr 2013 18:12:40 +0530

amar.kumar – 1 file(s) modified
Changing query to get scan mismatch report

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

Rev 7089 – Changing query to get scan mismatch report

amar.kumar — Wed, 03 Apr 2013 17:55:57 +0530

amar.kumar – 1 file(s) modified
Changing query to get scan mismatch report

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

Rev 7088 – Changing mailing list to only include myself (for testing purpose)

amar.kumar — Wed, 03 Apr 2013 17:52:27 +0530

amar.kumar – 1 file(s) modified
Changing mailing list to only include myself (for testing purpose)

~ /trunk/PyProj/src/shop2020/purchase/main/script/UnscannedItemsReporter.py

Rev 7087 – Fixed bugs.

rajveer — Wed, 03 Apr 2013 16:27:23 +0530

rajveer – 1 file(s) modified
Fixed bugs.

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

Rev 7086 – Deleted unused controllet

rajveer — Wed, 03 Apr 2013 16:14:30 +0530

rajveer – 1 file(s) modified
Deleted unused controllet

x /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeController.java

Rev 7085 – Auto generated code

rajveer — Wed, 03 Apr 2013 16:04:40 +0530

rajveer – 2 file(s) modified
Auto generated code

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py

Rev 7084 – Get all recharge transactions

rajveer — Wed, 03 Apr 2013 16:04:09 +0530

rajveer – 4 file(s) modified
Get all recharge transactions

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7083 – to get popularity ranks for each entity.

amit.gupta — Wed, 03 Apr 2013 15:57:44 +0530

amit.gupta – 1 file(s) modified
to get popularity ranks for each entity.

+ /trunk/runutils/popularity.sh

Rev 7082 – Added report controller.

rajveer — Wed, 03 Apr 2013 15:54:25 +0530

rajveer – 2 file(s) modified
Added report controller.

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ReportController.java (copied from /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeController.java@7081)
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7081 – Updated support to handle invoice numbers.

rajveer — Wed, 03 Apr 2013 14:38:06 +0530

rajveer – 2 file(s) modified
Updated support to handle invoice numbers.

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

Rev 7080 – Changes in RechargeWebapp

anupam.singh — Wed, 03 Apr 2013 14:18:10 +0530

anupam.singh – 19 file(s) modified
Changes in RechargeWebapp

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeResultController.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/index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/recharge-result.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/FRC.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.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 7079 – Corrected the path of folder.

rajveer — Wed, 03 Apr 2013 14:11:37 +0530

rajveer – 1 file(s) modified
Corrected the path of folder.

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

Rev 7078 – Trim the customer name.

rajveer — Wed, 03 Apr 2013 13:18:26 +0530

rajveer – 1 file(s) modified
Trim the customer name.

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

Rev 7077 – Added user id as part of fetching invoice

rajveer — Tue, 02 Apr 2013 19:05:37 +0530

rajveer – 1 file(s) modified
Added user id as part of fetching invoice

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

Rev 7076 – Added discount amount.

rajveer — Tue, 02 Apr 2013 19:00:55 +0530

rajveer – 2 file(s) modified
Added discount amount.

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

Rev 7075 – Added support to handle transactions for recharge transactions.

rajveer — Tue, 02 Apr 2013 18:26:49 +0530

rajveer – 9 file(s) modified
Added support to handle transactions for recharge transactions.

~ /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/model/v1/order/script/ProcessRechargeTransaction.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 7074 – classpath changed

anupam.singh — Tue, 02 Apr 2013 16:16:45 +0530

anupam.singh – 2 file(s) modified
classpath changed

~ /RechargeDashboard
~ /RechargeDashboard/.classpath

Rev 7073 – Changes for rechargeFromStore

anupam.singh — Tue, 02 Apr 2013 16:12:55 +0530

anupam.singh – 25 file(s) modified
Changes for rechargeFromStore

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/HomeController.java
x /RechargeDashboard/src/main/webapp/css/common.css
+ /RechargeDashboard/src/main/webapp/css/rechargewebapp.css (copied from /RechargeDashboard/src/main/webapp/css/common.css@7068)
~ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/service-provider.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/model/v1/order/impl/RechargeService.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/Company.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PayMethod.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletForCompany.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletHistoryForCompany.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7072 – Fixed small bug.

rajveer — Tue, 02 Apr 2013 14:58:22 +0530

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

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

Rev 7071 – Adding log statement

amar.kumar — Tue, 02 Apr 2013 14:23:23 +0530

amar.kumar – 1 file(s) modified
Adding log statement

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

Rev 7070 – Added Redexpress as courier partner.

rajveer — Tue, 02 Apr 2013 12:46:50 +0530

rajveer – 1 file(s) modified
Added Redexpress as courier partner.

~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm

Rev 7069 – Added Redexpress as courier partner.

rajveer — Tue, 02 Apr 2013 12:45:38 +0530

rajveer – 1 file(s) modified
Added Redexpress as courier partner.

~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm

Rev 7068 – Committing the RechargeDashboard Webapp

anupam.singh — Mon, 01 Apr 2013 11:46:21 +0530

anupam.singh – 62 file(s) modified
Committing the RechargeDashboard Webapp

+ /RechargeDashboard/.classpath
+ /RechargeDashboard/.project
+ /RechargeDashboard/.settings
+ /RechargeDashboard/.settings/org.eclipse.jdt.core.prefs
+ /RechargeDashboard/.settings/org.maven.ide.eclipse.prefs
+ /RechargeDashboard/pom.xml
+ /RechargeDashboard/src
+ /RechargeDashboard/src/main
+ /RechargeDashboard/src/main/java
+ /RechargeDashboard/src/main/java/in
+ /RechargeDashboard/src/main/java/in/shop2020
+ /RechargeDashboard/src/main/java/in/shop2020/recharge
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/BaseController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/HomeController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/LoginController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/RechargeController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/service
+ /RechargeDashboard/src/main/java/in/shop2020/serving
+ /RechargeDashboard/src/main/java/in/shop2020/serving/auth
+ /RechargeDashboard/src/main/java/in/shop2020/serving/auth/InventoryAuthorizingRealm.java
+ /RechargeDashboard/src/main/java/in/shop2020/serving/auth/VerboseFilter.java
+ /RechargeDashboard/src/main/resources
+ /RechargeDashboard/src/main/resources/log4j.properties
+ /RechargeDashboard/src/main/resources/shiro.ini
+ /RechargeDashboard/src/main/resources/struts.xml
+ /RechargeDashboard/src/main/webapp
+ /RechargeDashboard/src/main/webapp/change-password.html
+ /RechargeDashboard/src/main/webapp/css
+ /RechargeDashboard/src/main/webapp/css/common.css
+ /RechargeDashboard/src/main/webapp/css/demo_page.css
+ /RechargeDashboard/src/main/webapp/css/demo_table.css
+ /RechargeDashboard/src/main/webapp/css/demo_table_jui.css
+ /RechargeDashboard/src/main/webapp/css/TableTools.css
+ /RechargeDashboard/src/main/webapp/images
+ /RechargeDashboard/src/main/webapp/images/+91.png
+ /RechargeDashboard/src/main/webapp/images/add.png
+ /RechargeDashboard/src/main/webapp/images/copy.png
+ /RechargeDashboard/src/main/webapp/images/copy_hover.png
+ /RechargeDashboard/src/main/webapp/images/csv.png
+ /RechargeDashboard/src/main/webapp/images/csv_hover.png
+ /RechargeDashboard/src/main/webapp/images/pdf.png
+ /RechargeDashboard/src/main/webapp/images/pdf_hover.png
+ /RechargeDashboard/src/main/webapp/images/print.png
+ /RechargeDashboard/src/main/webapp/images/print_hover.png
+ /RechargeDashboard/src/main/webapp/images/Rupee.png
+ /RechargeDashboard/src/main/webapp/images/topbar.png
+ /RechargeDashboard/src/main/webapp/images/xls.png
+ /RechargeDashboard/src/main/webapp/images/xls_hover.png
+ /RechargeDashboard/src/main/webapp/js
+ /RechargeDashboard/src/main/webapp/js/jquery-1.4.2.js
+ /RechargeDashboard/src/main/webapp/js/jquery.colorbox-min.js
+ /RechargeDashboard/src/main/webapp/js/jquery.dataTables.min.js
+ /RechargeDashboard/src/main/webapp/js/jquery.validate.js
+ /RechargeDashboard/src/main/webapp/js/rechargewebapp.js
+ /RechargeDashboard/src/main/webapp/js/TableTools.min.js
+ /RechargeDashboard/src/main/webapp/login.html
+ /RechargeDashboard/src/main/webapp/WEB-INF
+ /RechargeDashboard/src/main/webapp/WEB-INF/content
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/velocity.properties
+ /RechargeDashboard/src/main/webapp/WEB-INF/web.xml

Rev 7067 – Adding RechargeDashboard Webapp

anupam.singh — Mon, 01 Apr 2013 11:42:06 +0530

anupam.singh – 1 file(s) modified
Adding RechargeDashboard Webapp

+ /RechargeDashboard

Rev 7066 – Request from vrinda TabletsNew Battery Battery capacity Unit -Add - ...

amit.gupta — Mon, 01 Apr 2013 11:24:09 +0530

amit.gupta – 2 file(s) modified
Request from vrinda
TabletsNew
Battery
Battery capacity
Unit -Add - WHr
Decimal should be accepted

Ref - iPads

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

Rev 7065 – Bug fix

kshitij.sood — Fri, 29 Mar 2013 18:04:01 +0530

kshitij.sood – 3 file(s) modified
Bug fix

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg