SmartDukaan – /

Rev 7574 – Additional Changes for Receiving Items from another warehouse

amar.kumar — Wed, 19 Jun 2013 16:58:48 +0530

amar.kumar – 7 file(s) modified
Additional Changes for Receiving Items from another warehouse

~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 7573 – Added dynamic width to slide navigation

amit.gupta — Wed, 19 Jun 2013 13:52:33 +0530

amit.gupta – 2 file(s) modified
Added dynamic width to slide navigation

~ /trunk/Website/src/main/webapp/css/entity.css
~ /trunk/Website/src/main/webapp/css/product.css

Rev 7572 – Added option to search by amazon order id. Also modified ...

anupam.singh — Wed, 19 Jun 2013 01:40:15 +0530

anupam.singh – 11 file(s) modified
Added option to search by amazon order id. Also modified "search by mobile number" to fetch orders with given mobile number and not the orders by user associated with that mobile number .

~ /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/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/orders-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7571 – Adding missing empty header in transfer lot table

amar.kumar — Tue, 18 Jun 2013 19:20:19 +0530

amar.kumar – 1 file(s) modified
Adding missing empty header in transfer lot table

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-index.vm

Rev 7570 – Adding missing empty header in transfer lot table

amar.kumar — Tue, 18 Jun 2013 19:17:53 +0530

amar.kumar – 1 file(s) modified
Adding missing empty header in transfer lot table

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-index.vm

Rev 7569 – Added not to emi page.

rajveer — Tue, 18 Jun 2013 18:37:35 +0530

rajveer – 1 file(s) modified
Added not to emi page.

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

Rev 7568 – Added not to emi page.

rajveer — Tue, 18 Jun 2013 18:34:46 +0530

rajveer – 1 file(s) modified
Added not to emi page.

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

Rev 7567 – Support to add new awb numbers for courier provider.

rajveer — Tue, 18 Jun 2013 18:19:05 +0530

rajveer – 8 file(s) modified
Support to add new awb numbers for courier provider.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/AwbUploadController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/awb-upload-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 7566 – Call logistics estimation instead of logistics info.

rajveer — Tue, 18 Jun 2013 16:28:46 +0530

rajveer – 1 file(s) modified
Call logistics estimation instead of logistics info.

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

Rev 7565 – Closed a div which was not properly closed

anupam.singh — Tue, 18 Jun 2013 15:53:27 +0530

anupam.singh – 1 file(s) modified
Closed a div which was not properly closed

~ /trunk/Support/src/main/webapp/WEB-INF/content/coupon-gvs-authsuccess.vm

Rev 7564 – Handle source at clone order and free bie split order.

rajveer — Tue, 18 Jun 2013 15:32:16 +0530

rajveer – 2 file(s) modified
Handle source at clone order and free bie split order.

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

Rev 7563 – Added option to give coupon on COD also.

anupam.singh — Tue, 18 Jun 2013 15:12:26 +0530

anupam.singh – 2 file(s) modified
Added option to give coupon on COD also.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CouponGvsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/coupon-gvs-authsuccess.vm

Rev 7562 – Corrected spacing.

rajveer — Tue, 18 Jun 2013 14:38:32 +0530

rajveer – 1 file(s) modified
Corrected spacing.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java

Rev 7561 – Add option to handle requests of courier change,

rajveer — Tue, 18 Jun 2013 14:21:30 +0530

rajveer – 6 file(s) modified
Add option to handle requests of courier change,

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ChooseColorEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ChooseColorBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChooseColorHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ChooseColorRequest.java

Rev 7560 – Added method to change courier provider.

rajveer — Tue, 18 Jun 2013 14:19:18 +0530

rajveer – 6 file(s) modified
Added method to change courier provider.

~ /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 7559 – Increased recharge limit to 2500

anupam.singh — Tue, 18 Jun 2013 12:10:45 +0530

anupam.singh – 1 file(s) modified
Increased recharge limit to 2500

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java

Rev 7558 – Move stores to rto in transit.

rajveer — Tue, 18 Jun 2013 12:10:36 +0530

rajveer – 1 file(s) modified
Move stores to rto in transit.

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

Rev 7557 – Disable otg for all sources.

rajveer — Tue, 18 Jun 2013 11:45:50 +0530

rajveer – 1 file(s) modified
Disable otg for all sources.

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

Rev 7556 – Make changes in source accoring to source.

rajveer — Tue, 18 Jun 2013 11:33:23 +0530

rajveer – 2 file(s) modified
Make changes in source accoring to source.

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

Rev 7555 – Unwanted...

amit.gupta — Tue, 18 Jun 2013 10:28:08 +0530

amit.gupta – 1 file(s) modified
Unwanted...

~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm

Rev 7554 – Convert date to py date.

rajveer — Mon, 17 Jun 2013 22:15:07 +0530

rajveer – 1 file(s) modified
Convert date to py date.

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

Rev 7553 – removed comparison.css from common css.

amit.gupta — Mon, 17 Jun 2013 19:51:13 +0530

amit.gupta – 1 file(s) modified
removed comparison.css from common css.

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

Rev 7552 –

vikram.raghav — Mon, 17 Jun 2013 17:01:58 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/AmazonOrder.java

Rev 7551 – Take the case where transaction status is changed to something ...

rajveer — Mon, 17 Jun 2013 16:12:54 +0530

rajveer – 1 file(s) modified
Take the case where transaction status is changed to something else.

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

Rev 7550 – Adding backup@saholic.com to list of recipients

anupam.singh — Mon, 17 Jun 2013 16:03:53 +0530

anupam.singh – 1 file(s) modified
Adding backup@saholic.com to list of recipients

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 7549 – Added default null.

rajveer — Mon, 17 Jun 2013 15:36:06 +0530

rajveer – 1 file(s) modified
Added default null.

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

Rev 7548 – Added "ORDER FROM" to HotSpotDashboard for Amazon

vikram.raghav — Mon, 17 Jun 2013 13:09:12 +0530

vikram.raghav – 1 file(s) modified
Added "ORDER FROM" to HotSpotDashboard for Amazon

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

Rev 7547 – Changes in placement of dates in advance receipt and advance ...

anupam.singh — Mon, 17 Jun 2013 12:04:03 +0530

anupam.singh – 1 file(s) modified
Changes in placement of dates in advance receipt and advance refund receipt.

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

Rev 7546 – Reverting change to save backup mail.

anupam.singh — Sun, 16 Jun 2013 22:51:00 +0530

anupam.singh – 1 file(s) modified
Reverting change to save backup mail.

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 7545 –

vikram.raghav — Sat, 15 Jun 2013 18:09:47 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJob.java

Rev 7544 –

vikram.raghav — Sat, 15 Jun 2013 18:09:24 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJobandAcknowledge.java

Rev 7543 –

vikram.raghav — Sat, 15 Jun 2013 17:58:25 +0530

vikram.raghav – 1 file(s) modified

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

Rev 7542 –

vikram.raghav — Sat, 15 Jun 2013 17:40:25 +0530

vikram.raghav – 7 file(s) modified

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

Rev 7541 –

vikram.raghav — Sat, 15 Jun 2013 16:41:08 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJobandAcknowledge.java

Rev 7540 –

vikram.raghav — Sat, 15 Jun 2013 16:40:42 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJob.java

Rev 7539 –

vikram.raghav — Sat, 15 Jun 2013 15:56:06 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJobandAcknowledge.java

Rev 7538 –

vikram.raghav — Sat, 15 Jun 2013 15:55:46 +0530

vikram.raghav – 1 file(s) modified

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJob.java

Rev 7537 – reverted

amit.gupta — Fri, 14 Jun 2013 23:52:30 +0530

amit.gupta – 1 file(s) modified
reverted

~ /trunk/ContentStore/src/velocity/SlideGuide.vm

Rev 7536 –

kshitij.sood — Fri, 14 Jun 2013 22:34:53 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJobandAcknowledge.java

Rev 7535 –

kshitij.sood — Fri, 14 Jun 2013 22:34:00 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJob.java