SmartDukaan – /

Rev 6706 – added availability filter to non-root as well.

amit.gupta — Fri, 18 Jan 2013 11:25:55 +0530

amit.gupta – 1 file(s) modified
added availability filter to non-root as well.

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 6705 – Setting microsecond of new_delivery_time as 0 to correct comparison logic ...

amar.kumar — Fri, 18 Jan 2013 02:27:47 +0530

amar.kumar – 1 file(s) modified
Setting microsecond of new_delivery_time as 0 to correct comparison logic of time for OTG mails

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

Rev 6704 – Send multiple files to courier in one mail only for ...

rajveer — Thu, 17 Jan 2013 18:46:45 +0530

rajveer – 1 file(s) modified
Send multiple files to courier in one mail only for all warehouses and all cod and prepaid

~ /trunk/PyProj/src/shop2020/logistics/service/script/LogisticsReportSender.py

Rev 6703 – Added OTG column in non delivered reports.

rajveer — Thu, 17 Jan 2013 16:36:08 +0530

rajveer – 2 file(s) modified
Added OTG column in non delivered reports.

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

Rev 6702 – Removed parsing of ItemKey

amar.kumar — Thu, 17 Jan 2013 15:55:12 +0530

amar.kumar – 1 file(s) modified
Removed parsing of ItemKey

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

Rev 6701 – Added more brands to Accessories menu.

kshitij.sood — Thu, 17 Jan 2013 15:34:55 +0530

kshitij.sood – 1 file(s) modified
Added more brands to Accessories menu.

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

Rev 6700 – Changing directory for Reports to /tmp

amar.kumar — Thu, 17 Jan 2013 14:01:20 +0530

amar.kumar – 2 file(s) modified
Changing directory for Reports to /tmp

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

Rev 6699 – Create file at temporary location instead of tomcat directory.

rajveer — Thu, 17 Jan 2013 13:13:41 +0530

rajveer – 1 file(s) modified
Create file at temporary location instead of tomcat directory.

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/POExcelGenerator.java

Rev 6698 – Changing location of Inventory File

amar.kumar — Thu, 17 Jan 2013 12:46:41 +0530

amar.kumar – 1 file(s) modified
Changing location of Inventory File

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

Rev 6697 – Changed mail id from pankaj to rajveer.

rajveer — Thu, 17 Jan 2013 12:27:31 +0530

rajveer – 1 file(s) modified
Changed mail id from pankaj to rajveer.

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

Rev 6696 – Update start date and coming start date while updating item.

rajveer — Thu, 17 Jan 2013 10:52:01 +0530

rajveer – 1 file(s) modified
Update start date and coming start date while updating item.

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

Rev 6695 – Adding styling for inventoryUpload Form

amar.kumar — Wed, 16 Jan 2013 17:04:21 +0530

amar.kumar – 1 file(s) modified
Adding styling for inventoryUpload Form

~ /trunk/InventoryManager/src/main/webapp/css/common.css

Rev 6694 – Adding Span of Upload Type

amar.kumar — Wed, 16 Jan 2013 17:02:57 +0530

amar.kumar – 1 file(s) modified
Adding Span of Upload Type

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-inventory-index.vm

Rev 6693 – Changes to add inventory for Third Party warehouses through Inventory ...

amar.kumar — Wed, 16 Jan 2013 16:50:09 +0530

amar.kumar – 3 file(s) modified
Changes to add inventory for Third Party warehouses through Inventory Dashboard by uploading Excel sheets

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/EffectiveAvailabilityComputer.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-inventory-index.vm

Rev 6692 – some more addons on faq.

amit.gupta — Wed, 16 Jan 2013 14:59:03 +0530

amit.gupta – 1 file(s) modified
some more addons on faq.

~ /trunk/Website/src/main/webapp/WEB-INF/content/on-time-guarantee.vm

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 6690 – added rajveer/rajneesh/amitsirohi/abhishek to bcc

amit.gupta — Tue, 15 Jan 2013 18:56:28 +0530

amit.gupta – 1 file(s) modified
added rajveer/rajneesh/amitsirohi/abhishek to bcc

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

Rev 6689 – Change to download entire Inventory instead of only serialized.

amar.kumar — Tue, 15 Jan 2013 16:44:24 +0530

amar.kumar – 1 file(s) modified
Change to download entire Inventory instead of only serialized.

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

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 6685 – Removed fog delay message from pay success page.

rajveer — Tue, 15 Jan 2013 15:54:02 +0530

rajveer – 1 file(s) modified
Removed fog delay message from pay success page.

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

Rev 6684 – Default global limit was 1. Now we ignore it.

anupam.singh — Tue, 15 Jan 2013 15:13:49 +0530

anupam.singh – 1 file(s) modified
Default global limit was 1. Now we ignore it.

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

Rev 6683 – Ignore item availability in case of min transfer delay.

rajveer — Tue, 15 Jan 2013 15:08:33 +0530

rajveer – 1 file(s) modified
Ignore item availability in case of min transfer delay.

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

Rev 6682 – If coupon type is not set then assuming it to ...

anupam.singh — Tue, 15 Jan 2013 15:05:26 +0530

anupam.singh – 2 file(s) modified
If coupon type is not set then assuming it to be applicable for physical only

~ /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

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 6680 – Coupon creation related fixes

anupam.singh — Tue, 15 Jan 2013 13:10:22 +0530

anupam.singh – 4 file(s) modified
Coupon creation related fixes

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CouponGvsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/coupon-gvs-authsuccess.vm

Rev 6679 – User specific GV and recharge coupon dashboard

anupam.singh — Tue, 15 Jan 2013 04:13:35 +0530

anupam.singh – 12 file(s) modified
User specific GV and recharge coupon dashboard

~ /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/Support/src/main/java/in/shop2020/support/controllers/CouponGvsController.java
+ /trunk/Support/src/main/webapp/images/down.png
+ /trunk/Support/src/main/webapp/images/sideways.png
~ /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/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 6678 – Added a
tag after

anupam.singh — Mon, 14 Jan 2013 20:09:03 +0530

anupam.singh – 1 file(s) modified
Added a <br> tag after <span>

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

Rev 6677 – Changes for Adding new TicketCategory for ON_TIME_GUARANTEE

amar.kumar — Mon, 14 Jan 2013 20:02:01 +0530

amar.kumar – 3 file(s) modified
Changes for Adding new TicketCategory for ON_TIME_GUARANTEE

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/TicketCategory.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 6676 – Now showing the otg flag in crm

anupam.singh — Mon, 14 Jan 2013 19:43:15 +0530

anupam.singh – 1 file(s) modified
Now showing the otg flag in crm

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

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 6673 – minor change.

amit.gupta — Mon, 14 Jan 2013 18:40:30 +0530

amit.gupta – 1 file(s) modified
minor change.

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

Rev 6672 – change Expected date to promised delivery date.

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

amit.gupta – 2 file(s) modified
change Expected date to promised delivery date.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/orderdetails.vm

Rev 6671 – id to class otg_know_more

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

amit.gupta – 3 file(s) modified
id to class otg_know_more

~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 6670 – Added recharge on otg tnc and popup.

amit.gupta — Mon, 14 Jan 2013 17:49:34 +0530

amit.gupta – 2 file(s) modified
Added recharge on otg tnc and popup.

~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/on-time-guarantee.vm

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 6667 – Changing AgentId for certain types of tickets

amar.kumar — Mon, 14 Jan 2013 14:24:36 +0530

amar.kumar – 4 file(s) modified
Changing AgentId for certain types of tickets

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/FlaggedPaymentProcessorTask.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UncertainRechargeProcessorTask.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java

SmartDukaan – /

Rev 6706 – added availability filter to non-root as well.

Rev 6705 – Setting microsecond of new_delivery_time as 0 to correct comparison logic ...

Rev 6704 – Send multiple files to courier in one mail only for ...

Rev 6703 – Added OTG column in non delivered reports.

Rev 6702 – Removed parsing of ItemKey

Rev 6701 – Added more brands to Accessories menu.

Rev 6700 – Changing directory for Reports to /tmp

Rev 6699 – Create file at temporary location instead of tomcat directory.

Rev 6698 – Changing location of Inventory File

Rev 6697 – Changed mail id from pankaj to rajveer.

Rev 6696 – Update start date and coming start date while updating item.

Rev 6695 – Adding styling for inventoryUpload Form

Rev 6694 – Adding Span of Upload Type

Rev 6693 – Changes to add inventory for Third Party warehouses through Inventory ...

Rev 6692 – some more addons on faq.

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

Rev 6690 – added rajveer/rajneesh/amitsirohi/abhishek to bcc

Rev 6689 – Change to download entire Inventory instead of only serialized.

Rev 6688 – Fixes related to OTG coupon generation

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

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

Rev 6685 – Removed fog delay message from pay success page.

Rev 6684 – Default global limit was 1. Now we ignore it.

Rev 6683 – Ignore item availability in case of min transfer delay.

Rev 6682 – If coupon type is not set then assuming it to ...

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

Rev 6680 – Coupon creation related fixes

Rev 6679 – User specific GV and recharge coupon dashboard

Rev 6678 – Added a tag after

Rev 6677 – Changes for Adding new TicketCategory for ON_TIME_GUARANTEE

Rev 6676 – Now showing the otg flag in crm

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

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

Rev 6673 – minor change.

Rev 6672 – change Expected date to promised delivery date.

Rev 6671 – id to class otg_know_more

Rev 6670 – Added recharge on otg tnc and popup.

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

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

Rev 6667 – Changing AgentId for certain types of tickets

Rev 6678 – Added a
tag after