SmartDukaan – /

Rev 23402 –

amit.gupta — Wed, 28 Feb 2018 15:24:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 23401 –

amit.gupta — Wed, 28 Feb 2018 14:29:25 +0530

amit.gupta – 1 file(s) modified

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

Rev 23400 – Added

amit.gupta — Wed, 28 Feb 2018 14:04:59 +0530

amit.gupta – 5 file(s) modified
Added

~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 23399 –

amit.gupta — Wed, 28 Feb 2018 00:29:11 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/ItemAvailabilityCache.java

Rev 23398 –

amit.gupta — Tue, 27 Feb 2018 20:28:09 +0530

amit.gupta – 1 file(s) modified

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

Rev 23397 – Bug Fix

amit.gupta — Tue, 27 Feb 2018 19:25:24 +0530

amit.gupta – 1 file(s) modified
Bug Fix

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 23396 – Bug : Error prompt when shop document is already uploaded

ashik.ali — Tue, 27 Feb 2018 14:05:25 +0530

ashik.ali – 3 file(s) modified
Bug : Error prompt when shop document is already uploaded

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm

Rev 23395 – We should only deduct the purchase price from wallet.

amit.gupta — Mon, 26 Feb 2018 19:39:45 +0530

amit.gupta – 1 file(s) modified
We should only deduct the purchase price from wallet.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 23394 – Fixed invoice related bug.

amit.gupta — Mon, 26 Feb 2018 18:16:33 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 23393 – Fixed costing while order creation

amit.gupta — Mon, 26 Feb 2018 17:26:11 +0530

amit.gupta – 2 file(s) modified
Fixed costing while order creation

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 23392 – Multiple price drop is possible on same imei

amit.gupta — Mon, 26 Feb 2018 15:17:57 +0530

amit.gupta – 1 file(s) modified
Multiple price drop is possible on same imei

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 23391 – Changed to self - pickup

amit.gupta — Mon, 26 Feb 2018 12:25:18 +0530

amit.gupta – 1 file(s) modified
Changed to self - pickup

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

Rev 23390 –

amit.gupta — Sat, 24 Feb 2018 15:53:10 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm

Rev 23389 – Catalog is not getting wrongly item names after pagination next ...

ashik.ali — Fri, 23 Feb 2018 12:48:46 +0530

ashik.ali – 2 file(s) modified
Catalog is not getting wrongly item names after pagination next - previous

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-paginated.vm

Rev 23388 – Added Smartdukaan

amit.gupta — Fri, 23 Feb 2018 12:20:05 +0530

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

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

Rev 23387 – bug : error while getting empty catalog

ashik.ali — Thu, 22 Feb 2018 18:22:07 +0530

ashik.ali – 1 file(s) modified
bug : error while getting empty catalog

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java

Rev 23386 – bug : error while getting empty catalog

ashik.ali — Thu, 22 Feb 2018 18:10:46 +0530

ashik.ali – 1 file(s) modified
bug : error while getting empty catalog

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java

Rev 23385 –

amit.gupta — Thu, 22 Feb 2018 17:53:53 +0530

amit.gupta – 1 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java

Rev 23384 – Princing unable to get when itemIds are empty

ashik.ali — Thu, 22 Feb 2018 17:46:51 +0530

ashik.ali – 1 file(s) modified
Princing unable to get when itemIds are empty

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java

Rev 23383 – Bug : Upload document of retailer

ashik.ali — Thu, 22 Feb 2018 15:27:52 +0530

ashik.ali – 3 file(s) modified
Bug : Upload document of retailer

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm

Rev 23382 – Fixed

amit.gupta — Wed, 21 Feb 2018 21:42:19 +0530

amit.gupta – 1 file(s) modified
Fixed

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 23381 – Bug Fix

amit.gupta — Wed, 21 Feb 2018 21:21:04 +0530

amit.gupta – 1 file(s) modified
Bug Fix

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 23380 – Fixed Partner address in invoice

amit.gupta — Wed, 21 Feb 2018 18:22:00 +0530

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

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

Rev 23379 – Implemented given web api host and port for file uploading ...

ashik.ali — Wed, 21 Feb 2018 11:40:40 +0530

ashik.ali – 9 file(s) modified
Implemented given web api host and port for file uploading for different different servers

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.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
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/test/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/test/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/test/resources/META-INF/staging.properties

Rev 23378 – Scheme process previous sale/purchase items should from scheme starttime and ...

ashik.ali — Tue, 20 Feb 2018 17:52:05 +0530

ashik.ali – 6 file(s) modified
Scheme process previous sale/purchase items should from scheme starttime and scheme endtime
Retailer update panel bugs

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm

Rev 23377 – good inventory not are in pagination nature retailer document upload ...

ashik.ali — Mon, 19 Feb 2018 19:53:04 +0530

ashik.ali – 7 file(s) modified
good inventory not are in pagination nature
retailer document upload problem, district names are required even if fofoStore code is available
downloading any excel sheet not with defined name
serial numbers are null in not serialized case in pdf invoice

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.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/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm

Rev 23376 – Added changes related to partially active products

amit.gupta — Sat, 17 Feb 2018 20:18:55 +0530

amit.gupta – 2 file(s) modified
Added changes related to partially active products

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java

Rev 23375 – Added Tax Invoice

amit.gupta — Sat, 17 Feb 2018 19:55:11 +0530

amit.gupta – 1 file(s) modified
Added Tax Invoice

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java

Rev 23374 – Added Tax Invoice

amit.gupta — Sat, 17 Feb 2018 19:53:06 +0530

amit.gupta – 1 file(s) modified
Added Tax Invoice

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

Rev 23373 – in case image is not available lets move ahead.

amit.gupta — Sat, 17 Feb 2018 19:52:28 +0530

amit.gupta – 1 file(s) modified
in case image is not available lets move ahead.

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

Rev 23372 – Code format

ashik.ali — Fri, 16 Feb 2018 21:54:46 +0530

ashik.ali – 1 file(s) modified
Code format

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 23371 – Bug : order unable to create when payment option amount ...

ashik.ali — Fri, 16 Feb 2018 20:19:59 +0530

ashik.ali – 1 file(s) modified
Bug : order unable to create when payment option amount is zero

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 23370 – Schemes can be active if no orders are exist

ashik.ali — Fri, 16 Feb 2018 19:53:30 +0530

ashik.ali – 6 file(s) modified
Schemes can be active if no orders are exist

~ /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
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeOut.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js

Rev 23369 – Customer Gst number at order creation time and at Scheme_In ...

ashik.ali — Fri, 16 Feb 2018 17:07:36 +0530

ashik.ali – 9 file(s) modified
Customer Gst number at order creation time and at Scheme_In time double amount is getting in retailer wallet

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCustomer.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 23368 – fix bug purchase update after scaning

ashik.ali — Fri, 16 Feb 2018 10:21:07 +0530

ashik.ali – 1 file(s) modified
fix bug purchase update after scaning

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java

Rev 23367 – Custom Payment Options can be created by fofo partner

ashik.ali — Thu, 15 Feb 2018 20:04:57 +0530

ashik.ali – 7 file(s) modified
Custom Payment Options can be created by fofo partner

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/user-profile.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.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/user-profile.vm

Rev 23366 –

ashik.ali — Thu, 15 Feb 2018 20:03:17 +0530

ashik.ali – 4 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FofoController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PaymentOptionController.java

Rev 23365 – Custom Payment Options can be created by fofo partner

ashik.ali — Thu, 15 Feb 2018 20:01:58 +0530

ashik.ali – 22 file(s) modified
Custom Payment Options can be created by fofo partner

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderPaymentOption.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoPartnerPaymentOption.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/repository/fofo/FofoOrderPaymentOptionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderPaymentOptionRepositoryImpl.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/FofoPartnerPaymentOptionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoPartnerPaymentOptionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PaymentOptionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PaymentOptionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderService.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderService.java@23202)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderServiceImpl.java@23351)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/PaymentOptionService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/PaymentOptionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 23364 – Custom Payment Options can be created by fofo partner

ashik.ali — Thu, 15 Feb 2018 19:59:04 +0530

ashik.ali – 4 file(s) modified
Custom Payment Options can be created by fofo partner

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomPaymentOption.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PaymentOptionIdStatus.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 23363 –

amit.gupta — Thu, 15 Feb 2018 13:48:37 +0530

amit.gupta – 1 file(s) modified

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