SmartDukaan – /

Rev 23218 – Fixed Ecom Forward shipment

amit.gupta — Tue, 16 Jan 2018 08:32:24 +0530

amit.gupta – 8 file(s) modified
Fixed Ecom Forward shipment

+ /trunk/HotspotDashboard/src/main/resources/rquick-surface
+ /trunk/HotspotDashboard/src/main/resources/rquick-surface/barcode.TTF
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 23217 – Moved Forward shipment to manifest generation time

amit.gupta — Tue, 16 Jan 2018 08:30:43 +0530

amit.gupta – 1 file(s) modified
Moved Forward shipment to manifest generation time

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

Rev 23216 –

amit.gupta — Tue, 16 Jan 2018 08:12:35 +0530

amit.gupta – 1 file(s) modified

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

Rev 23215 –

amit.gupta — Tue, 16 Jan 2018 07:57:18 +0530

amit.gupta – 2 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptPackageOrderHandler.java

Rev 23214 – Added RQuick Surface

amit.gupta — Tue, 16 Jan 2018 07:55:30 +0530

amit.gupta – 1 file(s) modified
Added RQuick Surface

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

Rev 23213 –

amit.gupta — Tue, 16 Jan 2018 07:44:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 23212 –

amit.gupta — Tue, 16 Jan 2018 07:20:29 +0530

amit.gupta – 1 file(s) modified

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

Rev 23211 –

amit.gupta — Mon, 15 Jan 2018 19:43:29 +0530

amit.gupta – 1 file(s) modified

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

Rev 23210 –

amit.gupta — Mon, 15 Jan 2018 19:28:01 +0530

amit.gupta – 1 file(s) modified

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

Rev 23209 –

ashik.ali — Mon, 15 Jan 2018 18:32:02 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.java

Rev 23208 –

ashik.ali — Mon, 15 Jan 2018 18:26:51 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.java

Rev 23207 –

ashik.ali — Mon, 15 Jan 2018 18:11:34 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.java

Rev 23206 –

amit.gupta — Mon, 15 Jan 2018 17:52:35 +0530

amit.gupta – 1 file(s) modified

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

Rev 23205 –

amit.gupta — Mon, 15 Jan 2018 17:44:57 +0530

amit.gupta – 1 file(s) modified

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

Rev 23204 –

ashik.ali — Mon, 15 Jan 2018 17:39:27 +0530

ashik.ali – 5 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java

Rev 23203 –

ashik.ali — Mon, 15 Jan 2018 17:38:41 +0530

ashik.ali – 6 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /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/WEB-INF/views/ftl/sale-history.vm
~ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/generic/GenericServiceTest.java

Rev 23202 –

ashik.ali — Mon, 15 Jan 2018 17:37:36 +0530

ashik.ali – 18 file(s) modified

~ /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/FofoOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/PinCodeTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRoleRepositoryImpl.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/GenericRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 23201 –

ashik.ali — Mon, 15 Jan 2018 17:36:40 +0530

ashik.ali – 4 file(s) modified

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/SearchType.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

Rev 23200 –

amit.gupta — Mon, 15 Jan 2018 15:45:09 +0530

amit.gupta – 1 file(s) modified

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

Rev 23199 –

amit.gupta — Mon, 15 Jan 2018 14:24:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 23198 –

amit.gupta — Mon, 15 Jan 2018 14:15:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 23197 –

amit.gupta — Mon, 15 Jan 2018 14:13:15 +0530

amit.gupta – 1 file(s) modified

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

Rev 23196 –

amit.gupta — Mon, 15 Jan 2018 14:09:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 23195 –

amit.gupta — Mon, 15 Jan 2018 13:38:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 23194 –

amit.gupta — Fri, 12 Jan 2018 18:15:15 +0530

amit.gupta – 1 file(s) modified

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

Rev 23193 –

ashik.ali — Thu, 11 Jan 2018 18:29:59 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-ledger-download.vm

Rev 23192 –

ashik.ali — Thu, 11 Jan 2018 18:29:31 +0530

ashik.ali – 1 file(s) modified

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

Rev 23191 –

ashik.ali — Thu, 11 Jan 2018 15:38:03 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerAddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerAddressRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/OrderServiceImpl.java

Rev 23190 –

ashik.ali — Thu, 11 Jan 2018 14:47:30 +0530

ashik.ali – 1 file(s) modified

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

Rev 23189 –

ashik.ali — Thu, 11 Jan 2018 14:33:43 +0530

ashik.ali – 1 file(s) modified

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

Rev 23188 –

ashik.ali — Thu, 11 Jan 2018 14:33:18 +0530

ashik.ali – 1 file(s) modified

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

Rev 23187 – changes

rajender — Thu, 11 Jan 2018 12:38:51 +0530

rajender – 7 file(s) modified
changes

+ /app/app/src/main/res/drawable/activate_screen.jpg
+ /app/app/src/main/res/drawable/deals_screen.jpg
+ /app/app/src/main/res/drawable/differ_screen.jpg
+ /app/app/src/main/res/drawable/first_screen.jpg
+ /app/app/src/main/res/drawable/home_page_sc.jpg
+ /app/app/src/main/res/drawable/payment_screen.jpg
+ /app/app/src/main/res/drawable/register_screen.jpg

Rev 23186 – changes

rajender — Thu, 11 Jan 2018 12:20:22 +0530

rajender – 1 file(s) modified
changes

~ /app/app/build.gradle

Rev 23185 – changes

rajender — Thu, 11 Jan 2018 12:19:34 +0530

rajender – 1 file(s) modified
changes

~ /app/app/src/main/java/com/saholic/profittill/main/LoginActivity.java

Rev 23184 – changes

rajender — Thu, 11 Jan 2018 12:18:56 +0530

rajender – 1 file(s) modified
changes

~ /app/app/src/main/java/com/saholic/profittill/main/DealsHomeFragment.java

Rev 23183 – Added handling of fofo for RQuick Surface

amit.gupta — Wed, 10 Jan 2018 20:10:49 +0530

amit.gupta – 3 file(s) modified
Added handling of fofo for RQuick Surface

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23182 –

amit.gupta — Wed, 10 Jan 2018 20:07:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/RQuickLogisticsReconciliation.py

Rev 23181 –

ashik.ali — Wed, 10 Jan 2018 16:59:13 +0530

ashik.ali – 16 file(s) modified

~ /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/WEB-INF/views/ftl/bad-inventory-snapshot.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/cart.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm

Rev 23180 –

ashik.ali — Wed, 10 Jan 2018 16:58:13 +0530

ashik.ali – 5 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java

Rev 23179 –

ashik.ali — Wed, 10 Jan 2018 16:51:02 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java