SmartDukaan – /

Rev 6263 – changes related to new events for click on Pickup storw ...

amit.gupta — Thu, 25 Oct 2012 23:25:13 +0530

amit.gupta – 1 file(s) modified
changes related to new events for click on Pickup storw widget and whats this.

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

Rev 6262 – Corrected google events as discussed by Abhishek.

amit.gupta — Thu, 25 Oct 2012 22:54:21 +0530

amit.gupta – 1 file(s) modified
Corrected google events as discussed by Abhishek.

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

Rev 6261 – Corrected google events as discussed by Abhishek.

amit.gupta — Thu, 25 Oct 2012 21:58:43 +0530

amit.gupta – 2 file(s) modified
Corrected google events as discussed by Abhishek.

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

Rev 6260 – Changed the dom structure for recharge index page.

anupam.singh — Thu, 25 Oct 2012 20:14:25 +0530

anupam.singh – 4 file(s) modified
Changed the dom structure for recharge index page.

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

Rev 6259 – Updated suspense statuses.

rajveer — Thu, 25 Oct 2012 16:57:44 +0530

rajveer – 1 file(s) modified
Updated suspense statuses.

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

Rev 6258 – mobilephones feed should be updated to static servers.

rajveer — Thu, 25 Oct 2012 14:25:39 +0530

rajveer – 1 file(s) modified
mobilephones feed should be updated to static servers.

~ /trunk/runutils/push-content-to-production.sh

Rev 6257 – In case of push prices to production. Feed should also ...

rajveer — Thu, 25 Oct 2012 14:16:51 +0530

rajveer – 2 file(s) modified
In case of push prices to production. Feed should also be updated automatically.

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

Rev 6256 – In case of Comming soon products, we should always return ...

rajveer — Thu, 25 Oct 2012 14:03:54 +0530

rajveer – 1 file(s) modified
In case of Comming soon products, we should always return True.

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

Rev 6255 – Only new out of stock mails should be sent. Previous ...

rajveer — Tue, 23 Oct 2012 18:53:11 +0530

rajveer – 2 file(s) modified
Only new out of stock mails should be sent. Previous day mails should be blocked.

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

Rev 6254 – On process of refund. Credit the user wallet also.

rajveer — Tue, 23 Oct 2012 18:52:26 +0530

rajveer – 1 file(s) modified
On process of refund. Credit the user wallet also.

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

Rev 6253 – Changed my Account link to my Orders in header snippet.

anupam.singh — Tue, 23 Oct 2012 12:54:47 +0530

anupam.singh – 2 file(s) modified
Changed my Account link to my Orders in header snippet.

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm

Rev 6252 – Changes in css (shipping.css) related to whats this popup

kshitij.sood — Tue, 23 Oct 2012 12:39:52 +0530

kshitij.sood – 1 file(s) modified
Changes in css (shipping.css) related to whats this popup

~ /trunk/Website/src/main/webapp/css/shipping.css

Rev 6251 – Added Whats this in pickup-in-store tab under shipping page

kshitij.sood — Tue, 23 Oct 2012 12:38:08 +0530

kshitij.sood – 1 file(s) modified
Added Whats this in pickup-in-store tab under shipping page

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

Rev 6250 – API for coupon generation for user specific Gift Vouchers and ...

amit.gupta — Mon, 22 Oct 2012 20:09:26 +0530

amit.gupta – 8 file(s) modified
API for coupon generation for user specific Gift Vouchers and coupons.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py
+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_gift_voucher_to_specific_users.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 6249 – Changed style for recharge box. Added captcha for Wallet only ...

anupam.singh — Mon, 22 Oct 2012 18:03:35 +0530

anupam.singh – 5 file(s) modified
Changed style for recharge box. Added captcha for Wallet only payments. Removed test gateway.

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

Rev 6248 – Changing mailId used to send PO because of daily quota ...

amar.kumar — Mon, 22 Oct 2012 16:22:31 +0530

amar.kumar – 1 file(s) modified
Changing mailId used to send PO because of daily quota exceeded exception

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

Rev 6247 – Display empty string for orders which have no plan.

rajveer — Mon, 22 Oct 2012 16:11:58 +0530

rajveer – 1 file(s) modified
Display empty string for orders which have no plan.

~ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-orders-authsuccess.vm

Rev 6246 – Banner(Pickup-Store)

kshitij.sood — Mon, 22 Oct 2012 13:16:43 +0530

kshitij.sood – 1 file(s) modified
Banner(Pickup-Store)

+ /trunk/Website/src/main/webapp/images/Pick-Up-Store.jpg

Rev 6245 – Banner and Pop-up related to pickup in store.

kshitij.sood — Mon, 22 Oct 2012 12:45:45 +0530

kshitij.sood – 3 file(s) modified
Banner and Pop-up related to pickup in store.

~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/webapp/css/widgets.css
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 6244 – plan names should match with website UI.

rajveer — Mon, 22 Oct 2012 12:43:57 +0530

rajveer – 2 file(s) modified
plan names should match with website UI.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RechargeOrdersController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-orders-authsuccess.vm

Rev 6243 – Displaying the plan in the recharge stats dashboard.

rajveer — Mon, 22 Oct 2012 11:50:18 +0530

rajveer – 1 file(s) modified
Displaying the plan in the recharge stats dashboard.

~ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-orders-authsuccess.vm

Rev 6242 – Adding Chandan's mailId to recipients of Skipped Inventory mails

amar.kumar — Mon, 22 Oct 2012 11:42:42 +0530

amar.kumar – 1 file(s) modified
Adding Chandan's mailId to recipients of Skipped Inventory mails

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

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