SmartDukaan – /

Rev 22253 –

ashik.ali — Mon, 14 Aug 2017 19:22:15 +0530

ashik.ali – 1 file(s) modified

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

Rev 22252 –

ashik.ali — Mon, 14 Aug 2017 18:47:03 +0530

ashik.ali – 1 file(s) modified

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

Rev 22251 –

ashik.ali — Mon, 14 Aug 2017 18:36:49 +0530

ashik.ali – 6 file(s) modified

x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/PrivateDeal.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/PrivateDealRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/PrivateDealRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java

Rev 22250 –

ashik.ali — Mon, 14 Aug 2017 18:35:38 +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/webapp/WEB-INF/views/ftl/order-index.vm

Rev 22249 –

amit.gupta — Mon, 14 Aug 2017 08:00:31 +0530

amit.gupta – 1 file(s) modified

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

Rev 22248 –

amit.gupta — Sun, 13 Aug 2017 16:02:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 22247 – Fixed fofo

amit.gupta — Sun, 13 Aug 2017 15:56:28 +0530

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

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java

Rev 22246 –

amit.gupta — Sun, 13 Aug 2017 14:47:58 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 22245 –

ashik.ali — Sun, 13 Aug 2017 13:00:31 +0530

ashik.ali – 10 file(s) modified

~ /trunk/profitmandi-fofo/pom.xml
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm

Rev 22244 –

ashik.ali — Sun, 13 Aug 2017 12:59:35 +0530

ashik.ali – 4 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/request/CreateOrderRequest.java

Rev 22243 –

ashik.ali — Sun, 13 Aug 2017 12:58:47 +0530

ashik.ali – 13 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/PrivateDeal.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/InsurancePolicy.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/FofoOrder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/PrivateDealRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/PrivateDealRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsurancePolicyRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java

Rev 22242 –

ashik.ali — Sun, 13 Aug 2017 12:57:37 +0530

ashik.ali – 2 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/util/StringUtils.java

Rev 22241 – using throwable to catch everything

amit.gupta — Sun, 13 Aug 2017 11:12:41 +0530

amit.gupta – 1 file(s) modified
using throwable to catch everything

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java

Rev 22240 – Update Accessories ranking

amit.gupta — Thu, 10 Aug 2017 08:33:32 +0530

amit.gupta – 3 file(s) modified
Update Accessories ranking

~ /trunk/PyDTR/src/dtr/storage/Mongo.py
~ /trunk/PyDTR/src/dtr/utils/utils.py
~ /trunk/PyDTR/src/scripts/Solr.py

Rev 22239 – Handled the case when item actually doesn't exist

amit.gupta — Thu, 10 Aug 2017 00:27:40 +0530

amit.gupta – 1 file(s) modified
Handled the case when item actually doesn't exist

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 22238 –

amit.gupta — Wed, 09 Aug 2017 19:28:24 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 22237 – Fixed aramex logic

amit.gupta — Wed, 09 Aug 2017 17:39:28 +0530

amit.gupta – 1 file(s) modified
Fixed aramex logic

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 22236 – Fixed ok

amit.gupta — Wed, 09 Aug 2017 13:40:13 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ActivationCode.java

Rev 22235 –

amit.gupta — Wed, 09 Aug 2017 13:36:43 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ActivationCode.java

Rev 22234 – Removed dependency

amit.gupta — Wed, 09 Aug 2017 13:28:36 +0530

amit.gupta – 1 file(s) modified
Removed dependency

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

Rev 22233 –

amit.gupta — Wed, 09 Aug 2017 12:59:02 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java

Rev 22232 – Added activation codes

amit.gupta — Wed, 09 Aug 2017 12:51:53 +0530

amit.gupta – 1 file(s) modified
Added activation codes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ActivationCode.java

Rev 22231 –

amit.gupta — Wed, 09 Aug 2017 09:36:46 +0530

amit.gupta – 1 file(s) modified

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

Rev 22230 –

amit.gupta — Wed, 09 Aug 2017 09:35:00 +0530

amit.gupta – 1 file(s) modified

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

Rev 22229 –

amit.gupta — Wed, 09 Aug 2017 09:27:09 +0530

amit.gupta – 1 file(s) modified

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

Rev 22228 –

amit.gupta — Wed, 09 Aug 2017 08:50:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 22227 –

amit.gupta — Wed, 09 Aug 2017 08:42:44 +0530

amit.gupta – 1 file(s) modified

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

Rev 22226 –

amit.gupta — Wed, 09 Aug 2017 08:31:27 +0530

amit.gupta – 1 file(s) modified

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

Rev 22225 –

amit.gupta — Wed, 09 Aug 2017 08:13:20 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 22224 –

amit.gupta — Wed, 09 Aug 2017 00:59:28 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 22223 –

amit.gupta — Wed, 09 Aug 2017 00:53:59 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 22222 –

amit.gupta — Wed, 09 Aug 2017 00:45:08 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 22221 –

amit.gupta — Tue, 08 Aug 2017 23:53:32 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 22220 – Added download of tag listing

amit.gupta — Tue, 08 Aug 2017 18:50:03 +0530

amit.gupta – 2 file(s) modified
Added download of tag listing

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java

Rev 22219 –

ashik.ali — Tue, 08 Aug 2017 13:42:15 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 22218 –

ashik.ali — Tue, 08 Aug 2017 13:41:48 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-fofo/pom.xml

Rev 22217 –

ashik.ali — Tue, 08 Aug 2017 13:41:19 +0530

ashik.ali – 8 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
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/GoogleTokenUtil.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties

Rev 22216 –

ashik.ali — Tue, 08 Aug 2017 13:40:41 +0530

ashik.ali – 28 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/entity/catalog/RetailerTag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Tag.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/Document.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/GadgetCopsInsuranceCalc.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/InsurancePolicy.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/InsuranceProvider.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PolicyNumberGenerationSequence.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/Shop.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/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/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/user/Address.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/GadgetCopsInsuranceCalcRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/GadgetCopsInsuranceCalcRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsurancePolicyRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsurancePolicyRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsuranceProviderRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsuranceProviderRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PolicyNumberGenerationSequenceRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PolicyNumberGenerationSequenceRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java

Rev 22215 –

ashik.ali — Tue, 08 Aug 2017 13:38:50 +0530

ashik.ali – 13 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/CustomFofoLineItem.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomInsurancePolicy.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/GadgetCopsInsuranceModel.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/ProfitMandiConstants.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SerialNumberDetail.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/InsuranceUtils.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/StringUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 22214 – Removed Other pay options temporarily

amit.gupta — Sat, 05 Aug 2017 14:54:45 +0530

amit.gupta – 1 file(s) modified
Removed Other pay options temporarily

~ /trunk/DtrMobileAppDashboard/app/View/Shippings/index.ctp