Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
5743 5090 d 16 h rajveer /trunk/ Added support to deliver to store from warehouse through runner.  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/MarkOrdersAsManifestedConfirmationBox.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
5714 5095 d 15 h rajveer /trunk/Support/src/main/ Lot of improvements in the store dashboard.  
/trunk/Support/src/main/webapp/js/jquery.colorbox-min.js
/trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreController.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-index.vm
/trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm
5678 5102 d 20 h rajveer /trunk/Support/src/main/ Pickup store dashboard for user.  
/trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm
/trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreController.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-index.vm
4788 5227 d 14 h rajveer /trunk/ Changes in shipping process where user will be able to select or deselect the orders.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
4410 5278 d 19 h rajveer /trunk/ Introduced new status Manifested. Also added new method MarkOrdersAsShippedFromWarehouse. Now old method will mark orders as manifested while new method will mark them as shipped from warehouse. Moved logistics reports generation code in second step.  
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/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
4209 5326 d 16 h rajveer /trunk/Support/src/main/java/in/shop2020/support/ Merge the multiple reports of the same warehouse location.  
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsReportMerger.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
3062 5437 d 12 h chandranshu /trunk/Support/src/main/ Changes for COD  
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm
1884 5537 d 15 h chandranshu /trunk/Support/src/main/java/in/shop2020/support/controllers/ Removed unused imports and unused variables  
/trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/InvoiceController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/PendingOrdersController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UserOrdersController.java
1023 5599 d 20 h chandranshu /trunk/Support/ Removed unused jar files from build declaration  
/trunk/Support/pom.xml
/trunk/Support/src/main
/trunk/Support/src/main/java
/trunk/Support/src/main/java/in
/trunk/Support/src/main/resources
/trunk/Support/src/in
/trunk/Support/.classpath
/trunk/Support/build.properties
/trunk/Support/build.xml
756 5640 d 17 h chandranshu /trunk/Support/ Started generating the courier-details report at the same time when the manifest file is generated  
/trunk/Support/WebContent/WEB-INF/content/courier-details-authfail.vm
/trunk/Support/WebContent/WEB-INF/content/courier-details-authsuccess.vm
/trunk/Support/src/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/in/shop2020/support/controllers/ManifestController.java
676 5649 d 6 h chandranshu /trunk/Support/ Added support to generate the manifest file  
/trunk/Support/WebContent/WEB-INF/content/manifest-lsuccess.vm
/trunk/Support/src/in/shop2020/support/controllers/ManifestController.java
/trunk/Support/src/in/shop2020/support/services/ManifestGenerator.java
/trunk/Support/src/in/shop2020/support/services/InvoiceGenerationService.java