SmartDukaan – /

Rev 21924 – hashCode and equals method

ashik.ali — Thu, 13 Jul 2017 12:32:03 +0530

ashik.ali – 47 file(s) modified
hashCode and equals method

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Api.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Brand.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Document.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Permission.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Retailer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerAddress.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerBrand.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerRegisteredAddress.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Role.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RoleApi.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Shop.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ShopAddress.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/SocialUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/User.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/UserAccounts.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/UserRole.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivationCode.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/BadInventorySnapshot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentInventorySnapshot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Customer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerAddress.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoItemId.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoLineItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoLineItemSerialNumber.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItemPricing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InvoiceNumberGenerationSequence.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PaymentOption.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PinCodeTag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Purchase.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RetailerTag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ScanRecord.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Tag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/PostOffice.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/Provider.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LineItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.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/entity/transaction/UserWallet.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWalletHistory.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Address.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/AccountType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemIdSum.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemIdTypeQuantity.java

Rev 21923 –

ashik.ali — Thu, 13 Jul 2017 12:26:56 +0530

ashik.ali – 25 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BillingDetail.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomAddress.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCurrentInventorySnapshot.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCustomer.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoLineItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomLineItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRole.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomTransaction.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/GstRate.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemQty.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PaymentStatusResponse.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PdfModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiResponse.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/Response.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ShipmentUpdate.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ShippedOrder.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ShippedOrderDetail.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ShippingAddress.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ShipppingDetail.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TagListingModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/UnshippedOrder.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/UserInfo.java

Rev 21922 – All unverified counters need to be verified

amit.gupta — Thu, 13 Jul 2017 12:11:15 +0530

amit.gupta – 1 file(s) modified
All unverified counters need to be verified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/CODTransactionProcessorTask.java

Rev 21921 – change

rajender — Thu, 13 Jul 2017 11:25:54 +0530

rajender – 1 file(s) modified
change

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

Rev 21920 – read form

rajender — Thu, 13 Jul 2017 11:18:21 +0530

rajender – 8 file(s) modified
read form

~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/controllers/BaseController.java
+ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/controllers/FofoController.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/js/fileindextable.js
+ /trunk/DtrApi/src/main/webapp/js/fofoedit.js
+ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-edit.vm
+ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-index.vm

Rev 21919 –

ashik.ali — Thu, 13 Jul 2017 11:12:45 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-fofo/pom.xml
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 21918 –

ashik.ali — Thu, 13 Jul 2017 11:12:05 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/pom.xml

Rev 21917 –

ashik.ali — Thu, 13 Jul 2017 11:11:35 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerRepositoryImpl.java

Rev 21916 –

ashik.ali — Thu, 13 Jul 2017 11:10:27 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/pom.xml

Rev 21915 –

ashik.ali — Thu, 13 Jul 2017 11:06:26 +0530

ashik.ali – 4 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCustomer.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java

Rev 21914 –

amit.gupta — Wed, 12 Jul 2017 20:44:30 +0530

amit.gupta – 1 file(s) modified

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

Rev 21913 –

amit.gupta — Wed, 12 Jul 2017 20:32:37 +0530

amit.gupta – 1 file(s) modified

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

Rev 21912 –

amit.gupta — Wed, 12 Jul 2017 20:24:22 +0530

amit.gupta – 1 file(s) modified

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

Rev 21911 –

amit.gupta — Wed, 12 Jul 2017 20:21:13 +0530

amit.gupta – 1 file(s) modified

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

Rev 21910 –

amit.gupta — Wed, 12 Jul 2017 20:11:09 +0530

amit.gupta – 1 file(s) modified

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

Rev 21909 – Fixed User Model added gstin Counter for customer purpose

amit.gupta — Wed, 12 Jul 2017 20:01:32 +0530

amit.gupta – 1 file(s) modified
Fixed User Model added gstin Counter for customer purpose

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

Rev 21908 – Fixed User Model added gstin Counter for customer purpose

amit.gupta — Wed, 12 Jul 2017 19:51:17 +0530

amit.gupta – 7 file(s) modified
Fixed User Model added gstin Counter for customer purpose

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Counter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 21907 – Fixed invoice format

amit.gupta — Wed, 12 Jul 2017 19:42:03 +0530

amit.gupta – 1 file(s) modified
Fixed invoice format

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

Rev 21906 –

amit.gupta — Wed, 12 Jul 2017 18:01:19 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl/Aramex.java

Rev 21905 –

kshitij.sood — Wed, 12 Jul 2017 16:20:33 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21904 –

amit.gupta — Wed, 12 Jul 2017 16:10:55 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl/Aramex.java

Rev 21903 –

kshitij.sood — Wed, 12 Jul 2017 15:49:59 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java

Rev 21902 –

ashik.ali — Wed, 12 Jul 2017 14:41:26 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java

Rev 21901 –

ashik.ali — Wed, 12 Jul 2017 14:39:47 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 21900 –

amit.gupta — Tue, 11 Jul 2017 21:25:19 +0530

amit.gupta – 1 file(s) modified

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

Rev 21899 –

amit.gupta — Tue, 11 Jul 2017 19:56:52 +0530

amit.gupta – 1 file(s) modified

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

Rev 21898 –

kshitij.sood — Tue, 11 Jul 2017 19:34:38 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java

Rev 21897 – Added temporary

amit.gupta — Tue, 11 Jul 2017 19:01:20 +0530

amit.gupta – 1 file(s) modified
Added temporary

~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl/Aramex.java

Rev 21896 –

ashik.ali — Tue, 11 Jul 2017 17:47:09 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java

Rev 21895 –

ashik.ali — Tue, 11 Jul 2017 17:38:01 +0530

ashik.ali – 5 file(s) modified

Rev 21894 –

ashik.ali — Tue, 11 Jul 2017 17:36:58 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/GstRate.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java

Rev 21893 – Added physical warehouse for NSSPL-DL

amit.gupta — Tue, 11 Jul 2017 16:26:24 +0530

amit.gupta – 1 file(s) modified
Added physical warehouse for NSSPL-DL

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

Rev 21892 –

amit.gupta — Mon, 10 Jul 2017 16:58:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/resources/log4j.properties

Rev 21891 –

amit.gupta — Mon, 10 Jul 2017 16:55:28 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 21890 –

amit.gupta — Mon, 10 Jul 2017 16:53:06 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/resources/log4j.properties

Rev 21889 –

kshitij.sood — Mon, 10 Jul 2017 15:17:15 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/storage/Mongo.py

Rev 21888 –

amit.gupta — Mon, 10 Jul 2017 14:49:36 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 21887 –

amit.gupta — Mon, 10 Jul 2017 13:49:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java

Rev 21886 –

kshitij.sood — Mon, 10 Jul 2017 13:43:16 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 21885 –

amit.gupta — Mon, 10 Jul 2017 13:32:54 +0530

amit.gupta – 1 file(s) modified

~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java