SmartDukaan – /

Rev 21844 – Gst Changes

amit.gupta — Mon, 03 Jul 2017 14:59:55 +0530

amit.gupta – 31 file(s) modified
Gst Changes

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.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/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/Supplier.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/StateInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/BuyerInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SellerInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TaxType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WarehouseAddress.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Supplier.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/TaxType.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 21843 –

kshitij.sood — Mon, 03 Jul 2017 03:48:58 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerAddressRepositoryImpl.java

Rev 21842 – Added new tax implementation i.e. gst

amit.gupta — Sat, 01 Jul 2017 15:11:30 +0530

amit.gupta – 1 file(s) modified
Added new tax implementation i.e. gst

~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 21841 – Added changes related to new tax implementation i.e. gst

amit.gupta — Sat, 01 Jul 2017 13:44:33 +0530

amit.gupta – 2 file(s) modified
Added changes related to new tax implementation i.e. gst

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

Rev 21840 – Added flag for selfpickup

amit.gupta — Fri, 30 Jun 2017 20:23:12 +0530

amit.gupta – 1 file(s) modified
Added flag for selfpickup

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 21839 – added t_state

amit.gupta — Fri, 30 Jun 2017 20:22:02 +0530

amit.gupta – 1 file(s) modified
added t_state

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py

Rev 21838 – Added new tax implementation i.e. gst

amit.gupta — Fri, 30 Jun 2017 20:21:54 +0530

amit.gupta – 20 file(s) modified
Added new tax implementation i.e. gst

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /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/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CategoryGst.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/GstRate.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/SgstRates.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StateCategoryGst.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StateGstRates.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/StateInfo.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 21837 –

amit.gupta — Fri, 30 Jun 2017 15:59:55 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm

Rev 21836 – Added Sale return

amit.gupta — Fri, 30 Jun 2017 15:11:36 +0530

amit.gupta – 1 file(s) modified
Added Sale return

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 21835 – Fixed address

amit.gupta — Fri, 30 Jun 2017 14:35:28 +0530

amit.gupta – 1 file(s) modified
Fixed address

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm

Rev 21834 – Minor Textual changes

rajender — Fri, 30 Jun 2017 12:28:27 +0530

rajender – 1 file(s) modified
Minor Textual changes

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm

Rev 21833 –

kshitij.sood — Thu, 29 Jun 2017 19:55:09 +0530

kshitij.sood – 3 file(s) modified

~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/controllers/RegisterController.java
~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/models/FofoForm.java
~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm

Rev 21832 –

rajender — Thu, 29 Jun 2017 19:14:20 +0530

rajender – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm

Rev 21831 –

rajender — Thu, 29 Jun 2017 19:13:45 +0530

rajender – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/js/reqformvalidator.js

Rev 21830 –

kshitij.sood — Wed, 28 Jun 2017 22:00:39 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/js/reqformvalidator.js

Rev 21829 –

kshitij.sood — Wed, 28 Jun 2017 21:50:52 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/js/reqformvalidator.js

Rev 21828 –

kshitij.sood — Wed, 28 Jun 2017 21:50:02 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm

Rev 21827 –

kshitij.sood — Wed, 28 Jun 2017 21:41:20 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/controllers/RegisterController.java

Rev 21826 –

kshitij.sood — Wed, 28 Jun 2017 20:33:00 +0530

kshitij.sood – 17 file(s) modified

+ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/controllers/RegisterController.java
+ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/models/FofoForm.java
~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/Storage/Mongo.java
+ /trunk/DtrApi/src/main/webapp/css
+ /trunk/DtrApi/src/main/webapp/css/bootstrap-theme.min.css
+ /trunk/DtrApi/src/main/webapp/css/bootstrap.min.css
+ /trunk/DtrApi/src/main/webapp/css/main.css
+ /trunk/DtrApi/src/main/webapp/images
+ /trunk/DtrApi/src/main/webapp/images/loading.gif
+ /trunk/DtrApi/src/main/webapp/images/mini.jpg
+ /trunk/DtrApi/src/main/webapp/js/bootstrap.min.js
+ /trunk/DtrApi/src/main/webapp/js/bootstrapValidator.js
+ /trunk/DtrApi/src/main/webapp/js/jquery-1.10.2.min.js
+ /trunk/DtrApi/src/main/webapp/js/reg.js
~ /trunk/DtrApi/src/main/webapp/js/reqformvalidator.js
~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm
+ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-thankyou.vm

Rev 21825 –

kshitij.sood — Wed, 28 Jun 2017 16:23:15 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm

Rev 21824 –

kshitij.sood — Wed, 28 Jun 2017 16:17:47 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/js/reqformvalidator.js

Rev 21823 –

rajender — Wed, 28 Jun 2017 16:07:24 +0530

rajender – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/js/reqformvalidator.js

Rev 21822 –

rajender — Wed, 28 Jun 2017 16:07:00 +0530

rajender – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm

Rev 21821 –

amit.gupta — Tue, 27 Jun 2017 22:36:03 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/CustomTransactionConvertorUtil.java

Rev 21820 –

amit.gupta — Tue, 27 Jun 2017 22:27:34 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java

Rev 21819 –

amit.gupta — Tue, 27 Jun 2017 22:05:40 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java

Rev 21818 –

kshitij.sood — Tue, 27 Jun 2017 19:13:10 +0530

kshitij.sood – 2 file(s) modified

+ /trunk/DtrApi/src/main/webapp/js
+ /trunk/DtrApi/src/main/webapp/js/reqformvalidator.js

Rev 21817 –

kshitij.sood — Tue, 27 Jun 2017 18:53:02 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm

Rev 21816 –

amit.gupta — Tue, 27 Jun 2017 12:21:51 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21815 – added sha256

amit.gupta — Tue, 27 Jun 2017 11:57:00 +0530

amit.gupta – 3 file(s) modified
added sha256

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/HelperServiceUtils.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ShaUtil.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/interceptor/SimpleCORSInterceptor.java

Rev 21814 –

amit.gupta — Mon, 26 Jun 2017 22:17:15 +0530

amit.gupta – 2 file(s) modified

x /trunk/profitmandi-admin/src/main/webapp/WEB-INF/views/ftl
x /trunk/profitmandi-admin/src/main/webapp/WEB-INF/views/index.jsp

Rev 21813 – Fixed pom

amit.gupta — Mon, 26 Jun 2017 22:14:33 +0530

amit.gupta – 2 file(s) modified
Fixed pom

+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/admin/util/JWTUtil.java
~ /trunk/profitmandi-common/pom.xml

Rev 21812 – Fixed services in profitmandi admin

amit.gupta — Mon, 26 Jun 2017 21:32:30 +0530

amit.gupta – 17 file(s) modified
Fixed services in profitmandi admin

~ /trunk/profitmandi-admin/pom.xml
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/admin
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/admin/util
~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/AuthController.java
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/interceptor
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/request/EmailPassword.java
x /trunk/profitmandi-admin/src/main/webapp/resources
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomTransaction.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/Department.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/HelperServiceUtils.java
x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java

Rev 21811 – Only status 2,4,5,6 are entertained

amit.gupta — Sat, 24 Jun 2017 09:50:04 +0530

amit.gupta – 1 file(s) modified
Only status 2,4,5,6 are entertained

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java

Rev 21810 –

amit.gupta — Sat, 24 Jun 2017 09:40:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/CustomTransactionConvertorUtil.java

Rev 21809 –

amit.gupta — Sat, 24 Jun 2017 09:26:32 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java

Rev 21808 –

amit.gupta — Fri, 23 Jun 2017 19:17:55 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java

Rev 21807 – Fixed descending order

amit.gupta — Fri, 23 Jun 2017 19:12:56 +0530

amit.gupta – 1 file(s) modified
Fixed descending order

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java

Rev 21806 –

amit.gupta — Fri, 23 Jun 2017 19:02:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java

Rev 21805 – Add payment mode

amit.gupta — Fri, 23 Jun 2017 13:49:27 +0530

amit.gupta – 7 file(s) modified
Add payment mode

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PaymentStatusResponse.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/CommonPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/PaymentUtils.java