SmartDukaan – /

Rev 6241 – Providing handle to categories team to decide whether selling prices ...

amit.gupta — Mon, 22 Oct 2012 09:36:55 +0530

amit.gupta – 24 file(s) modified
Providing handle to categories team to decide whether selling prices should be displayed or not.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ComingSoon.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ComingSoonDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportGenerator.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ComingSoonDialog.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/ContentStore/src/velocity/SearchSnippet.vm
~ /trunk/ContentStore/src/velocity/WidgetSnippet.vm
~ /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/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 6240 – Changed order of operator selector and accNo box for DTH

anupam.singh — Fri, 19 Oct 2012 22:17:18 +0530

anupam.singh – 2 file(s) modified
Changed order of operator selector and accNo box for DTH

~ /trunk/Website/src/main/webapp/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6239 – Phone number was not getting set in the billing address ...

anupam.singh — Fri, 19 Oct 2012 20:51:27 +0530

anupam.singh – 2 file(s) modified
Phone number was not getting set in the billing address for mobile recharges when address was not present.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePayOptionsController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm

Rev 6238 – Display refunded orders also.

rajveer — Fri, 19 Oct 2012 19:33:28 +0530

rajveer – 1 file(s) modified
Display refunded orders also.

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

Rev 6237 – Changed COD lower limit to 9600.

rajveer — Fri, 19 Oct 2012 19:14:30 +0530

rajveer – 1 file(s) modified
Changed COD lower limit to 9600.

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

Rev 6236 – Adding Amit, Rajveer and Khushal for PLB mismatch reports

amar.kumar — Fri, 19 Oct 2012 19:09:46 +0530

amar.kumar – 1 file(s) modified
Adding Amit, Rajveer and Khushal for PLB mismatch reports

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

Rev 6235 – Process refund in case of recharge.

rajveer — Fri, 19 Oct 2012 18:34:19 +0530

rajveer – 6 file(s) modified
Process refund in case of recharge.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessRechargeTransaction.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6234 – getAmount was private, made it public now.

anupam.singh — Fri, 19 Oct 2012 17:49:26 +0530

anupam.singh – 1 file(s) modified
getAmount was private, made it public now.

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

Rev 6233 – Fixed bugs related to recharge payment options.

anupam.singh — Fri, 19 Oct 2012 15:55:21 +0530

anupam.singh – 5 file(s) modified
Fixed bugs related to recharge payment options.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePaymentController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePayOptionsController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm

Rev 6232 – Send mail after we have updated the missing inventory.

rajveer — Fri, 19 Oct 2012 13:16:58 +0530

rajveer – 1 file(s) modified
Send mail after we have updated the missing inventory.

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

Rev 6231 – Added logic to handle STO status in case of timeout. ...

rajveer — Fri, 19 Oct 2012 11:46:45 +0530

rajveer – 1 file(s) modified
Added logic to handle STO status in case of timeout. Also stopped creating tickets in case of recharge failed.

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

Rev 6230 – Add h1 tag for all recharge pages.

rajveer — Fri, 19 Oct 2012 11:08:23 +0530

rajveer – 1 file(s) modified
Add h1 tag for all recharge pages.

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

Rev 6229 – Added Windows 8 to the Laptop OS

amit.gupta — Fri, 19 Oct 2012 10:57:34 +0530

amit.gupta – 2 file(s) modified
Added Windows 8 to the Laptop OS

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/operatingsystem.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 6228 – We now ask for address only when payment > ...

anupam.singh — Thu, 18 Oct 2012 21:58:30 +0530

anupam.singh – 13 file(s) modified
We now ask for address only when payment > rs.1000. For lower amount payments we would only ask for phone number.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePaymentController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePayOptionsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/WalletOnlyPaymentController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm

Rev 6227 – Updated timeout seconds.

rajveer — Thu, 18 Oct 2012 19:12:38 +0530

rajveer – 1 file(s) modified
Updated timeout seconds.

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

Rev 6226 – Changed url.

rajveer — Thu, 18 Oct 2012 15:31:09 +0530

rajveer – 1 file(s) modified
Changed url.

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

Rev 6225 – Added result for the recharge links.

rajveer — Thu, 18 Oct 2012 15:19:49 +0530

rajveer – 1 file(s) modified
Added result for the recharge links.

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

Rev 6224 – Changed parameters of checkstatus according to spicedeck changes.

rajveer — Thu, 18 Oct 2012 11:40:05 +0530

rajveer – 1 file(s) modified
Changed parameters of checkstatus according to spicedeck changes.

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

Rev 6223 – For wallet payments amount was 0.

anupam.singh — Wed, 17 Oct 2012 18:09:33 +0530

anupam.singh – 1 file(s) modified
For wallet payments amount was 0.

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

Rev 6222 – Typo mistake

kshitij.sood — Wed, 17 Oct 2012 17:20:04 +0530

kshitij.sood – 1 file(s) modified
Typo mistake

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

Rev 6221 – Typo mistake

kshitij.sood — Wed, 17 Oct 2012 17:18:42 +0530

kshitij.sood – 1 file(s) modified
Typo mistake

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

Rev 6220 – Corrected the get recharge map.

rajveer — Wed, 17 Oct 2012 17:09:44 +0530

rajveer – 1 file(s) modified
Corrected the get recharge map.

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

Rev 6219 – Process the successful transactions using offline script.

rajveer — Wed, 17 Oct 2012 16:53:02 +0530

rajveer – 3 file(s) modified
Process the successful transactions using offline script.

Rev 6218 – availability should return true or false only.

amit.gupta — Wed, 17 Oct 2012 16:51:01 +0530

amit.gupta – 1 file(s) modified
availability should return true or false only.

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

Rev 6217 – Setting tracking url for bluedart in case of not being ...

amar.kumar — Wed, 17 Oct 2012 16:38:33 +0530

amar.kumar – 1 file(s) modified
Setting tracking url for bluedart in case of not being able to read it from config service

~ /trunk/Common/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java

Rev 6216 – Also display order whose payment is successful but we did ...

rajveer — Wed, 17 Oct 2012 15:16:55 +0530

rajveer – 1 file(s) modified
Also display order whose payment is successful but we did not get recharge status.

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

Rev 6215 – Removed CC issued outside india option. Removed address form. Added ...

anupam.singh — Wed, 17 Oct 2012 15:13:09 +0530

anupam.singh – 7 file(s) modified
Removed CC issued outside india option. Removed address form. Added another message for cases where recharge status is unknown.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePaymentController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePayOptionsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/dispatcher/SaholicServletRedirectResult.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm

Rev 6214 – If status is changed from payment successful to recharge successful/failed, ...

rajveer — Wed, 17 Oct 2012 15:06:19 +0530

rajveer – 1 file(s) modified
If status is changed from payment successful to recharge successful/failed, we should be able to do it through service.

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

Rev 6213 – Removed unused commit.

rajveer — Wed, 17 Oct 2012 14:53:15 +0530

rajveer – 1 file(s) modified
Removed unused commit.

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

Rev 6212 – Logos (new banks) payment page under net banking

kshitij.sood — Wed, 17 Oct 2012 14:25:21 +0530

kshitij.sood – 4 file(s) modified
Logos (new banks) payment page under net banking

+ /trunk/Website/src/main/webapp/images/banks-cbi.png
+ /trunk/Website/src/main/webapp/images/banks-kmb.gif
+ /trunk/Website/src/main/webapp/images/banks-sbt.png
+ /trunk/Website/src/main/webapp/images/banks-yesbank.jpg

Rev 6211 – Changes related to new banks under netbanking

kshitij.sood — Wed, 17 Oct 2012 14:18:36 +0530

kshitij.sood – 1 file(s) modified
Changes related to new banks under netbanking

~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css

Rev 6210 – Added new banks under netbanking

kshitij.sood — Wed, 17 Oct 2012 14:17:51 +0530

kshitij.sood – 1 file(s) modified
Added new banks under netbanking

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

Rev 6209 – Added new banks under netbanking

kshitij.sood — Wed, 17 Oct 2012 14:17:22 +0530

kshitij.sood – 1 file(s) modified
Added new banks under netbanking

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

Rev 6208 – Added page in footer for recharge links.

rajveer — Wed, 17 Oct 2012 14:07:32 +0530

rajveer – 3 file(s) modified
Added page in footer for recharge links.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/QuicklinksController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/templates/footer.vm

Rev 6207 – Hide the pricing as requested by chaitnaya.

amit.gupta — Wed, 17 Oct 2012 13:02:27 +0530

amit.gupta – 7 file(s) modified
Hide the pricing as requested by chaitnaya.

~ /trunk/ContentStore/src/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
~ /trunk/ContentStore/src/velocity/MyResearchSnippet.vm
~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/ContentStore/src/velocity/SearchSnippet.vm
~ /trunk/ContentStore/src/velocity/WidgetSnippet.vm

Rev 6206 – Added option to get all or active operators based on ...

rajveer — Wed, 17 Oct 2012 12:47:31 +0530

rajveer – 11 file(s) modified
Added option to get all or active operators based on parameter passed.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /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/Support/src/main/java/in/shop2020/support/controllers/RechargeOrdersController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 6205 – Changing email address as cnc.center account was temporarily suspended

amar.kumar — Wed, 17 Oct 2012 12:29:48 +0530

amar.kumar – 1 file(s) modified
Changing email address as cnc.center account was temporarily suspended

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

Rev 6204 – SEO pages for recharge service.

rajveer — Wed, 17 Oct 2012 11:56:15 +0530

rajveer – 4 file(s) modified
SEO pages for recharge service.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/mappers/SaholicMapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm

Rev 6203 – Navratri Offer

amit.gupta — Wed, 17 Oct 2012 10:52:23 +0530

amit.gupta – 1 file(s) modified
Navratri Offer

+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_navratri.py

Rev 6202 – Changed to 1K as requested by chaitnaya.

amit.gupta — Wed, 17 Oct 2012 10:40:48 +0530

amit.gupta – 1 file(s) modified
Changed to 1K as requested by chaitnaya.

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