SmartDukaan – /

Rev 6726 – Added new field of courier delivery time in order.

rajveer — Tue, 22 Jan 2013 15:12:28 +0530

rajveer – 8 file(s) modified
Added new field of courier delivery time in order.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /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 6725 – Added billing type and delivery delay in inventory and logistics ...

rajveer — Tue, 22 Jan 2013 14:55:23 +0530

rajveer – 6 file(s) modified
Added billing type and delivery delay in inventory and logistics service.

~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BillingType.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 6724 – Added script to send mail for extra inventory

rajveer — Tue, 22 Jan 2013 13:27:36 +0530

rajveer – 1 file(s) modified
Added script to send mail for extra inventory

+ /trunk/runutils/negativeInventoryReport.sh

Rev 6723 – Trimming device number before storing it

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

anupam.singh – 1 file(s) modified
Trimming device number before storing it

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

Rev 6722 – removed unnecessary domains in products.

amit.gupta — Tue, 22 Jan 2013 13:05:41 +0530

amit.gupta – 1 file(s) modified
removed unnecessary domains in products.

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

Rev 6721 – Added new recharge offers

amit.gupta — Tue, 22 Jan 2013 12:42:43 +0530

amit.gupta – 1 file(s) modified
Added new recharge offers

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

Rev 6720 – Updated logic to show product if only selling price is ...

amit.gupta — Tue, 22 Jan 2013 12:36:08 +0530

amit.gupta – 1 file(s) modified
Updated logic to show product if only selling price is to be shown.

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

Rev 6719 – Moving to the "smsapi.spiceharbour.com" server. Limiting total recharge amount to ...

anupam.singh — Mon, 21 Jan 2013 19:15:51 +0530

anupam.singh – 2 file(s) modified
Moving to the "smsapi.spiceharbour.com" server. Limiting total recharge amount to 3000 per 24 hours per ipAddress.

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

Rev 6718 – OTG should not be applicable for pickup stores.

rajveer — Mon, 21 Jan 2013 18:42:14 +0530

rajveer – 1 file(s) modified
OTG should not be applicable for pickup stores.

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

Rev 6717 – Added url to music players

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

amit.gupta – 1 file(s) modified
Added url to music players

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

Rev 6716 – Changed the shipping confirmation mail.

rajveer — Mon, 21 Jan 2013 16:21:20 +0530

rajveer – 1 file(s) modified
Changed the shipping confirmation mail.

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

Rev 6715 – Added Emi processing charges to total amount.

amit.gupta — Mon, 21 Jan 2013 12:44:25 +0530

amit.gupta – 1 file(s) modified
Added Emi processing charges to total amount.

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

Rev 6714 – Added khushal and chandan to product report

anupam.singh — Mon, 21 Jan 2013 11:49:52 +0530

anupam.singh – 1 file(s) modified
Added khushal and chandan to product report

~ /trunk/pentaho/scripts/ReportMailerFromDb.py

Rev 6713 – Added chandan to last day orders reports

anupam.singh — Fri, 18 Jan 2013 23:59:46 +0530

anupam.singh – 2 file(s) modified
Added chandan to last day orders reports

~ /trunk/pentaho/scripts/LastDayAccessoriesSales.py
~ /trunk/pentaho/scripts/PreviousDayOrdersMailer.py

Rev 6712 – Changed product name in shipping confirmation email.

rajveer — Fri, 18 Jan 2013 19:37:23 +0530

rajveer – 1 file(s) modified
Changed product name in shipping confirmation email.

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

Rev 6711 – changed expected delivery timestamp to promised shipping timestamp while evaluating ...

amit.gupta — Fri, 18 Jan 2013 16:58:45 +0530

amit.gupta – 1 file(s) modified
changed expected delivery timestamp to promised shipping timestamp while evaluating the delay.

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

Rev 6710 – Changes in page loader handler for cartwidget.

kshitij.sood — Fri, 18 Jan 2013 14:41:59 +0530

kshitij.sood – 1 file(s) modified
Changes in page loader handler for cartwidget.

~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java

Rev 6709 – OTG Image

kshitij.sood — Fri, 18 Jan 2013 13:24:52 +0530

kshitij.sood – 1 file(s) modified
OTG Image

+ /trunk/Website/src/main/webapp/images/On-time-guarantee.jpg

Rev 6708 – Otg widget (for all pages where cartwidget is shown except ...

kshitij.sood — Fri, 18 Jan 2013 13:13:30 +0530

kshitij.sood – 4 file(s) modified
Otg widget (for all pages where cartwidget is shown except for homepage)

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/resources/templates/cartwidget.vm

Rev 6707 – Added wh 5 for the courier reports.

rajveer — Fri, 18 Jan 2013 12:03:42 +0530

rajveer – 1 file(s) modified
Added wh 5 for the courier reports.

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

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