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

Rev 6691 – Textual changes suggested by abhishek on delayed deliveries with on ...

amit.gupta — Wed, 16 Jan 2013 12:11:15 +0530

amit.gupta – 1 file(s) modified
Textual changes suggested by abhishek on delayed deliveries with on time guarantees mail.

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

Rev 6688 – Fixes related to OTG coupon generation

anupam.singh — Tue, 15 Jan 2013 16:32:00 +0530

anupam.singh – 2 file(s) modified
Fixes related to OTG coupon generation

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

Rev 6687 – Mail should be marked bcc to team also.

rajveer — Tue, 15 Jan 2013 16:11:24 +0530

rajveer – 1 file(s) modified
Mail should be marked bcc to team also.

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

Rev 6686 – Otg coupon is applicable for both physical and recharge.

anupam.singh — Tue, 15 Jan 2013 15:58:02 +0530

anupam.singh – 1 file(s) modified
Otg coupon is applicable for both physical and recharge.

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

Rev 6681 – Changed the way create coupon was being called in OTG

anupam.singh — Tue, 15 Jan 2013 15:01:33 +0530

anupam.singh – 1 file(s) modified
Changed the way create coupon was being called in OTG

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

Rev 6675 – Break in the email for shipping confirmation for OTG case.

rajveer — Mon, 14 Jan 2013 18:53:25 +0530

rajveer – 1 file(s) modified
Break in the email for shipping confirmation for OTG case.

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

Rev 6674 – Added recharge info to delivery success mail as well in ...

amit.gupta — Mon, 14 Jan 2013 18:49:05 +0530

amit.gupta – 1 file(s) modified
Added recharge info to delivery success mail as well in case of otg + delay

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

Rev 6669 – fixed business count logically after discussing it with Rajveer.

amit.gupta — Mon, 14 Jan 2013 15:37:43 +0530

amit.gupta – 1 file(s) modified
fixed business count logically after discussing it with Rajveer.

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

Rev 6668 – 1) Setting Amit Sirohi's emailId instead of Suraj Sharma 2) ...

amar.kumar — Mon, 14 Jan 2013 15:19:16 +0530

amar.kumar – 6 file(s) modified
1) Setting Amit Sirohi's emailId instead of Suraj Sharma
2) Setting Received_Return timestamp when order is cancelled after billing

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EODStockReportProcessor.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelhiveryLogisticsReconciliation.py

Rev 6666 – Update expected delivery timestamp at the time of shipping.

rajveer — Mon, 14 Jan 2013 14:00:55 +0530

rajveer – 1 file(s) modified
Update expected delivery timestamp at the time of shipping.

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

Rev 6665 – corrected logic to calculate sundays.

amit.gupta — Mon, 14 Jan 2013 13:29:15 +0530

amit.gupta – 1 file(s) modified
corrected logic to calculate sundays.

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

Rev 6663 – Added order id in pickup request email.

rajveer — Mon, 14 Jan 2013 12:24:44 +0530

rajveer – 1 file(s) modified
Added order id in pickup request email.

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

Rev 6662 – Updated shipping email to inform customers accordingly in case of ...

rajveer — Mon, 14 Jan 2013 12:06:16 +0530

rajveer – 1 file(s) modified
Updated shipping email to inform customers accordingly in case of OTG.

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

Rev 6660 – Removed br between We pay if we delay.

amit.gupta — Sun, 13 Jan 2013 15:23:21 +0530

amit.gupta – 1 file(s) modified
Removed br between We pay if we delay.

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

Rev 6659 – added empty row between two orders

amit.gupta — Sun, 13 Jan 2013 15:14:57 +0530

amit.gupta – 1 file(s) modified
added empty row between two orders

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

Rev 6658 – changed

amit.gupta — Sun, 13 Jan 2013 13:33:55 +0530

amit.gupta – 1 file(s) modified
changed

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

Rev 6655 – Changed mail to send otg text in case of OTG.

rajveer — Fri, 11 Jan 2013 18:14:01 +0530

rajveer – 1 file(s) modified
Changed mail to send otg text in case of OTG.

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

Rev 6654 – added hr between two products.

amit.gupta — Fri, 11 Jan 2013 18:08:28 +0530

amit.gupta – 1 file(s) modified
added hr between two products.

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

Rev 6650 – Changes made to subject

amit.gupta — Fri, 11 Jan 2013 16:00:43 +0530

amit.gupta – 1 file(s) modified
Changes made to subject

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

Rev 6649 – Created out separate promotion for otg i.e.28

amit.gupta — Fri, 11 Jan 2013 13:55:38 +0530

amit.gupta – 2 file(s) modified
Created out separate promotion for otg i.e.28

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

Rev 6645 – Added shrawan and ritesh instead of gaurabh and suraj mailing ...

anupam.singh — Thu, 10 Jan 2013 20:14:56 +0530

anupam.singh – 1 file(s) modified
Added shrawan and ritesh instead of gaurabh and suraj mailing list for pickup request

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

Rev 6643 – Added support to store awb updates in our system.

rajveer — Thu, 10 Jan 2013 16:24:05 +0530

rajveer – 17 file(s) modified
Added support to store awb updates in our system.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberAlerter.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/script/ProcurementReportProcessor.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/PickupStoreReturns.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/PyProj/src/shop2020/utils/orderTablePoller.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/AwbUpdate.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 6637 – Typo corrected

amit.gupta — Wed, 09 Jan 2013 22:18:02 +0530

amit.gupta – 1 file(s) modified
Typo corrected

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

Rev 6636 – Prefix is removed

amit.gupta — Wed, 09 Jan 2013 20:38:43 +0530

amit.gupta – 1 file(s) modified
Prefix is removed

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

Rev 6632 – Added checks for first delivery timestamp

amit.gupta — Wed, 09 Jan 2013 18:31:30 +0530

amit.gupta – 1 file(s) modified
Added checks for first delivery timestamp

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

Rev 6631 – Added checks for first delivery timestamp

amit.gupta — Wed, 09 Jan 2013 18:17:53 +0530

amit.gupta – 1 file(s) modified
Added checks for first delivery timestamp

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

Rev 6629 – setting promised and expected shipping timestamp while cloning an order ...

anupam.singh — Wed, 09 Jan 2013 17:38:00 +0530

anupam.singh – 1 file(s) modified
setting promised and expected shipping timestamp while cloning an order for reshipping

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

Rev 6591 – Added ip address recognition and blocking of malicious ip addresses ...

anupam.singh — Wed, 02 Jan 2013 21:04:11 +0530

anupam.singh – 11 file(s) modified
Added ip address recognition and blocking of malicious ip addresses for rechargeOrders. Also started to log addresses which are blocked.

~ /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/BaseOrder.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/RechargeOrder.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

Rev 6567 – commented

amit.gupta — Mon, 31 Dec 2012 17:26:36 +0530

amit.gupta – 1 file(s) modified
commented

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

Rev 6561 – otg front-end and mail logic implementation.

amit.gupta — Mon, 31 Dec 2012 16:40:20 +0530

amit.gupta – 20 file(s) modified
otg front-end and mail logic implementation.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelhiveryLogisticsReconciliation.py
+ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticUtils.py
~ /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
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/webapp/css/entity.css
+ /trunk/Website/src/main/webapp/images/quesmark.png
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 6553 – Add invoice in case of recharge successful.

rajveer — Fri, 28 Dec 2012 18:42:35 +0530

rajveer – 1 file(s) modified
Add invoice in case of recharge successful.

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

Rev 6537 – Added option to add delivery delay for selected pincodes.

rajveer — Mon, 24 Dec 2012 16:31:22 +0530

rajveer – 4 file(s) modified
Added option to add delivery delay for selected pincodes.

Rev 6525 – Added the on time guarantee field to order.

rajveer — Fri, 21 Dec 2012 12:42:21 +0530

rajveer – 7 file(s) modified
Added the on time guarantee field to order.

~ /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/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 6524 – Added code for on time guarantee.

rajveer — Thu, 20 Dec 2012 19:19:16 +0530

rajveer – 14 file(s) modified
Added code for on time guarantee.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java

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 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 6482 – Added support of refund in hdfc.

rajveer — Tue, 11 Dec 2012 15:19:46 +0530

rajveer – 7 file(s) modified
Added support of refund in hdfc.

~ /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/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentStatus.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 6444 – Send coupon details in mail.

rajveer — Wed, 05 Dec 2012 13:06:17 +0530

rajveer – 1 file(s) modified
Send coupon details in mail.

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

Rev 6441 – Process refund in case of coupon in recharge orders.

rajveer — Wed, 05 Dec 2012 12:29:58 +0530

rajveer – 1 file(s) modified
Process refund in case of coupon in recharge orders.

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

Rev 6438 – Removing the promotion to assign coupons to user on recharge.

rajveer — Wed, 05 Dec 2012 11:57:13 +0530

rajveer – 2 file(s) modified
Removing the promotion to assign coupons to user on recharge.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java