SmartDukaan – /

Rev 7423 – Minor UI fixes

anupam.singh — Fri, 07 Jun 2013 19:27:52 +0530

anupam.singh – 16 file(s) modified
Minor UI fixes

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/css/header-footer.css
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.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/StoreOrderCollection.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StoreOrderDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StorePaymentStatus.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7422 – Changes made for all invoice related.

rajveer — Fri, 07 Jun 2013 19:22:23 +0530

rajveer – 4 file(s) modified
Changes made for all invoice related.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java

Rev 7421 – Updating warehouse executive contact details for Goregaon warehouse

amar.kumar — Fri, 07 Jun 2013 16:54:11 +0530

amar.kumar – 1 file(s) modified
Updating warehouse executive contact details for Goregaon warehouse

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

Rev 7420 – cosmetic fixes

kshitij.sood — Fri, 07 Jun 2013 16:53:50 +0530

kshitij.sood – 4 file(s) modified
cosmetic fixes

+ /trunk/Support/src/main/webapp/images/background_image.jpg
+ /trunk/Support/src/main/webapp/images/favicon_alt.ico
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-index.vm

Rev 7419 – Update active on store for all items.

rajveer — Fri, 07 Jun 2013 14:47:11 +0530

rajveer – 1 file(s) modified
Update active on store for all items.

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

Rev 7418 – Added Power bank in accessory section.

amit.gupta — Fri, 07 Jun 2013 13:51:30 +0530

amit.gupta – 2 file(s) modified
Added Power bank in accessory section.

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

Rev 7417 – FIxed small bugs.

rajveer — Fri, 07 Jun 2013 12:52:41 +0530

rajveer – 1 file(s) modified
FIxed small bugs.

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

Rev 7416 – Showing all po's in Amend Existing PO when no warehousIds ...

amar.kumar — Fri, 07 Jun 2013 12:23:19 +0530

amar.kumar – 1 file(s) modified
Showing all po's in Amend Existing PO when no warehousIds is passed

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

Rev 7415 – Showing all po's in Amend Existing PO when no warehousIds ...

amar.kumar — Fri, 07 Jun 2013 12:04:20 +0530

amar.kumar – 1 file(s) modified
Showing all po's in Amend Existing PO when no warehousIds is passed

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

Rev 7414 – Updated configuration.

rajveer — Fri, 07 Jun 2013 12:03:13 +0530

rajveer – 1 file(s) modified
Updated configuration.

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

Rev 7413 – Changes in CSS for menu bar

anupam.singh — Fri, 07 Jun 2013 11:50:42 +0530

anupam.singh – 1 file(s) modified
Changes in CSS for menu bar

~ /StoreWebsite/src/main/webapp/css/header-footer.css

Rev 7412 – Increasing height of physicalWarehouse dropdown

amar.kumar — Fri, 07 Jun 2013 11:47:59 +0530

amar.kumar – 1 file(s) modified
Increasing height of physicalWarehouse dropdown

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

Rev 7411 – Reverting accidental checkin

amar.kumar — Fri, 07 Jun 2013 11:12:57 +0530

amar.kumar – 1 file(s) modified
Reverting accidental checkin

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 7410 – Changes for 1)Multiple Ours Physical Warehouses 2)Movement of Goods ...

amar.kumar — Fri, 07 Jun 2013 10:13:38 +0530

amar.kumar – 111 file(s) modified
Changes for
1)Multiple Ours Physical Warehouses
2)Movement of Goods across our warehouses
3)Creation of orders for different sources through Excel Upload

Reviewed By Amit Gupta

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryReaderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InvoiceController.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/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/ScanRecordController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/TransferLotController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/TransferLotReceiveController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
+ /trunk/InventoryManager/src/main/webapp/css/colorbox.css
~ /trunk/InventoryManager/src/main/webapp/css/common.css
+ /trunk/InventoryManager/src/main/webapp/css/images
+ /trunk/InventoryManager/src/main/webapp/css/images/border.png
+ /trunk/InventoryManager/src/main/webapp/css/images/controls.png
+ /trunk/InventoryManager/src/main/webapp/css/images/loading.gif
+ /trunk/InventoryManager/src/main/webapp/css/images/loading_background.png
+ /trunk/InventoryManager/src/main/webapp/css/images/overlay.png
+ /trunk/InventoryManager/src/main/webapp/images/sort_asc.png
+ /trunk/InventoryManager/src/main/webapp/images/sort_asc_disabled.png
+ /trunk/InventoryManager/src/main/webapp/images/sort_both.png
+ /trunk/InventoryManager/src/main/webapp/images/sort_desc.png
+ /trunk/InventoryManager/src/main/webapp/images/sort_desc_disabled.png
+ /trunk/InventoryManager/src/main/webapp/js/common.js
~ /trunk/InventoryManager/src/main/webapp/js/jquery.colorbox-min.js
+ /trunk/InventoryManager/src/main/webapp/js/jquery.colorbox.js
~ /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/js/purchase.js
+ /trunk/InventoryManager/src/main/webapp/js/transfer-lot.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/invoice-editNew.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-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-new.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-output.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-receive-show.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-show.vm
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/A110Processor.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/FreebieBulkOrderCreator.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/Invoice.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.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/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/SourceOrderCreationController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/source-order-creation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMServiceException.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SourceDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Invoice.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/AgentWarehouseMapping.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/PossibleWarehouseMovement.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Scan.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferLot.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/transferLot.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferLotStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/PossibleWarehouseMovement.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/Scan.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/TransferLot.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/TransferLotHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/TransferLotMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
+ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/TransferLotMapper.xml
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 7409 – Added Menu bar in home page. Change store payment status ...

anupam.singh — Fri, 07 Jun 2013 00:49:59 +0530

anupam.singh – 7 file(s) modified
Added Menu bar in home page.
Change store payment status upon order delivery
UI fixes

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/css/header-footer.css
~ /StoreWebsite/src/main/webapp/css/storewebsite.css
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 7408 –

kshitij.sood — Thu, 06 Jun 2013 20:06:29 +0530

kshitij.sood – 1 file(s) modified

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

Rev 7407 – Added key for amazon (catalog)

kshitij.sood — Thu, 06 Jun 2013 20:05:19 +0530

kshitij.sood – 1 file(s) modified
Added key for amazon (catalog)

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

Rev 7406 – Added option to store data before pushing to ocr.

rajveer — Thu, 06 Jun 2013 18:52:25 +0530

rajveer – 2 file(s) modified
Added option to store data before pushing to ocr.

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

Rev 7405 – Added amazonlisted table in migration script

rajveer — Thu, 06 Jun 2013 15:27:20 +0530

rajveer – 1 file(s) modified
Added amazonlisted table in migration script

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 7404 –

kshitij.sood — Thu, 06 Jun 2013 14:41:50 +0530

kshitij.sood – 1 file(s) modified

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

Rev 7403 – typo correction

amit.gupta — Thu, 06 Jun 2013 13:20:46 +0530

amit.gupta – 1 file(s) modified
typo correction

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

Rev 7402 – Changes in Receipt

anupam.singh — Thu, 06 Jun 2013 12:24:33 +0530

anupam.singh – 1 file(s) modified
Changes in Receipt

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

Rev 7401 – Updated configuration for new machine.

rajveer — Thu, 06 Jun 2013 10:35:00 +0530

rajveer – 1 file(s) modified
Updated configuration for new machine.

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

Rev 7400 – Only print cancellation receipt when status is cancelled and some ...

anupam.singh — Thu, 06 Jun 2013 10:27:26 +0530

anupam.singh – 1 file(s) modified
Only print cancellation receipt when status is cancelled and some refund amount is saved in storeOrderDetail

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

Rev 7399 – StoreWebsite changes

anupam.singh — Thu, 06 Jun 2013 02:00:36 +0530

anupam.singh – 8 file(s) modified
StoreWebsite changes

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.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/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 7398 – minor migration for accessory

amit.gupta — Wed, 05 Jun 2013 23:06:34 +0530

amit.gupta – 1 file(s) modified
minor migration for accessory

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

Rev 7397 –

kshitij.sood — Wed, 05 Jun 2013 21:16:36 +0530

kshitij.sood – 1 file(s) modified

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

Rev 7396 –

kshitij.sood — Wed, 05 Jun 2013 21:10:25 +0530

kshitij.sood – 1 file(s) modified

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

Rev 7395 – updated content generation script

rajveer — Wed, 05 Jun 2013 18:35:38 +0530

rajveer – 1 file(s) modified
updated content generation script

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 7394 – updated content generation script

rajveer — Wed, 05 Jun 2013 18:09:10 +0530

rajveer – 1 file(s) modified
updated content generation script

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 7393 – Added options in CRM to cancel storeWebsite orders

anupam.singh — Wed, 05 Jun 2013 16:47:44 +0530

anupam.singh – 17 file(s) modified
Added options in CRM to cancel storeWebsite orders

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /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/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/StoreOrderDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7392 – Changed mail text.

rajveer — Wed, 05 Jun 2013 15:26:41 +0530

rajveer – 1 file(s) modified
Changed mail text.

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

Rev 7391 – Approval mechanism for store orders.

rajveer — Wed, 05 Jun 2013 15:20:42 +0530

rajveer – 3 file(s) modified
Approval mechanism for store orders.

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

Rev 7390 – Commited by Manish Sharma for Hiding wallet amount at Recharge ...

manish.sharma — Wed, 05 Jun 2013 14:51:42 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Hiding wallet amount at Recharge Order Page on June-05-2013

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

Rev 7389 – Commited by Manish Sharma for Hiding wallet amount at Recharge ...

manish.sharma — Wed, 05 Jun 2013 14:50:52 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Hiding wallet amount at Recharge Order Page on June-05-2013

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

Rev 7388 – Commited by Manish Sharma for Displaying wallet amount at user ...

manish.sharma — Wed, 05 Jun 2013 14:50:17 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Displaying wallet amount at user page on June-05-2013

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

Rev 7387 – Commited by Manish Sharma for Displaying wallet amount at user ...

manish.sharma — Wed, 05 Jun 2013 14:48:23 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Displaying wallet amount at user page on June-05-2013

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

Rev 7386 – Changes for store website

anupam.singh — Wed, 05 Jun 2013 12:05:09 +0530

anupam.singh – 32 file(s) modified
Changes for store website

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/HomeController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderSuccessController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /StoreWebsite/src/main/webapp/css/storewebsite.css
~ /StoreWebsite/src/main/webapp/js/entity.js
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/logout.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm
~ /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/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/StoreOrderDetail.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StorePaymentStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7385 – Push advance collection to hotspot for store.

rajveer — Tue, 04 Jun 2013 19:25:30 +0530

rajveer – 1 file(s) modified
Push advance collection to hotspot for store.

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

Rev 7384 – Added all alerts to store people wherever required.

rajveer — Tue, 04 Jun 2013 18:08:58 +0530

rajveer – 1 file(s) modified
Added all alerts to store people wherever required.

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