SmartDukaan – /

Rev 22452 – Fixed bulk Order processing

amit.gupta — Sat, 16 Sep 2017 21:45:59 +0530

amit.gupta – 20 file(s) modified
Fixed bulk Order processing

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/webapp/js/bulk-order-events.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-show.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/ItemPriceQuantity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 22451 –

amit.gupta — Sat, 16 Sep 2017 14:48:16 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java

Rev 22450 – Added pooja

amit.gupta — Fri, 15 Sep 2017 16:09:13 +0530

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

~ /trunk/ContentStore/src/xml/model/users.xml

Rev 22449 – bannerType filter fixed

amit.gupta — Fri, 15 Sep 2017 13:32:23 +0530

amit.gupta – 1 file(s) modified
bannerType filter fixed

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

Rev 22448 –

amit.gupta — Fri, 15 Sep 2017 13:25:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 22447 – fixed banner

amit.gupta — Fri, 15 Sep 2017 13:12:48 +0530

amit.gupta – 2 file(s) modified
fixed banner

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 22446 – Added banners api for profitmandi

amit.gupta — Fri, 15 Sep 2017 13:10:28 +0530

amit.gupta – 2 file(s) modified
Added banners api for profitmandi

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 22445 – Removed bug

amit.gupta — Fri, 15 Sep 2017 11:59:50 +0530

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

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

Rev 22444 – Fixed dependency issue

amit.gupta — Thu, 14 Sep 2017 19:07:05 +0530

amit.gupta – 1 file(s) modified
Fixed dependency issue

~ /trunk/profitmandi-web/pom.xml

Rev 22443 –

amit.gupta — Thu, 14 Sep 2017 16:46:12 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/pom.xml

Rev 22442 –

amit.gupta — Thu, 14 Sep 2017 16:30:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/pom.xml

Rev 22441 –

ashik.ali — Thu, 14 Sep 2017 16:28:16 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/pom.xml

Rev 22440 –

amit.gupta — Thu, 14 Sep 2017 15:40:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/pom.xml

Rev 22439 –

amit.gupta — Thu, 14 Sep 2017 15:36:45 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/pom.xml

Rev 22438 –

amit.gupta — Thu, 14 Sep 2017 13:57:02 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/pom.xml

Rev 22437 –

amit.gupta — Thu, 14 Sep 2017 13:35:46 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/pom.xml

Rev 22436 –

amit.gupta — Thu, 14 Sep 2017 12:53:58 +0530

amit.gupta – 1 file(s) modified

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

Rev 22435 –

amit.gupta — Thu, 14 Sep 2017 11:50:19 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/reports/usersegmentation.py

Rev 22434 – Removed rajneesh, khushal

amit.gupta — Thu, 14 Sep 2017 11:48:42 +0530

amit.gupta – 1 file(s) modified
Removed rajneesh, khushal

~ /trunk/PyDTR/src/dtr/reports/usersegmentation.py

Rev 22433 – Added api to fetch online orders

amit.gupta — Wed, 13 Sep 2017 14:52:33 +0530

amit.gupta – 1 file(s) modified
Added api to fetch online orders

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

Rev 22432 – Added api to fetch online orders

amit.gupta — Wed, 13 Sep 2017 14:44:00 +0530

amit.gupta – 1 file(s) modified
Added api to fetch online orders

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

Rev 22431 –

ashik.ali — Wed, 13 Sep 2017 11:50:57 +0530

ashik.ali – 1 file(s) modified

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

Rev 22430 –

amit.gupta — Wed, 13 Sep 2017 08:47:18 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/Model/Order.php

Rev 22429 –

amit.gupta — Wed, 13 Sep 2017 08:13:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/Model/Order.php

Rev 22428 –

ashik.ali — Tue, 12 Sep 2017 17:52:48 +0530

ashik.ali – 1 file(s) modified

+ /trunk/ThriftConfig/build.gradle

Rev 22427 –

ashik.ali — Tue, 12 Sep 2017 17:34:21 +0530

ashik.ali – 4 file(s) modified

+ /trunk/profitmandi-web/build.gradle
+ /trunk/profitmandi-web/deploy.sh
+ /trunk/profitmandi-web/deployG.sh
+ /trunk/profitmandi-web/settings.gradle

Rev 22426 –

ashik.ali — Tue, 12 Sep 2017 17:33:48 +0530

ashik.ali – 4 file(s) modified

+ /trunk/profitmandi-fofo/build.gradle
+ /trunk/profitmandi-fofo/deployG.sh
+ /trunk/profitmandi-fofo/deployM.sh
+ /trunk/profitmandi-fofo/settings.gradle

Rev 22425 –

ashik.ali — Tue, 12 Sep 2017 17:33:13 +0530

ashik.ali – 1 file(s) modified

+ /trunk/profitmandi-dao/build.gradle

Rev 22424 – Gradle integration

ashik.ali — Tue, 12 Sep 2017 17:32:46 +0530

ashik.ali – 1 file(s) modified
Gradle integration

+ /trunk/profitmandi-common/build.gradle

Rev 22423 –

ashik.ali — Tue, 12 Sep 2017 16:44:06 +0530

ashik.ali – 1 file(s) modified

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

Rev 22422 –

ashik.ali — Tue, 12 Sep 2017 15:50:39 +0530

ashik.ali – 4 file(s) modified

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

Rev 22421 –

amit.gupta — Tue, 12 Sep 2017 15:45:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 22420 –

ashik.ali — Tue, 12 Sep 2017 15:40:38 +0530

ashik.ali – 2 file(s) modified

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

Rev 22419 –

ashik.ali — Tue, 12 Sep 2017 15:22:43 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java

Rev 22418 –

ashik.ali — Tue, 12 Sep 2017 15:20:54 +0530

ashik.ali – 6 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/DistrictMaster.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/FofoStore.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DistrictMasterRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DistrictMasterRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java

Rev 22417 –

ashik.ali — Tue, 12 Sep 2017 15:17:51 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java

Rev 22416 – Added retailer

amit.gupta — Tue, 12 Sep 2017 13:17:20 +0530

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

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

Rev 22415 – Profitmandi logo change

ashik.ali — Tue, 12 Sep 2017 12:19:52 +0530

ashik.ali – 5 file(s) modified
Profitmandi logo change

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/login.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/images/profitmandi-login-logo.jpg
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/profitmandi-login-logo1.jpg (copied from /trunk/profitmandi-fofo/src/main/webapp/resources/images/profitmandi-login-logo.jpg@22183)
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm

Rev 22414 – Added dtrPricing client

amit.gupta — Mon, 11 Sep 2017 18:34:24 +0530

amit.gupta – 1 file(s) modified
Added dtrPricing client

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 22413 –

amit.gupta — Mon, 11 Sep 2017 17:31:31 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/pincode.vm