Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
26908 1989 d 0 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
26003 2223 d 1 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
26002 2223 d 15 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
24419 2556 d 18 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
24228 2618 d 20 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
24033 2701 d 20 h amit.gupta /trunk/ fixed data.  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/webapp/js/bulk-order-common.js
/trunk/Support/src/main/webapp/js/bulk-order-events.js
23709 2791 d 5 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/ Fixed logic for clear cart.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
23684 2794 d 20 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/ Fixed  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
23571 2829 d 18 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
23314 2904 d 0 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/ Fixed  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
22635 3016 d 4 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
22633 3016 d 7 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/ Default address is must to create order  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
22452 3043 d 15 h amit.gupta /trunk/ Fixed bulk Order processing  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/ItemPriceQuantity.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/model/v1/user/impl/CartDataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.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/user/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-index.vm
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-show.vm
/trunk/Support/src/main/webapp/js/bulk-order-events.js
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
22451 3043 d 22 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
12653 4139 d 18 h manish.sharma /trunk/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderBillingController.java
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-billing.vm
/trunk/Support/src/main/webapp/js/bulk-order-billing.js
/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/Support/pom.xml
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
9416 4384 d 20 h amar.kumar /trunk/ Changes for
1) Allow Billing of Orders on CForm
2) Store and Show Mrp of items purchased in Purchase-order page
3) Add Support for C-Form in purchase-orders		  
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/TaxType.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.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/js/purchase-order-common.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
8925 4431 d 1 h amar.kumar /trunk/ Changes for
1) Marking order as bad while creating bulk order
2) Changes for Date parsing for Ebay Order
3) Changes for setting airway bill number for Our-shipping Ebay orders		  
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
7623 4587 d 19 h anupam.singh /trunk/Support/src/main/java/in/shop2020/support/controllers/ Added source while creating bulk order.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
7293 4626 d 23 h anupam.singh / - Changes related to StoreWebsite
- Added source to "change_transaction_status" method		  
/StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
/StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
/StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
/StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
/StoreWebsite/src/main/webapp/js/storewebsite.js
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.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/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/order/script/CreateRTGSBulkOrders.py
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.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/BulkOrderController.java
/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
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
6051 4859 d 21 h amit.gupta /trunk/Support/src/main/java/in/shop2020/support/controllers/ isdigital false for bulk orders.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java

←Prev12Next→

Show All