SmartDukaan – /

Rev 6523 – Added new display type Super LCD 3.

amit.gupta — Thu, 20 Dec 2012 17:34:03 +0530

amit.gupta – 2 file(s) modified
Added new display type Super LCD 3.

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

Rev 6522 – Tag functionality implemented.

amit.gupta — Thu, 20 Dec 2012 17:12:07 +0530

amit.gupta – 2 file(s) modified
Tag functionality implemented.

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/SpecialPage.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/SpecialPageJSONConvertor.java

Rev 6521 – removed it.

amit.gupta — Thu, 20 Dec 2012 17:00:25 +0530

amit.gupta – 1 file(s) modified
removed it.

x /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-addentity.vm

Rev 6520 – Tag functionality implemented.

amit.gupta — Thu, 20 Dec 2012 16:58:51 +0530

amit.gupta – 8 file(s) modified
Tag functionality implemented.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SpecialPageController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/TagPageController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-edit.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-editNew.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-edit.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SpecialPageConfigurer.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/tag-page-index.vm

Rev 6519 – Controller and VM's for tag implementation in CMS.

kshitij.sood — Thu, 20 Dec 2012 13:09:07 +0530

kshitij.sood – 7 file(s) modified
Controller and VM's for tag implementation in CMS.

+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/TagPageController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-addentity.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-edit.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-editNew.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-index.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-show.vm

Rev 6518 – Changes in service handler and accessor for tag implementation in ...

kshitij.sood — Wed, 19 Dec 2012 23:09:20 +0530

kshitij.sood – 2 file(s) modified
Changes in service handler and accessor for tag implementation in catalog.

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

Rev 6517 – Removed a span added by mistake

anupam.singh — Wed, 19 Dec 2012 18:40:43 +0530

anupam.singh – 1 file(s) modified
Removed a span added by mistake

~ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm

Rev 6516 – Page refresh on successful refund for recharges.

anupam.singh — Wed, 19 Dec 2012 16:42:36 +0530

anupam.singh – 1 file(s) modified
Page refresh on successful refund for recharges.

~ /trunk/Crm/src/main/webapp/js/common.js

Rev 6515 – Added refund timestamp to baseorder.

anupam.singh — Wed, 19 Dec 2012 16:27:20 +0530

anupam.singh – 7 file(s) modified
Added refund timestamp to baseorder.

~ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/BaseOrder.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6514 – Added pagetype in VM

kshitij.sood — Wed, 19 Dec 2012 12:57:29 +0530

kshitij.sood – 1 file(s) modified
Added pagetype in VM

~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-editNew.vm

Rev 6513 – Added payment configuration for the refund.

rajveer — Wed, 19 Dec 2012 12:32:05 +0530

rajveer – 1 file(s) modified
Added payment configuration for the refund.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 6512 – Added thrift service for new tag implementation in catalog.

kshitij.sood — Wed, 19 Dec 2012 12:30:30 +0530

kshitij.sood – 3 file(s) modified
Added thrift service for new tag implementation in catalog.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 6511 – Added thrift service for new tag implementation in catalog.

kshitij.sood — Wed, 19 Dec 2012 12:29:55 +0530

kshitij.sood – 8 file(s) modified
Added thrift service for new tag implementation in catalog.

~ /trunk/PyProj/src/shop2020/config/ConfigServer.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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/EntityTag.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 6510 – Ignore the warehouses while populating itemavailability cache.

rajveer — Tue, 18 Dec 2012 17:37:52 +0530

rajveer – 1 file(s) modified
Ignore the warehouses while populating itemavailability cache.

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

Rev 6509 – Accounting for coupon amount as well.

anupam.singh — Tue, 18 Dec 2012 16:45:16 +0530

anupam.singh – 1 file(s) modified
Accounting for coupon amount as well.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java

Rev 6508 – Refund button should not be visible in case of wallet ...

anupam.singh — Tue, 18 Dec 2012 16:26:49 +0530

anupam.singh – 1 file(s) modified
Refund button should not be visible in case of wallet only payment.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java

Rev 6507 – Added a method in order service for refunding orders. Gave ...

anupam.singh — Tue, 18 Dec 2012 12:46:05 +0530

anupam.singh – 16 file(s) modified
Added a method in order service for refunding orders. Gave a handle in crm for the same.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/RechargeOrderInfoController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-order-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/recharge-orders-index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/refund-failed.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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6506 – made 120170 Memory clock speed skippable

amit.gupta — Tue, 18 Dec 2012 12:05:39 +0530

amit.gupta – 1 file(s) modified
made 120170 Memory clock speed skippable

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

Rev 6505 – Validating the coupon before on proceed to pay page.

anupam.singh — Mon, 17 Dec 2012 18:39:03 +0530

anupam.singh – 1 file(s) modified
Validating the coupon before on proceed to pay page.

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

Rev 6504 – Fixed a bug where coupon code was not getting updated ...

anupam.singh — Mon, 17 Dec 2012 18:11:08 +0530

anupam.singh – 1 file(s) modified
Fixed a bug where coupon code was not getting updated in the db.

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

Rev 6503 – Set refund amount in case of refund of a payment.

rajveer — Mon, 17 Dec 2012 14:55:12 +0530

rajveer – 10 file(s) modified
Set refund amount in case of refund of a payment.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/domain/Payment.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcEmiPaymentHandler.java
~ /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/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentMapper.xml
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Payment.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 6502 – Added cart id in the exception message

rajveer — Mon, 17 Dec 2012 12:45:17 +0530

rajveer – 1 file(s) modified
Added cart id in the exception message

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

Rev 6501 – Added Chandan email id in various emails.

rajveer — Mon, 17 Dec 2012 11:48:05 +0530

rajveer – 5 file(s) modified
Added Chandan email id in various emails.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CatalogComparer.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/purchase/scripts/vendorFulfilmentReport.py

Rev 6500 – coupon chages.

amit.gupta — Fri, 14 Dec 2012 14:59:53 +0530

amit.gupta – 1 file(s) modified
coupon chages.

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

Rev 6499 – Removing message about giftvoucher.

anupam.singh — Fri, 14 Dec 2012 14:49:48 +0530

anupam.singh – 1 file(s) modified
Removing message about giftvoucher.

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

Rev 6498 – Changes to update Selective inventory from a warehouse.

vikram.raghav — Fri, 14 Dec 2012 11:49:16 +0530

vikram.raghav – 2 file(s) modified
Changes to update Selective inventory from a warehouse.

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

Rev 6497 – Now suraj can cretate gvs.

amit.gupta — Fri, 14 Dec 2012 10:56:13 +0530

amit.gupta – 11 file(s) modified
Now suraj can cretate gvs.

~ /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/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/CouponGvsController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/coupon-gvs-authfail.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/coupon-gvs-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 6496 – Added id attribute for discount coupon field

anupam.singh — Thu, 13 Dec 2012 17:47:54 +0530

anupam.singh – 1 file(s) modified
Added id attribute for discount coupon field

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

Rev 6495 – Added backend validations on all fields. Added a hash of ...

anupam.singh — Thu, 13 Dec 2012 15:24:41 +0530

anupam.singh – 4 file(s) modified
Added backend validations on all fields. Added a hash of userId. RechargeAmount was becoming zero for logged in user when wallet was being used.

~ /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/webapp/js/recharge.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm

Rev 6494 – Change to show Receiver in Purchase Report

amar.kumar — Thu, 13 Dec 2012 14:53:41 +0530

amar.kumar – 4 file(s) modified
Change to show Receiver in Purchase Report

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 6493 – Getting all items's availability from currentInventorySnapShot irrespective of ItemStatus

amar.kumar — Wed, 12 Dec 2012 20:15:54 +0530

amar.kumar – 1 file(s) modified
Getting all items's availability from currentInventorySnapShot irrespective of ItemStatus

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

Rev 6492 – Correcting the order of Availability in Excel

amar.kumar — Wed, 12 Dec 2012 20:04:22 +0530

amar.kumar – 1 file(s) modified
Correcting the order of Availability in Excel

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

Rev 6491 – Refund implemented for EBS and HDFC EMI.

rajveer — Wed, 12 Dec 2012 18:35:38 +0530

rajveer – 3 file(s) modified
Refund implemented for EBS and HDFC EMI.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/EbsPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcEmiPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java

Rev 6490 – Updated the facebook message.

rajveer — Wed, 12 Dec 2012 16:42:25 +0530

rajveer – 1 file(s) modified
Updated the facebook message.

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

Rev 6489 – Refund the actual amount, not the payment amount.

rajveer — Wed, 12 Dec 2012 15:34:41 +0530

rajveer – 1 file(s) modified
Refund the actual amount, not the payment amount.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java

Rev 6488 – Lets not do refunds manually till properly tested.

rajveer — Wed, 12 Dec 2012 15:01:33 +0530

rajveer – 1 file(s) modified
Lets not do refunds manually till properly tested.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java

Rev 6487 – Updated to handle case when bulk orders created from one ...

rajveer — Wed, 12 Dec 2012 15:00:54 +0530

rajveer – 1 file(s) modified
Updated to handle case when bulk orders created from one account.

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

Rev 6486 – Added new method to payment service to refund for hdfc.

rajveer — Wed, 12 Dec 2012 14:25:25 +0530

rajveer – 6 file(s) modified
Added new method to payment service to refund for hdfc.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/IPaymentHandler.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

Rev 6485 – Content model changes requested by Vrinda.

amit.gupta — Wed, 12 Dec 2012 12:03:50 +0530

amit.gupta – 3 file(s) modified
Content model changes requested by Vrinda.

~ /trunk/ContentStore/src/jython/comparisonrules/display_math.py
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml

Rev 6484 – Changes to send mail for mismatches between availability shown in ...

amar.kumar — Tue, 11 Dec 2012 19:46:53 +0530

amar.kumar – 10 file(s) modified
Changes to send mail for mismatches between availability shown in currentinventorySnapShot and availability calculated through ScanRecords

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.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
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InventoryMismatchGenerator.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml