SmartDukaan – /

Rev 4779 – Removed dropped columns mop and dealer price.

mandeep.dhir — Thu, 22 Mar 2012 13:04:50 +0530

mandeep.dhir – 2 file(s) modified
Removed dropped columns mop and dealer price.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Item.java

Rev 4778 – Adding log messages

mandeep.dhir — Thu, 22 Mar 2012 11:58:14 +0530

mandeep.dhir – 1 file(s) modified
Adding log messages

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

Rev 4777 – Adding log messages

mandeep.dhir — Thu, 22 Mar 2012 11:52:38 +0530

mandeep.dhir – 1 file(s) modified
Adding log messages

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

Rev 4776 – Removed dependency from ContentGenerationUtil in case of full run

amit.gupta — Thu, 22 Mar 2012 11:42:39 +0530

amit.gupta – 1 file(s) modified
Removed dependency from ContentGenerationUtil in case of full run

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

Rev 4775 – Adding log messages

mandeep.dhir — Thu, 22 Mar 2012 11:33:42 +0530

mandeep.dhir – 1 file(s) modified
Adding log messages

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

Rev 4774 – Ticket #995 script not required so deleted

phani.kumar — Wed, 21 Mar 2012 18:50:10 +0530

phani.kumar – 1 file(s) modified
Ticket #995 script not required so deleted

x /trunk/PyProj/src/shop2020/model/v1/catalog/script/one_time_Item_product_group_change.py

Rev 4773 – Trac#976 Not scanning non-serialized items

mandeep.dhir — Wed, 21 Mar 2012 18:45:05 +0530

mandeep.dhir – 1 file(s) modified
Trac#976 Not scanning non-serialized items

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

Rev 4772 – Ticket Id : #998 Added index for new Query ...

amar.kumar — Wed, 21 Mar 2012 17:26:23 +0530

amar.kumar – 1 file(s) modified
Ticket Id : #998

Added index for new Query for Entity:Datalog & Filters:event,date,query

~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/datastore-indexes.xml

Rev 4771 – Adding string size

mandeep.dhir — Wed, 21 Mar 2012 17:03:54 +0530

mandeep.dhir – 1 file(s) modified
Adding string size

~ /trunk/PyProj/src/shop2020/helpers/impl/model/Agent.py

Rev 4770 – Trac#976 Not scanning non-serialized items

mandeep.dhir — Wed, 21 Mar 2012 16:53:16 +0530

mandeep.dhir – 1 file(s) modified
Trac#976 Not scanning non-serialized items

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

Rev 4769 – Update delivered timestamp in case of RTO_IN_TRANSIT.

rajveer — Wed, 21 Mar 2012 16:41:44 +0530

rajveer – 1 file(s) modified
Update delivered timestamp in case of RTO_IN_TRANSIT.

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

Rev 4768 – If color is NA, do not send any color.

rajveer — Wed, 21 Mar 2012 15:43:59 +0530

rajveer – 1 file(s) modified
If color is NA, do not send any color.

~ /ClientAgent/src/main/java/in/shop2020/agent/utils/Agent.java

Rev 4767 – If color is null or empty do not store anything.

rajveer — Wed, 21 Mar 2012 15:41:27 +0530

rajveer – 1 file(s) modified
If color is null or empty do not store anything.

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

Rev 4766 – Fetch color along with billnumber from ETP. And send the ...

rajveer — Wed, 21 Mar 2012 15:37:15 +0530

rajveer – 1 file(s) modified
Fetch color along with billnumber from ETP. And send the updates to server.

~ /ClientAgent/src/main/java/in/shop2020/agent/utils/Agent.java

Rev 4765 – Fetch color along with billnumber from ETP. And send the ...

rajveer — Wed, 21 Mar 2012 15:37:01 +0530

rajveer – 2 file(s) modified
Fetch color along with billnumber from ETP. And send the updates to server.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/Support/src/main/java/in/shop2020/support/models/BillingUpdate.java

Rev 4764 – Added support to display warning if user has incorrectly billed ...

rajveer — Wed, 21 Mar 2012 15:32:24 +0530

rajveer – 8 file(s) modified
Added support to display warning if user has incorrectly billed different product in ETP.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/BilledOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/BillConfirmationBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/BillingInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/BillOrderRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/BillOrderResponse.java

Rev 4763 – Added support to verify the correct color is billied in ...

rajveer — Wed, 21 Mar 2012 15:28:54 +0530

rajveer – 6 file(s) modified
Added support to verify the correct color is billied in ETP.

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

Rev 4762 – Ticket #995 Refinements to catalog/item model reviewer: Rajveer

phani.kumar — Wed, 21 Mar 2012 14:07:30 +0530

phani.kumar – 24 file(s) modified
Ticket #995 Refinements to catalog/item model
reviewer: Rajveer

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.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/server/FileDownloadServlet.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /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/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/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/AddNewCategory.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py
+ /trunk/PyProj/src/shop2020/model/v1/catalog/script/one_time_Item_product_group_change.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4761 – added more features

amit.gupta — Wed, 21 Mar 2012 13:56:01 +0530

amit.gupta – 1 file(s) modified
added more features

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

Rev 4760 – Ticket #1002 Logistics Reconcilation of Bluedart and Aramex and Ticket ...

phani.kumar — Wed, 21 Mar 2012 13:55:15 +0530

phani.kumar – 3 file(s) modified
Ticket #1002 Logistics Reconcilation of Bluedart and Aramex and
Ticket #1000 Bluedart Logistics Reconcilation using thier api
new email added

~ /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/LogisticsReconciliation.py

Rev 4759 – Added new values to the Laptops

amit.gupta — Wed, 21 Mar 2012 13:15:07 +0530

amit.gupta – 1 file(s) modified
Added new values to the Laptops

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

Rev 4758 – Exposing purchaseOrderId

mandeep.dhir — Wed, 21 Mar 2012 12:26:16 +0530

mandeep.dhir – 5 file(s) modified
Exposing purchaseOrderId

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4757 – Trac#974 Marking orders as PO raised

mandeep.dhir — Wed, 21 Mar 2012 12:07:01 +0530

mandeep.dhir – 8 file(s) modified
Trac#974 Marking orders as PO raised

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4756 – No Print pending now! Trac#974

mandeep.dhir — Wed, 21 Mar 2012 12:05:56 +0530

mandeep.dhir – 1 file(s) modified
No Print pending now! Trac#974

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/PrintPendingOrderHandler.java

Rev 4755 – Paginated the entity table. #986

amit.gupta — Wed, 21 Mar 2012 11:32:30 +0530

amit.gupta – 4 file(s) modified
Paginated the entity table.
#986

+ /trunk/ContentCreation/src/main/webapp/css/datatable.css
+ /trunk/ContentCreation/src/main/webapp/jquery/jquery.dataTables.js
+ /trunk/ContentCreation/src/main/webapp/js/entity-index.js
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm

Rev 4754 – Trac#974 Trac#975 Adding UI for PO create, amend etc. ALso ...

mandeep.dhir — Wed, 21 Mar 2012 10:45:42 +0530

mandeep.dhir – 27 file(s) modified
Trac#974 Trac#975 Adding UI for PO create, amend etc.
ALso UI for inventory read and edit.
Display Vendor name, date in POs list
On PO creation, list the vendors to whom PO can be sent.
For selected Vendor,display the PO to be generated to users who later can amend the PO, (quantity, add/remove lineitem etc.) before actually creating and sending mail for PO to vendors.
Display COD vs Prepaid count, total amount of PO being raised etc. as well
Allow quantity, item and color amends in existing PO
Feature to resend the amended PO to vendor in mail
Ability to find PO given an item pending scan
Users should be sent emails to remind them to create PO
We should also be able to audit all the amends made to a PO

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
~ /trunk/InventoryManager/src/main/webapp/css/common.css
~ /trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
~ /trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/output.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-new.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-edit.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/helpers/impl/model/Agent.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
+ /trunk/PyProj/src/shop2020/purchase/main/model/RevisionedPurchaseOrder.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 4753 – Orders whose status is Payment_Flagged should not be cancellable

anupam.singh — Tue, 20 Mar 2012 17:17:58 +0530

anupam.singh – 1 file(s) modified
Orders whose status is Payment_Flagged should not be cancellable

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

Rev 4752 – Added check.

rajveer — Tue, 20 Mar 2012 06:41:03 +0530

rajveer – 1 file(s) modified
Added check.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java

Rev 4751 – Reveiwer : Amar Tickets created when cancellation request is ...

anupam.singh — Tue, 20 Mar 2012 00:49:12 +0530

anupam.singh – 6 file(s) modified
Reveiwer : Amar

Tickets created when cancellation request is raised were not visible to Outbound team as they were being assigned to admin.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 4750 – Closed a div tag in email template for shipping confirmation ...

varun.gupta — Mon, 19 Mar 2012 19:35:18 +0530

varun.gupta – 1 file(s) modified
Closed a div tag in email template for shipping confirmation email.

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

Rev 4749 – Trac #896 - An email confirming order shipping will be ...

varun.gupta — Mon, 19 Mar 2012 19:33:11 +0530

varun.gupta – 1 file(s) modified
Trac #896 - An email confirming order shipping will be sent with updated delivery estimate

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

Rev 4748 – Trac#992 Adding notifications for key not found cases while updating ...

mandeep.dhir — Mon, 19 Mar 2012 18:20:02 +0530

mandeep.dhir – 2 file(s) modified
Trac#992 Adding notifications for key not found cases while updating inventory

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

Rev 4747 – Changes the place of the invoice generation receipt.

rajveer — Mon, 19 Mar 2012 16:55:00 +0530

rajveer – 1 file(s) modified
Changes the place of the invoice generation receipt.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java

Rev 4746 – Adding support to store invoices for Mahipalpur warehouse.

rajveer — Mon, 19 Mar 2012 16:05:03 +0530

rajveer – 1 file(s) modified
Adding support to store invoices for Mahipalpur warehouse.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java

Rev 4745 – intermediate check-in

varun.gupta — Mon, 19 Mar 2012 02:54:02 +0530

varun.gupta – 2 file(s) modified
intermediate check-in

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm

Rev 4744 – Ticket Id: #954 Enhancements to show Searches in Categories ...

amar.kumar — Sun, 18 Mar 2012 17:27:42 +0530

amar.kumar – 2 file(s) modified
Ticket Id: #954

Enhancements to show Searches in Categories & total Sessions for a search query

+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/server/SearchMetadata.java
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearchFrequency.jsp

Rev 4743 – More fields to accessories are added.

amit.gupta — Sat, 17 Mar 2012 15:01:13 +0530

amit.gupta – 1 file(s) modified
More fields to accessories are added.

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

Rev 4742 – More fields to accessories are added.

amit.gupta — Sat, 17 Mar 2012 12:55:39 +0530

amit.gupta – 1 file(s) modified
More fields to accessories are added.

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

Rev 4741 – Ticket #1002 Logistics Reconcilation of Bluedart and Aramex and Ticket ...

phani.kumar — Fri, 16 Mar 2012 20:58:16 +0530

phani.kumar – 9 file(s) modified
Ticket #1002 Logistics Reconcilation of Bluedart and Aramex and
Ticket #1000 Bluedart Logistics Reconcilation using thier api

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.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/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4740 – Added ga event when Out of stock Lightbox shown #939

amit.gupta — Fri, 16 Mar 2012 19:57:33 +0530

amit.gupta – 1 file(s) modified
Added ga event when Out of stock Lightbox shown
#939

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